add container_name label to logs

fixes #190
Pods can have multiple containers. This fix ensures that we collect
logs for all containers.

production/helm/templates/promtail/configmap.yaml

@@ -36,6 +36,12 @@ data:
           source_labels:
           - __meta_kubernetes_pod_name
           target_label: instance
+        - action: replace
+          source_labels:
+          - __meta_kubernetes_container_name
+          target_label: container_name
+        - action: labelmap
+          regex: __meta_kubernetes_pod_label_(.+)
         - replacement: /var/log/pods/$1/0.log
           separator: /
           source_labels:
@@ -68,6 +74,10 @@ data:
           source_labels:
           - __meta_kubernetes_pod_name
           target_label: instance
+        - action: replace
+          source_labels:
+          - __meta_kubernetes_container_name
+          target_label: container_name
         - action: labelmap
           regex: __meta_kubernetes_pod_label_(.+)
         - replacement: /var/log/pods/$1/0.log

production/ksonnet/promtail/promtail.libsonnet

@@ -82,6 +82,19 @@ k {
             target_label: 'instance',
           },
 
+          // Include container_name label
+          {
+            source_labels: ['__meta_kubernetes_container_name'],
+            action: 'replace',
+            target_label: 'container_name',
+          },
+
+          // Also include all the other labels on the pod.
+          {
+            action: 'labelmap',
+            regex: '__meta_kubernetes_pod_label_(.+)',
+          },
+
           // Kubernetes puts logs under subdirectories keyed pod UID and container_name.
           {
             source_labels: ['__meta_kubernetes_pod_uid', '__meta_kubernetes_pod_container_name'],
@@ -135,6 +148,13 @@ k {
             target_label: 'instance',
           },
 
+          // Include container_name label
+          {
+            source_labels: ['__meta_kubernetes_container_name'],
+            action: 'replace',
+            target_label: 'container_name',
+          },
+
           // Also include all the other labels on the pod.
           {
             action: 'labelmap',

tools/promtail.sh

@@ -42,6 +42,12 @@ data:
         source_labels:
         - __meta_kubernetes_pod_name
         target_label: instance
+      - action: replace
+        source_labels:
+        - __meta_kubernetes_container_name
+        target_label: container_name
+      - action: labelmap
+          regex: __meta_kubernetes_pod_label_(.+)
       - replacement: /var/log/pods/$1
         separator: /
         source_labels:
@@ -74,6 +80,10 @@ data:
         source_labels:
         - __meta_kubernetes_pod_name
         target_label: instance
+      - action: replace
+        source_labels:
+        - __meta_kubernetes_container_name
+        target_label: container_name
       - action: labelmap
         regex: __meta_kubernetes_pod_label_(.+)
       - replacement: /var/log/pods/$1