update ceph source to reef 18.2.1

[ceph.git] / ceph / src / pybind / mgr / dashboard / frontend / src / app / shared / services / prometheus-alert.service.ts

diff --git a/ceph/src/pybind/mgr/dashboard/frontend/src/app/shared/services/prometheus-alert.service.ts b/ceph/src/pybind/mgr/dashboard/frontend/src/app/shared/services/prometheus-alert.service.ts
index f26b80629b9206f61496dc4bcf513ef6eaa90e94..be6c27da6e2a77603531ca644eb4e486324cbe2e 100644 (file)
--- a/ceph/src/pybind/mgr/dashboard/frontend/src/app/shared/services/prometheus-alert.service.ts
+++ b/ceph/src/pybind/mgr/dashboard/frontend/src/app/shared/services/prometheus-alert.service.ts
@@ -64,23 +64,25 @@ export class PrometheusAlertService {
       this.notifyOnAlertChanges(alerts, this.alerts);
     }
     this.activeAlerts = _.reduce<AlertmanagerAlert, number>(
-      this.alerts,
+      alerts,
       (result, alert) => (alert.status.state === 'active' ? ++result : result),
       0
     );
     this.activeCriticalAlerts = _.reduce<AlertmanagerAlert, number>(
-      this.alerts,
+      alerts,
       (result, alert) =>
         alert.status.state === 'active' && alert.labels.severity === 'critical' ? ++result : result,
       0
     );
     this.activeWarningAlerts = _.reduce<AlertmanagerAlert, number>(
-      this.alerts,
+      alerts,
       (result, alert) =>
         alert.status.state === 'active' && alert.labels.severity === 'warning' ? ++result : result,
       0
     );
-    this.alerts = alerts;
+    this.alerts = alerts.reverse().sort((a, b) => {
+      return a.labels.severity.localeCompare(b.labels.severity);
+    });
     this.canAlertsBeNotified = true;
   }