From d83ed358288d29e35427e6337b32af852236b6c5 Mon Sep 17 00:00:00 2001
From: Bin Yi <byi@sumologic.com>
Date: Mon, 6 May 2019 11:06:18 -0700
Subject: [PATCH 1/2] drop container==POD

---
 deploy/helm/overrides.yaml | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/deploy/helm/overrides.yaml b/deploy/helm/overrides.yaml
index de7818d14c..04ff38a4a5 100644
--- a/deploy/helm/overrides.yaml
+++ b/deploy/helm/overrides.yaml
@@ -77,26 +77,56 @@ prometheus:
     # cadvisor container metrics
     - url: http://fluentd:9888/prometheus.metrics.container
       writeRelabelConfigs:
+      - action: drop
+        regex: POD
+        sourceLabels: [container]
+      - action: drop
+        regex: POD
+        sourceLabels: [container_name]
       - action: keep
         regex: kubelet;container_cpu_(?:load_average_10s|(?:system|usage)_seconds_total)
         sourceLabels: [job, __name__]
     - url: http://fluentd:9888/prometheus.metrics.container
       writeRelabelConfigs:
+      - action: drop
+        regex: POD
+        sourceLabels: [container]
+      - action: drop
+        regex: POD
+        sourceLabels: [container_name]
       - action: keep
         regex: kubelet;container_memory_(?:usage_bytes|memory_swap)
         sourceLabels: [job, __name__]
     - url: http://fluentd:9888/prometheus.metrics.container
       writeRelabelConfigs:
+      - action: drop
+        regex: POD
+        sourceLabels: [container]
+      - action: drop
+        regex: POD
+        sourceLabels: [container_name]
       - action: keep
         regex: kubelet;container_spec_memory_(?:|swap|reservation)_limit_bytes
         sourceLabels: [job, __name__]
     - url: http://fluentd:9888/prometheus.metrics.container
       writeRelabelConfigs:
+      - action: drop
+        regex: POD
+        sourceLabels: [container]
+      - action: drop
+        regex: POD
+        sourceLabels: [container_name]
       - action: keep
         regex: kubelet;container_fs_(?:(?:usage|limit)_bytes|(?:reads|writes)_bytes_total)
         sourceLabels: [job, __name__]
     - url: http://fluentd:9888/prometheus.metrics.container
       writeRelabelConfigs:
+      - action: drop
+        regex: POD
+        sourceLabels: [container]
+      - action: drop
+        regex: POD
+        sourceLabels: [container_name]
       - action: keep
         regex: kubelet;container_network_(?:receive|transmit)_(?:bytes|errors)_total
         sourceLabels: [job, __name__]

From 78d40e1611fd92d430452e851ffd7abfc1f17e2b Mon Sep 17 00:00:00 2001
From: Bin Yi <byi@sumologic.com>
Date: Mon, 6 May 2019 11:06:35 -0700
Subject: [PATCH 2/2] disable cookies on output plugins

---
 deploy/kubernetes/fluentd-sumologic.yaml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/deploy/kubernetes/fluentd-sumologic.yaml b/deploy/kubernetes/fluentd-sumologic.yaml
index 8e3f280e7d..d76d80d194 100644
--- a/deploy/kubernetes/fluentd-sumologic.yaml
+++ b/deploy/kubernetes/fluentd-sumologic.yaml
@@ -81,42 +81,49 @@ data:
       endpoint "#{ENV['SUMO_ENDPOINT_METRICS_APISERVER']}"
       data_type metrics
       metric_data_format prometheus
+      disable_cookies true
     </match>
     <match prometheus.datapoint.kubelet**>
       @type sumologic
       endpoint "#{ENV['SUMO_ENDPOINT_METRICS_KUBELET']}"
       data_type metrics
       metric_data_format prometheus
+      disable_cookies true
     </match>
     <match prometheus.datapoint.kube-controller-manager**>
       @type sumologic
       endpoint "#{ENV['SUMO_ENDPOINT_METRICS_KUBE_CONTROLLER_MANAGER']}"
       data_type metrics
       metric_data_format prometheus
+      disable_cookies true
     </match>
     <match prometheus.datapoint.kube-scheduler**>
       @type sumologic
       endpoint "#{ENV['SUMO_ENDPOINT_METRICS_KUBE_SCHEDULER']}"
       data_type metrics
       metric_data_format prometheus
+      disable_cookies true
     </match>
     <match prometheus.datapoint.kube-state**>
       @type sumologic
       endpoint "#{ENV['SUMO_ENDPOINT_METRICS_KUBE_STATE']}"
       data_type metrics
       metric_data_format prometheus
+      disable_cookies true
     </match>
     <match prometheus.datapoint.node-exporter**>
       @type sumologic
       endpoint "#{ENV['SUMO_ENDPOINT_METRICS_NODE_EXPORTER']}"
       data_type metrics
       metric_data_format prometheus
+      disable_cookies true
     </match>
     <match prometheus.datapoint**>
       @type sumologic
       endpoint "#{ENV['SUMO_ENDPOINT_METRICS']}"
       data_type metrics
       metric_data_format prometheus
+      disable_cookies true
     </match>
   events.conf: |-
     <source>