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

config: remove prometheus secondary-endpoint flag

Browse Source 
Signed-off-by: huanggze <loganhuang@yunify.com>
This commit is contained in:
huanggze
2020-05-29 17:12:43 +08:00
parent a575c3eda8
commit 22cbbb30b1
3 changed files with 4 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/apiserver/config/config.go
View File

@@ -186,8 +186,7 @@ func (conf *Config) stripEmptyOptions() {
conf.DevopsOptions = nil
}
if conf.MonitoringOptions != nil && conf.MonitoringOptions.Endpoint == "" &&
conf.MonitoringOptions.SecondaryEndpoint == "" {
if conf.MonitoringOptions != nil && conf.MonitoringOptions.Endpoint == "" {
conf.MonitoringOptions = nil
}

3
pkg/apiserver/config/config_test.go
View File

@@ -103,8 +103,7 @@ func newTestConfig() (*Config, error) {
WeaveScopeHost: "weave-scope-app.weave.svc",
},
MonitoringOptions: &prometheus.Options{
Endpoint: "http://prometheus.kubesphere-monitoring-system.svc",
SecondaryEndpoint: "http://prometheus.kubesphere-monitoring-system.svc",
Endpoint: "http://prometheus.kubesphere-monitoring-system.svc",
},
LoggingOptions: &elasticsearch.Options{
Host: "http://elasticsearch-logging.kubesphere-logging-system.svc:9200",