fix: fix pvc queries (#171)

Signed-off-by: David Calvert <david@0xdc.me>

Author: dotdc

dashboards/k8s-addons-prometheus.json

@@ -2349,9 +2349,9 @@
           },
           "editorMode": "code",
           "exemplar": true,
-          "expr": "sum(kubelet_volume_stats_used_bytes{persistentvolumeclaim=~\".*prom.*\", cluster=~\"$cluster\"}) by (persistentvolumeclaim) / sum(kubelet_volume_stats_capacity_bytes{persistentvolumeclaim=~\".*prom.*\", cluster=~\"$cluster\"}) by (persistentvolumeclaim)",
+          "expr": "max(kubelet_volume_stats_used_bytes{persistentvolumeclaim=~\".*prom.*\", cluster=~\"$cluster\"}) by (persistentvolumeclaim, namespace) / max(kubelet_volume_stats_capacity_bytes{persistentvolumeclaim=~\".*prom.*\", cluster=~\"$cluster\"}) by (persistentvolumeclaim, namespace)",
           "interval": "",
-          "legendFormat": "{{ persistentvolumeclaim }}",
+          "legendFormat": "{{ namespace }} - {{ persistentvolumeclaim }}",
           "range": true,
           "refId": "A"
         }
@@ -2452,9 +2452,9 @@
           },
           "editorMode": "code",
           "exemplar": true,
-          "expr": "sum(kubelet_volume_stats_used_bytes{persistentvolumeclaim=~\".*prom.*\", cluster=~\"$cluster\"}) by (persistentvolumeclaim)",
+          "expr": "max(kubelet_volume_stats_used_bytes{persistentvolumeclaim=~\".*prom.*\", cluster=~\"$cluster\"}) by (persistentvolumeclaim, namespace)",
           "interval": "",
-          "legendFormat": "{{ persistentvolumeclaim }} - Used",
+          "legendFormat": "{{ namespace }} - {{ persistentvolumeclaim }} - Used",
           "range": true,
           "refId": "A"
         },
@@ -2465,9 +2465,9 @@
           },
           "editorMode": "code",
           "exemplar": true,
-          "expr": "sum(kubelet_volume_stats_capacity_bytes{persistentvolumeclaim=~\".*prom.*\", cluster=~\"$cluster\"}) by (persistentvolumeclaim)",
+          "expr": "max(kubelet_volume_stats_capacity_bytes{persistentvolumeclaim=~\".*prom.*\", cluster=~\"$cluster\"}) by (persistentvolumeclaim, namespace)",
           "hide": false,
-          "legendFormat": "{{ persistentvolumeclaim }} - Capacity",
+          "legendFormat": "{{ namespace }} - {{ persistentvolumeclaim }} - Capacity",
           "range": true,
           "refId": "B"
         }
@@ -3182,6 +3182,6 @@
   "timezone": "",
   "title": "Prometheus",
   "uid": "k8s_addons_prometheus",
-  "version": 7,
+  "version": 8,
   "weekStart": ""
-}
+}

dashboards/k8s-views-namespaces.json

@@ -2195,9 +2195,9 @@
             "uid": "${datasource}"
           },
           "exemplar": true,
-          "expr": "sum(kubelet_volume_stats_used_bytes{namespace=~\"$namespace\", cluster=\"$cluster\"}) by (persistentvolumeclaim) / sum(kubelet_volume_stats_capacity_bytes{namespace=~\"$namespace\", cluster=\"$cluster\"}) by (persistentvolumeclaim)",
+          "expr": "max(kubelet_volume_stats_used_bytes{namespace=~\"$namespace\", cluster=\"$cluster\"}) by (persistentvolumeclaim, namespace) / max(kubelet_volume_stats_capacity_bytes{namespace=~\"$namespace\", cluster=\"$cluster\"}) by (persistentvolumeclaim, namespace)",
           "interval": "",
-          "legendFormat": "{{ persistentvolumeclaim }}",
+          "legendFormat": "{{ namespace }} - {{ persistentvolumeclaim }}",
           "refId": "A"
         }
       ],
@@ -2293,9 +2293,9 @@
             "uid": "${datasource}"
           },
           "exemplar": true,
-          "expr": "sum(kubelet_volume_stats_used_bytes{namespace=~\"$namespace\", cluster=\"$cluster\"}) by (persistentvolumeclaim)",
+          "expr": "max(kubelet_volume_stats_used_bytes{namespace=~\"$namespace\", cluster=\"$cluster\"}) by (persistentvolumeclaim, namespace)",
           "interval": "",
-          "legendFormat": "{{ persistentvolumeclaim }} - Used",
+          "legendFormat": "{{ namespace }} - {{ persistentvolumeclaim }} - Used",
           "refId": "A"
         },
         {
@@ -2304,10 +2304,10 @@
             "uid": "${datasource}"
           },
           "exemplar": true,
-          "expr": "sum(kubelet_volume_stats_capacity_bytes{namespace=~\"$namespace\", cluster=\"$cluster\"}) by (persistentvolumeclaim)",
+          "expr": "max(kubelet_volume_stats_capacity_bytes{namespace=~\"$namespace\", cluster=\"$cluster\"}) by (persistentvolumeclaim, namespace)",
           "hide": false,
           "interval": "",
-          "legendFormat": "{{ persistentvolumeclaim }} - Capacity",
+          "legendFormat": "{{ namespace }} - {{ persistentvolumeclaim }} - Capacity",
           "refId": "B"
         }
       ],
@@ -3030,6 +3030,6 @@
   "timezone": "",
   "title": "Kubernetes / Views / Namespaces",
   "uid": "k8s_views_ns",
-  "version": 43,
+  "version": 44,
   "weekStart": ""
 }

dashboards/k8s-views-nodes.json

@@ -2774,9 +2774,9 @@
           },
           "editorMode": "code",
           "exemplar": true,
-          "expr": "sum(kubelet_volume_stats_used_bytes{node=\"$node\", cluster=\"$cluster\"}) by (persistentvolumeclaim) / sum(kubelet_volume_stats_capacity_bytes{node=\"$node\", cluster=\"$cluster\"}) by (persistentvolumeclaim)",
+          "expr": "max(kubelet_volume_stats_used_bytes{node=\"$node\", cluster=\"$cluster\"}) by (persistentvolumeclaim, namespace) / max(kubelet_volume_stats_capacity_bytes{node=\"$node\", cluster=\"$cluster\"}) by (persistentvolumeclaim, namespace)",
           "interval": "$resolution",
-          "legendFormat": "{{ persistentvolumeclaim }}",
+          "legendFormat": "{{ namespace }} - {{ persistentvolumeclaim }}",
           "range": true,
           "refId": "A"
         }
@@ -2873,7 +2873,7 @@
             "uid": "${datasource}"
           },
           "exemplar": true,
-          "expr": "sum(kubelet_volume_stats_used_bytes{node=\"$node\", cluster=\"$cluster\"}) by (persistentvolumeclaim)",
+          "expr": "max(kubelet_volume_stats_used_bytes{node=\"$node\", cluster=\"$cluster\"}) by (persistentvolumeclaim, namespace)",
           "format": "table",
           "hide": false,
           "interval": "",
@@ -2886,7 +2886,7 @@
             "uid": "${datasource}"
           },
           "exemplar": true,
-          "expr": "sum(kubelet_volume_stats_capacity_bytes{node=\"$node\", cluster=\"$cluster\"}) by (persistentvolumeclaim)",
+          "expr": "max(kubelet_volume_stats_capacity_bytes{node=\"$node\", cluster=\"$cluster\"}) by (persistentvolumeclaim, namespace)",
           "format": "table",
           "hide": false,
           "interval": "",
@@ -4014,6 +4014,6 @@
   "timezone": "",
   "title": "Kubernetes / Views / Nodes",
   "uid": "k8s_views_nodes",
-  "version": 39,
+  "version": 40,
   "weekStart": ""
 }