summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAchilleas Pipinellis <axil@gitlab.com>2017-10-30 11:49:53 +0000
committerAchilleas Pipinellis <axil@gitlab.com>2017-10-30 11:49:53 +0000
commit0289e7b8e3016c68048f21ac0c36e5db5ef74c4a (patch)
tree4ddc5ac26379aedf88a52b5355aaeaeaf5198786
parent6919f6361c3cfa87a38cd7eb391ade70823c9106 (diff)
parent9ced16d914861933293402cde33b079536e49325 (diff)
downloadgitlab-ce-0289e7b8e3016c68048f21ac0c36e5db5ef74c4a.tar.gz
Merge branch 'bvl-add-circuitbreaker-metrics-docs' into 'master'
Add missing circuitbreaker metrics to prometheus documentation See merge request gitlab-org/gitlab-ce!15062
-rw-r--r--doc/administration/monitoring/prometheus/gitlab_metrics.md4
1 files changed, 3 insertions, 1 deletions
diff --git a/doc/administration/monitoring/prometheus/gitlab_metrics.md b/doc/administration/monitoring/prometheus/gitlab_metrics.md
index 6baae20d16a..11d5e077a36 100644
--- a/doc/administration/monitoring/prometheus/gitlab_metrics.md
+++ b/doc/administration/monitoring/prometheus/gitlab_metrics.md
@@ -20,7 +20,7 @@ it, the client IP needs to be [included in a whitelist][whitelist].
Currently the embedded Prometheus server is not automatically configured to
collect metrics from this endpoint. We recommend setting up another Prometheus
server, because the embedded server configuration is overwritten once every
-[reconfigure of GitLab][reconfigure]. In the future this will not be required.
+[reconfigure of GitLab][reconfigure]. In the future this will not be required.
## Metrics available
@@ -45,6 +45,8 @@ In this experimental phase, only a few metrics are available:
| redis_ping_success | Gauge | 9.4 | Whether or not the last redis ping succeeded |
| redis_ping_latency_seconds | Gauge | 9.4 | Round trip time of the redis ping |
| user_session_logins_total | Counter | 9.4 | Counter of how many users have logged in |
+| filesystem_circuitbreaker_latency_seconds | Histogram | 9.5 | Latency of the stat check the circuitbreaker uses to probe a shard |
+| filesystem_circuitbreaker | Gauge | 9.5 | Wether or not the circuit for a certain shard is broken or not |
## Metrics shared directory