Enable logFormat in helm / Forward option from operator to p-c-r (#1605)

* Use defined logFormat for prometheus-config-reloader

* helm: Enable logformat option for prometheus-operator

helm/prometheus-operator/Chart.yaml

@@ -7,7 +7,7 @@ maintainers:
 name: prometheus-operator
 sources:
   - https://github.com/coreos/prometheus-operator
-version: 0.0.27
+version: 0.0.28
 appVersion: "0.20.0"
 home: https://github.com/coreos/prometheus-operator
 keywords:

helm/prometheus-operator/templates/deployment.yaml

@@ -24,6 +24,9 @@ spec:
           args:
           {{- if .Values.kubeletService.enable }}
             - --kubelet-service={{ .Values.kubeletService.namespace }}/{{ .Values.kubeletService.name }}
+          {{- end }}
+          {{- if .Values.logFormat }}
+            - --log-format= {{ .Values.logFormat }}
           {{- end }}
             - --prometheus-config-reloader={{ .Values.prometheusConfigReloader.repository }}:{{ .Values.prometheusConfigReloader.tag }}
             - --config-reloader-image={{ .Values.configmapReload.repository }}:{{ .Values.configmapReload.tag }}

helm/prometheus-operator/values.yaml

@@ -52,6 +52,9 @@ pspEnable: true
 imagePullSecrets: []
 #  - name: "image-pull-secret"
 
+# Use logfmt (default) or json-formatted logging
+# logFormat: logfmt
+
 ## Prometheus-operator resource limits & requests
 ## Ref: https://kubernetes.io/docs/user-guide/compute-resources/
 ##

pkg/prometheus/statefulset.go

@@ -487,6 +487,7 @@ func makeStatefulSetSpec(p monitoringv1.Prometheus, c *Config, ruleConfigMapName
 	}
 
 	configReloadArgs := []string{
+		fmt.Sprintf("--log-format=%s", c.LogFormat),
 		fmt.Sprintf("--reload-url=%s", localReloadURL),
 		fmt.Sprintf("--config-file=%s", path.Join(confDir, configFilename)),
 		fmt.Sprintf("--config-envsubst-file=%s", path.Join(confOutDir, configEnvsubstFilename)),