Commit debf4f68 authored by Sarah Waldner's avatar Sarah Waldner Committed by Amy Qualls

Incident Management docs: Correct name of feature and remove old image

parent 942746b8
......@@ -27,12 +27,12 @@ The list displays the integration name, type, and status (enabled or disabled):
## Configuration
GitLab can receive alerts via a [HTTP endpoint](#generic-http-endpoint) that you configure,
GitLab can receive alerts via a HTTP endpoint that you configure,
or the [Prometheus integration](#external-prometheus-integration).
### Generic HTTP Endpoint **CORE**
### Single HTTP Endpoint **CORE**
Enabling the Generic HTTP Endpoint activates a unique HTTP endpoint that can
Enabling the HTTP Endpoint in a GitLab projects activates it to
receive alert payloads in JSON format. You can always
[customize the payload](#customize-the-alert-payload-outside-of-gitlab) to your liking.
......@@ -172,7 +172,7 @@ If the existing alert is already `resolved`, GitLab creates a new alert instead.
WARNING:
We are building deeper integration with Opsgenie and other alerting tools through
[HTTP endpoint integrations](#generic-http-endpoint) so you can see alerts within
[HTTP endpoint integrations](#single-http-endpoint) so you can see alerts within
the GitLab interface. As a result, the previous direct link to Opsgenie Alerts from
the GitLab alerts list is scheduled for deprecation following the 13.7 release on December 22, 2020.
......@@ -181,7 +181,7 @@ the GitLab alerts list is scheduled for deprecation following the 13.7 release o
You can monitor alerts using a GitLab integration with [Opsgenie](https://www.atlassian.com/software/opsgenie).
If you enable the Opsgenie integration, you can't have other GitLab alert
services, such as [Generic Alerts](alert_integrations.md) or Prometheus alerts,
services
active at the same time.
To enable Opsgenie integration:
......
......@@ -46,10 +46,7 @@ Incident, you have two options to do this manually.
With Maintainer or higher [permissions](../../user/permissions.md), you can enable
GitLab to create incident automatically whenever an alert is triggered:
1. Navigate to **Settings > Operations > Incidents** and expand **Incidents**:
![Incident Management Settings](img/incident_management_settings_v13_3.png)
1. Navigate to **Settings > Operations > Incidents** and expand **Incidents**.
1. Check the **Create an incident** checkbox.
1. To customize the incident, select an
[issue template](../../user/project/description_templates.md#creating-issue-templates).
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment