Merge branch 'docs/prom-incidents' into 'master'

Change name of Prometheus incidents and change version See merge request gitlab-org/gitlab-ee!11250

Merge branch 'docs/prom-incidents' into 'master'
Change name of Prometheus incidents and change version See merge request gitlab-org/gitlab-ee!11250
d175d222 · Achilleas Pipinellis · a7955a9d · 3a5d18c7 · d175d222
Commit d175d222 authored Apr 19, 2019 by Achilleas Pipinellis
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

doc/user/project/integrations/prometheus.md doc/user/project/integrations/prometheus.md +2 -2

No files found.
--- a/doc/user/project/integrations/prometheus.md
+++ b/doc/user/project/integrations/prometheus.md
@@ -156,9 +156,9 @@ receivers:
  ...
 ```

-### Taking action on an alert **[ULTIMATE]**
+### Taking action on incidents **[ULTIMATE]**

-> [Introduced](https://gitlab.com/gitlab-org/gitlab-ee/issues/4925) in [GitLab Ultimate](https://about.gitlab.com/pricing/) 11.10.
+> [Introduced](https://gitlab.com/gitlab-org/gitlab-ee/issues/4925) in [GitLab Ultimate](https://about.gitlab.com/pricing/) 11.11.

 Alerts can be used to trigger actions, like open an issue automatically. To configure the actions: