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__]
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
@type sumologic
endpoint "#{ENV['SUMO_ENDPOINT_METRICS_KUBELET']}"
data_type metrics
metric_data_format prometheus
+ disable_cookies true
@type sumologic
endpoint "#{ENV['SUMO_ENDPOINT_METRICS_KUBE_CONTROLLER_MANAGER']}"
data_type metrics
metric_data_format prometheus
+ disable_cookies true
@type sumologic
endpoint "#{ENV['SUMO_ENDPOINT_METRICS_KUBE_SCHEDULER']}"
data_type metrics
metric_data_format prometheus
+ disable_cookies true
@type sumologic
endpoint "#{ENV['SUMO_ENDPOINT_METRICS_KUBE_STATE']}"
data_type metrics
metric_data_format prometheus
+ disable_cookies true
@type sumologic
endpoint "#{ENV['SUMO_ENDPOINT_METRICS_NODE_EXPORTER']}"
data_type metrics
metric_data_format prometheus
+ disable_cookies true
@type sumologic
endpoint "#{ENV['SUMO_ENDPOINT_METRICS']}"
data_type metrics
metric_data_format prometheus
+ disable_cookies true
events.conf: |-