admin/kubesphere
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add test code to metrics client, and fix metrics items process

Browse Source 
Signed-off-by: root <danma@yunify.com>
This commit is contained in:
root
2021-01-22 14:50:49 +00:00
parent 8c86c9e1a5
commit 3095fd9403
13 changed files with 765 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
cmd/ks-apiserver/app/options/options.go
View File

@@ -118,18 +118,14 @@ func (s *ServerRunOptions) NewAPIServer(stopCh <-chan struct{}) (*apiserver.APIS
if s.MonitoringOptions == nil || len(s.MonitoringOptions.Endpoint) == 0 {
return nil, fmt.Errorf("moinitoring service address in configuration MUST not be empty, please check configmap/kubesphere-config in kubesphere-system namespace")
} else {
prometheusClient, err := prometheus.NewPrometheus(s.MonitoringOptions)
monitoringClient, err := prometheus.NewPrometheus(s.MonitoringOptions)
if err != nil {
return nil, fmt.Errorf("failed to connect to prometheus, please check prometheus status, error: %v", err)
}
apiServer.PrometheusClient = prometheusClient
apiServer.MonitoringClient = monitoringClient
}
metricsClient, err := metricsserver.NewMetricsServer(kubernetesClient.Kubernetes(), s.KubernetesOptions)
if err != nil {
return nil, fmt.Errorf("failed to connect to metrics-server, please check metrics-server status, error: %v", err)
}
apiServer.MetricsClient = metricsClient
apiServer.MetricsClient = metricsserver.NewMetricsClient(kubernetesClient.Kubernetes(), s.KubernetesOptions)
if s.LoggingOptions.Host != "" {
loggingClient, err := esclient.NewClient(s.LoggingOptions)