[OSCP]KusciaTask 系统资源指标采集、暴露及统一导出

cmd/kuscia/modules/ktexporter.go

@@ -0,0 +1,56 @@
+// Copyright 2023 Ant Group Co., Ltd.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package modules
+
+import (
+	"context"
+	"fmt"
+	"time"
+
+	pkgcom "github.com/secretflow/kuscia/pkg/common"
+	"github.com/secretflow/kuscia/pkg/ktexporter"
+	"github.com/secretflow/kuscia/pkg/utils/readyz"
+)
+
+type ktExporterModule struct {
+	moduleRuntimeBase
+	runMode            pkgcom.RunModeType
+	domainID           string
+	rootDir            string
+	metricUpdatePeriod uint
+	ktExportPort       string
+}
+
+func NewKtExporter(i *ModuleRuntimeConfigs) (Module, error) {
+	readyURI := fmt.Sprintf("http://127.0.0.1:%s", i.KtExportPort)
+	return &ktExporterModule{
+		moduleRuntimeBase: moduleRuntimeBase{
+			name:         "ktexporter",
+			readyTimeout: 60 * time.Second,
+			rdz: readyz.NewHTTPReadyZ(readyURI, 404, func(_ []byte) error {
+				return nil
+			}),
+		},
+		runMode:            i.RunMode,
+		domainID:           i.DomainID,
+		rootDir:            i.RootDir,
+		metricUpdatePeriod: i.MetricUpdatePeriod,
+		ktExportPort:       i.KtExportPort,
+	}, nil
+}
+
+func (exporter *ktExporterModule) Run(ctx context.Context) error {
+	return ktexporter.KtExporter(ctx, exporter.runMode, exporter.domainID, exporter.metricUpdatePeriod, exporter.ktExportPort)
+}

cmd/kuscia/modules/metricexporter.go

@@ -33,6 +33,7 @@ type metricExporterModule struct {
 	metricURLs       map[string]string
 	nodeExportPort   string
 	ssExportPort     string
+	ktExportPort     string
 	metricExportPort string
 	podManager       pod.Manager
 }
@@ -63,12 +64,14 @@ func NewMetricExporter(i *ModuleRuntimeConfigs) (Module, error) {
 		rootDir:          i.RootDir,
 		nodeExportPort:   i.NodeExportPort,
 		ssExportPort:     i.SsExportPort,
+		ktExportPort:     i.KtExportPort,
 		metricExportPort: i.MetricExportPort,
 		podManager:       podManager,
 		metricURLs: map[string]string{
 			"node-exporter": "http://localhost:" + i.NodeExportPort + "/metrics",
 			"envoy":         envoyexporter.GetEnvoyMetricURL(),
 			"ss":            "http://localhost:" + i.SsExportPort + "/ssmetrics",
+			"kt":            "http://localhost:" + i.KtExportPort + "/ktmetrics",
 		},
 	}
 	return exporter, nil

cmd/kuscia/modules/runtime.go

@@ -51,6 +51,7 @@ type ModuleRuntimeConfigs struct {
 	TransportPort           int
 	InterConnSchedulerPort  int
 	SsExportPort            string
+	KtExportPort            string
 	NodeExportPort          string
 	MetricExportPort        string
 	KusciaKubeConfig        string
@@ -190,6 +191,7 @@ func NewModuleRuntimeConfigs(ctx context.Context, kusciaConf confloader.KusciaCo
 	}
 
 	// init exporter ports
+	dependencies.KtExportPort = "9093"
 	dependencies.SsExportPort = "9092"
 	dependencies.NodeExportPort = "9100"
 	dependencies.MetricExportPort = "9091"

cmd/kuscia/start/start.go

@@ -90,6 +90,7 @@ func Start(ctx context.Context, configFile string) error {
 	mm.Regist("metricexporter", modules.NewMetricExporter, autonomy, lite, master)
 	mm.Regist("nodeexporter", modules.NewNodeExporter, autonomy, lite, master)
 	mm.Regist("ssexporter", modules.NewSsExporter, autonomy, lite, master)
+	mm.Regist("ktexporter", modules.NewKtExporter, autonomy, lite, master)
 	mm.Regist("scheduler", modules.NewScheduler, autonomy, master)
 	mm.Regist("transport", modules.NewTransport, autonomy, lite)
 
@@ -104,7 +105,8 @@ func Start(ctx context.Context, configFile string) error {
 	mm.SetDependencies("kusciaapi", "k3s", "config", "domainroute")
 	mm.SetDependencies("scheduler", "k3s")
 	mm.SetDependencies("ssexporter", "envoy")
-	mm.SetDependencies("metricexporter", "agent", "envoy", "ssexporter", "nodeexporter")
+	mm.SetDependencies("ktexporter", "envoy")
+	mm.SetDependencies("metricexporter", "agent", "envoy", "ssexporter", "ktexporter", "nodeexporter")
 	mm.SetDependencies("transport", "envoy")
 	mm.SetDependencies("k3s", "coredns")
 

docs/tutorial/run_scql_on_kuscia_cn.md

@@ -291,7 +291,12 @@ curl -X POST http://127.0.0.1:80/intra/project/create \
 ```bash
 curl -X POST http://127.0.0.1:80/intra/project/list \
 --header "host: scql-broker-intra.alice.svc" \
---header "kuscia-source: alice"
+--header "kuscia-source: alice" \
+-d '{
+  "ids": [
+    "demo"
+  ]
+}'
 ```
 
 4.邀请 bob 加入到 "demo" 项目中
@@ -309,7 +314,8 @@ curl -X POST http://127.0.0.1:80/intra/member/invite \
 ```bash
 curl -X POST http://127.0.0.1:80/intra/invitation/list \
 --header "host: scql-broker-intra.alice.svc" \
---header "kuscia-source: alice"
+--header "kuscia-source: alice" \
+-d '{}'
 ```
 
 #### Bob 接受邀请
@@ -699,4 +705,4 @@ ls /home/kuscia/var/stdout/pods
 # 查看应用容器的日志，示例如下:
 cat /home/kuscia/var/stdout/pods/alice_xxxx_engine_xxxx/secretflow/0.log
 cat /home/kuscia/var/stdout/pods/alice_xxxx_broker_xxxx/secretflow/0.log
-```
+```

go.mod

@@ -34,7 +34,7 @@ require (
 	github.com/moby/sys/mount v0.3.3
 	github.com/moby/sys/mountinfo v0.7.1
 	github.com/olekukonko/tablewriter v0.0.5
-	github.com/opencontainers/image-spec v1.1.0-rc5
+	github.com/opencontainers/image-spec v1.1.0
 	github.com/opencontainers/runtime-spec v1.1.1-0.20230823135140-4fec88fd00a4
 	github.com/opencontainers/selinux v1.11.0
 	github.com/patrickmn/go-cache v2.1.0+incompatible
@@ -90,11 +90,14 @@ require (
 require (
 	cloud.google.com/go/compute v1.23.3 // indirect
 	cloud.google.com/go/compute/metadata v0.2.3 // indirect
+	github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24 // indirect
+	github.com/AdamKorcz/go-118-fuzz-build v0.0.0-20230306123547-8075edf89bb0 // indirect
 	github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
 	github.com/JeffAshton/win_pdh v0.0.0-20161109143554-76bb4ee9f0ab // indirect
 	github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible // indirect
 	github.com/MakeNowJust/heredoc v1.0.0 // indirect
-	github.com/Microsoft/go-winio v0.6.1 // indirect
+	github.com/Microsoft/go-winio v0.6.2 // indirect
+	github.com/Microsoft/hcsshim v0.11.7 // indirect
 	github.com/NYTimes/gziphandler v1.1.1 // indirect
 	github.com/antlr/antlr4/runtime/Go/antlr v1.4.10 // indirect
 	github.com/apparentlymart/go-cidr v1.1.0 // indirect
@@ -109,9 +112,19 @@ require (
 	github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311 // indirect
 	github.com/cilium/ebpf v0.11.0 // indirect
 	github.com/cncf/xds/go v0.0.0-20230607035331-e9ce68804cb4 // indirect
+	github.com/containerd/cgroups v1.1.0 // indirect
 	github.com/containerd/console v1.0.3 // indirect
+	github.com/containerd/containerd v1.7.24 // indirect
+	github.com/containerd/containerd/api v1.7.19 // indirect
+	github.com/containerd/continuity v0.4.2 // indirect
+	github.com/containerd/errdefs v0.3.0 // indirect
+	github.com/containerd/fifo v1.1.0 // indirect
+	github.com/containerd/log v0.1.0 // indirect
+	github.com/containerd/platforms v0.2.1 // indirect
 	github.com/containerd/stargz-snapshotter/estargz v0.14.3 // indirect
-	github.com/containerd/ttrpc v1.2.2 // indirect
+	github.com/containerd/ttrpc v1.2.5 // indirect
+	github.com/containerd/typeurl v1.0.2 // indirect
+	github.com/containerd/typeurl/v2 v2.1.1 // indirect
 	github.com/coreos/go-semver v0.3.0 // indirect
 	github.com/coreos/go-systemd/v22 v22.5.0 // indirect
 	github.com/cyphar/filepath-securejoin v0.2.4 // indirect
@@ -120,8 +133,10 @@ require (
 	github.com/distribution/reference v0.6.0 // indirect
 	github.com/dnstap/golang-dnstap v0.4.0 // indirect
 	github.com/docker/cli v27.1.1+incompatible // indirect
-	github.com/docker/docker v27.1.1+incompatible // indirect
+	github.com/docker/docker v27.3.1+incompatible // indirect
 	github.com/docker/docker-credential-helpers v0.7.0 // indirect
+	github.com/docker/go-connections v0.4.0 // indirect
+	github.com/docker/go-events v0.0.0-20190806004212-e31b211e4f1c // indirect
 	github.com/emicklei/go-restful/v3 v3.11.0 // indirect
 	github.com/envoyproxy/protoc-gen-validate v1.0.2 // indirect
 	github.com/euank/go-kmsg-parser v2.0.0+incompatible // indirect
@@ -184,7 +199,12 @@ require (
 	github.com/mistifyio/go-zfs v2.1.2-0.20190413222219-f784269be439+incompatible // indirect
 	github.com/mitchellh/go-wordwrap v1.0.0 // indirect
 	github.com/moby/docker-image-spec v1.3.1 // indirect
+	github.com/moby/locker v1.0.1 // indirect
 	github.com/moby/spdystream v0.2.0 // indirect
+	github.com/moby/sys/sequential v0.5.0 // indirect
+	github.com/moby/sys/signal v0.7.0 // indirect
+	github.com/moby/sys/user v0.3.0 // indirect
+	github.com/moby/sys/userns v0.1.0 // indirect
 	github.com/moby/term v0.0.0-20221205130635-1aeaba878587 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
@@ -221,11 +241,12 @@ require (
 	github.com/xlab/treeprint v1.1.0 // indirect
 	github.com/yusufpapurcu/wmi v1.2.2 // indirect
 	github.com/zeebo/xxh3 v1.0.2 // indirect
-	go.etcd.io/bbolt v1.3.8 // indirect
+	go.etcd.io/bbolt v1.3.10 // indirect
 	go.etcd.io/etcd/api/v3 v3.5.6 // indirect
 	go.etcd.io/etcd/client/pkg/v3 v3.5.6 // indirect
 	go.etcd.io/etcd/client/v2 v2.305.6 // indirect
 	go.etcd.io/etcd/client/v3 v3.5.6 // indirect
+	go.opencensus.io v0.24.0 // indirect
 	go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.1 // indirect
 	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.45.0 // indirect
 	go.opentelemetry.io/otel v1.21.0 // indirect