diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-02 09:08:27 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-02 09:08:27 +0300 |
| commit | 91ef4dcc05931e8be5cfb28462656386ed1fca21 (patch) | |
| tree | 88bb2c5225c49baa3e260dd3d50e865177054d04 /doc/operations/metrics | |
| parent | 895563036ae0fb388dd3ac3cae3a31f2bf1fa85f (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/operations/metrics')
| -rw-r--r-- | doc/operations/metrics/alerts.md | 3 | ||||
| -rw-r--r-- | doc/operations/metrics/dashboards/panel_types.md | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/doc/operations/metrics/alerts.md b/doc/operations/metrics/alerts.md index e8f9142a36c..c0a16da3702 100644 --- a/doc/operations/metrics/alerts.md +++ b/doc/operations/metrics/alerts.md @@ -70,7 +70,8 @@ receivers: bearer_token: 9e1cbfcd546896a9ea8be557caf13a76 send_resolved: true url: http://192.168.178.31:3001/root/manual_prometheus/prometheus/alerts/notify.json - ... + # Rest of configuration omitted + # ... ``` For GitLab to associate your alerts with an [environment](../../ci/environments/index.md), diff --git a/doc/operations/metrics/dashboards/panel_types.md b/doc/operations/metrics/dashboards/panel_types.md index f9038795cfe..20f6e25cb6b 100644 --- a/doc/operations/metrics/dashboards/panel_types.md +++ b/doc/operations/metrics/dashboards/panel_types.md @@ -17,7 +17,7 @@ dashboard: 'Dashboard Title' panel_groups: - group: 'Group Title' panels: - - type: area-chart # or line-chart + - type: area-chart # or line-chart title: 'Area Chart Title' y_label: 'Y-Axis' y_axis: |