diff options
author | Douwe Maan <douwe@gitlab.com> | 2017-11-24 12:01:12 +0300 |
---|---|---|
committer | Douwe Maan <douwe@gitlab.com> | 2017-11-24 12:01:12 +0300 |
commit | fad4ab7d56ea1deb415adff541212ae901e31fd4 (patch) | |
tree | beb536056a2d8809a13ccf6dda7270aa1c8eedf0 /changelogs | |
parent | cf631ddbdceec49579a658698f11679a29cea579 (diff) | |
parent | 46cd2d93bb23807b76bf20bb06e6ef93f1985ad9 (diff) |
Merge branch 'pawel/update_prometheus_gem_to_well_tested_version' into 'master'
Update Prometheus Gem version and disable Prometheus method call instrumentation by default.
Closes gitlab-ee#4139 and #40457
See merge request gitlab-org/gitlab-ce!15558
Diffstat (limited to 'changelogs')
-rw-r--r-- | changelogs/unreleased/pawel-update_prometheus_gem_to_well_tested_version.yml | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/changelogs/unreleased/pawel-update_prometheus_gem_to_well_tested_version.yml b/changelogs/unreleased/pawel-update_prometheus_gem_to_well_tested_version.yml new file mode 100644 index 00000000000..a4133ae5cec --- /dev/null +++ b/changelogs/unreleased/pawel-update_prometheus_gem_to_well_tested_version.yml @@ -0,0 +1,5 @@ +--- +title: Reenable Prometheus metrics, add more control over Prometheus method instrumentation +merge_request: 15558 +author: +type: fixed |