Skip to content

Show alerts when prometheus service is active

Tristan Read requested to merge tr-fix-prometheus-alert-list into master

What does this MR do?

The alert list is sometimes not shown when the prometheus alerts setting is enabled. This MR fixes that issue, and updates the help message shown when the list is empty.

It is paired with these docs changes: !34241 (merged)

Discussion about the proposed solution: #218639 (comment 355823730)

Issue: #218639 (closed)

Screenshots

Before After
With prometheus alerts on + alert integration off Screenshot_2020-06-11_at_13.24.01 Screenshot_2020-06-11_at_13.24.56
With an empty list Screenshot_2020-06-11_at_13.38.44 Screenshot_2020-06-15_at_23.32.51

Does this MR meet the acceptance criteria?

Conformity

Availability and Testing

Security

If this MR contains changes to processing or storing of credentials or tokens, authorization and authentication methods and other items described in the security review guidelines:

  • [n/a] Label as security and @ mention @gitlab-com/gl-security/appsec
  • [n/a] The MR includes necessary changes to maintain consistency between UI, API, email, or other methods
  • [n/a] Security reports checked/validated by a reviewer from the AppSec team
Edited by Rémy Coutable

Merge request reports