Helm chart: Allow additional scrape_configs to be added (#1134)

* Allow additional scrape_configs to be added * Bump version of loki-stack chart
grafana · Oct 10, 2019 · eb9d732 · eb9d732
1 parent b94a436
commit eb9d732
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/production/helm/promtail/Chart.yaml b/production/helm/promtail/Chart.yaml
@@ -1,5 +1,5 @@
 name: promtail
-version: 0.12.2
+version: 0.12.3
 appVersion: v0.3.0
 kubeVersion: "^1.10.0-0"
 description: "Responsible for gathering logs and sending them to Loki"

diff --git a/production/helm/promtail/templates/configmap.yaml b/production/helm/promtail/templates/configmap.yaml
@@ -262,3 +262,6 @@ data:
         - __meta_kubernetes_pod_container_name
         target_label: __path__
     {{- end }}
+    {{- if .Values.extraScrapeConfigs }}
+    {{- toYaml .Values.extraScrapeConfigs | nindent 4 }}
+    {{- end }}
diff --git a/production/helm/promtail/values.yaml b/production/helm/promtail/values.yaml
@@ -64,6 +64,9 @@ resources: {}
 # Custom scrape_configs to override the default ones in the configmap
 scrapeConfigs: []
 
+# Custom scrape_configs together with the default ones in the configmap
+extraScrapeConfigs: []
+
 securityContext:
   readOnlyRootFilesystem: true
   runAsGroup: 0