Skip to content

Add nil check for Gitlab.config.prometheus

Reuben Pereira requested to merge 13806-fix into master

What does this MR do?

This MR adds a nil check for Gitlab.config.prometheus because if prometheus is present but does not have any child keys in gitlab.yml, Gitlab.config.prometheus returns nil.

Issue: https://gitlab.com/gitlab-org/gitlab-ee/issues/13806

EE MR: https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/15629

Screenshots

Does this MR meet the acceptance criteria?

Conformity

Performance 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:

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

Closes #13806 (closed)

Edited by 🤖 GitLab Bot 🤖

Merge request reports