diff --git a/deploy/helm/prometheus-overrides.yaml b/deploy/helm/prometheus-overrides.yaml index 3e5a40bd53..1e2edf9a4d 100644 --- a/deploy/helm/prometheus-overrides.yaml +++ b/deploy/helm/prometheus-overrides.yaml @@ -299,6 +299,7 @@ prometheus: ## container_fs_limit_bytes ## container_fs_usage_bytes ## container_memory_working_set_bytes + ## container_cpu_cfs_throttled_seconds_total url: http://$(CHART).$(NAMESPACE).svc.cluster.local:9888/prometheus.metrics.container writeRelabelConfigs: - action: labelmap @@ -308,7 +309,7 @@ prometheus: regex: POD sourceLabels: [container] - action: keep - regex: kubelet;.+;(?:container_cpu_usage_seconds_total|container_memory_working_set_bytes|container_fs_usage_bytes|container_fs_limit_bytes) + regex: kubelet;.+;(?:container_cpu_usage_seconds_total|container_memory_working_set_bytes|container_fs_usage_bytes|container_fs_limit_bytes|container_cpu_cfs_throttled_seconds_total) sourceLabels: [job, container, __name__] - ## cadvisor aggregate container metrics ## container_network_receive_bytes_total diff --git a/deploy/helm/sumologic/values.yaml b/deploy/helm/sumologic/values.yaml index 529df2135e..fbe609aafe 100644 --- a/deploy/helm/sumologic/values.yaml +++ b/deploy/helm/sumologic/values.yaml @@ -1087,6 +1087,7 @@ prometheus-operator: ## container_fs_limit_bytes ## container_fs_usage_bytes ## container_memory_working_set_bytes + ## container_cpu_cfs_throttled_seconds_total - url: http://$(CHART).$(NAMESPACE).svc.cluster.local:9888/prometheus.metrics.container writeRelabelConfigs: - action: labelmap @@ -1096,7 +1097,7 @@ prometheus-operator: regex: POD sourceLabels: [container] - action: keep - regex: kubelet;.+;(?:container_cpu_usage_seconds_total|container_memory_working_set_bytes|container_fs_usage_bytes|container_fs_limit_bytes) + regex: kubelet;.+;(?:container_cpu_usage_seconds_total|container_memory_working_set_bytes|container_fs_usage_bytes|container_fs_limit_bytes|container_cpu_cfs_throttled_seconds_total) sourceLabels: [job,container,__name__] ## cadvisor aggregate container metrics ## container_network_receive_bytes_total diff --git a/deploy/kubernetes/kube-prometheus-sumo-logic-mixin.libsonnet b/deploy/kubernetes/kube-prometheus-sumo-logic-mixin.libsonnet index 4ddf5b7792..753295473f 100644 --- a/deploy/kubernetes/kube-prometheus-sumo-logic-mixin.libsonnet +++ b/deploy/kubernetes/kube-prometheus-sumo-logic-mixin.libsonnet @@ -109,7 +109,7 @@ }, { action: "keep", - regex: "kubelet;.+;(?:container_cpu_usage_seconds_total|container_memory_working_set_bytes|container_fs_usage_bytes|container_fs_limit_bytes)", + regex: "kubelet;.+;(?:container_cpu_usage_seconds_total|container_memory_working_set_bytes|container_fs_usage_bytes|container_fs_limit_bytes|container_cpu_cfs_throttled_seconds_total)", sourceLabels: [ "job", "container",