From 3c8f06c66e644d46e9f85bbc92630d5eb93ddd07 Mon Sep 17 00:00:00 2001 From: Tarun Gupta Akirala Date: Thu, 30 Jan 2025 11:26:30 -0800 Subject: [PATCH] fix: grafana dashboard templating Signed-off-by: Tarun Gupta Akirala --- .../grafana-dashboards/attached-disks.json | 22 +++++++++---------- .../network-cloud-services.json | 4 ++-- .../networkCosts-metrics.json | 2 +- .../workload-metrics-aggregator.json | 4 ++-- .../grafana-dashboards/workload-metrics.json | 4 ++-- 5 files changed, 18 insertions(+), 18 deletions(-) diff --git a/cost-analyzer/grafana-dashboards/attached-disks.json b/cost-analyzer/grafana-dashboards/attached-disks.json index 49c8d6c1a..1f5617707 100644 --- a/cost-analyzer/grafana-dashboards/attached-disks.json +++ b/cost-analyzer/grafana-dashboards/attached-disks.json @@ -31,7 +31,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "${datasource}" }, "fieldConfig": { "defaults": { @@ -112,7 +112,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "${datasource}" }, "editorMode": "code", "expr": "sum(container_fs_limit_bytes{instance=~'$disk', device!=\"tmpfs\", id=\"/\", cluster_id=~'$cluster'}) by (cluster_id, instance)", @@ -130,7 +130,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "${datasource}" }, "fieldConfig": { "defaults": { @@ -213,7 +213,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "${datasource}" }, "editorMode": "code", "expr": "sum(container_fs_usage_bytes{instance=~'$disk',id=\"/\", cluster_id=~'$cluster'}) by (cluster_id, instance) / sum(container_fs_limit_bytes{instance=~'$disk',device!=\"tmpfs\", id=\"/\", cluster_id=~'$cluster'}) by (cluster_id,instance)", @@ -231,7 +231,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "${datasource}" }, "fieldConfig": { "defaults": { @@ -314,7 +314,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "${datasource}" }, "editorMode": "code", "expr": "1 - sum(container_fs_inodes_free{instance=~'$disk',id=\"/\", cluster_id=~'$cluster'}) by (cluster_id, instance) / sum(container_fs_inodes_total{instance=~'$disk',id=\"/\", cluster_id=~'$cluster'}) by (cluster_id, instance)", @@ -331,7 +331,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "${datasource}" }, "fieldConfig": { "defaults": { @@ -412,7 +412,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "${datasource}" }, "editorMode": "code", "expr": "sum(container_fs_usage_bytes{instance=~'$disk',id=\"/\", cluster_id=~'$cluster'}) by (cluster_id, instance)", @@ -441,7 +441,7 @@ "current": { "selected": false, "text": "Prometheus", - "value": "PBFA97CFB590B2093" + "value": "Prometheus" }, "hide": 0, "includeAll": false, @@ -463,7 +463,7 @@ }, "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "${datasource}" }, "definition": "label_values(cluster_id)", "hide": 0, @@ -489,7 +489,7 @@ }, "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "${datasource}" }, "definition": "label_values(container_fs_limit_bytes{cluster_id=~\"$cluster\"}, instance)", "hide": 0, diff --git a/cost-analyzer/grafana-dashboards/network-cloud-services.json b/cost-analyzer/grafana-dashboards/network-cloud-services.json index 2729b6ca7..911372811 100644 --- a/cost-analyzer/grafana-dashboards/network-cloud-services.json +++ b/cost-analyzer/grafana-dashboards/network-cloud-services.json @@ -275,7 +275,7 @@ "current": { "selected": false, "text": "Prometheus", - "value": "PBFA97CFB590B2093" + "value": "Prometheus" }, "hide": 0, "includeAll": false, @@ -351,7 +351,7 @@ }, "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "${datasource}" }, "definition": "label_values(kube_pod_container_status_running{namespace=\"$namespace\"},container)", "hide": 0, diff --git a/cost-analyzer/grafana-dashboards/networkCosts-metrics.json b/cost-analyzer/grafana-dashboards/networkCosts-metrics.json index 79e568ccb..36bb6a257 100644 --- a/cost-analyzer/grafana-dashboards/networkCosts-metrics.json +++ b/cost-analyzer/grafana-dashboards/networkCosts-metrics.json @@ -498,7 +498,7 @@ "current": { "selected": false, "text": "Prometheus", - "value": "PBFA97CFB590B2093" + "value": "Prometheus" }, "hide": 0, "includeAll": false, diff --git a/cost-analyzer/grafana-dashboards/workload-metrics-aggregator.json b/cost-analyzer/grafana-dashboards/workload-metrics-aggregator.json index 660358905..0c1396d61 100644 --- a/cost-analyzer/grafana-dashboards/workload-metrics-aggregator.json +++ b/cost-analyzer/grafana-dashboards/workload-metrics-aggregator.json @@ -865,7 +865,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "${datasource}" }, "editorMode": "code", "expr": "kubecost_read_db_size", @@ -905,7 +905,7 @@ "current": { "selected": false, "text": "Prometheus", - "value": "PBFA97CFB590B2093" + "value": "Prometheus" }, "hide": 0, "includeAll": false, diff --git a/cost-analyzer/grafana-dashboards/workload-metrics.json b/cost-analyzer/grafana-dashboards/workload-metrics.json index 248afc134..143b6d55f 100644 --- a/cost-analyzer/grafana-dashboards/workload-metrics.json +++ b/cost-analyzer/grafana-dashboards/workload-metrics.json @@ -783,7 +783,7 @@ "current": { "selected": false, "text": "Prometheus", - "value": "PBFA97CFB590B2093" + "value": "Prometheus" }, "hide": 0, "includeAll": false, @@ -859,7 +859,7 @@ }, "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "${datasource}" }, "definition": "label_values({namespace=~\"$namespace\", pod=~\"$pod\"},container)", "hide": 0,