Commit 4ba6d05c authored by Jason Plum's avatar Jason Plum

Merge branch 'document-prometheus-customization' into 'master'

Document how to customize Prometheus

Closes #1271

See merge request charts/gitlab!749
parents c439215c 45f03a10
Pipeline #55298842 passed with stages
in 19 minutes and 36 seconds
......@@ -67,7 +67,6 @@ Tables below contain all the possible charts configurations that can be supplied
| global.appConfig.incomingEmail.mailbox | Mailbox where incoming mail will end up. | inbox |
| global.appConfig.incomingEmail.idleTimeout | The IDLE command timeout | 60 |
## GitLab Shell
| Parameter | Description | Default |
......@@ -289,3 +288,18 @@ See [nginx-ingress chart](../charts/nginx/index.md)
| gitlab-runner.resources.limits.cpu | runner resources | |
| gitlab-runner.resources.requests.memory | runner resources | |
| gitlab-runner.resources.requests.cpu | runner resources | |
## External Charts
GitLab makes use of several other charts. These are [treated as parent-child relationships](https://helm.sh/docs/developing_charts/#chart-dependencies).
Ensure that any properties you wish to configure are provided as `chart-name.property`.
## Prometheus
Prefix Prometheus values with `prometheus`. For example, set the persistence
storage value using `prometheus.server.persistentVolume.size`.
Refer to the [Prometheus chart documentation][prometheus-configuration] for the
exhaustive list of configuration options.
[prometheus-configuration]: https://github.com/helm/charts/tree/master/stable/prometheus#configuration
......@@ -111,6 +111,39 @@ This configuration should not be used in production.
You can read more about setting up your production-ready object storage in the [external object storage](../advanced/external-object-storage/index.md)
### Prometheus
We use the [upstream Prometheus chart][prometheus-configuration],
and do not override values from our own defaults.
We do, however, default disable `alertmanager`, `nodeExporter`, and
`pushgateway`.
Refer to the [Prometheus chart documentation][prometheus-configuration] for the
exhaustive list of configuration options and ensure they are sub-keys to
`prometheus`, as we use this as requirement chart.
For instance, the requests for persistent storage can be controlled with:
```yaml
prometheus:
alertmanager:
enabled: false
persistentVolume:
enabled: false
size: 2GiB
pushgateway:
enabled: false
persistentVolume:
enabled: false
size: 2GiB
server:
persistentVolume:
enabled: true
size: 8GiB
```
[prometheus-configuration]: https://github.com/helm/charts/tree/master/stable/prometheus#configuration
### Outgoing email
By default outgoing email is disabled. To enable it, provide details for your SMTP server
......
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