Add latest changes from gitlab-org/gitlab@master

5 files changed, 17 insertions, 3 deletions

diff --git a/doc/operations/metrics/alerts.md b/doc/operations/metrics/alerts.md
index 6b5cbab8399..2ed8de9396a 100644
--- a/doc/operations/metrics/alerts.md
+++ b/doc/operations/metrics/alerts.md
@@ -14,7 +14,6 @@ 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 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
@@ -32,6 +31,18 @@ For managed Prometheus instances using auto configuration, you can
 
 To remove the alert, click back on the alert icon for the desired metric, and click **Delete**.
 
+### Link runbooks to alerts
+
+> - Runbook URLs [introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/39315) in GitLab 13.3.
+
+When creating alerts from the metrics dashboard for [managed Prometheus instances](#managed-prometheus-instances),
+you can also link a runbook. When the alert triggers, the
+[chart context menu](dashboards/index.md#chart-context-menu) on the metrics chart
+links to the runbook, making it easy for you to locate and access the correct runbook
+as soon as the alert fires:
+
+![Linked Runbook in charts](img/linked_runbooks_on_charts.png)
+
 ## External Prometheus instances
 
 >- [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/9258) in [GitLab Ultimate](https://about.gitlab.com/pricing/) 11.8.
diff --git a/doc/operations/metrics/dashboards/img/panel_context_menu_v13_0.png b/doc/operations/metrics/dashboards/img/panel_context_menu_v13_0.png
deleted file mode 100644
index 2d7cb923981..00000000000
--- a/doc/operations/metrics/dashboards/img/panel_context_menu_v13_0.png
+++ /dev/null
diff --git a/doc/operations/metrics/dashboards/img/panel_context_menu_v13_3.png b/doc/operations/metrics/dashboards/img/panel_context_menu_v13_3.png
new file mode 100644
index 00000000000..1259917608b
--- /dev/null
+++ b/doc/operations/metrics/dashboards/img/panel_context_menu_v13_3.png
diff --git a/doc/operations/metrics/dashboards/index.md b/doc/operations/metrics/dashboards/index.md
index 11d2dc45008..ffcb7dc92c6 100644
--- a/doc/operations/metrics/dashboards/index.md
+++ b/doc/operations/metrics/dashboards/index.md
@@ -136,7 +136,7 @@ You can take action related to a chart's data by clicking the
 **{ellipsis_v}** **More actions** dropdown box above the upper right corner of
 any chart on a dashboard:
 
-![Context Menu](img/panel_context_menu_v13_0.png)
+![Context Menu](img/panel_context_menu_v13_3.png)
 
 The options are:
 
@@ -148,7 +148,10 @@ The options are:
   feature, logs narrow down to the selected time range. ([Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/122013) in GitLab 12.8.)
 - **Download CSV** - Data from Prometheus charts on the metrics dashboard can be downloaded as CSV.
 - [Copy link to chart](../embed.md#embedding-gitlab-managed-kubernetes-metrics)
-- [Alerts](../alerts.md)
+- **Alerts** - Display any [alerts](../alerts.md) configured for this metric.
+- **View Runbook** - Displays the runbook for an alert. For information about configuring
+  runbooks, read [Set up alerts for Prometheus metrics](../alerts.md).
+  ([Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/211844) in GitLab 13.3.)
 
 ### Timeline zoom and URL sharing
 
diff --git a/doc/operations/metrics/img/linked_runbooks_on_charts.png b/doc/operations/metrics/img/linked_runbooks_on_charts.png
new file mode 100644
index 00000000000..335ba5dc172
--- /dev/null
+++ b/doc/operations/metrics/img/linked_runbooks_on_charts.png