Merge pull request ceph#53817 from cloudbehl/active-alert-filter

mgr/dashboard: Filter active alerts Reviewed-by: Nizamudeen A <[email protected]>
cybozu · Oct 9, 2023 · 6ed5a28 · 6ed5a28
2 parents 03e43c5 + a40fd8c
commit 6ed5a28
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/...nd/mgr/dashboard/frontend/src/app/ceph/dashboard-v3/dashboard/dashboard-v3.component.html b/...nd/mgr/dashboard/frontend/src/app/ceph/dashboard-v3/dashboard/dashboard-v3.component.html
@@ -272,7 +272,9 @@
 <ng-template #alertsCard>
   <ng-container *ngFor="let alert of prometheusAlertService.alerts; let i = index;  trackBy: trackByFn">
     <div [ngClass]="['border-'+alertClass[alert.labels.severity]]"
-         *ngIf="alert.labels.severity === alertType || !alertType">
+         *ngIf="alert.status.state === 'active' &&
+         alert.labels.severity === alertType ||
+         !alertType">
       <div class="card tc_alerts border-0 pt-3">
         <div class="row no-gutters ps-2">
           <div class="col-sm-1 text-center">

diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/services/prometheus-alert.service.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/services/prometheus-alert.service.ts
@@ -80,9 +80,9 @@ export class PrometheusAlertService {
         alert.status.state === 'active' && alert.labels.severity === 'warning' ? ++result : result,
       0
     );
-    this.alerts = alerts.reverse().sort((a, b) => {
-      return a.labels.severity.localeCompare(b.labels.severity);
-    });
+    this.alerts = alerts
+      .reverse()
+      .sort((a, b) => a.labels.severity.localeCompare(b.labels.severity));
     this.canAlertsBeNotified = true;
   }