From: Volker Theile <vtheile@suse.com>
Date: Fri, 24 Apr 2020 10:18:25 +0000 (+0200)
Subject: mgr/dashboard: monitoring menu entry should indicate firing alerts
X-Git-Tag: v14.2.10~46^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=3a06196c18cc5b7485afd906ca8c9b9db9bf7e54;p=ceph.git

mgr/dashboard: monitoring menu entry should indicate firing alerts

Fixes: https://tracker.ceph.com/issues/43081

Signed-off-by: Volker Theile <vtheile@suse.com>
(cherry picked from commit f88fb46d680127963c0d04b797b5742ada6024b4)

Conflicts:
	src/pybind/mgr/dashboard/frontend/src/app/core/navigation/navigation/navigation.component.html
	src/pybind/mgr/dashboard/frontend/src/app/core/navigation/navigation/navigation.component.scss
	src/pybind/mgr/dashboard/frontend/src/app/core/navigation/navigation/navigation.component.spec.ts
---

diff --git a/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/navigation/navigation.component.html b/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/navigation/navigation.component.html
index 562e75355f4..a61b0581dde 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/navigation/navigation.component.html
+++ b/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/navigation/navigation.component.html
@@ -102,7 +102,11 @@
               class="tc_submenuitem tc_submenuitem_monitoring"
               *ngIf="(isAlertmanagerConfigured || isPrometheusConfigured) && permissions.prometheus.read">
             <a i18n
-               routerLink="/monitoring">Monitoring</a>
+               routerLink="/monitoring">
+              <ng-container i18n>Monitoring</ng-container>
+              <small *ngIf="prometheusAlertService.alerts.length > 0"
+                     class="badge badge-danger">{{ prometheusAlertService.alerts.length }}</small>
+            </a>
           </li>
         </ul>
       </li>
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/navigation/navigation.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/navigation/navigation.component.ts
index 0fc85e8da75..efd87da15af 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/navigation/navigation.component.ts
+++ b/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/navigation/navigation.component.ts
@@ -7,6 +7,7 @@ import {
   FeatureTogglesMap$,
   FeatureTogglesService
 } from '../../../shared/services/feature-toggles.service';
+import { PrometheusAlertService } from '../../../shared/services/prometheus-alert.service';
 import { SummaryService } from '../../../shared/services/summary.service';
 
 @Component({
@@ -27,7 +28,8 @@ export class NavigationComponent implements OnInit {
     private authStorageService: AuthStorageService,
     private prometheusService: PrometheusService,
     private summaryService: SummaryService,
-    private featureToggles: FeatureTogglesService
+    private featureToggles: FeatureTogglesService,
+    public prometheusAlertService: PrometheusAlertService
   ) {
     this.permissions = this.authStorageService.getPermissions();
     this.enabledFeature$ = this.featureToggles.get();