diff options
| author | Ben Kochie <superq@gmail.com> | 2018-04-26 10:28:16 +0200 |
|---|---|---|
| committer | Ben Kochie <superq@gmail.com> | 2018-04-26 10:28:16 +0200 |
| commit | c5abf0d7c8ed0d1ee536556c3bed5d5b0201d2e3 (patch) | |
| tree | c4ed3dab5ed7761d4250645be644114c9465a5cc | |
| parent | 928e45e7d3ac34d4b98bf0d8d57ca6c33e1e924f (diff) | |
| download | gitlab-ce-bjk/grafana_example.tar.gz | |
Update Grafana docsbjk/grafana_example
Include Prometheus setup instructions.
| -rw-r--r-- | doc/administration/monitoring/performance/grafana_configuration.md | 28 |
1 files changed, 22 insertions, 6 deletions
diff --git a/doc/administration/monitoring/performance/grafana_configuration.md b/doc/administration/monitoring/performance/grafana_configuration.md index 7947b0fedc4..1b1ef33c82f 100644 --- a/doc/administration/monitoring/performance/grafana_configuration.md +++ b/doc/administration/monitoring/performance/grafana_configuration.md @@ -2,11 +2,12 @@ [Grafana](http://grafana.org/) is a tool that allows you to visualize time series metrics through graphs and dashboards. It supports several backend -data stores, including InfluxDB. GitLab writes performance data to InfluxDB -and Grafana will allow you to query InfluxDB to display useful graphs. +data stores, including Prometheus and InfluxDB. GitLab provides performance +and operational data to Prometheus and InfluxDB. Grafana will allow you to +query and display useful graphs. -For the easiest installation and configuration, install Grafana on the same -server as InfluxDB. For larger installations, you may want to split out these +Grafana will need API access to Prometheus and/or InfluxDB. It can be installed +on the same server. For larger installations, you may want to split out these services. ## Installation @@ -27,11 +28,26 @@ in the top bar.  +### Prometheus + +Fill in the configuration details for the InfluxDB data source. Save and +Test Connection to ensure the configuration is correct. + +- **Name**: Prometheus +- **Default**: Checked (Optional) +- **Type**: Prometheus +- **Url**: https://localhost:9090 (Or the remote URL if you've Grafana is +on a separate server) +- **Access**: proxy +- **Scrape interval**: 15s (This is the default configured in GitLab omnibus) + +### InfluxDB + Fill in the configuration details for the InfluxDB data source. Save and Test Connection to ensure the configuration is correct. - **Name**: InfluxDB -- **Default**: Checked +- **Default**: Checked (Optional) - **Type**: InfluxDB 0.9.x (Even if you're using InfluxDB 0.10.x) - **Url**: https://localhost:8086 (Or the remote URL if you've installed InfluxDB on a separate server) @@ -42,7 +58,7 @@ on a separate server)  -## Apply retention policies and create continuous queries +## Apply retention policies and create continuous queries (InfluxDB only) If you intend to import the GitLab provided Grafana dashboards, you will need to set up the right retention policies and continuous queries. The easiest way of |