From 199b1eac1befacb45a47c3d5624533c827df20a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Manuel=20R=C3=BCger?= <manuel@rueg.eu>
Date: Fri, 20 Jul 2018 16:10:53 +0200
Subject: [PATCH] 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                | 2 +-
 helm/prometheus-operator/templates/deployment.yaml | 3 +++
 helm/prometheus-operator/values.yaml               | 3 +++
 pkg/prometheus/statefulset.go                      | 1 +
 4 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/helm/prometheus-operator/Chart.yaml b/helm/prometheus-operator/Chart.yaml
index 96c05c620..bc7fbc7ae 100644
--- a/helm/prometheus-operator/Chart.yaml
+++ b/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:
diff --git a/helm/prometheus-operator/templates/deployment.yaml b/helm/prometheus-operator/templates/deployment.yaml
index ddeaebda5..5a8eb36a6 100644
--- a/helm/prometheus-operator/templates/deployment.yaml
+++ b/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 }}
diff --git a/helm/prometheus-operator/values.yaml b/helm/prometheus-operator/values.yaml
index 2ca94ceab..78f36ecf2 100755
--- a/helm/prometheus-operator/values.yaml
+++ b/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/
 ##
diff --git a/pkg/prometheus/statefulset.go b/pkg/prometheus/statefulset.go
index 0ae4951af..3139832f5 100644
--- a/pkg/prometheus/statefulset.go
+++ b/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)),