summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvan Read <eread@gitlab.com>2019-07-01 01:58:16 +0000
committerEvan Read <eread@gitlab.com>2019-07-01 01:58:16 +0000
commite0ada98cbb2716199e810908e7d5bd342f6e2f4a (patch)
tree8bab960ac25bdb7640242280ae6a0d57639bf3b5
parent7d56df1b26480059f00aee770af149da95500cc8 (diff)
parenta0e818c9516aa8747ece4e8ac246656a10390668 (diff)
downloadgitlab-ce-e0ada98cbb2716199e810908e7d5bd342f6e2f4a.tar.gz
Merge branch 'docs/health_check' into 'master'
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/62080 Closes #62080 See merge request gitlab-org/gitlab-ce!30148
-rw-r--r--doc/user/admin_area/monitoring/health_check.md51
1 files changed, 30 insertions, 21 deletions
diff --git a/doc/user/admin_area/monitoring/health_check.md b/doc/user/admin_area/monitoring/health_check.md
index f80d4e9d2aa..35e7b6fb541 100644
--- a/doc/user/admin_area/monitoring/health_check.md
+++ b/doc/user/admin_area/monitoring/health_check.md
@@ -41,42 +41,51 @@ The readiness and liveness probes will provide a report of system health in JSON
```json
{
- "queues_check" : {
- "status" : "ok"
+ "db_check":{
+ "status":"ok"
},
- "redis_check" : {
- "status" : "ok"
+ "redis_check":{
+ "status":"ok"
},
- "shared_state_check" : {
- "status" : "ok"
+ "cache_check":{
+ "status":"ok"
},
- "db_check" : {
- "status" : "ok"
+ "queues_check":{
+ "status":"ok"
},
- "cache_check" : {
- "status" : "ok"
+ "shared_state_check":{
+ "status":"ok"
+ },
+ "gitaly_check":{
+ "status":"ok",
+ "labels":{
+ "shard":"default"
+ }
+ }
}
-}
```
`liveness` probe example output:
```json
{
- "cache_check" : {
- "status" : "ok"
+ "db_check":{
+ "status":"ok"
+ },
+ "redis_check":{
+ "status":"ok"
},
- "db_check" : {
- "status" : "ok"
+ "cache_check":{
+ "status":"ok"
},
- "redis_check" : {
- "status" : "ok"
+ "queues_check":{
+ "status":"ok"
},
- "queues_check" : {
- "status" : "ok"
+ "shared_state_check":{
+ "status":"ok"
},
- "shared_state_check" : {
- "status" : "ok"
+ "gitaly_check":{
+ "status":"ok"
}
}
```