Add latest changes from gitlab-org/gitlab@master

8 files changed, 65 insertions, 20 deletions

diff --git a/doc/user/project/operations/alert_management.md b/doc/user/project/operations/alert_management.md
index 0d1d725692c..db4f0783a3b 100644
--- a/doc/user/project/operations/alert_management.md
+++ b/doc/user/project/operations/alert_management.md
@@ -129,6 +129,18 @@ GitLab currently only supports a single assignee per alert.
 To remove an assignee, click **Edit** next to the **Assignee** dropdown menu and
 deselect the user from the list of assignees, or click **Unassigned**.
 
+### Alert system notes
+
+> [Introduced](https://gitlab.com/groups/gitlab-org/-/epics/3066) in GitLab 13.1.
+
+NOTE: **Note:**
+GitLab currently only supports creating system notes when assigning an Alert.
+
+Assigning a user an Alert creates a system note, visible in the Alert Details view,
+giving you a linear timeline of the alert's investigation and assignment history.
+
+![Alert Management Details View System Notes](img/alert_detail_system_notes_v13_1.png)
+
 ## Use cases for assigning alerts
 
 Consider a team formed by different sections of monitoring, collaborating on a
@@ -136,7 +148,7 @@ single application. After an alert surfaces, it's extremely important to
 route the alert to the team members who can address and resolve the alert.
 
 Assigning Alerts to multiple assignees eases collaboration and delegation. All
-assignees are shown in your team's workflows, and all assignees receive
+assignees are shown in your team's work-flows, and all assignees receive
 notifications, simplifying communication and ownership of the alert.
 
 After completing their portion of investigating or fixing the alert, users can
diff --git a/doc/user/project/operations/dashboard_settings.md b/doc/user/project/operations/dashboard_settings.md
new file mode 100644
index 00000000000..e14c478ab7a
--- /dev/null
+++ b/doc/user/project/operations/dashboard_settings.md
@@ -0,0 +1,47 @@
+---
+stage: Monitor
+group: APM
+info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/engineering/ux/technical-writing/#designated-technical-writers
+---
+
+# Metrics dashboard settings
+
+You can configure your [Monitoring dashboard](../integrations/prometheus.md) to
+display the time zone of your choice, and the links of your choice.
+
+## Change the dashboard time zone
+
+> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/214370) in GitLab 13.1.
+
+By default, your monitoring dashboard displays dates and times in your local
+time zone, but you can display dates and times in UTC format. To change the
+time zone:
+
+1. Navigate to **{settings}** **Settings > Operations**, and scroll to
+   **Metrics Dashboard**.
+1. In the **Dashboard timezone** select box, select *User's local timezone*
+   or *UTC*:
+
+   ![Dashboard timezone setting](img/dashboard_local_timezone_v13_1.png)
+1. Click **Save changes**.
+
+## Link to an external dashboard
+
+> [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/-/issues/57171) in GitLab 12.0.
+
+You can add a button on your monitoring dashboard that links directly to your
+existing external dashboards:
+
+1. Navigate to **{settings}** **Settings > Operations**, and scroll to
+   **Metrics Dashboard**.
+1. In **External dashboard URL**, provide the URL to your external dashboard:
+
+   ![External Dashboard Setting](img/dashboard_external_link_v13_1.png)
+
+1. Click **Save changes**.
+
+GitLab displays a **View full dashboard** button in the top right corner of your
+[monitoring dashboard](../../../ci/environments/index.md#monitoring-environments)
+which opens the URL you provided:
+
+![External Dashboard Link](img/external_dashboard_link.png)
diff --git a/doc/user/project/operations/img/alert_detail_system_notes_v13_1.png b/doc/user/project/operations/img/alert_detail_system_notes_v13_1.png
new file mode 100644
index 00000000000..2a6d0320a54
--- /dev/null
+++ b/doc/user/project/operations/img/alert_detail_system_notes_v13_1.png
diff --git a/doc/user/project/operations/img/dashboard_external_link_v13_1.png b/doc/user/project/operations/img/dashboard_external_link_v13_1.png
new file mode 100644
index 00000000000..3e8d792c53e
--- /dev/null
+++ b/doc/user/project/operations/img/dashboard_external_link_v13_1.png
diff --git a/doc/user/project/operations/img/dashboard_local_timezone_v13_1.png b/doc/user/project/operations/img/dashboard_local_timezone_v13_1.png
new file mode 100644
index 00000000000..8d45607a940
--- /dev/null
+++ b/doc/user/project/operations/img/dashboard_local_timezone_v13_1.png
diff --git a/doc/user/project/operations/img/external_dashboard_settings.png b/doc/user/project/operations/img/external_dashboard_settings.png
deleted file mode 100644
index e1b7fa56a1c..00000000000
--- a/doc/user/project/operations/img/external_dashboard_settings.png
+++ /dev/null
diff --git a/doc/user/project/operations/index.md b/doc/user/project/operations/index.md
index 954f88fe4f2..ca38eab9455 100644
--- a/doc/user/project/operations/index.md
+++ b/doc/user/project/operations/index.md
@@ -10,4 +10,4 @@ your applications:
 - Discover and view errors generated by your applications with [Error Tracking](error_tracking.md).
 - Create, toggle, and remove [Feature Flags](feature_flags.md). **(PREMIUM)**
 - [Trace](tracing.md) the performance and health of a deployed application. **(ULTIMATE)**
-- Add a [button to the Monitoring dashboard](linking_to_an_external_dashboard.md) linking directly to your existing external dashboards.
+- Change the [settings of the Monitoring Dashboard](dashboard_settings.md).
diff --git a/doc/user/project/operations/linking_to_an_external_dashboard.md b/doc/user/project/operations/linking_to_an_external_dashboard.md
index a2129e6769f..ff609a3720e 100644
--- a/doc/user/project/operations/linking_to_an_external_dashboard.md
+++ b/doc/user/project/operations/linking_to_an_external_dashboard.md
@@ -1,19 +1,5 @@
-# Linking to an external dashboard
+---
+redirect_to: 'dashboard_settings.md'
+---
 
-> [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/-/issues/57171) in GitLab 12.0.
-
-You can add a button to the Monitoring dashboard linking directly to your existing external dashboards.
-
-## Enabling the external dashboard link
-
-1. Go to **Settings > Operations** and scroll to the section titled **External dashboard**.
-
-1. Fill in the URL to your external dashboard and click **Save changes**.
-
-   ![External Dashboard Settings](img/external_dashboard_settings.png)
-
-1. There should now be a button on your
-   [Monitoring dashboard](../../../ci/environments/index.md#monitoring-environments) which
-   will open the URL you entered in the above step.
-
-   ![External Dashboard Link](img/external_dashboard_link.png)
+This document was moved to [another location](dashboard_settings.md).