mirrors/prometheus-operator
mirrors/prometheus-operator
1
0
Fork 0
mirror of https://github.com/prometheus-operator/prometheus-operator.git synced 2025-04-21 11:48:53 +00:00
Code Activity

thanos sidecar: log flags double definition

Browse source 
This fixes a double definition of the `--log.level` and `--log.format`
flags in the thanos sidecar.

Fixes
This commit is contained in:
ston1th 2020-05-25 17:47:00 +02:00
parent fc551e1099
commit e9207c8cb2
1 changed files with 8 additions and 11 deletions

19
pkg/prometheus/statefulset.go
View file

@ -739,13 +739,6 @@ func makeStatefulSetSpec(p monitoringv1.Prometheus, c *Config, ruleConfigMapName
fmt.Sprintf("--http-address=%s:10902", bindAddress),
}
if p.Spec.Thanos.LogLevel != "" {
thanosArgs = append(thanosArgs, "--log.level="+p.Spec.Thanos.LogLevel)
}
if p.Spec.Thanos.LogFormat != "" {
thanosArgs = append(thanosArgs, "--log.format="+p.Spec.Thanos.LogFormat)
}
if p.Spec.Thanos.GRPCServerTLSConfig != nil {
tls := p.Spec.Thanos.GRPCServerTLSConfig
if tls.CertFile != "" {
@ -817,11 +810,15 @@ func makeStatefulSetSpec(p monitoringv1.Prometheus, c *Config, ruleConfigMapName
})
}
if p.Spec.LogLevel != "" {
container.Args = append(container.Args, fmt.Sprintf("--log.level=%s", p.Spec.LogLevel))
if p.Spec.Thanos.LogLevel != "" {
container.Args = append(container.Args, "--log.level="+p.Spec.Thanos.LogLevel)
} else if p.Spec.LogLevel != "" {
container.Args = append(container.Args, "--log.level="+p.Spec.LogLevel)
}
if p.Spec.LogFormat != "" {
container.Args = append(container.Args, fmt.Sprintf("--log.format=%s", p.Spec.LogFormat))
if p.Spec.Thanos.LogFormat != "" {
container.Args = append(container.Args, "--log.format="+p.Spec.Thanos.LogFormat)
} else if p.Spec.LogFormat != "" {
container.Args = append(container.Args, "--log.format="+p.Spec.LogFormat)
}
additionalContainers = append(additionalContainers, container)
}