From e92e9c86772ce40b4739cb9d7d5d7d15f8066a6a Mon Sep 17 00:00:00 2001
From: Nikolai Rodionov <allanger@badhouseplants.net>
Date: Tue, 30 Apr 2024 15:32:42 +0200
Subject: [PATCH] Fix some panels on the zot grafana dashboard (#528)

Issue: https://github.com/giantswarm/roadmap/issues/3068
---
 CHANGELOG.md                                              | 2 ++
 .../dashboards/shared/private/zot.json                    | 8 ++++----
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b64e11e1..07dd7b4c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+- Fix storage related panes on zot's dashboards
+
 ## [3.13.0] - 2024-04-24
 
 ### Changed
diff --git a/helm/dashboards/charts/private_dashboards_mz/dashboards/shared/private/zot.json b/helm/dashboards/charts/private_dashboards_mz/dashboards/shared/private/zot.json
index 4564dbcc..b5f09ba5 100644
--- a/helm/dashboards/charts/private_dashboards_mz/dashboards/shared/private/zot.json
+++ b/helm/dashboards/charts/private_dashboards_mz/dashboards/shared/private/zot.json
@@ -113,7 +113,7 @@
           "disableTextWrap": false,
           "editorMode": "code",
           "exemplar": false,
-          "expr": "sum(kubelet_volume_stats_used_bytes{persistentvolumeclaim=\"$zot_pvc_name\", namespace=\"zot\", service=\"kubelet\"}) / sum(kube_persistentvolumeclaim_resource_requests_storage_bytes{persistentvolumeclaim=\"$zot_pvc_name\",namespace=\"zot\"})",
+          "expr": "sum(kubelet_volume_stats_used_bytes{persistentvolumeclaim=\"$zot_pvc_name\", namespace=\"zot\"}) / max(kube_persistentvolumeclaim_resource_requests_storage_bytes{persistentvolumeclaim=\"$zot_pvc_name\",namespace=\"zot\"})",
           "format": "table",
           "fullMetaSearch": false,
           "hide": false,
@@ -265,7 +265,7 @@
           "disableTextWrap": false,
           "editorMode": "code",
           "exemplar": false,
-          "expr": "sum(kube_persistentvolumeclaim_resource_requests_storage_bytes{persistentvolumeclaim=\"$zot_pvc_name\",namespace=\"zot\"})",
+          "expr": "max(kube_persistentvolumeclaim_resource_requests_storage_bytes{persistentvolumeclaim=\"$zot_pvc_name\",namespace=\"zot\"})",
           "format": "time_series",
           "fullMetaSearch": false,
           "hide": false,
@@ -282,7 +282,7 @@
             "uid": "${datasource}"
           },
           "editorMode": "code",
-          "expr": "sum(kubelet_volume_stats_used_bytes{persistentvolumeclaim=\"$zot_pvc_name\", namespace=\"zot\", service=\"kubelet\"})",
+          "expr": "kubelet_volume_stats_used_bytes{persistentvolumeclaim=\"$zot_pvc_name\", namespace=\"zot\"}",
           "hide": false,
           "instant": false,
           "legendFormat": "Storage space used",
@@ -352,7 +352,7 @@
           "disableTextWrap": false,
           "editorMode": "code",
           "exemplar": false,
-          "expr": "sum(kubelet_volume_stats_used_bytes{persistentvolumeclaim=\"$zot_pvc_name\", namespace=\"zot\", service=\"kubelet\"})",
+          "expr": "kubelet_volume_stats_used_bytes{persistentvolumeclaim=\"$zot_pvc_name\", namespace=\"zot\"}",
           "format": "time_series",
           "fullMetaSearch": false,
           "hide": false,