Add latest changes from gitlab-org/gitlab@15-0-stable-eev15.0.0-rc42

8 files changed, 41 insertions, 15 deletions

diff --git a/doc/operations/error_tracking.md b/doc/operations/error_tracking.md
index 907c59adacb..2a007eade99 100644
--- a/doc/operations/error_tracking.md
+++ b/doc/operations/error_tracking.md
@@ -1,6 +1,6 @@
 ---
 stage: Monitor
-group: Respond
+group: Observability
 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/#assignments
 ---
 
@@ -32,7 +32,7 @@ For error tracking to work, you need two pieces:
 
 ### Deploying Sentry
 
-You can sign up to the cloud hosted [Sentry](https://sentry.io), deploy your own [on-premise instance](https://github.com/getsentry/onpremise/), or use GitLab to [install Sentry to a Kubernetes cluster](../user/clusters/applications.md#install-sentry-using-gitlab-cicd).
+You can sign up to the cloud hosted [Sentry](https://sentry.io), deploy your own [on-premise instance](https://github.com/getsentry/onpremise/), or use GitLab to [install Sentry to a Kubernetes cluster](../user/infrastructure/clusters/manage/management_project_applications/sentry.md).
 
 ### Enabling Sentry
 
diff --git a/doc/operations/feature_flags.md b/doc/operations/feature_flags.md
index e7d78beb0b9..4b503af2cf7 100644
--- a/doc/operations/feature_flags.md
+++ b/doc/operations/feature_flags.md
@@ -402,7 +402,7 @@ docker run \
 > - [Feature flag removed](https://gitlab.com/gitlab-org/gitlab/-/issues/251234) in GitLab 13.5.
 > - Showing related feature flags in issues [introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/220333) in GitLab 14.1.
 
-You can link related issues to a feature flag. In the **Linked issues** section,
+You can link related issues to a feature flag. In the Feature Flag **Linked issues** section,
 click the `+` button and input the issue reference number or the full URL of the issue.
 The issues then appear in the related feature flag and the other way round.
 
@@ -430,7 +430,7 @@ Please note that the polling rate is configurable in SDKs. Provided that all cli
 
 For applications looking for more scalable solution, we recommend to use [Unleash Proxy](#unleash-proxy-example).
 This proxy server sits between the server and clients. It requests to the server as a behalf of the client groups,
-so the nubmer of outbound requests can be greatly reduced.
+so the number of outbound requests can be greatly reduced.
 
 There is also an [issue](https://gitlab.com/gitlab-org/gitlab/-/issues/295472) to give more
 capacity to the current rate limit.
diff --git a/doc/operations/incident_management/alerts.md b/doc/operations/incident_management/alerts.md
index 5eb0624be31..008e41f5d64 100644
--- a/doc/operations/incident_management/alerts.md
+++ b/doc/operations/incident_management/alerts.md
@@ -202,7 +202,7 @@ To assign an alert:
 
 1. Select your desired alert to display its details.
 
-   ![Alert Details View Assignee(s)](img/alert_details_assignees_v13_1.png)
+   ![Alert Details View Assignees](img/alert_details_assignees_v13_1.png)
 
 1. If the right sidebar is not expanded, select
    **Expand sidebar** (**{angle-double-right}**) to expand it.
diff --git a/doc/operations/incident_management/paging.md b/doc/operations/incident_management/paging.md
index d0c14ab6e59..420454d8d8a 100644
--- a/doc/operations/incident_management/paging.md
+++ b/doc/operations/incident_management/paging.md
@@ -38,7 +38,7 @@ a single email notification for new alerts.
 
 ## Paging **(PREMIUM)**
 
-In projects that have an [escalation policy](escalation_policies.md) configured, on-call responder(s)
+In projects that have an [escalation policy](escalation_policies.md) configured, on-call responders
 can be automatically paged about critical problems through email.
 
 ### Escalating an alert
diff --git a/doc/operations/index.md b/doc/operations/index.md
index 61d38c3d6a9..88687c2faf1 100644
--- a/doc/operations/index.md
+++ b/doc/operations/index.md
@@ -11,11 +11,11 @@ your applications.
 
 ## Measure reliability and stability with metrics (DEPRECATED)
 
-> [Deprecated](https://gitlab.com/gitlab-org/gitlab/-/issues/346485) in GitLab 14.7.
+> [Deprecated](https://gitlab.com/gitlab-org/gitlab/-/issues/346541) in GitLab 14.7.
 
 WARNING:
-This feature is in its end-of-life process. It is [deprecated](https://gitlab.com/gitlab-org/gitlab/-/issues/346485)
-in GitLab 14.7, and is planned for removal in GitLab 15.0.
+This feature is in its end-of-life process. It is [deprecated](https://gitlab.com/gitlab-org/gitlab/-/issues/346541)
+for use in GitLab 14.7, and is planned for removal in GitLab 16.0.
 
 Metrics help you understand the health and performance of your infrastructure,
 applications, and systems by providing insights into your application's reliability,
@@ -77,13 +77,20 @@ microservices-based distributed systems - and displays results within GitLab.
 
 - [Trace the performance and health](tracing.md) of a deployed application.
 
-## Aggregate and store logs (DEPRECATED)
+## Aggregate and store logs (DEPRECATED) **(FREE SELF)**
 
-> [Deprecated](https://gitlab.com/gitlab-org/gitlab/-/issues/346485) in GitLab 14.7.
+> - [Deprecated](https://gitlab.com/gitlab-org/gitlab/-/issues/346485) in GitLab 14.7.
+> - [Moved](https://gitlab.com/gitlab-org/gitlab/-/issues/360182) behind a [feature flag](../administration/feature_flags.md) named `monitor_logging` in GitLab 15.0. Disabled by default.
 
 WARNING:
 This feature is in its end-of-life process. It is [deprecated](https://gitlab.com/gitlab-org/gitlab/-/issues/346485)
-in GitLab 14.7, and is planned for removal in GitLab 15.0.
+in GitLab 14.7.
+It will be removed completely in GitLab 15.2.
+
+FLAG:
+On self-managed GitLab, by default this feature is not available. To make it available, ask an administrator to [enable the feature flag](../administration/feature_flags.md) named `monitor_logging`.
+On GitLab.com, this feature is not available.
+This feature is not recommended for production use.
 
 Developers need to troubleshoot application changes in development, and incident
 responders need aggregated, real-time logs when troubleshooting problems with
diff --git a/doc/operations/metrics/embed.md b/doc/operations/metrics/embed.md
index 26ea7aa07eb..44b998dc3ee 100644
--- a/doc/operations/metrics/embed.md
+++ b/doc/operations/metrics/embed.md
@@ -6,6 +6,12 @@ info: To determine the technical writer assigned to the Stage/Group associated w
 
 # Embedding metric charts within GitLab Flavored Markdown **(FREE)**
 
+> [Deprecated](https://gitlab.com/gitlab-org/gitlab/-/issues/346541) in GitLab 14.7.
+
+WARNING:
+This feature is in its end-of-life process. It is [deprecated](https://gitlab.com/gitlab-org/gitlab/-/issues/346541)
+for use in GitLab 14.7, and is planned for removal in GitLab 16.0.
+
 You can display metrics charts within
 [GitLab Flavored Markdown (GLFM)](../../user/markdown.md)
 fields such as issue or merge request descriptions. The maximum number of embedded
diff --git a/doc/operations/metrics/index.md b/doc/operations/metrics/index.md
index b04e19807f8..937bd329570 100644
--- a/doc/operations/metrics/index.md
+++ b/doc/operations/metrics/index.md
@@ -6,6 +6,12 @@ info: To determine the technical writer assigned to the Stage/Group associated w
 
 # Monitor your environment's metrics **(FREE)**
 
+> [Deprecated](https://gitlab.com/gitlab-org/gitlab/-/issues/346541) in GitLab 14.7.
+
+WARNING:
+This feature is in its end-of-life process. It is [deprecated](https://gitlab.com/gitlab-org/gitlab/-/issues/346541)
+for use in GitLab 14.7, and is planned for removal in GitLab 16.0.
+
 GitLab helps your team monitor the health and performance of your applications
 and infrastructure by turning statistics and log files into charts and graphs
 that are easy to understand, especially when time is short and decisions are
@@ -116,7 +122,7 @@ dashboard is visible to authenticated and non-authenticated users.
 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/project/clusters/add_remove_clusters.md)
+- 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
   [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).
diff --git a/doc/operations/tracing.md b/doc/operations/tracing.md
index bbc05bb0f9a..e68d7077328 100644
--- a/doc/operations/tracing.md
+++ b/doc/operations/tracing.md
@@ -4,14 +4,21 @@ group: Respond
 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/#assignments
 ---
 
-# Tracing (DEPRECATED) **(FREE)**
+# Tracing (DEPRECATED) **(FREE SELF)**
 
 > - [Moved](https://gitlab.com/gitlab-org/gitlab/-/issues/42645) from GitLab Ultimate to GitLab Free in 13.5.
 > - [Deprecated](https://gitlab.com/gitlab-org/gitlab/-/issues/346540) in GitLab 14.7.
+> - [Moved](https://gitlab.com/gitlab-org/gitlab/-/issues/359904) behind a [feature flag](../administration/feature_flags.md) named `monitor_tracing` in GitLab 15.0. Disabled by default.
 
 WARNING:
 This feature is in its end-of-life process. It is [deprecated](https://gitlab.com/gitlab-org/gitlab/-/issues/346540)
-in GitLab 14.7, and is planned for removal in GitLab 15.0.
+in GitLab 14.7.
+It will be removed completely in GitLab 15.2.
+
+FLAG:
+On self-managed GitLab, by default this feature is not available. To make it available, ask an administrator to [enable the feature flag](../administration/feature_flags.md) named `monitor_tracing`.
+On GitLab.com, this feature is not available.
+This feature is not recommended for production use.
 
 Tracing provides insight into the performance and health of a deployed application, tracking each
 function or microservice that handles a given request. Tracing makes it easy to understand the