diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2018-04-06 09:43:34 +0300 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2018-04-06 09:43:34 +0300 |
| commit | 702b4fec317ca7fc4a2894a519aec5a0e95d16b6 (patch) | |
| tree | 315dcc0986411563bd29a95ede8038ff49dbbaec /changelogs | |
| parent | b9c62c21c6e1dd06e8b68fff5cfa6b13aaf87ae9 (diff) | |
| parent | 8fd61a7e44614a2e4ab24a52d43fe2b676d6532e (diff) | |
Merge branch '45070-prometheus-integration-via-kubernetes-is-broken' into 'master'
Override Prometheus service name to fix integration with GitLab.
Closes #45070
See merge request gitlab-org/gitlab-ce!18206
Diffstat (limited to 'changelogs')
| -rw-r--r-- | changelogs/unreleased/45070-prometheus-integration-via-kubernetes-is-broken.yml | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/changelogs/unreleased/45070-prometheus-integration-via-kubernetes-is-broken.yml b/changelogs/unreleased/45070-prometheus-integration-via-kubernetes-is-broken.yml new file mode 100644 index 00000000000..046785deb3f --- /dev/null +++ b/changelogs/unreleased/45070-prometheus-integration-via-kubernetes-is-broken.yml @@ -0,0 +1,5 @@ +--- +title: Work around Prometheus Helm chart name changes to fix integration +merge_request: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/18206/ +author: joshlambert +type: fixed |