mgr/dashboard: Fix host count per cluster and total hosts count on multi-cluster...

Fixes: https://tracker.ceph.com/issues/66058
Signed-off-by: Aashish Sharma <aasharma@redhat.com>

diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/multi-cluster/multi-cluster.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/multi-cluster/multi-cluster.component.html
index 0b209abaa505d3551a83533fc94cfa8850e7885d..e64e2f46e2a4ac88edadec06ea60ccab46bd32fa 100644 (file)
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/multi-cluster/multi-cluster.component.html
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/multi-cluster/multi-cluster.component.html
@@ -113,6 +113,7 @@
                      i18n-title
                      class="col-sm-6 m-0 p-0 ps-2 pe-2"
                      aria-label="Alerts"
+                     [fullHeight]="true"
                      *ngIf="queriesResults['ALERTS_COUNT'] && queriesResults['ALERTS_COUNT'][0]">
               <span class="text-center">
                 <h3 *ngIf="queriesResults['CRITICAL_ALERTS_COUNT'][0][1] === '0' && queriesResults['WARNING_ALERTS_COUNT'][0][1] === '0'">

diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/enum/dashboard-promqls.enum.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/enum/dashboard-promqls.enum.ts
index 117cc943d51a1d6a3af1894abbe5fa3eb6e5b3e9..1a7c7af9d3a4695fa6448705296fe406749692fa 100644 (file)
--- a/src/pybind/mgr/dashboard/frontend/src/app/shared/enum/dashboard-promqls.enum.ts
+++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/enum/dashboard-promqls.enum.ts
@@ -34,8 +34,8 @@ export enum MultiClusterPromqls {
   CRITICAL_ALERTS_COUNT = 'count(ALERTS{alertstate="firing",severity="critical"}) or vector(0)',
   WARNING_ALERTS_COUNT = 'count(ALERTS{alertstate="firing",severity="warning"}) or vector(0)',
   ALERTS = 'ALERTS{alertstate="firing"}',
-  HOSTS = 'sum by (hostname, cluster) (group by (hostname, cluster) (ceph_osd_metadata)) or vector(0)',
-  TOTAL_HOSTS = 'count by (cluster) (ceph_osd_metadata) or vector(0)',
+  HOSTS = 'count_values("hostname", ceph_mon_metadata) by (cluster) or vector (0)',
+  TOTAL_HOSTS = 'count(sum by (hostname) (ceph_osd_metadata)) or vector(0)',
   CLUSTER_ALERTS = 'count by (cluster) (ALERTS{alertstate="firing"}) or vector(0)'
 }