diff options
| author | Ben Kochie <superq@gmail.com> | 2017-07-24 13:50:12 +0200 |
|---|---|---|
| committer | Ben Kochie <superq@gmail.com> | 2017-07-24 19:43:05 +0200 |
| commit | 38a2641b6edcacac5bed7421156f2628ee74f962 (patch) | |
| tree | e729986a00f3afa47f64f1b56e1b7123a108e5f2 /spec/controllers/metrics_controller_spec.rb | |
| parent | 9bbe2acf7fb75d19cc3db4e82e82eba47c65202e (diff) | |
| download | gitlab-ce-bjk/patch.tar.gz | |
Add patch for Prometheus metric updates.bjk/patch
Include patch of https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/12812
Diffstat (limited to 'spec/controllers/metrics_controller_spec.rb')
| -rw-r--r-- | spec/controllers/metrics_controller_spec.rb | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/spec/controllers/metrics_controller_spec.rb b/spec/controllers/metrics_controller_spec.rb index 265efb84cf2..d604cd02df8 100644 --- a/spec/controllers/metrics_controller_spec.rb +++ b/spec/controllers/metrics_controller_spec.rb @@ -24,7 +24,7 @@ describe MetricsController do expect(response.body).to match(/^db_ping_timeout 0$/) expect(response.body).to match(/^db_ping_success 1$/) - expect(response.body).to match(/^db_ping_latency [0-9\.]+$/) + expect(response.body).to match(/^db_ping_latency_seconds [0-9\.]+$/) end it 'returns Redis ping metrics' do @@ -32,17 +32,17 @@ describe MetricsController do expect(response.body).to match(/^redis_ping_timeout 0$/) expect(response.body).to match(/^redis_ping_success 1$/) - expect(response.body).to match(/^redis_ping_latency [0-9\.]+$/) + expect(response.body).to match(/^redis_ping_latency_seconds [0-9\.]+$/) end it 'returns file system check metrics' do get :index - expect(response.body).to match(/^filesystem_access_latency{shard="default"} [0-9\.]+$/) + expect(response.body).to match(/^filesystem_access_latency_seconds{shard="default"} [0-9\.]+$/) expect(response.body).to match(/^filesystem_accessible{shard="default"} 1$/) - expect(response.body).to match(/^filesystem_write_latency{shard="default"} [0-9\.]+$/) + expect(response.body).to match(/^filesystem_write_latency_seconds{shard="default"} [0-9\.]+$/) expect(response.body).to match(/^filesystem_writable{shard="default"} 1$/) - expect(response.body).to match(/^filesystem_read_latency{shard="default"} [0-9\.]+$/) + expect(response.body).to match(/^filesystem_read_latency_seconds{shard="default"} [0-9\.]+$/) expect(response.body).to match(/^filesystem_readable{shard="default"} 1$/) end |