dont add pods twice if they have app and name labels

issue #313

production/helm/templates/promtail/configmap.yaml

@@ -59,6 +59,10 @@ data:
           regex: ^$
           source_labels:
           - __meta_kubernetes_pod_label_app
+        - action: drop
+          regex: .+
+          source_labels:
+          - __meta_kubernetes_pod_label_name
         - action: replace
           replacement: $1
           separator: /

production/ksonnet/promtail/promtail.libsonnet

@@ -129,6 +129,14 @@ k {
             regex: '^$',
           },
 
+          // Drop pods with a 'name' and an 'app' label.  They will have already been added by 
+          // the scrape_config that matches on the 'name' label
+          {
+            source_labels: ['__meta_kubernetes_pod_label_name'],
+            action: 'drop',
+            regex: '.+',
+          },
+
           // Rename jobs to be <namespace>/<app, from pod app label>
           {
             source_labels: ['__meta_kubernetes_namespace', '__meta_kubernetes_pod_label_app'],

tools/promtail.sh

@@ -65,6 +65,10 @@ data:
         regex: ^$
         source_labels:
         - __meta_kubernetes_pod_label_app
+      - action: drop
+        regex: .+
+        source_labels:
+        - __meta_kubernetes_pod_label_name
       - action: replace
         replacement: $1
         separator: /