Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-08-13 12:10:09 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2020-08-13 12:10:09 +0300
commit4e33606f0114c39e07f0151465299f75bfe00c3e (patch)
tree5d5f3593c7114b64e611e4c10ea9ca25e94d566a /doc/operations/metrics
parent6c516c90efc656531d2d90f55dcc49b863e10158 (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/operations/metrics')
-rw-r--r--doc/operations/metrics/alerts.md4
-rw-r--r--doc/operations/metrics/img/prometheus_alert.pngbin8192 -> 6611 bytes
2 files changed, 3 insertions, 1 deletions
diff --git a/doc/operations/metrics/alerts.md b/doc/operations/metrics/alerts.md
index 63d4919bd61..6b5cbab8399 100644
--- a/doc/operations/metrics/alerts.md
+++ b/doc/operations/metrics/alerts.md
@@ -13,7 +13,8 @@ your team when environment performance falls outside of the boundaries you set.
## Managed Prometheus instances
-> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/6590) in [GitLab Ultimate](https://about.gitlab.com/pricing/) 11.2 for [custom metrics](index.md#adding-custom-metrics), and 11.3 for [library metrics](../../user/project/integrations/prometheus_library/metrics.md).
+> - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/6590) in [GitLab Ultimate](https://about.gitlab.com/pricing/) 11.2 for [custom metrics](index.md#adding-custom-metrics), and GitLab 11.3 for [library metrics](../../user/project/integrations/prometheus_library/metrics.md).
+> - Runbook URLs [introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/39315) in GitLab 13.3.
For managed Prometheus instances using auto configuration, you can
[configure alerts for metrics](index.md#adding-custom-metrics) directly in the
@@ -24,6 +25,7 @@ For managed Prometheus instances using auto configuration, you can
**ellipsis** **{ellipsis_v}** icon in the top right corner of the metric.
1. Choose **Alerts**.
1. Set threshold and operator.
+1. (Optional) Add a Runbook URL.
1. Click **Add** to save and activate the alert.
![Adding an alert](img/prometheus_alert.png)
diff --git a/doc/operations/metrics/img/prometheus_alert.png b/doc/operations/metrics/img/prometheus_alert.png
index ffa1008ff51..08680c88b23 100644
--- a/doc/operations/metrics/img/prometheus_alert.png
+++ b/doc/operations/metrics/img/prometheus_alert.png
Binary files differ