git-server-git.apps.pok.os.sepia.ceph.com Git

mgr/dashboard: alert badge includes suppressed alerts

On a cluster with alerting enabled, when alerts are triggered, even if they are silenced, the vertical navigation item (Cluster > Monitoring) displays the total number of alerts, including the ones suppressed.This PR intends to fix this issue.

Fixes: https://tracker.ceph.com/issues/48591
Signed-off-by: Aashish Sharma <aasharma@redhat.com>
(cherry picked from commit b4e32461f1f8430f223965c245974b2a2dbab3aa)

Conflicts:
src/pybind/mgr/dashboard/frontend/src/app/core/navigation/navigation/navigation.component.html
- Adopt the master branch changes.

author	Aashish Sharma <aashishsharma@localhost.localdomain>
	Mon, 4 Jan 2021 05:09:16 +0000 (10:39 +0530)
committer	Avan Thakkar <athakkar@localhost.localdomain>
	Wed, 17 Feb 2021 06:17:36 +0000 (11:47 +0530)
commit	956a70b413d1e3fd741d559f9570ccb053a634ce
tree	c7d91536f2b007ba5bb682399100df8a26f39e66	tree \| snapshot
parent	2a78fb902cabae3cdf065027bfee0c9e2f66a27d	commit \| diff

src/pybind/mgr/dashboard/frontend/src/app/core/navigation/navigation/navigation.component.html		diff \| blob \| history
src/pybind/mgr/dashboard/frontend/src/app/shared/services/prometheus-alert.service.spec.ts		diff \| blob \| history
src/pybind/mgr/dashboard/frontend/src/app/shared/services/prometheus-alert.service.ts		diff \| blob \| history