diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2017-11-06 17:02:22 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-11-06 17:02:22 +0000 |
| commit | cc058de8df718af1f1ed4f61677770d40df676ac (patch) | |
| tree | a76274c0cb9f71d25eb5f7f28651f5bb59f8a42f /spec/controllers/metrics_controller_spec.rb | |
| parent | c76426fc640d1d214d78e343c463636dcf68fa6c (diff) | |
| parent | 05f41253a9fb1ae88ecc53a1ceade780d1cfe0d4 (diff) | |
| download | gitlab-ce-cc058de8df718af1f1ed4f61677770d40df676ac.tar.gz | |
Merge branch 'pawel/show_empty_page_when_prometheus_metrics_are_disabled-35639' into 'master'
Make Prometheus metrics endpoint return empty response when metrics are disabled
Closes #35639
See merge request gitlab-org/gitlab-ce!14490
Diffstat (limited to 'spec/controllers/metrics_controller_spec.rb')
| -rw-r--r-- | spec/controllers/metrics_controller_spec.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/spec/controllers/metrics_controller_spec.rb b/spec/controllers/metrics_controller_spec.rb index 4aed2a25baa..9e8a37171ec 100644 --- a/spec/controllers/metrics_controller_spec.rb +++ b/spec/controllers/metrics_controller_spec.rb @@ -67,7 +67,8 @@ describe MetricsController do it 'returns proper response' do get :index - expect(response.status).to eq(404) + expect(response.status).to eq(200) + expect(response.body).to eq("# Metrics are disabled, see: http://test.host/help/administration/monitoring/prometheus/gitlab_metrics#gitlab-prometheus-metrics\n") end end end |