Skip to content

Commit

Permalink
disable logging & montoring service on UI
Browse files Browse the repository at this point in the history
  • Loading branch information
sancyx committed Sep 9, 2021
1 parent c9407b9 commit 14e8583
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 80 deletions.
8 changes: 4 additions & 4 deletions config/ui/feature-set.json.dist
Original file line number Diff line number Diff line change
Expand Up @@ -78,9 +78,9 @@
},
"features": {
"monitoring": {
"enabled": true,
"enabled": false,
"createClusterFlow": {
"enabled": true
"enabled": false
}
},
"securityScan": {
Expand All @@ -93,9 +93,9 @@
"enabled": true
},
"logging": {
"enabled": true,
"enabled": false,
"createClusterFlow": {
"enabled": true
"enabled": false
}
},
"backup": {
Expand Down
3 changes: 1 addition & 2 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,6 @@ require (
github.com/lestrrat-go/backoff v1.0.0
github.com/mattn/go-sqlite3 v2.0.3+incompatible // indirect
github.com/microcosm-cc/bluemonday v1.0.3
github.com/mitchellh/copystructure v1.0.0
github.com/mitchellh/mapstructure v1.4.1
github.com/moogar0880/problems v0.1.1
github.com/oklog/run v1.1.0
Expand Down Expand Up @@ -93,7 +92,7 @@ require (
gopkg.in/yaml.v2 v2.4.0
helm.sh/helm/v3 v3.5.3
k8s.io/api v0.20.9
k8s.io/apiextensions-apiserver v0.20.9
k8s.io/apiextensions-apiserver v0.20.9 // indirect
k8s.io/apimachinery v0.20.9
k8s.io/cli-runtime v0.20.9
k8s.io/client-go v0.20.9
Expand Down
74 changes: 0 additions & 74 deletions internal/cmd/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -537,80 +537,6 @@ func Configure(v *viper.Viper, p *pflag.FlagSet) {
v.SetDefault("cluster::vault::charts::webhook::version", "1.10.1")
v.SetDefault("cluster::vault::charts::webhook::values", map[string]interface{}{})

v.SetDefault("cluster::monitoring::enabled", true)
v.SetDefault("cluster::monitoring::namespace", "")
v.SetDefault("cluster::monitoring::grafana::adminUser", "admin")
v.SetDefault("cluster::monitoring::charts::operator::chart", "prometheus-community/kube-prometheus-stack")
v.SetDefault("cluster::monitoring::charts::operator::version", "12.11.3")
v.SetDefault("cluster::monitoring::charts::operator::values", map[string]interface{}{
"prometheus": map[string]interface{}{
"ingress": map[string]interface{}{
"annotations": map[string]interface{}{
"traefik.frontend.rule.type": "PathPrefix",
"traefik.ingress.kubernetes.io/ssl-redirect": "true",
},
},
},
"alertmanager": map[string]interface{}{
"ingress": map[string]interface{}{
"annotations": map[string]interface{}{
"traefik.frontend.rule.type": "PathPrefix",
"traefik.ingress.kubernetes.io/ssl-redirect": "true",
},
},
},
"grafana": map[string]interface{}{
"ingress": map[string]interface{}{
"annotations": map[string]interface{}{
"traefik.frontend.rule.type": "PathPrefixStrip",
"traefik.ingress.kubernetes.io/redirect-permanent": "true",
"traefik.ingress.kubernetes.io/redirect-regex": "^http://(.*)",
"traefik.ingress.kubernetes.io/redirect-replacement": `https://$1\`,
},
},
"sidecar": map[string]interface{}{
"datasources": map[string]interface{}{
"enabled": "true",
},
},
},
})
v.SetDefault("cluster::monitoring::images::operator::repository", "quay.io/prometheus-operator/prometheus-operator")
v.SetDefault("cluster::monitoring::images::operator::tag", "v0.44.1")
v.SetDefault("cluster::monitoring::images::prometheus::repository", "quay.io/prometheus/prometheus")
v.SetDefault("cluster::monitoring::images::prometheus::tag", "v2.22.1")
v.SetDefault("cluster::monitoring::images::alertmanager::repository", "quay.io/prometheus/alertmanager")
v.SetDefault("cluster::monitoring::images::alertmanager::tag", "v0.21.0")
v.SetDefault("cluster::monitoring::images::grafana::repository", "grafana/grafana")
v.SetDefault("cluster::monitoring::images::grafana::tag", "7.3.5")
v.SetDefault("cluster::monitoring::images::kubestatemetrics::repository", "quay.io/coreos/kube-state-metrics")
v.SetDefault("cluster::monitoring::images::kubestatemetrics::tag", "v1.9.7")
v.SetDefault("cluster::monitoring::images::nodeexporter::repository", "quay.io/prometheus/node-exporter")
v.SetDefault("cluster::monitoring::images::nodeexporter::tag", "v1.0.1")

v.SetDefault("cluster::monitoring::charts::pushgateway::chart", "prometheus-community/prometheus-pushgateway")
v.SetDefault("cluster::monitoring::charts::pushgateway::version", "1.5.1")
v.SetDefault("cluster::monitoring::charts::pushgateway::values", map[string]interface{}{})
v.SetDefault("cluster::monitoring::images::pushgateway::repository", "prom/pushgateway")
v.SetDefault("cluster::monitoring::images::pushgateway::tag", "v1.0.1")

v.SetDefault("cluster::logging::enabled", true)
v.SetDefault("cluster::logging::namespace", "")
v.SetDefault("cluster::logging::charts::operator::chart", "banzaicloud-stable/logging-operator")
v.SetDefault("cluster::logging::charts::operator::version", "3.2.2")
v.SetDefault("cluster::logging::charts::operator::values", map[string]interface{}{})
v.SetDefault("cluster::logging::images::operator::repository", "banzaicloud/logging-operator")
v.SetDefault("cluster::logging::images::operator::tag", "3.2.0")
v.SetDefault("cluster::logging::charts::loki::chart", "banzaicloud-stable/loki")
v.SetDefault("cluster::logging::charts::loki::version", "0.17.4")
v.SetDefault("cluster::logging::charts::loki::values", map[string]interface{}{})
v.SetDefault("cluster::logging::images::loki::repository", "grafana/loki")
v.SetDefault("cluster::logging::images::loki::tag", "v1.3.0")
v.SetDefault("cluster::logging::images::fluentbit::repository", "fluent/fluent-bit")
v.SetDefault("cluster::logging::images::fluentbit::tag", "1.4.4")
v.SetDefault("cluster::logging::images::fluentd::repository", "banzaicloud/fluentd")
v.SetDefault("cluster::logging::images::fluentd::tag", "v1.10.3-alpine-2")

v.SetDefault("cluster::dns::enabled", true)
v.SetDefault("cluster::dns::namespace", "")
v.SetDefault("cluster::dns::baseDomain", "")
Expand Down

0 comments on commit 14e8583

Please sign in to comment.