summaryrefslogtreecommitdiff
path: root/doc/operations
diff options
context:
space:
mode:
Diffstat (limited to 'doc/operations')
-rw-r--r--doc/operations/feature_flags.md7
-rw-r--r--doc/operations/incident_management/alerts.md9
-rw-r--r--doc/operations/incident_management/img/incident_list_v15_6.pngbin53028 -> 20804 bytes
-rw-r--r--doc/operations/incident_management/linked_resources.md4
-rw-r--r--doc/operations/incident_management/slack.md4
-rw-r--r--doc/operations/metrics/alerts.md13
-rw-r--r--doc/operations/metrics/embed_grafana.md2
-rw-r--r--doc/operations/metrics/index.md2
8 files changed, 19 insertions, 22 deletions
diff --git a/doc/operations/feature_flags.md b/doc/operations/feature_flags.md
index fff2c8ffbf7..b6e200c3ec4 100644
--- a/doc/operations/feature_flags.md
+++ b/doc/operations/feature_flags.md
@@ -14,7 +14,7 @@ Feature flags help reduce risk, allowing you to do controlled testing, and separ
delivery from customer launch.
<i class="fa fa-youtube-play youtube" aria-hidden="true"></i>
-For an example of feature flags in action, see [GitLab for deploys, feature flags, and error tracking](https://www.youtube.com/embed/5tw2p6lwXxo).
+For an example of feature flags in action, see [GitLab for deploys, feature flags, and error tracking](https://www.youtube.com/watch?v=5tw2p6lwXxo).
NOTE:
To contribute to the development of the GitLab product, view
@@ -132,7 +132,7 @@ For example, set a value of 15% to enable the feature for 15% of authenticated u
The rollout percentage can be from 0% to 100%.
-Stickiness (consistent application behavior for the same user) is guaranteed for logged-in users,
+Stickiness (consistent application behavior for the same user) is guaranteed for authenticated users,
but not anonymous users.
Note that [percent rollout](#percent-rollout) with a consistency based on **User IDs** has the same
@@ -395,6 +395,9 @@ docker run \
| `UNLEASH_APP_NAME` | The name of the environment the application runs in. For more details, read [Get access credentials](#get-access-credentials). |
| `UNLEASH_API_TOKEN` | Required to start the Unleash Proxy, but not used to connect to GitLab. Can be set to any value. |
+There is a limitation when using the Unleash Proxy where each proxy instance can request flags only for the environment named in `UNLEASH_APP_NAME`. The Proxy sends
+this to GitLab on behalf of the client, which means the client can't override it.
+
## Feature flag related issues **(PREMIUM)**
> - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/36617) in GitLab 13.2.
diff --git a/doc/operations/incident_management/alerts.md b/doc/operations/incident_management/alerts.md
index 0dffa15351c..d42ee237749 100644
--- a/doc/operations/incident_management/alerts.md
+++ b/doc/operations/incident_management/alerts.md
@@ -37,11 +37,6 @@ The alert list displays the following information:
- **Resolved**: No further work is required.
- **Ignored**: No action will be taken on the alert.
-NOTE:
-Check out a live example available from the
-[`tanuki-inc` project page](https://gitlab.com/gitlab-examples/ops/incident-setup/everyone/tanuki-inc)
-in GitLab to examine alerts in action.
-
## Alert severity
Each level of alert contains a uniquely shaped and color-coded icon to help
@@ -70,10 +65,6 @@ Alerts contain one of the following icons:
Navigate to the Alert details view by visiting the [Alert list](alerts.md)
and selecting an alert from the list. You need at least the Developer role
to access alerts.
-
-NOTE:
-To review live examples of GitLab alerts, visit the
-[alert list](https://gitlab.com/gitlab-examples/ops/incident-setup/everyone/tanuki-inc/-/alert_management)
for this demo project. Select any alert in the list to examine its alert details
page.
diff --git a/doc/operations/incident_management/img/incident_list_v15_6.png b/doc/operations/incident_management/img/incident_list_v15_6.png
index fe2a91e2eba..2a13ed6d311 100644
--- a/doc/operations/incident_management/img/incident_list_v15_6.png
+++ b/doc/operations/incident_management/img/incident_list_v15_6.png
Binary files differ
diff --git a/doc/operations/incident_management/linked_resources.md b/doc/operations/incident_management/linked_resources.md
index eb289076424..96edd41c12f 100644
--- a/doc/operations/incident_management/linked_resources.md
+++ b/doc/operations/incident_management/linked_resources.md
@@ -48,7 +48,7 @@ To add a linked resource:
1. Complete the required fields.
1. Select **Add**.
-### Using a quick action **(PREMIUM)**
+### Using a quick action
> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/374964) in GitLab 15.5.
@@ -66,7 +66,7 @@ The description shows instead of the URL in the **Linked resources** section of
/link https://example.link.us/j/123456789 multiple alerts firing
```
-### Link Zoom meetings from an incident **(PREMIUM)**
+### Link Zoom meetings from an incident
> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/230853) in GitLab 15.4.
diff --git a/doc/operations/incident_management/slack.md b/doc/operations/incident_management/slack.md
index 1ab1391ea2a..0e7a85142f6 100644
--- a/doc/operations/incident_management/slack.md
+++ b/doc/operations/incident_management/slack.md
@@ -34,7 +34,7 @@ Prerequisites:
1. Install the [GitLab for Slack app](../../user/project/integrations/gitlab_slack_application.md).
This way, you can use slash commands in Slack to create and update GitLab incidents.
1. Enable [Slack notifications](../../user/project/integrations/slack.md). Be sure to enable
- notifications for `Issue` events, and to define a Slack channel to receive the relevant notifications.
+ notifications for `Incident` events, and to define a Slack channel to receive the relevant notifications.
1. Authorize GitLab to take actions on behalf of your Slack user.
Each user must do this before they can use any of the incident slash commands.
@@ -113,5 +113,5 @@ Slack shows a prompt asking you to confirm which incident you'd like to close.
## Send GitLab incident notifications to Slack
-If you have [enabled notifications](#manage-an-incident-from-slack) for issues, you should receive
+If you have [enabled notifications](#manage-an-incident-from-slack) for incidents, you should receive
notifications to the selected Slack channel every time an incident is opened, closed, or updated.
diff --git a/doc/operations/metrics/alerts.md b/doc/operations/metrics/alerts.md
index 4b6bc91cc73..44cd683bc4f 100644
--- a/doc/operations/metrics/alerts.md
+++ b/doc/operations/metrics/alerts.md
@@ -57,11 +57,14 @@ values extracted from the `alerts` field in the
- Alert severity:
Extracted from the alert payload field `labels/severity`. Maps case-insensitive
value to [Alert's severity](../incident_management/alerts.md#alert-severity):
- - **Critical**: `critical`, `s1`, `p1`, `emergency`, `fatal`, or any value not in this list
- - **High**: `high`, `s2`, `p2`, `major`, `page`
- - **Medium**: `medium`, `s3`, `p3`, `error`, `alert`
- - **Low**: `low`, `s4`, `p4`, `warn`, `warning`
- - **Info**: `info`, `s5`, `p5`, `debug`, `information`, `notice`
+
+ | Alert payload | Mapped to alert severity |
+ | ------------- | --------------------------------------------------------------------------- |
+ | Critical | `critical`, `s1`, `p1`, `emergency`, `fatal`, or any value not in this list |
+ | High | `high`, `s2`, `p2`, `major`, `page` |
+ | Medium | `medium`, `s3`, `p3`, `error`, `alert` |
+ | Low | `low`, `s4`, `p4`, `warn`, `warning` |
+ | Info | `info`, `s5`, `p5`, `debug`, `information`, `notice` |
To further customize the incident, you can add labels, mentions, or any other supported
[quick action](../../user/project/quick_actions.md) in the selected issue template,
diff --git a/doc/operations/metrics/embed_grafana.md b/doc/operations/metrics/embed_grafana.md
index 43a7447a978..15969f0d6be 100644
--- a/doc/operations/metrics/embed_grafana.md
+++ b/doc/operations/metrics/embed_grafana.md
@@ -25,7 +25,7 @@ To use Grafana-rendered images:
1. Go to the dashboard containing the panel in Grafana.
1. From the panel's menu, select **Share**.
-1. Select the **Direct link rendered image** button, which provides the link.
+1. Select **Direct link rendered image**, which provides the link.
1. Copy the link and add an image tag as [inline HTML](../../user/markdown.md#inline-html) in your
Markdown in the format `<img src="your_link"/>`. You can tweak the query parameters to meet your needs, such as removing the `&from=`
and `&to=` parameters to display a live panel.
diff --git a/doc/operations/metrics/index.md b/doc/operations/metrics/index.md
index 3c2790a96b7..0ecb63807fb 100644
--- a/doc/operations/metrics/index.md
+++ b/doc/operations/metrics/index.md
@@ -123,7 +123,7 @@ Custom metrics can be monitored by adding them on the monitoring dashboard page.
After saving them, they display on the environment metrics dashboard provided that either:
- A [connected Kubernetes cluster](../../user/clusters/agent/index.md)
- with the matching [environment scope](../../ci/environments/index.md#scope-environments-with-specs) is used and
+ with the matching [environment scope](../../ci/environments/index.md#limit-the-environment-scope-of-a-cicd-variable) is used and
[Prometheus installed on the cluster](../../user/project/integrations/prometheus.md#enabling-prometheus-integration).
- Prometheus is [manually configured](../../user/project/integrations/prometheus.md#manual-configuration-of-prometheus).