diff --git a/jsonnetfile.lock.json b/jsonnetfile.lock.json index aa933dc4ad806d09359a77cc28936aec35718349..db8bd91739ff3eac138c3824552f89aa565ef088 100644 --- a/jsonnetfile.lock.json +++ b/jsonnetfile.lock.json @@ -28,7 +28,7 @@ "subdir": "" } }, - "version": "3cf3741fcb8aad72e0d4cb351ef3712a5df58d0f" + "version": "0afc72e70df6048c6b65fd3e4968e53b0812b30c" }, { "name": "grafonnet", diff --git a/manifests/grafana-dashboardDefinitions.yaml b/manifests/grafana-dashboardDefinitions.yaml index 5358e108d1f26c37629d0df0bc52322243353112..75a2a987f07f3c54e2fa7489122d0465a5e4710e 100644 --- a/manifests/grafana-dashboardDefinitions.yaml +++ b/manifests/grafana-dashboardDefinitions.yaml @@ -12793,7 +12793,7 @@ items: "show": true }, { - "format": "ms", + "format": "s", "label": null, "logBase": 1, "max": null, diff --git a/manifests/prometheus-rules.yaml b/manifests/prometheus-rules.yaml index 6ae126dca12f455856ad643c416c215ffde6a4d5..f35510b53feb0df789fad8cead803cb5c4ce1ee0 100644 --- a/manifests/prometheus-rules.yaml +++ b/manifests/prometheus-rules.yaml @@ -21,13 +21,6 @@ spec: - expr: | sum(container_memory_usage_bytes{job="kubelet", image!="", container!="POD"}) by (namespace) record: namespace:container_memory_usage_bytes:sum - - expr: | - sum by (namespace, label_name) ( - sum(rate(container_cpu_usage_seconds_total{job="kubelet", image!="", container!="POD"}[5m])) by (namespace, pod) - * on (namespace, pod) - group_left(label_name) kube_pod_labels{job="kube-state-metrics"} - ) - record: namespace:container_cpu_usage_seconds_total:sum_rate - expr: | sum by (namespace, label_name) ( sum(container_memory_usage_bytes{job="kubelet",image!="", container!="POD"}) by (pod, namespace)