Update config for newer kubernetes clusters (grafana#55)

Signed-off-by: Goutham Veeramachaneni <gouthamve@gmail.com>
cyriltovena · Dec 10, 2018 · 8c236f1 · 8c236f1
1 parent 91f41f3
commit 8c236f1
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/tools/promtail.sh b/tools/promtail.sh
@@ -41,9 +41,11 @@ data:
         source_labels:
         - __meta_kubernetes_pod_name
         target_label: instance
-      - replacement: /var/log/pods/$1/
+      - replacement: /var/log/pods/$1
+        separator: /
         source_labels:
         - __meta_kubernetes_pod_uid
+        - __meta_kubernetes_pod_container_name
         target_label: __path__
     - job_name: kubernetes-pods-app
       kubernetes_sd_configs:
@@ -73,9 +75,11 @@ data:
         target_label: instance
       - action: labelmap
         regex: __meta_kubernetes_pod_label_(.+)
-      - replacement: /var/log/pods/$1/
+      - replacement: /var/log/pods/$1
+        separator: /
         source_labels:
         - __meta_kubernetes_pod_uid
+        - __meta_kubernetes_pod_container_name
         target_label: __path__
 kind: ConfigMap
 metadata: