Add latest changes from gitlab-org/gitlab@master

12 files changed, 19 insertions, 15 deletions

diff --git a/doc/api/graphql/reference/gitlab_schema.graphql b/doc/api/graphql/reference/gitlab_schema.graphql
index 61adc3283b9..ee55360e5f5 100644
--- a/doc/api/graphql/reference/gitlab_schema.graphql
+++ b/doc/api/graphql/reference/gitlab_schema.graphql
@@ -2391,7 +2391,7 @@ input DastOnDemandScanCreateInput {
   """
   ID of the site profile to be used for the scan.
   """
-  dastSiteProfileId: ID!
+  dastSiteProfileId: DastSiteProfileID!
 
   """
   The project the site profile belongs to.
diff --git a/doc/api/graphql/reference/gitlab_schema.json b/doc/api/graphql/reference/gitlab_schema.json
index f61025aedc7..3fe75338d84 100644
--- a/doc/api/graphql/reference/gitlab_schema.json
+++ b/doc/api/graphql/reference/gitlab_schema.json
@@ -6374,7 +6374,7 @@
                 "name": null,
                 "ofType": {
                   "kind": "SCALAR",
-                  "name": "ID",
+                  "name": "DastSiteProfileID",
                   "ofType": null
                 }
               },
diff --git a/doc/operations/metrics/dashboards/img/actions_menu_create_new_dashboard_v13_2.png b/doc/operations/metrics/dashboards/img/actions_menu_create_new_dashboard_v13_2.png
deleted file mode 100644
index 5d530a80421..00000000000
--- a/doc/operations/metrics/dashboards/img/actions_menu_create_new_dashboard_v13_2.png
+++ /dev/null
diff --git a/doc/operations/metrics/dashboards/img/actions_menu_create_new_dashboard_v13_3.png b/doc/operations/metrics/dashboards/img/actions_menu_create_new_dashboard_v13_3.png
new file mode 100644
index 00000000000..4b7a8418eef
--- /dev/null
+++ b/doc/operations/metrics/dashboards/img/actions_menu_create_new_dashboard_v13_3.png
diff --git a/doc/operations/metrics/dashboards/img/metrics_settings_button_v13_2.png b/doc/operations/metrics/dashboards/img/metrics_settings_button_v13_2.png
deleted file mode 100644
index d649f77eded..00000000000
--- a/doc/operations/metrics/dashboards/img/metrics_settings_button_v13_2.png
+++ /dev/null
diff --git a/doc/operations/metrics/dashboards/img/metrics_settings_button_v13_3.png b/doc/operations/metrics/dashboards/img/metrics_settings_button_v13_3.png
new file mode 100644
index 00000000000..9c0eac12a3f
--- /dev/null
+++ b/doc/operations/metrics/dashboards/img/metrics_settings_button_v13_3.png
diff --git a/doc/operations/metrics/dashboards/index.md b/doc/operations/metrics/dashboards/index.md
index 9207a6bd951..b9008c18e13 100644
--- a/doc/operations/metrics/dashboards/index.md
+++ b/doc/operations/metrics/dashboards/index.md
@@ -20,7 +20,7 @@ The metrics as defined below do not support alerts, unlike
 
 ## Add a new dashboard to your project
 
-> UI option [introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/223204) in GitLab 13.2.
+> UI option [introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/228856) in GitLab 13.3.
 
 You can configure a custom dashboard by adding a new YAML file into your project's
 `.gitlab/dashboards/` directory. For the dashboard to display on your project's **Operations > Metrics** page, the files must have a `.yml`
@@ -31,9 +31,9 @@ To create a new dashboard from the GitLab user interface:
 1. Sign in to GitLab as a user with Maintainer or Owner
    [permissions](../../../user/permissions.md#project-members-permissions).
 1. Navigate to your dashboard at **Operations > Metrics**.
-1. In the top-right corner of your dashboard, click the **{file-addition-solid}** **Actions** menu,
+1. In the top-right corner of your dashboard, click the **{{ellipsis_v}}** **More actions** menu,
    and select **Create new**:
-   ![Monitoring Dashboard actions menu with create new item](img/actions_menu_create_new_dashboard_v13_2.png)
+   ![Monitoring Dashboard actions menu with create new item](img/actions_menu_create_new_dashboard_v13_3.png)
 1. In the modal window, click **Open Repository**, then follow the instructions
    for creating a new dashboard from the command line.
 
@@ -82,7 +82,7 @@ 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.
 
-1. Click **Duplicate dashboard** in the actions menu.
+1. Click **Duplicate current dashboard** in the **{{ellipsis_v}}** **More actions** menu.
 
    NOTE: **Note:**
    You can duplicate only GitLab-defined dashboards.
@@ -105,7 +105,7 @@ To manage the settings for your metrics dashboard:
 1. Navigate to your dashboard at **Operations > Metrics**.
 1. In the top-right corner of your dashboard, click **Metrics Settings**:
 
-   ![Monitoring Dashboard actions menu with create new item](img/metrics_settings_button_v13_2.png)
+   ![Monitoring Dashboard actions menu with create new item](img/metrics_settings_button_v13_3.png)
 
 ## Chart Context Menu
 
diff --git a/doc/operations/metrics/img/example-dashboard_v13_1.png b/doc/operations/metrics/img/example-dashboard_v13_1.png
deleted file mode 100644
index 0805346b916..00000000000
--- a/doc/operations/metrics/img/example-dashboard_v13_1.png
+++ /dev/null
diff --git a/doc/operations/metrics/img/example-dashboard_v13_3.png b/doc/operations/metrics/img/example-dashboard_v13_3.png
new file mode 100644
index 00000000000..1178b4a9be7
--- /dev/null
+++ b/doc/operations/metrics/img/example-dashboard_v13_3.png
diff --git a/doc/operations/metrics/img/prometheus_monitoring_dashboard_v13_1.png b/doc/operations/metrics/img/prometheus_monitoring_dashboard_v13_1.png
deleted file mode 100644
index 56a0a508a1d..00000000000
--- a/doc/operations/metrics/img/prometheus_monitoring_dashboard_v13_1.png
+++ /dev/null
diff --git a/doc/operations/metrics/img/prometheus_monitoring_dashboard_v13_3.png b/doc/operations/metrics/img/prometheus_monitoring_dashboard_v13_3.png
new file mode 100644
index 00000000000..1178b4a9be7
--- /dev/null
+++ b/doc/operations/metrics/img/prometheus_monitoring_dashboard_v13_3.png
diff --git a/doc/operations/metrics/index.md b/doc/operations/metrics/index.md
index de817fe0c52..99b3a485002 100644
--- a/doc/operations/metrics/index.md
+++ b/doc/operations/metrics/index.md
@@ -25,7 +25,7 @@ To view the metrics dashboard for an environment that has
 GitLab displays the default metrics dashboard for the environment, like the
 following example:
 
-![Example of metrics dashboard](img/example-dashboard_v13_1.png)
+![Example of metrics dashboard](img/example-dashboard_v13_3.png)
 
 The top of the dashboard contains a navigation bar. From left to right, the
 navigation bar contains:
@@ -37,15 +37,19 @@ navigation bar contains:
 - **Range** - The time period of data to display.
 - **Refresh dashboard** **{retry}** - Reload the dashboard with current data.
 - **Set refresh rate** - Set a time frame for refreshing the data displayed.
-- **Star dashboard** **{star-o}** - Click to mark a dashboard as a favorite.
+- **More actions** **{ellipsis_v}** - More dashboard actions
+  - **Add metric** - Adds a [custom metric](#adding-custom-metrics). Only available on GitLab-defined dashboards.
+  ([Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/34779) in GitLab 12.5.)
+  - **Edit dashboard YAML** - Edit the source YAML file of a custom dashboard. Only available on
+  [custom dashboards](dashboards/index.md).
+  ([Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/34779) in GitLab 12.5.)
+  - **Duplicate current dashboard** - Save a [complete copy of a dashboard](dashboards/index.md#duplicate-a-gitlab-defined-dashboard). Only available on GitLab-defined dashboards.
+  - **Star dashboard** **{star-o}** - Click to mark a dashboard as a favorite.
   Starred dashboards display a solid star **{star}** button, and display first
   in the **Dashboard** dropdown list.
   ([Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/214582) in GitLab 13.0.)
-- **Edit dashboard** - Edit the source YAML file of a custom dashboard. Only available on
-  [custom dashboards](dashboards/index.md).
-  ([Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/34779) in GitLab 12.5.)
-- **Create dashboard** **{file-addition-solid}** - Create a
-  [new custom dashboard for your project](dashboards/index.md#add-a-new-dashboard-to-your-project).
+  - **Create new dashboard** - Create a [new custom dashboard for your project](dashboards/index.md#add-a-new-dashboard-to-your-project).
+  ([Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/228856) in GitLab 13.3.)
 - **Metrics settings** - Configure the
   [settings for this dashboard](dashboards/index.md#manage-the-metrics-dashboard-settings).
 
@@ -70,7 +74,7 @@ helps quickly create a deployment:
 1. When the pipeline has run successfully, graphs are available on the
    **Operations > Metrics** page.
 
-![Monitoring Dashboard](img/prometheus_monitoring_dashboard_v13_1.png)
+![Monitoring Dashboard](img/prometheus_monitoring_dashboard_v13_3.png)
 
 ## Customize your metrics dashboard