Add latest changes from gitlab-org/gitlab@master

6 files changed, 12 insertions, 21 deletions

diff --git a/doc/operations/metrics/alerts.md b/doc/operations/metrics/alerts.md
index c0a16da3702..b7d0576d6c7 100644
--- a/doc/operations/metrics/alerts.md
+++ b/doc/operations/metrics/alerts.md
@@ -78,7 +78,6 @@ For GitLab to associate your alerts with an [environment](../../ci/environments/
 you must configure a `gitlab_environment_name` label on the alerts you set up in
 Prometheus. The value of this should match the name of your environment in GitLab.
 
-NOTE: **Note:**
 In GitLab versions 13.1 and greater, you can configure your manually configured
 Prometheus server to use the
 [Generic alerts integration](../incident_management/generic_alerts.md).
diff --git a/doc/operations/metrics/dashboards/default.md b/doc/operations/metrics/dashboards/default.md
index f086d7737bd..21cb3d5a5a6 100644
--- a/doc/operations/metrics/dashboards/default.md
+++ b/doc/operations/metrics/dashboards/default.md
@@ -25,7 +25,6 @@ metrics about the [deployed application](../index.md#configure-prometheus-to-gat
 
 ## Kubernetes pod health dashboard
 
-NOTE: **Note:**
 This dashboard requires Kubernetes v1.14 or higher, due to the
 [change in metric labels](https://github.com/kubernetes/kubernetes/pull/69099)
 in Kubernetes 1.14.
diff --git a/doc/operations/metrics/dashboards/index.md b/doc/operations/metrics/dashboards/index.md
index 42dc5bbfb6d..12e6b7b5740 100644
--- a/doc/operations/metrics/dashboards/index.md
+++ b/doc/operations/metrics/dashboards/index.md
@@ -14,7 +14,6 @@ includes a few key metrics, but you can also define your own custom dashboards.
 You may create a [new dashboard from scratch](#add-a-new-dashboard-to-your-project)
 or [duplicate a GitLab-defined Prometheus dashboard](#duplicate-a-gitlab-defined-dashboard).
 
-NOTE: **Note:**
 The metrics as defined below do not support alerts, unlike
 [custom metrics](../index.md#adding-custom-metrics).
 
@@ -86,7 +85,7 @@ with the **Add Panel** page:
 1. Click **Add panel** in the **{ellipsis_v}** **More actions** menu.
 
    NOTE: **Note:**
-   You can add panel only to custom dashboards.
+   You can only add panels to custom dashboards.
 
    ![Monitoring Dashboard actions menu with add panel item](img/actions_menu_create_add_panel_v13_3.png)
 1. In the **Define and preview panel** section, paste in the YAML you want to
@@ -100,16 +99,12 @@ with the **Add Panel** page:
 > - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/37238) in GitLab 12.7.
 > - From [GitLab 12.8 onwards](https://gitlab.com/gitlab-org/gitlab/-/issues/39505), custom metrics are also duplicated when you duplicate a dashboard.
 
-You can save a complete copy of a GitLab defined dashboard along with all custom metrics added to it.
+You can save a complete copy of a GitLab-defined dashboard along with all custom metrics added to it.
 The resulting `.yml` file can be customized and adapted to your project.
 You can decide to save the dashboard `.yml` file in the project's **default** branch or in a
-new branch.
+new branch. To duplicate a GitLab-defined dashboard:
 
 1. Click **Duplicate current dashboard** in the **{ellipsis_v}** **More actions** menu.
-
-   NOTE: **Note:**
-   You can duplicate only GitLab-defined dashboards.
-
 1. Enter the filename and other information, such as the new commit's message, and click **Duplicate**.
 1. Select a branch to add your dashboard to:
    - *If you select your **default** branch,* the new dashboard becomes immediately available.
diff --git a/doc/operations/metrics/dashboards/variables.md b/doc/operations/metrics/dashboards/variables.md
index 22c8814e8bd..745e53150fc 100644
--- a/doc/operations/metrics/dashboards/variables.md
+++ b/doc/operations/metrics/dashboards/variables.md
@@ -16,7 +16,10 @@ Queries that continue to use the old format will show no data.
 
 ## Predefined variables
 
-GitLab supports a limited set of [CI variables](../../../ci/variables/README.md) in the Prometheus query. This is particularly useful for identifying a specific environment, for example with `ci_environment_slug`. The supported variables are:
+GitLab supports a limited set of [CI variables](../../../ci/variables/README.md)
+in the Prometheus query. This is particularly useful for identifying a specific
+environment, for example with `ci_environment_slug`. Variables for Prometheus queries
+must be lowercase. The supported variables are:
 
 - `environment_filter`
 - `ci_environment_slug`
@@ -27,9 +30,6 @@ GitLab supports a limited set of [CI variables](../../../ci/variables/README.md)
 - `ci_environment_name`
 - `__range`
 
-NOTE: **Note:**
-Variables for Prometheus queries must be lowercase.
-
 ### environment_filter
 
 `environment_filter` is automatically expanded to `container_name!="POD",environment="ENVIRONMENT_NAME"`
diff --git a/doc/operations/metrics/embed.md b/doc/operations/metrics/embed.md
index fcf9679d164..a57b7216f1a 100644
--- a/doc/operations/metrics/embed.md
+++ b/doc/operations/metrics/embed.md
@@ -17,8 +17,7 @@ metrics to others, and you want to have relevant information directly available.
 
 > [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/29691) in GitLab 12.2.
 
-NOTE: **Note:**
-Requires [Kubernetes](../../user/project/integrations/prometheus_library/kubernetes.md) metrics.
+This feature requires [Kubernetes](../../user/project/integrations/prometheus_library/kubernetes.md) metrics.
 
 Note: **Note:**
 In GitLab versions 13.3 and earlier, metrics dashboard links were in the form
diff --git a/doc/operations/metrics/embed_grafana.md b/doc/operations/metrics/embed_grafana.md
index 2843a4319a8..30207179736 100644
--- a/doc/operations/metrics/embed_grafana.md
+++ b/doc/operations/metrics/embed_grafana.md
@@ -12,14 +12,13 @@ Grafana metrics can be embedded in [GitLab Flavored Markdown](../../user/markdow
 
 You can embed live [Grafana](https://docs.gitlab.com/omnibus/settings/grafana.html)
 charts in issues as a
-[direct linked rendered image](https://grafana.com/docs/grafana/latest/reference/share_panel/#direct-link-rendered-image).
-The **Direct link rendered image** sharing dialog within Grafana provides the link:
+[direct linked rendered image](https://grafana.com/docs/grafana/latest/reference/share_panel/#direct-link-rendered-image). Your Grafana instance must be available to the
+target user, either as a public dashboard or on the same network. The
+**Direct link rendered image** sharing dialog within Grafana provides the link:
 
 ![Grafana Direct Linked Rendered Image](img/grafana_live_embed.png)
 
-NOTE: **Note:**
-For this embed to display correctly, the Grafana instance must be available to the
-target user, either as a public dashboard or on the same network.
+For this embed to display correctly, the
 
 Copy the link and add an image tag as [inline HTML](../../user/markdown.md#inline-html)
 in your Markdown. You can tweak the query parameters to meet your needs, such as