Skip to content

Add ServiceMonitor or PodMonitors to GitLab sub charts

Steve Hipwell requested to merge stevehipwell/gitlab-chart:add-service-monitors into master

What does this MR do?

This MR adds the ability to use either a ServiceMonitor or a PodMonitor instead of annotations to each of the GitLab sub charts which expose Prometheus metrics; this supports the use of the Prometheus Operator to scrape these metrics. While doing this work I've normalised the metrics values in all of the charts and added deprecations to values which shouldn't be used.

I'm unsure of how this would need documenting so please could someone let me know?

Related issues

Closes #2525 (closed).

Checklist

See Definition of done.

For anything in this list which will not be completed, please provide a reason in the MR discussion.

Required

  • Merge Request Title and Description are up to date, accurate, and descriptive
  • MR targeting the appropriate branch
  • MR has a green pipeline on GitLab.com

Expected (please provide an explanation if not completing)

  • Test plan indicating conditions for success has been posted and passes
  • Documentation created/updated
  • Tests added
  • Integration tests added to GitLab QA
  • Equivalent MR/issue for omnibus-gitlab opened
Edited by Steve Hipwell

Merge request reports