From 3c64cc935cd85c552a8b95261a956dfaf3fa125a Mon Sep 17 00:00:00 2001
From: lord63 <lord63.j@gmail.com>
Date: Thu, 8 Aug 2019 18:28:30 +0800
Subject: [PATCH] Fix io time yaxe
---
jsonnetfile.lock.json | 2 +-
manifests/grafana-dashboardDefinitions.yaml | 2 +-
manifests/prometheus-rules.yaml | 7 -------
3 files changed, 2 insertions(+), 9 deletions(-)
diff --git a/jsonnetfile.lock.json b/jsonnetfile.lock.json
index aa933dc4..db8bd917 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 5358e108..75a2a987 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 6ae126dc..f35510b5 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)
--
GitLab