未验证 提交 82b93f89 编写于 作者: K KubeSphere CI Bot 提交者: GitHub

Merge pull request #2134 from huanggze/monitor-fix

config: remove prometheus secondary-endpoint flag
...@@ -186,8 +186,7 @@ func (conf *Config) stripEmptyOptions() { ...@@ -186,8 +186,7 @@ func (conf *Config) stripEmptyOptions() {
conf.DevopsOptions = nil conf.DevopsOptions = nil
} }
if conf.MonitoringOptions != nil && conf.MonitoringOptions.Endpoint == "" && if conf.MonitoringOptions != nil && conf.MonitoringOptions.Endpoint == "" {
conf.MonitoringOptions.SecondaryEndpoint == "" {
conf.MonitoringOptions = nil conf.MonitoringOptions = nil
} }
......
...@@ -103,8 +103,7 @@ func newTestConfig() (*Config, error) { ...@@ -103,8 +103,7 @@ func newTestConfig() (*Config, error) {
WeaveScopeHost: "weave-scope-app.weave.svc", WeaveScopeHost: "weave-scope-app.weave.svc",
}, },
MonitoringOptions: &prometheus.Options{ MonitoringOptions: &prometheus.Options{
Endpoint: "http://prometheus.kubesphere-monitoring-system.svc", Endpoint: "http://prometheus.kubesphere-monitoring-system.svc",
SecondaryEndpoint: "http://prometheus.kubesphere-monitoring-system.svc",
}, },
LoggingOptions: &elasticsearch.Options{ LoggingOptions: &elasticsearch.Options{
Host: "http://elasticsearch-logging.kubesphere-logging-system.svc:9200", Host: "http://elasticsearch-logging.kubesphere-logging-system.svc:9200",
......
...@@ -5,14 +5,12 @@ import ( ...@@ -5,14 +5,12 @@ import (
) )
type Options struct { type Options struct {
Endpoint string `json:"endpoint,omitempty" yaml:"endpoint"` Endpoint string `json:"endpoint,omitempty" yaml:"endpoint"`
SecondaryEndpoint string `json:"secondaryEndpoint,omitempty" yaml:"secondaryEndpoint"`
} }
func NewPrometheusOptions() *Options { func NewPrometheusOptions() *Options {
return &Options{ return &Options{
Endpoint: "", Endpoint: "",
SecondaryEndpoint: "",
} }
} }
...@@ -25,17 +23,10 @@ func (s *Options) ApplyTo(options *Options) { ...@@ -25,17 +23,10 @@ func (s *Options) ApplyTo(options *Options) {
if s.Endpoint != "" { if s.Endpoint != "" {
options.Endpoint = s.Endpoint options.Endpoint = s.Endpoint
} }
if s.SecondaryEndpoint != "" {
options.SecondaryEndpoint = s.SecondaryEndpoint
}
} }
func (s *Options) AddFlags(fs *pflag.FlagSet, c *Options) { func (s *Options) AddFlags(fs *pflag.FlagSet, c *Options) {
fs.StringVar(&s.Endpoint, "prometheus-endpoint", c.Endpoint, ""+ fs.StringVar(&s.Endpoint, "prometheus-endpoint", c.Endpoint, ""+
"Prometheus service endpoint which stores KubeSphere monitoring data, if left "+ "Prometheus service endpoint which stores KubeSphere monitoring data, if left "+
"blank, will use builtin metrics-server as data source.") "blank, will use builtin metrics-server as data source.")
fs.StringVar(&s.SecondaryEndpoint, "prometheus-secondary-endpoint", c.SecondaryEndpoint, ""+
"Prometheus secondary service endpoint, if left empty and endpoint is set, will use endpoint instead.")
} }
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册