Promtail Helm Chart: Add support for extra environment variables (#1529)

* Make Promtail's Helm chart support passing extra env variables * bump charts versions
grafana · Feb 5, 2020 · d830612 · d830612
1 parent f1dc58c
commit d830612
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 6 deletions.
diff --git a/production/helm/loki-stack/Chart.yaml b/production/helm/loki-stack/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: "v1"
 name: loki-stack
-version: 0.30.0
+version: 0.31.0
 appVersion: v1.3.0
 kubeVersion: "^1.10.0-0"
 description: "Loki: like Prometheus, but for logs."

diff --git a/production/helm/promtail/Chart.yaml b/production/helm/promtail/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: "v1"
 name: promtail
-version: 0.18.0
+version: 0.18.1
 appVersion: v1.3.0
 kubeVersion: "^1.10.0-0"
 description: "Responsible for gathering logs and sending them to Loki"

diff --git a/production/helm/promtail/templates/daemonset.yaml b/production/helm/promtail/templates/daemonset.yaml
@@ -76,10 +76,13 @@ spec:
             {{- toYaml . | nindent 12 }}
             {{- end }}
           env:
-          - name: HOSTNAME
-            valueFrom:
-              fieldRef:
-                fieldPath: spec.nodeName
+            {{- with .Values.env }}
+              {{- toYaml . | nindent 12 }}
+            {{- end }}
+            - name: HOSTNAME
+              valueFrom:
+                fieldRef:
+                  fieldPath: spec.nodeName
           ports:
             - containerPort: {{ .Values.config.server.http_listen_port }}
               name: http-metrics

diff --git a/production/helm/promtail/values.yaml b/production/helm/promtail/values.yaml
@@ -138,3 +138,6 @@ serviceMonitor:
   interval: ""
   additionalLabels: {}
   # scrapeTimeout: 10s
+
+# Extra env variables to pass to the promtail container
+env: []