Merge pull request ceph#57497 from rhcs-dashboard/fix-66058-main

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


Reviewed-by: Nizamudeen A <[email protected]>

Author: aaSharma14

src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/multi-cluster/multi-cluster.component.html

@@ -113,6 +113,7 @@ <h3 *ngIf="queriesResults['HEALTH_ERROR_COUNT'][0][1] === '0' && queriesResults[
                      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'">

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)'
 }