jsonnet,test/rules: fix cluster:kubelet_volume_stats_used_bytes:provisioner:sum and add tests

Author: paulfantom

jsonnet/rules.jsonnet

@@ -211,7 +211,16 @@ local droppedKsmLabels = 'endpoint, instance, job, pod, service';
             record: 'cluster:kube_persistentvolumeclaim_resource_requests_storage_bytes:provisioner:sum',
           },
           {
-            expr: 'sum  by (provisioner) (kubelet_volume_stats_used_bytes * on (namespace,persistentvolumeclaim) group_right() (kube_persistentvolumeclaim_info * on (storageclass)  group_left(provisioner) kube_storageclass_info))',
+            expr: |||
+              sum  by (provisioner) (
+                topk by (namespace, persistentvolumeclaim) (
+                  1, kubelet_volume_stats_used_bytes
+                ) * on (namespace,persistentvolumeclaim) group_right()
+                topk by (namespace, persistentvolumeclaim) (
+                  1, kube_persistentvolumeclaim_info * on(storageclass) group_left(provisioner) topk by(storageclass) (1, max by(storageclass, provisioner) (kube_storageclass_info))
+                )
+              )
+            |||,
             record: 'cluster:kubelet_volume_stats_used_bytes:provisioner:sum',
           },
           {

test/rules/bz1879520.yaml

@@ -0,0 +1,40 @@
+# Tests for https://bugzilla.redhat.com/show_bug.cgi?id=1879520.
+# Having more than one storage class tied to one provisioner can lead to
+# problems with many-to-many matching. Recording rule need to account for this.
+
+rule_files:
+  - rules.yaml
+
+evaluation_interval: 30s
+
+tests:
+  - interval: 1m
+    input_series:
+      - series: 'kube_storageclass_info{endpoint="https-main",instance="10.130.2.7:8443",job="kube-state-metrics",namespace="openshift-monitoring",pod="kube-state-metrics-6674fd6cfd-4crcl",provisioner="kubernetes.io/gce-pd",reclaimPolicy="Delete",service="kube-state-metrics",storageclass="standard",volumeBindingMode="WaitForFirstConsumer"}'
+        values: '1+0x5'
+      - series: 'kube_persistentvolumeclaim_info{endpoint="https-main",instance="10.130.2.7:8443",job="kube-state-metrics",namespace="xiuwang",persistentvolumeclaim="jenkins",pod="kube-state-metrics-6674fd6cfd-4crcl",service="kube-state-metrics",storageclass="standard",volumename="pvc-555e1a2c-326d-42f6-a914-512a720574e0"}'
+        values: '1+0x5'
+      - series: 'kubelet_volume_stats_used_bytes{endpoint="https-metrics",instance="10.0.32.5:10250",job="kubelet",metrics_path="/metrics",namespace="xiuwang",node="dyan-upg0916-09160342-w-a-l-rhel-0",persistentvolumeclaim="jenkins",service="kubelet"}'
+        values: '336764928+0x5'
+    promql_expr_test:
+      - expr: cluster:kubelet_volume_stats_used_bytes:provisioner:sum
+        eval_time: 1m
+        exp_samples:
+          - labels: 'cluster:kubelet_volume_stats_used_bytes:provisioner:sum{provisioner="kubernetes.io/gce-pd"}'
+            value: 3.36764928E+08
+  - interval: 1m
+    input_series:
+      - series: 'kube_storageclass_info{endpoint="https-main",instance="10.130.2.7:8443",job="kube-state-metrics",namespace="openshift-monitoring",pod="kube-state-metrics-6674fd6cfd-4crcl",prometheus="openshift-monitoring/k8s",provisioner="kubernetes.io/gce-pd",reclaimPolicy="Delete",service="kube-state-metrics",storageclass="standard",volumeBindingMode="WaitForFirstConsumer"}'
+        values: '1+0x5'
+      - series: 'kube_persistentvolumeclaim_info{endpoint="https-main",instance="10.130.2.7:8443",job="kube-state-metrics",namespace="xiuwang",persistentvolumeclaim="jenkins",pod="kube-state-metrics-6674fd6cfd-4crcl",prometheus="openshift-monitoring/k8s",service="kube-state-metrics",storageclass="standard",volumename="pvc-555e1a2c-326d-42f6-a914-512a720574e0"}'
+        values: '1+0x5'
+      - series: 'kubelet_volume_stats_used_bytes{endpoint="https-metrics",instance="192.168.101.30:10250",job="kubelet",metrics_path="/metrics",namespace="xiuwang",node="scdosw1054.ocpnpr01.npr.isaq.app",persistentvolumeclaim="jenkins",prometheus="openshift-monitoring/k8s",service="kubelet"}'
+        values: '336764921+0x5'
+      - series: 'kubelet_volume_stats_used_bytes{endpoint="https-metrics",instance="192.168.101.23:10250",job="kubelet",metrics_path="/metrics",namespace="xiuwang",node="scdosw1051.ocpnpr01.npr.isaq.app",persistentvolumeclaim="jenkins",prometheus="openshift-monitoring/k8s",service="kubelet"}'
+        values: '336764928+0x5'
+    promql_expr_test:
+      - expr: cluster:kubelet_volume_stats_used_bytes:provisioner:sum
+        eval_time: 1m
+        exp_samples:
+          - labels: 'cluster:kubelet_volume_stats_used_bytes:provisioner:sum{provisioner="kubernetes.io/gce-pd"}'
+            value: 3.36764928E+08