This instance will be upgraded to Heptapod 0.31.0 (final) on 2022-05-24 at 14:00 UTC+2 (a few minutes of down time)

Commit 1d4efeec authored by Stan Hu's avatar Stan Hu
Browse files

Merge branch 'pawel/disable_nfs_metrics_checks_39730' into 'master'

Remove Filesystem check metrics that use too much CPU to handle requests

See merge request gitlab-org/gitlab-ce!15158
...@@ -6,8 +6,7 @@ class MetricsService ...@@ -6,8 +6,7 @@ class MetricsService
Gitlab::HealthChecks::Redis::RedisCheck, Gitlab::HealthChecks::Redis::RedisCheck,
Gitlab::HealthChecks::Redis::CacheCheck, Gitlab::HealthChecks::Redis::CacheCheck,
Gitlab::HealthChecks::Redis::QueuesCheck, Gitlab::HealthChecks::Redis::QueuesCheck,
Gitlab::HealthChecks::Redis::SharedStateCheck, Gitlab::HealthChecks::Redis::SharedStateCheck
Gitlab::HealthChecks::FsShardsCheck
].freeze ].freeze
def prometheus_metrics_text def prometheus_metrics_text
......
---
title: Remove Filesystem check metrics that use too much CPU to handle requests
merge_request:
author:
type: performance
...@@ -59,17 +59,6 @@ ...@@ -59,17 +59,6 @@
expect(response.body).to match(/^redis_shared_state_ping_latency_seconds [0-9\.]+$/) expect(response.body).to match(/^redis_shared_state_ping_latency_seconds [0-9\.]+$/)
end end
it 'returns file system check metrics' do
get :index
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_seconds{shard="default"} [0-9\.]+$/)
expect(response.body).to match(/^filesystem_writable{shard="default"} 1$/)
expect(response.body).to match(/^filesystem_read_latency_seconds{shard="default"} [0-9\.]+$/)
expect(response.body).to match(/^filesystem_readable{shard="default"} 1$/)
end
context 'prometheus metrics are disabled' do context 'prometheus metrics are disabled' do
before do before do
allow(Gitlab::Metrics).to receive(:prometheus_metrics_enabled?).and_return(false) allow(Gitlab::Metrics).to receive(:prometheus_metrics_enabled?).and_return(false)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment