Commit c5cb2100 authored by Sean McGivern's avatar Sean McGivern

Merge branch 'jv-rename-redis-counter' into 'master'

Namespace redis_client metrics with gitlab_

See merge request gitlab-org/gitlab!36197
parents db775720 08a49d40
...@@ -261,8 +261,8 @@ instance (`cache`, `shared_state` etc.). ...@@ -261,8 +261,8 @@ instance (`cache`, `shared_state` etc.).
| Metric | Type | Since | Description | | Metric | Type | Since | Description |
|:--------------------------------- |:------- |:----- |:----------- | |:--------------------------------- |:------- |:----- |:----------- |
| `redis_client_exceptions_total` | Counter | 13.2 | Number of Redis client exceptions, broken down by exception class | | `gitlab_redis_client_exceptions_total` | Counter | 13.2 | Number of Redis client exceptions, broken down by exception class |
| `redis_client_requests_total` | Counter | 13.2 | Number of Redis client requests | | `gitlab_redis_client_requests_total` | Counter | 13.2 | Number of Redis client requests |
## Metrics shared directory ## Metrics shared directory
......
...@@ -82,7 +82,7 @@ module Gitlab ...@@ -82,7 +82,7 @@ module Gitlab
end end
def count_request def count_request
@request_counter ||= Gitlab::Metrics.counter(:redis_client_requests_total, 'Client side Redis request count, per Redis server') @request_counter ||= Gitlab::Metrics.counter(:gitlab_redis_client_requests_total, 'Client side Redis request count, per Redis server')
@request_counter.increment({ storage: storage_key }) @request_counter.increment({ storage: storage_key })
end end
...@@ -90,7 +90,7 @@ module Gitlab ...@@ -90,7 +90,7 @@ module Gitlab
# This metric is meant to give a client side view of how the Redis # This metric is meant to give a client side view of how the Redis
# server is doing. Redis itself does not expose error counts. This # server is doing. Redis itself does not expose error counts. This
# metric can be used for Redis alerting and service health monitoring. # metric can be used for Redis alerting and service health monitoring.
@exception_counter ||= Gitlab::Metrics.counter(:redis_client_exceptions_total, 'Client side Redis exception count, per Redis server, per exception class') @exception_counter ||= Gitlab::Metrics.counter(:gitlab_redis_client_exceptions_total, 'Client side Redis exception count, per Redis server, per exception class')
@exception_counter.increment({ storage: storage_key, exception: ex.class.to_s }) @exception_counter.increment({ storage: storage_key, exception: ex.class.to_s })
end end
......
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