From 106ef31edf717d8f7b565816aa188ed04c8c8988 Mon Sep 17 00:00:00 2001 From: lbbniu Date: Tue, 9 May 2023 16:30:55 +0800 Subject: [PATCH] fix: dashboards view bug --- integration/grafana-reference/dashboards/cluster-overview.json | 2 +- integration/grafana-reference/override_values.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/integration/grafana-reference/dashboards/cluster-overview.json b/integration/grafana-reference/dashboards/cluster-overview.json index 128f449..f805f4e 100644 --- a/integration/grafana-reference/dashboards/cluster-overview.json +++ b/integration/grafana-reference/dashboards/cluster-overview.json @@ -530,7 +530,7 @@ }, "editorMode": "code", "exemplar": false, - "expr": "sum(\n label_replace(irate(container_cpu_usage_seconds_total{container!=\"\"}[1h]), \"node\", \"$1\", \"instance\", \"^[^:]+\") \n * on (node) group_left() max(kube_node_labels{label_beta_kubernetes_io_instance_type!~\"eklet\", label_node_kubernetes_io_instance_type!~\"eklet\"}) by (node)\n) by (node)\n/\nsum(\n kube_node_status_capacity{resource=\"cpu\", unit=\"core\"} \n * on (node) group_left() max(kube_node_labels{label_beta_kubernetes_io_instance_type!~\"eklet\", label_node_kubernetes_io_instance_type!~\"eklet\"}) by (node) \n) by (node) \n\n* 100", + "expr": "sum(\n label_replace(irate(container_cpu_usage_seconds_total{container!=\"\"}[1h]), \"node\", \"$1\", \"instance\", \"(^[^:]+)\") \n * on (node) group_left() max(kube_node_labels{label_beta_kubernetes_io_instance_type!~\"eklet\", label_node_kubernetes_io_instance_type!~\"eklet\"}) by (node)\n) by (node)\n/\nsum(\n kube_node_status_capacity{resource=\"cpu\", unit=\"core\"} \n * on (node) group_left() max(kube_node_labels{label_beta_kubernetes_io_instance_type!~\"eklet\", label_node_kubernetes_io_instance_type!~\"eklet\"}) by (node) \n) by (node) \n\n* 100", "format": "table", "hide": false, "instant": true, diff --git a/integration/grafana-reference/override_values.yaml b/integration/grafana-reference/override_values.yaml index 1398433..0d76687 100644 --- a/integration/grafana-reference/override_values.yaml +++ b/integration/grafana-reference/override_values.yaml @@ -592,7 +592,7 @@ dashboards: }, "editorMode": "code", "exemplar": false, - "expr": "sum(\n label_replace(irate(container_cpu_usage_seconds_total{container!=\"\"}[1h]), \"node\", \"$1\", \"instance\", \"^[^:]+\") \n * on (node) group_left() max(kube_node_labels{label_beta_kubernetes_io_instance_type!~\"eklet\", label_node_kubernetes_io_instance_type!~\"eklet\"}) by (node)\n) by (node)\n/\nsum(\n kube_node_status_capacity{resource=\"cpu\", unit=\"core\"} \n * on (node) group_left() max(kube_node_labels{label_beta_kubernetes_io_instance_type!~\"eklet\", label_node_kubernetes_io_instance_type!~\"eklet\"}) by (node) \n) by (node) \n\n* 100", + "expr": "sum(\n label_replace(irate(container_cpu_usage_seconds_total{container!=\"\"}[1h]), \"node\", \"$1\", \"instance\", \"(^[^:]+)\") \n * on (node) group_left() max(kube_node_labels{label_beta_kubernetes_io_instance_type!~\"eklet\", label_node_kubernetes_io_instance_type!~\"eklet\"}) by (node)\n) by (node)\n/\nsum(\n kube_node_status_capacity{resource=\"cpu\", unit=\"core\"} \n * on (node) group_left() max(kube_node_labels{label_beta_kubernetes_io_instance_type!~\"eklet\", label_node_kubernetes_io_instance_type!~\"eklet\"}) by (node) \n) by (node) \n\n* 100", "format": "table", "hide": false, "instant": true,