From 012db49d676e736bc348c40997003a433b82af8c Mon Sep 17 00:00:00 2001 From: Vijit Singhal Date: Fri, 17 Jan 2020 10:21:02 -0800 Subject: [PATCH 1/4] relabel container_name to container for pre and post k8s 1.16 support --- deploy/helm/sumologic/values.yaml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/deploy/helm/sumologic/values.yaml b/deploy/helm/sumologic/values.yaml index a30be258f4..4579d27707 100644 --- a/deploy/helm/sumologic/values.yaml +++ b/deploy/helm/sumologic/values.yaml @@ -397,15 +397,16 @@ prometheus-operator: # cadvisor container metrics - url: http://collection-sumologic.sumologic.svc.cluster.local:9888/prometheus.metrics.container writeRelabelConfigs: + - action: labelmap + regex: .* + replacement: ${1} + targetLabel: container - action: drop regex: POD sourceLabels: [container] - - action: drop - regex: POD - sourceLabels: [container_name] - action: keep regex: kubelet;.+;(?:container_cpu_load_average_10s|container_cpu_system_seconds_total|container_cpu_usage_seconds_total|container_cpu_cfs_throttled_seconds_total|container_memory_usage_bytes|container_memory_swap|container_memory_working_set_bytes|container_spec_memory_limit_bytes|container_spec_memory_swap_limit_bytes|container_spec_memory_reservation_limit_bytes|container_spec_cpu_quota|container_spec_cpu_period|container_fs_usage_bytes|container_fs_limit_bytes|container_fs_reads_bytes_total|container_fs_writes_bytes_total|) - sourceLabels: [job,container_name,__name__] + sourceLabels: [job,container,__name__] # cadvisor aggregate container metrics - url: http://collection-sumologic.sumologic.svc.cluster.local:9888/prometheus.metrics.container writeRelabelConfigs: From e35efa1971a947d5e163fd8281457f411bb45870 Mon Sep 17 00:00:00 2001 From: Vijit Singhal Date: Fri, 17 Jan 2020 10:50:24 -0800 Subject: [PATCH 2/4] fix typo --- deploy/helm/sumologic/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deploy/helm/sumologic/values.yaml b/deploy/helm/sumologic/values.yaml index 4579d27707..2def739981 100644 --- a/deploy/helm/sumologic/values.yaml +++ b/deploy/helm/sumologic/values.yaml @@ -398,7 +398,7 @@ prometheus-operator: - url: http://collection-sumologic.sumologic.svc.cluster.local:9888/prometheus.metrics.container writeRelabelConfigs: - action: labelmap - regex: .* + regex: container_name replacement: ${1} targetLabel: container - action: drop From 51c5d8dfd5177f8e906721c8fe331fa42d5344e0 Mon Sep 17 00:00:00 2001 From: Vijit Singhal Date: Fri, 17 Jan 2020 13:27:09 -0800 Subject: [PATCH 3/4] fix replacement in labelmap --- deploy/helm/sumologic/values.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/deploy/helm/sumologic/values.yaml b/deploy/helm/sumologic/values.yaml index 2def739981..af1d2ffc3f 100644 --- a/deploy/helm/sumologic/values.yaml +++ b/deploy/helm/sumologic/values.yaml @@ -399,8 +399,7 @@ prometheus-operator: writeRelabelConfigs: - action: labelmap regex: container_name - replacement: ${1} - targetLabel: container + replacement: container - action: drop regex: POD sourceLabels: [container] From af3050927eccb29d76be34953e9389051eeaa643 Mon Sep 17 00:00:00 2001 From: Travis CI Date: Fri, 17 Jan 2020 21:32:27 +0000 Subject: [PATCH 4/4] Generate new overrides yaml/libsonnet file(s). --- deploy/helm/prometheus-overrides.yaml | 8 ++++---- .../kube-prometheus-sumo-logic-mixin.libsonnet | 12 +++++------- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/deploy/helm/prometheus-overrides.yaml b/deploy/helm/prometheus-overrides.yaml index ff0fe1c231..607b5bd8c9 100644 --- a/deploy/helm/prometheus-overrides.yaml +++ b/deploy/helm/prometheus-overrides.yaml @@ -85,15 +85,15 @@ prometheus: # cadvisor container metrics - url: http://collection-sumologic.sumologic.svc.cluster.local:9888/prometheus.metrics.container writeRelabelConfigs: + - action: labelmap + regex: container_name + replacement: container - action: drop regex: POD sourceLabels: [container] - - action: drop - regex: POD - sourceLabels: [container_name] - action: keep regex: kubelet;.+;(?:container_cpu_load_average_10s|container_cpu_system_seconds_total|container_cpu_usage_seconds_total|container_cpu_cfs_throttled_seconds_total|container_memory_usage_bytes|container_memory_swap|container_memory_working_set_bytes|container_spec_memory_limit_bytes|container_spec_memory_swap_limit_bytes|container_spec_memory_reservation_limit_bytes|container_spec_cpu_quota|container_spec_cpu_period|container_fs_usage_bytes|container_fs_limit_bytes|container_fs_reads_bytes_total|container_fs_writes_bytes_total|) - sourceLabels: [job,container_name,__name__] + sourceLabels: [job,container,__name__] # cadvisor aggregate container metrics - url: http://collection-sumologic.sumologic.svc.cluster.local:9888/prometheus.metrics.container writeRelabelConfigs: diff --git a/deploy/kubernetes/kube-prometheus-sumo-logic-mixin.libsonnet b/deploy/kubernetes/kube-prometheus-sumo-logic-mixin.libsonnet index 47c8f6abc2..050a1b7ac8 100644 --- a/deploy/kubernetes/kube-prometheus-sumo-logic-mixin.libsonnet +++ b/deploy/kubernetes/kube-prometheus-sumo-logic-mixin.libsonnet @@ -74,17 +74,15 @@ url: $._config.sumologicCollectorSvc + "prometheus.metrics.container", writeRelabelConfigs: [ { - action: "drop", - regex: "POD", - sourceLabels: [ - "container" - ] + action: "labelmap", + regex: "container_name", + replacement: "container" }, { action: "drop", regex: "POD", sourceLabels: [ - "container_name" + "container" ] }, { @@ -92,7 +90,7 @@ regex: "kubelet;.+;(?:container_cpu_load_average_10s|container_cpu_system_seconds_total|container_cpu_usage_seconds_total|container_cpu_cfs_throttled_seconds_total|container_memory_usage_bytes|container_memory_swap|container_memory_working_set_bytes|container_spec_memory_limit_bytes|container_spec_memory_swap_limit_bytes|container_spec_memory_reservation_limit_bytes|container_spec_cpu_quota|container_spec_cpu_period|container_fs_usage_bytes|container_fs_limit_bytes|container_fs_reads_bytes_total|container_fs_writes_bytes_total|)", sourceLabels: [ "job", - "container_name", + "container", "__name__" ] }