summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Kochie <bjk@gitlab.com>2019-07-15 14:27:35 +0200
committerBen Kochie <bjk@gitlab.com>2019-07-15 15:16:36 +0200
commit382a13c015538783ca90b27362ad3c821644ef55 (patch)
tree2b19e84b6bdeb0b2e094af87484b0a2eb656d668
parentf2582fbcddb353a640cf65acae5714b025ef07ad (diff)
downloadgitlab-ce-382a13c015538783ca90b27362ad3c821644ef55.tar.gz
Update example Prometheus scrape configbjk/fix_prom_example
Use a full real-world example that is compatible with the omnibus dashboards and follows Prometheus best practices.
-rw-r--r--changelogs/unreleased/bjk-fix_prom_example.yml5
-rw-r--r--doc/administration/monitoring/prometheus/index.md54
2 files changed, 52 insertions, 7 deletions
diff --git a/changelogs/unreleased/bjk-fix_prom_example.yml b/changelogs/unreleased/bjk-fix_prom_example.yml
new file mode 100644
index 00000000000..2f81bc6196b
--- /dev/null
+++ b/changelogs/unreleased/bjk-fix_prom_example.yml
@@ -0,0 +1,5 @@
+---
+title: Update example Prometheus scrape config
+merge_request: 30739
+author:
+type: other
diff --git a/doc/administration/monitoring/prometheus/index.md b/doc/administration/monitoring/prometheus/index.md
index 341ea3330d7..c8968c51393 100644
--- a/doc/administration/monitoring/prometheus/index.md
+++ b/doc/administration/monitoring/prometheus/index.md
@@ -134,17 +134,57 @@ To use an external Prometheus server:
```yaml
scrape_configs:
- - job_name: 'gitlab_exporters'
+ - job_name: nginx
static_configs:
- - targets: ['1.1.1.1:9168', '1.1.1.1:9236', '1.1.1.1:9236', '1.1.1.1:9100', '1.1.1.1:9121', '1.1.1.1:9187']
-
- - job_name: 'gitlab_metrics'
- metrics_path: /-/metrics
+ - targets:
+ - 1.1.1.1:8060
+ - job_name: redis
+ static_configs:
+ - targets:
+ - 1.1.1.1:9121
+ - job_name: postgres
+ static_configs:
+ - targets:
+ - 1.1.1.1:9187
+ - job_name: node
+ static_configs:
+ - targets:
+ - 1.1.1.1:9100
+ - job_name: gitlab-workhorse
+ static_configs:
+ - targets:
+ - 1.1.1.1:9229
+ - job_name: gitlab-rails
+ metrics_path: "/-/metrics"
+ static_configs:
+ - targets:
+ - 1.1.1.1:8080
+ - job_name: gitlab-sidekiq
+ static_configs:
+ - targets:
+ - 1.1.1.1:8082
+ - job_name: gitlab_monitor_database
+ metrics_path: "/database"
+ static_configs:
+ - targets:
+ - 1.1.1.1:9168
+ - job_name: gitlab_monitor_sidekiq
+ metrics_path: "/sidekiq"
+ static_configs:
+ - targets:
+ - 1.1.1.1:9168
+ - job_name: gitlab_monitor_process
+ metrics_path: "/process"
+ static_configs:
+ - targets:
+ - 1.1.1.1:9168
+ - job_name: gitaly
static_configs:
- - targets: ['1.1.1.1:443']
+ - targets:
+ - 1.1.1.1:9236
```
-1. Restart the Prometheus server.
+1. Reload the Prometheus server.
## Viewing performance metrics