From f4d84ab68366db271b733dfe03b70811b8ddc071 Mon Sep 17 00:00:00 2001
From: Dmitry Nikolaev <dnikolaev@rocketsoftware.com>
Date: Thu, 16 Oct 2025 14:27:49 +0200
Subject: [PATCH] Fix promql query when CPC data is duplicated

Signed-off-by: Dmitry Nikolaev <dnikolaev@rocketsoftware.com>
---
 grafana/dashboards/prometheus/zos-msu-capacity.json           | 4 ++--
 .../rmf-app/src/dashboards/prometheus/zos-msu-capacity.json   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/grafana/dashboards/prometheus/zos-msu-capacity.json b/grafana/dashboards/prometheus/zos-msu-capacity.json
index 83124ed..4e6d44a 100644
--- a/grafana/dashboards/prometheus/zos-msu-capacity.json
+++ b/grafana/dashboards/prometheus/zos-msu-capacity.json
@@ -92,7 +92,7 @@
           },
           "editorMode": "code",
           "exemplar": false,
-          "expr": "# Use average values since the same CPC info may come from different sysplexes\navg by(cpc_id) (sum by(cpc_id) (mvs_lpar_actual_msu_h{line_type=\"CP\",cpc_id=~\"${cpcId}\"}) / on(cpc_id) mvs_cpc_capacity_msu_h{cpc_id=~\"${cpcId}\"})",
+          "expr": "sum by(cpc_id) (mvs_lpar_actual_msu_h{line_type=\"CP\",cpc_id=~\"${cpcId}\"}) / on(cpc_id) sum by(cpc_id) (mvs_cpc_capacity_msu_h{cpc_id=~\"${cpcId}\"})",
           "hide": false,
           "instant": true,
           "legendFormat": "{{cpc_sequence_number}}",
@@ -275,7 +275,7 @@
           },
           "editorMode": "code",
           "exemplar": false,
-          "expr": "# Use average values since the same CPC info may come from different sysplexes\navg by (cpc_id) (sum by(cpc_id) (mvs_lpar_actual_msu_h{line_type=\"CP\",cpc_id=~\"${cpcId}\"}) / on(cpc_id) mvs_cpc_capacity_msu_h{cpc_id=~\"${cpcId}\"})",
+          "expr": "sum by(cpc_id) (mvs_lpar_actual_msu_h{line_type=\"CP\",cpc_id=~\"${cpcId}\"}) / on(cpc_id) sum by(cpc_id) (mvs_cpc_capacity_msu_h{cpc_id=~\"${cpcId}\"})",
           "instant": false,
           "legendFormat": "{{cpc_id}}",
           "range": true,
diff --git a/grafana/rmf-app/src/dashboards/prometheus/zos-msu-capacity.json b/grafana/rmf-app/src/dashboards/prometheus/zos-msu-capacity.json
index 83124ed..4e6d44a 100644
--- a/grafana/rmf-app/src/dashboards/prometheus/zos-msu-capacity.json
+++ b/grafana/rmf-app/src/dashboards/prometheus/zos-msu-capacity.json
@@ -92,7 +92,7 @@
           },
           "editorMode": "code",
           "exemplar": false,
-          "expr": "# Use average values since the same CPC info may come from different sysplexes\navg by(cpc_id) (sum by(cpc_id) (mvs_lpar_actual_msu_h{line_type=\"CP\",cpc_id=~\"${cpcId}\"}) / on(cpc_id) mvs_cpc_capacity_msu_h{cpc_id=~\"${cpcId}\"})",
+          "expr": "sum by(cpc_id) (mvs_lpar_actual_msu_h{line_type=\"CP\",cpc_id=~\"${cpcId}\"}) / on(cpc_id) sum by(cpc_id) (mvs_cpc_capacity_msu_h{cpc_id=~\"${cpcId}\"})",
           "hide": false,
           "instant": true,
           "legendFormat": "{{cpc_sequence_number}}",
@@ -275,7 +275,7 @@
           },
           "editorMode": "code",
           "exemplar": false,
-          "expr": "# Use average values since the same CPC info may come from different sysplexes\navg by (cpc_id) (sum by(cpc_id) (mvs_lpar_actual_msu_h{line_type=\"CP\",cpc_id=~\"${cpcId}\"}) / on(cpc_id) mvs_cpc_capacity_msu_h{cpc_id=~\"${cpcId}\"})",
+          "expr": "sum by(cpc_id) (mvs_lpar_actual_msu_h{line_type=\"CP\",cpc_id=~\"${cpcId}\"}) / on(cpc_id) sum by(cpc_id) (mvs_cpc_capacity_msu_h{cpc_id=~\"${cpcId}\"})",
           "instant": false,
           "legendFormat": "{{cpc_id}}",
           "range": true,