Merge branch 'docs-aqualls-move-incidents' into 'master'

Move incident management page

See merge request gitlab-org/gitlab!37757

doc/README.md

@@ -344,7 +344,7 @@ The following documentation relates to the DevOps **Monitor** stage:
 | [Health check](user/admin_area/monitoring/health_check.md)                                      | GitLab provides liveness and readiness probes to indicate service health and reachability to required services.                          |
 | [Prometheus project integration](user/project/integrations/prometheus.md)                       | Configure the Prometheus integration per project and monitor your CI/CD environments.                                                    |
 | [Prometheus metrics](user/project/integrations/prometheus_library/index.md)                     | Let Prometheus collect metrics from various services, like Kubernetes, NGINX, NGINX Ingress controller, HAProxy, and Amazon Cloud Watch. |
-| [Incident management](user/incident_management/index.md)                     | Use GitLab to help you better respond to incidents that may occur in your systems. |
+| [Incident management](operations/incident_management/index.md)                     | Use GitLab to help you better respond to incidents that may occur in your systems. |
 
 <div align="right">
   <a type="button" class="btn btn-default" href="#overview">

doc/operations/incident_management/index.md

+---
+stage: Monitor
+group: Health
+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
+---
+
+# Incident management
+
+GitLab offers solutions for handling incidents in your applications and services,
+such as setting up Prometheus alerts, displaying metrics, and sending notifications.
+
+## Configure incidents **(ULTIMATE)**
+
+> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/4925) in GitLab Ultimate 11.11.
+
+You can enable or disable Incident Management features in the GitLab user interface
+to create issues when alerts are triggered:
+
+1. Navigate to **{settings}** **Settings > Operations > Incidents** and expand
+   **Incidents**:
+
+   ![Incident Management Settings](img/incident_management_settings.png)
+
+1. For GitLab versions 11.11 and greater, you can select the **Create an issue**
+   checkbox to create an issue based on your own
+   [issue templates](../../user/project/description_templates.md#creating-issue-templates).
+   For more information, see
+   [Trigger actions from alerts](../metrics/alerts.md#trigger-actions-from-alerts-ultimate) **(ULTIMATE)**.
+1. To create issues from alerts, select the template in the **Issue Template**
+   select box.
+1. To send [separate email notifications](#notify-developers-of-alerts) to users
+   with [Developer permissions](../../user/permissions.md), select
+   **Send a separate email notification to Developers**.
+1. Click **Save changes**.
+
+Appropriately configured alerts include an
+[embedded chart](../metrics/embed.md#embedding-metrics-based-on-alerts-in-incident-issues)
+for the query corresponding to the alert. You can also configure GitLab to
+[close issues](../metrics/alerts.md#trigger-actions-from-alerts-ultimate)
+when you receive notification that the alert is resolved.
+
+### Notify developers of alerts
+
+GitLab can react to the alerts triggered from your applications and services
+by creating issues and alerting developers through email. By default, GitLab
+sends these emails to [owners and maintainers](../../user/permissions.md) of the project.
+These emails contain details of the alert, and a link for more information.
+
+To send separate email notifications to users with
+[Developer permissions](../../user/permissions.md), see [Configure incidents](#configure-incidents-ultimate).
+
+## Configure PagerDuty integration
+
+> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/119018) in GitLab 13.3.
+
+You can set up a webhook with PagerDuty to automatically create a GitLab issue
+for each PagerDuty incident. This configuration requires you to make changes
+in both PagerDuty and GitLab:
+
+1. Sign in as a user with Maintainer [permissions](../../user/permissions.md).
+1. Navigate to **{settings}** **Settings > Operations > Incidents** and expand **Incidents**.
+1. Select the **PagerDuty integration** tab:
+
+   ![PagerDuty incidents integration](img/pagerduty_incidents_integration_13_3.png)
+
+1. Activate the integration, and save the changes in GitLab.
+1. Copy the value of **Webhook URL** for use in a later step.
+1. Follow the steps described in the
+   [PagerDuty documentation](https://support.pagerduty.com/docs/webhooks)
+   to add the webhook URL to a PagerDuty webhook integration.
+
+To confirm the integration is successful, trigger a test incident from PagerDuty to
+confirm that a GitLab issue is created from the incident.
+
+## Configure Prometheus alerts
+
+You can set up Prometheus alerts in:
+
+- [GitLab-managed Prometheus](../metrics/alerts.md) installations.
+- [Self-managed Prometheus](../metrics/alerts.md#external-prometheus-instances) installations.
+
+Prometheus alerts are created by the special Alert Bot user. You can't remove this
+user, but it does not count toward your license limit.
+
+## Configure external generic alerts
+
+GitLab can accept alerts from any source through a generic webhook receiver. When
+[configuring the generic alerts integration](../../user/project/integrations/generic_alerts.md),
+GitLab creates a unique endpoint which receives a JSON-formatted, customizable payload.
+
+## Embed metrics in incidents and issues
+
+You can embed metrics anywhere [GitLab Markdown](../../user/markdown.md) is used, such as descriptions,
+comments on issues, and merge requests. Embedding metrics helps you share them
+when discussing incidents or performance issues. You can output the dashboard directly
+into any issue, merge request, epic, or any other Markdown text field in GitLab
+by [copying and pasting the link to the metrics dashboard](../metrics/embed.md#embedding-gitlab-managed-kubernetes-metrics).
+
+You can embed both
+[GitLab-hosted metrics](../metrics/embed.md) and
+[Grafana metrics](../metrics/embed_grafana.md)
+in incidents and issue templates.
+
+### Context menu
+
+You can view more details about an embedded metrics panel from the context menu.
+To access the context menu, click the **{ellipsis_v}** **More actions** dropdown box
+above the upper right corner of the panel. For a list of options, see
+[Chart context menu](../metrics/dashboards/index.md#chart-context-menu).
+
+#### View logs from metrics panel
+
+> - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/201846) in GitLab Ultimate 12.8.
+> - [Moved](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/25455) to [GitLab Core](https://about.gitlab.com/pricing/) 12.9.
+
+Viewing logs from a metrics panel can be useful if you're triaging an application
+incident and need to [explore logs](../metrics/dashboards/index.md#chart-context-menu)
+from across your application. These logs help you understand what is affecting
+your application's performance and resolve any problems.
+
+## Integrate incidents with Slack
+
+Slack slash commands allow you to control GitLab and view GitLab content without leaving Slack.
+
+Learn how to [set up Slack slash commands](../../user/project/integrations/slack_slash_commands.md)
+and how to [use the available slash commands](../../integration/slash_commands.md).
+
+## Integrate issues with Zoom
+
+GitLab enables you to [associate a Zoom meeting with an issue](../../user/project/issues/associate_zoom_meeting.md)
+for synchronous communication during incident management. After starting a Zoom
+call for an incident, you can associate the conference call with an issue. Your
+team members can join the Zoom call without requesting a link.

doc/operations/index.md

@@ -15,6 +15,7 @@ your applications:
 - Connect your project to a [Kubernetes cluster](../user/project/clusters/index.md).
 - Manage your infrastructure with [Infrastructure as Code](../user/infrastructure/index.md) approaches.
 - Discover and view errors generated by your applications with [Error Tracking](../user/project/operations/error_tracking.md).
+- Handle incidents in your applications and services with [Incident Management](incident_management/index.md).
 - Create, toggle, and remove [Feature Flags](feature_flags.md). **(PREMIUM)**
 - [Trace](tracing.md) the performance and health of a deployed application. **(ULTIMATE)**
 - Change the [settings of the Monitoring Dashboard](metrics/dashboards/settings.md).

doc/user/admin_area/settings/index.md

@@ -90,7 +90,7 @@ Access the default page for admin area settings by navigating to
 | [User and IP rate limits](user_and_ip_rate_limits.md) | Configure limits for web and API requests. |
 | [Outbound requests](../../../security/webhooks.md) | Allow requests to the local network from hooks and services. |
 | [Protected Paths](protected_paths.md) | Configure paths to be protected by Rack Attack. |
-| [Incident Management](../../incident_management/index.md) Limits | Configure limits on the number of inbound alerts able to be sent to a project. |
+| [Incident Management](../../../operations/incident_management/index.md) Limits | Configure limits on the number of inbound alerts able to be sent to a project. |
 
 ## Geo
 

doc/user/incident_management/index.md

 ---
-stage: Monitor
-group: Health
-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
+redirect_to: '../../operations/incident_management/index.md'
 ---
 
-# Incident management
-
-GitLab offers solutions for handling incidents in your applications and services,
-such as setting up Prometheus alerts, displaying metrics, and sending notifications.
-
-## Configure incidents **(ULTIMATE)**
-
-> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/4925) in GitLab Ultimate 11.11.
-
-You can enable or disable Incident Management features in the GitLab user interface
-to create issues when alerts are triggered:
-
-1. Navigate to **{settings}** **Settings > Operations > Incidents** and expand
-   **Incidents**:
-
-   ![Incident Management Settings](img/incident_management_settings.png)
-
-1. For GitLab versions 11.11 and greater, you can select the **Create an issue**
-   checkbox to create an issue based on your own
-   [issue templates](../project/description_templates.md#creating-issue-templates).
-   For more information, see
-   [Trigger actions from alerts](../../operations/metrics/alerts.md#trigger-actions-from-alerts-ultimate) **(ULTIMATE)**.
-1. To create issues from alerts, select the template in the **Issue Template**
-   select box.
-1. To send [separate email notifications](#notify-developers-of-alerts) to users
-   with [Developer permissions](../permissions.md), select
-   **Send a separate email notification to Developers**.
-1. Click **Save changes**.
-
-Appropriately configured alerts include an
-[embedded chart](../../operations/metrics/embed.md#embedding-metrics-based-on-alerts-in-incident-issues)
-for the query corresponding to the alert. You can also configure GitLab to
-[close issues](../../operations/metrics/alerts.md#trigger-actions-from-alerts-ultimate)
-when you receive notification that the alert is resolved.
-
-### Notify developers of alerts
-
-GitLab can react to the alerts triggered from your applications and services
-by creating issues and alerting developers through email. By default, GitLab
-sends these emails to [owners and maintainers](../permissions.md) of the project.
-These emails contain details of the alert, and a link for more information.
-
-To send separate email notifications to users with
-[Developer permissions](../permissions.md), see [Configure incidents](#configure-incidents-ultimate).
-
-## Configure PagerDuty integration
-
-> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/119018) in GitLab 13.3.
-
-You can set up a webhook with PagerDuty to automatically create a GitLab issue
-for each PagerDuty incident. This configuration requires you to make changes
-in both PagerDuty and GitLab:
-
-1. Sign in as a user with Maintainer [permissions](../permissions.md).
-1. Navigate to **{settings}** **Settings > Operations > Incidents** and expand **Incidents**.
-1. Select the **PagerDuty integration** tab:
-
-   ![PagerDuty incidents integration](img/pagerduty_incidents_integration_13_3.png)
-
-1. Activate the integration, and save the changes in GitLab.
-1. Copy the value of **Webhook URL** for use in a later step.
-1. Follow the steps described in the
-   [PagerDuty documentation](https://support.pagerduty.com/docs/webhooks)
-   to add the webhook URL to a PagerDuty webhook integration.
-
-To confirm the integration is successful, trigger a test incident from PagerDuty to
-confirm that a GitLab issue is created from the incident.
-
-## Configure Prometheus alerts
-
-You can set up Prometheus alerts in:
-
-- [GitLab-managed Prometheus](../../operations/metrics/alerts.md) installations.
-- [Self-managed Prometheus](../../operations/metrics/alerts.md#external-prometheus-instances) installations.
-
-Prometheus alerts are created by the special Alert Bot user. You can't remove this
-user, but it does not count toward your license limit.
-
-## Configure external generic alerts
-
-GitLab can accept alerts from any source through a generic webhook receiver. When
-[configuring the generic alerts integration](../project/integrations/generic_alerts.md),
-GitLab creates a unique endpoint which receives a JSON-formatted, customizable payload.
-
-## Embed metrics in incidents and issues
-
-You can embed metrics anywhere [GitLab Markdown](../markdown.md) is used, such as descriptions,
-comments on issues, and merge requests. Embedding metrics helps you share them
-when discussing incidents or performance issues. You can output the dashboard directly
-into any issue, merge request, epic, or any other Markdown text field in GitLab
-by [copying and pasting the link to the metrics dashboard](../../operations/metrics/embed.md#embedding-gitlab-managed-kubernetes-metrics).
-
-You can embed both
-[GitLab-hosted metrics](../../operations/metrics/embed.md) and
-[Grafana metrics](../../operations/metrics/embed_grafana.md)
-in incidents and issue templates.
-
-### Context menu
-
-You can view more details about an embedded metrics panel from the context menu.
-To access the context menu, click the **{ellipsis_v}** **More actions** dropdown box
-above the upper right corner of the panel. For a list of options, see
-[Chart context menu](../../operations/metrics/dashboards/index.md#chart-context-menu).
-
-#### View logs from metrics panel
-
-> - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/201846) in GitLab Ultimate 12.8.
-> - [Moved](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/25455) to [GitLab Core](https://about.gitlab.com/pricing/) 12.9.
-
-Viewing logs from a metrics panel can be useful if you're triaging an application
-incident and need to [explore logs](../../operations/metrics/dashboards/index.md#chart-context-menu)
-from across your application. These logs help you understand what is affecting
-your application's performance and resolve any problems.
-
-## Integrate incidents with Slack
-
-Slack slash commands allow you to control GitLab and view GitLab content without leaving Slack.
-
-Learn how to [set up Slack slash commands](../project/integrations/slack_slash_commands.md)
-and how to [use the available slash commands](../../integration/slash_commands.md).
-
-## Integrate issues with Zoom
-
-GitLab enables you to [associate a Zoom meeting with an issue](../project/issues/associate_zoom_meeting.md)
-for synchronous communication during incident management. After starting a Zoom
-call for an incident, you can associate the conference call with an issue. Your
-team members can join the Zoom call without requesting a link.
+This document was moved to [../../operations/incident_management/index.md](../../operations/incident_management/index.md).