Add entryParser option to helm chart

Signed-off-by: Steven Sheehy <[email protected]>
grafana · Mar 6, 2019 · a915399 · a915399
1 parent c366665
commit a915399
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/production/helm/Chart.yaml b/production/helm/Chart.yaml
@@ -1,5 +1,5 @@
 name: loki
-version: 0.0.1
+version: 0.1.0
 appVersion: 0.0.1
 kubeVersion: "^1.10.0-0"
 description: "Loki: like Prometheus, but for logs."
@@ -10,4 +10,4 @@ sources:
 maintainers:
   - name: Loki Maintainers
     email: [email protected]
-engine: gotpl
+engine: gotpl
diff --git a/production/helm/templates/promtail/configmap.yaml b/production/helm/templates/promtail/configmap.yaml
@@ -11,6 +11,7 @@ data:
   promtail.yaml: |
     scrape_configs:
       - job_name: kubernetes-pods
+        entry_parser: {{ .Values.promtail.entryParser }}
         kubernetes_sd_configs:
         - role: pod
         relabel_configs:
@@ -49,6 +50,7 @@ data:
           - __meta_kubernetes_pod_container_name
           target_label: __path__
       - job_name: kubernetes-pods-app
+        entry_parser: {{ .Values.promtail.entryParser }}
         kubernetes_sd_configs:
         - role: pod
         relabel_configs:
@@ -89,4 +91,4 @@ data:
           source_labels:
           - __meta_kubernetes_pod_uid
           - __meta_kubernetes_pod_container_name
-          target_label: __path__
+          target_label: __path__
diff --git a/production/helm/values.yaml b/production/helm/values.yaml
@@ -97,6 +97,8 @@ promtail:
   nameOverride: promtail
   deploymentStrategy: RollingUpdate
 
+  entryParser: docker
+
   image:
     repository: grafana/promtail
     tag: master