From 71633730646058a9aa05fbb2fc7b292e5b563bab Mon Sep 17 00:00:00 2001 From: Jeff Date: Thu, 11 Apr 2019 11:06:47 +0800 Subject: [PATCH] change servicemesh prometheus to kubesphere monitoring prometheus --- cmd/ks-apiserver/app/options/options.go | 5 ++++- cmd/ks-apiserver/app/server.go | 3 +-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/cmd/ks-apiserver/app/options/options.go b/cmd/ks-apiserver/app/options/options.go index 7e31cfc1d..c22998fe8 100644 --- a/cmd/ks-apiserver/app/options/options.go +++ b/cmd/ks-apiserver/app/options/options.go @@ -14,6 +14,9 @@ type ServerRunOptions struct { // jaeger query service url JaegerQueryServiceUrl string + // prometheus service url for servicemesh metrics + ServicemeshPrometheusServiceUrl string + // openpitrix api gateway service url OpenPitrixServer string @@ -38,5 +41,5 @@ func (s *ServerRunOptions) AddFlags(fs *pflag.FlagSet) { fs.StringVar(&s.IstioPilotServiceURL, "istio-pilot-service-url", "http://istio-pilot.istio-system.svc:8080/version", "istio pilot discovery service url") fs.StringVar(&s.JaegerQueryServiceUrl, "jaeger-query-service-url", "http://jaeger-query.istio-system.svc:16686/jaeger", "jaeger query service url") - + fs.StringVar(&s.ServicemeshPrometheusServiceUrl, "servicemesh-prometheus-service-url", "http://prometheus-k8s-system.kubesphere-monitoring-system.svc:9090", "prometheus service for servicemesh") } diff --git a/cmd/ks-apiserver/app/server.go b/cmd/ks-apiserver/app/server.go index b81322549..8cef8836a 100644 --- a/cmd/ks-apiserver/app/server.go +++ b/cmd/ks-apiserver/app/server.go @@ -121,8 +121,7 @@ func initializeServicemeshConfig(s *options.ServerRunOptions) { config.InCluster = true // Set default prometheus service url - // TODO: use kubesphere builtin p8s instead of istio p8s - config.ExternalServices.PrometheusServiceURL = "http://prometheus.istio-system.svc.cluster.local:9090" + config.ExternalServices.PrometheusServiceURL = s.ServicemeshPrometheusServiceUrl config.ExternalServices.PrometheusCustomMetricsURL = config.ExternalServices.PrometheusServiceURL // Set istio pilot discovery service url