Add latest changes from gitlab-org/gitlab@master

6 files changed, 133 insertions, 198 deletions

diff --git a/doc/administration/audit_event_streaming.md b/doc/administration/audit_event_streaming.md
index e3928e31962..d51fc0b2097 100644
--- a/doc/administration/audit_event_streaming.md
+++ b/doc/administration/audit_event_streaming.md
@@ -6,39 +6,53 @@ info: To determine the technical writer assigned to the Stage/Group associated w
 
 # Audit event streaming **(ULTIMATE)**
 
-> - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/332747) in GitLab 14.5 [with a flag](../administration/feature_flags.md) named `ff_external_audit_events_namespace`. Disabled by default.
-> - [Enabled on GitLab.com and by default on self-managed](https://gitlab.com/gitlab-org/gitlab/-/issues/338939) in GitLab 14.7.
-> - [Feature flag `ff_external_audit_events_namespace`](https://gitlab.com/gitlab-org/gitlab/-/issues/349588) removed in GitLab 14.8.
+> - API [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/332747) in GitLab 14.5 [with a flag](../administration/feature_flags.md) named `ff_external_audit_events_namespace`. Disabled by default.
+> - API [Enabled on GitLab.com and by default on self-managed](https://gitlab.com/gitlab-org/gitlab/-/issues/338939) in GitLab 14.7.
+> - API [Feature flag `ff_external_audit_events_namespace`](https://gitlab.com/gitlab-org/gitlab/-/issues/349588) removed in GitLab 14.8.
+> - UI [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/336411) in GitLab 14.9.
 > - [Subgroup events recording](https://gitlab.com/gitlab-org/gitlab/-/issues/366878) fixed in GitLab 15.2.
+> - Custom HTTP headers API [introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/361216) in GitLab 15.1 [with a flag](feature_flags.md) named `streaming_audit_event_headers`. Disabled by default.
+> - Custom HTTP headers API [enabled on GitLab.com and self-managed](https://gitlab.com/gitlab-org/gitlab/-/issues/362941) in GitLab 15.2.
+> - Custom HTTP headers API [made generally available](https://gitlab.com/gitlab-org/gitlab/-/issues/366524) in GitLab 15.3. [Feature flag `streaming_audit_event_headers`](https://gitlab.com/gitlab-org/gitlab/-/issues/362941) removed.
+> - Custom HTTP headers UI [introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/361630) in GitLab 15.2 [with a flag](feature_flags.md) named `custom_headers_streaming_audit_events_ui`. Disabled by default.
+> - Custom HTTP headers UI [made generally available](https://gitlab.com/gitlab-org/gitlab/-/issues/365259) in GitLab 15.3. [Feature flag `custom_headers_streaming_audit_events_ui`](https://gitlab.com/gitlab-org/gitlab/-/issues/365259) removed.
 
-Users can set an HTTP endpoint for a top-level group to receive all audit events about the group, its subgroups, and
+Users can set a streaming destination for a top-level group to receive all audit events about the group, its subgroups, and
 projects as structured JSON.
 
 Top-level group owners can manage their audit logs in third-party systems. Any service that can receive
-structured JSON data can be used as the endpoint.
+structured JSON data can be used as the streaming destination.
+
+Each streaming destination can have up to 20 custom HTTP headers included with each streamed event.
 
 NOTE:
 GitLab can stream a single event more than once to the same destination. Use the `id` key in the payload to deduplicate incoming data.
 
-## Add a new event streaming destination
+## Add a new streaming destination
 
 WARNING:
-Event streaming destinations receive **all** audit event data, which could include sensitive information. Make sure you trust the destination endpoint.
+Streaming destinations receive **all** audit event data, which could include sensitive information. Make sure you trust the streaming destination.
 
 ### Use the GitLab UI
 
-Users with at least the Owner role for a group can add event streaming destinations for it:
+Users with the Owner role for a group can add streaming destinations for it:
 
 1. On the top bar, select **Menu > Groups** and find your group.
 1. On the left sidebar, select **Security & Compliance > Audit events**.
 1. On the main area, select **Streams** tab.
     - When the destination list is empty, select **Add stream** to show the section for adding destinations.
-    - When the destination list is not empty, select **{plus}** to show the section for adding destinations.
-1. Enter the destination URL to add and select **Add**.
+    - When the destination list is not empty, select **Add stream** (**{plus}**) to show the section for adding destinations.
+1. Enter the destination URL to add.
+1. Optional. Locate the **Custom HTTP headers** table.
+1. Ignore the **Active** checkbox because it isn't functional. To track progress on adding functionality to the **Active** checkbox, see the
+   [relevant issue](https://gitlab.com/gitlab-org/gitlab/-/issues/361925).
+1. Enter as many name and value pairs as required. When you enter a unique name and a value for a header, a new row in the table automatically appears. You can add up to
+   20 headers per streaming destination.
+1. After all headers have been filled out, select **Add** to add the new streaming destination.
 
 ### Use the API
 
-To enable event streaming and add a destination, users with at least the Owner role for a group must use the
+To enable streaming and add a destination, users with the Owner role for a group must use the
 `externalAuditEventDestinationCreate` mutation in the GraphQL API.
 
 ```graphql
@@ -46,6 +60,7 @@ mutation {
   externalAuditEventDestinationCreate(input: { destinationUrl: "https://mydomain.io/endpoint/ingest", groupPath: "my-group" } ) {
     errors
     externalAuditEventDestination {
+      id
       destinationUrl
       verificationToken
       group {
@@ -61,23 +76,35 @@ Event streaming is enabled if:
 - The returned `errors` object is empty.
 - The API responds with `200 OK`.
 
+Group owners can add an HTTP header using the GraphQL `auditEventsStreamingHeadersCreate` mutation. You can retrieve the destination ID
+by [listing all the streaming destinations](#use-the-api-1) for the group or from the mutation above.
+
+```graphql
+mutation {
+  auditEventsStreamingHeadersCreate(input: { destinationId: "gid://gitlab/AuditEvents::ExternalAuditEventDestination/24601", key: "foo", value: "bar" }) {
+    errors
+  }
+}
+```
+
+The header is created if the returned `errors` object is empty.
+
 ## List streaming destinations
 
-Users with at least the Owner role for a group can list event streaming destinations.
+Users with the Owner role for a group can list streaming destinations.
 
 ### Use the GitLab UI
 
-> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/336411) in GitLab 14.9.
-
-Users with at least the Owner role for a group can list event streaming destinations:
+To list the streaming destinations:
 
 1. On the top bar, select **Menu > Groups** and find your group.
 1. On the left sidebar, select **Security & Compliance > Audit events**.
 1. On the main area, select **Streams** tab.
+1. To the right of the item, select **Edit** (**{pencil}**) to see all the custom HTTP headers.
 
 ### Use the API
 
-Users with at least the Owner role for a group can view a list of event streaming destinations at any time using the
+Users with the Owner role for a group can view a list of streaming destinations at any time using the
 `externalAuditEventDestinations` query type.
 
 ```graphql
@@ -89,37 +116,48 @@ query {
         destinationUrl
         verificationToken
         id
+        headers {
+          nodes {
+            key
+            value
+            id
+          }
+        }
       }
     }
   }
 }
 ```
 
-If the resulting list is empty, then audit event streaming is not enabled for that group.
+If the resulting list is empty, then audit streaming is not enabled for that group.
 
-## Delete streaming destinations
+You need the ID values returned by this query for the update and delete mutations.
 
-Users with at least the Owner role for a group can delete event streaming destinations using the
-`deleteAuditEventDestinations` mutation type.
+## Update streaming destinations
 
-When the last destination is successfully deleted, event streaming is disabled for the group.
+Users with the Owner role for a group can update streaming destinations.
 
 ### Use the GitLab UI
 
-> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/336411) in GitLab 14.9.
-
-Users with at least the Owner role for a group can delete event streaming destinations:
+To update a streaming destinations custom HTTP headers:
 
 1. On the top bar, select **Menu > Groups** and find your group.
 1. On the left sidebar, select **Security & Compliance > Audit events**.
 1. On the main area, select **Streams** tab.
-1. Select **{remove}** at the right side of each item.
+1. To the right of the item, select **Edit** (**{pencil}**).
+1. Locate the **Custom HTTP headers** table.
+1. Locate the header that you wish to update.
+1. Ignore the **Active** checkbox because it isn't functional. To track progress on adding functionality to the **Active** checkbox, see the
+   [relevant issue](https://gitlab.com/gitlab-org/gitlab/-/issues/361925).
+1. Enter as many name and value pairs as required. When you enter a unique name and a value for a header, a new row in the table automatically appears. You can add up to
+   20 headers per streaming destination.
+1. Select **Save** to update the streaming destination.
 
 ### Use the API
 
-Delete an event streaming destination by specifying an ID. Get the required ID by
-[listing the details](audit_event_streaming.md#use-the-api-1) of event
-streaming destinations.
+Users with the Owner role for a group can update streaming destinations custom HTTP headers using the
+`auditEventsStreamingHeadersUpdate` mutation type. You can retrieve the custom HTTP headers ID
+by [listing all the custom HTTP headers](#use-the-api-1) for the group.
 
 ```graphql
 mutation {
@@ -129,112 +167,71 @@ mutation {
 }
 ```
 
-Destination is deleted if:
+Streaming destination is updated if:
 
 - The returned `errors` object is empty.
 - The API responds with `200 OK`.
 
-## Custom HTTP headers
-
-> - API [introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/361216) in GitLab 15.1 [with a flag](feature_flags.md) named `streaming_audit_event_headers`. Disabled by default.
-> - API [enabled on GitLab.com and self-managed](https://gitlab.com/gitlab-org/gitlab/-/issues/362941) in GitLab 15.2.
-> - UI [introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/361630) in GitLab 15.2 [with a flag](feature_flags.md) named `custom_headers_streaming_audit_events_ui`. Disabled by default.
-> - [Feature flag removed](https://gitlab.com/gitlab-org/gitlab/-/issues/366524) in GitLab 15.3.
-
-Each streaming destination can have up to 20 custom HTTP headers included with each streamed event.
-
-### Adding custom HTTP headers
-
-Add custom HTTP headers with the API or GitLab UI.
-
-#### Use the API
-
-Group owners can add a HTTP header using the GraphQL `auditEventsStreamingHeadersCreate` mutation. You can retrieve the destination ID
-by [listing the external audit destinations](#list-streaming-destinations) on the group.
+Group owners can remove an HTTP header using the GraphQL `auditEventsStreamingHeadersDestroy` mutation. You can retrieve the header ID
+by [listing all the custom HTTP headers](#use-the-api-1) for the group.
 
 ```graphql
 mutation {
-  auditEventsStreamingHeadersCreate(input: { destinationId: "gid://gitlab/AuditEvents::ExternalAuditEventDestination/24601", key: "foo", value: "bar" }) {
+  auditEventsStreamingHeadersDestroy(input: { headerId: "gid://gitlab/AuditEvents::Streaming::Header/1" }) {
     errors
   }
 }
 ```
 
-The header is created if the returned `errors` object is empty.
+The header is deleted if the returned `errors` object is empty.
 
-#### Use the GitLab UI
+## Delete streaming destinations
 
-FLAG:
-On self-managed GitLab, by default the UI for this feature is not available. To make it available per group, ask an administrator to
-[enable the feature flag](../administration/feature_flags.md) named `custom_headers_streaming_audit_events_ui`. On GitLab.com, the UI for this feature is
-not available. The UI for this feature is not ready for production use.
+Users with the Owner role for a group can delete streaming destinations.
+
+When the last destination is successfully deleted, streaming is disabled for the group.
 
-Users with at least the Owner role for a group can add event streaming destinations and custom HTTP headers for it:
+### Use the GitLab UI
+
+To delete a streaming destination:
 
 1. On the top bar, select **Menu > Groups** and find your group.
 1. On the left sidebar, select **Security & Compliance > Audit events**.
-1. On the main area, select **Streams** tab.
-    - When the destination list is empty, select **Add stream** to show the section for adding destinations.
-    - When the destination list is not empty, select **{plus}** to show the section for adding destinations.
-1. Enter the destination URL to add.
-1. Locate the **Custom HTTP headers** table.
-1. In the **Header** column, add the header's name.
-1. In the **Value** column, add the header's value.
-1. Ignore the **Active** checkbox because it isn't functional. To track progress on adding functionality to the **Active** checkbox, see the
-   [relevant issue](https://gitlab.com/gitlab-org/gitlab/-/issues/361925).
-1. Enter as many name and value pairs as required. When you enter a unique name and a value for a header, a new row in the table automatically appears. You can add up to
-   20 headers per endpoint.
-1. After all headers have been filled out, select **Add** to add the new endpoint.
-
-### Updating custom HTTP headers
+1. On the main area, select the **Streams** tab.
+1. To the right of the item, select **Delete** (**{remove}**).
 
-Add custom HTTP headers with the API or GitLab UI.
+To delete only the custom HTTP headers for a streaming destination:
 
-#### Use the API
+1. On the top bar, select **Menu > Groups** and find your group.
+1. On the left sidebar, select **Security & Compliance > Audit events**.
+1. On the main area, select the **Streams** tab.
+1. To the right of the item, **Edit** (**{pencil}**).
+1. Locate the **Custom HTTP headers** table.
+1. Locate the header that you wish to remove.
+1. To the right of the header, select **Delete** (**{remove}**).
+1. Select **Save** to update the streaming destination.
 
-> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/361964) in GitLab 15.2.
+### Use the API
 
-Group owners can update a HTTP header using the GraphQL `auditEventsStreamingHeadersCreate` mutation.
+Users with the Owner role for a group can delete streaming destinations using the
+`externalAuditEventDestinationDestroy` mutation type. You can retrieve the destinations ID
+by [listing all the streaming destinations](#use-the-api-1) for the group.
 
 ```graphql
 mutation {
-  auditEventsStreamingHeadersUpdate(input: { headerId: "gid://gitlab/AuditEvents::Streaming::Header/24255", key: "new-foo", value: "new-bar" }) {
+  externalAuditEventDestinationDestroy(input: { id: destination }) {
     errors
   }
 }
 ```
 
-#### Use the GitLab UI
-
-> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/91986) in GitLab 15.3 [with a flag](feature_flags.md) named `custom_headers_streaming_audit_events_ui`. Disabled by default.
-
-FLAG:
-On self-managed GitLab, by default the UI for this feature is not available. To make it available per group, ask an administrator to
-[enable the feature flag](../administration/feature_flags.md) named `custom_headers_streaming_audit_events_ui`. On GitLab.com, the UI for this feature is
-not available. The UI for this feature is not ready for production use.
-
-Users with at least the Owner role for a group can add event streaming destinations and custom HTTP headers for it:
-
-1. On the top bar, select **Menu > Groups** and find your group.
-1. On the left sidebar, select **Security & Compliance > Audit events**.
-1. On the main area, select **Streams** tab.
-1. Select **{pencil}** at the right side of an item.
-1. Locate the **Custom HTTP headers** table.
-1. Locate the header that you wish to update.
-1. In the **Header** column, you can change the header's name.
-1. In the **Value** column, you can change the header's value.
-1. Ignore the **Active** checkbox because it isn't functional. To track progress on adding functionality to the **Active** checkbox, see the
-   [relevant issue](https://gitlab.com/gitlab-org/gitlab/-/issues/361925).
-1. Select **Save** to update the endpoint.
-
-### Deleting custom HTTP headers
-
-Deleting custom HTTP headers with the API or GitLab UI.
+Streaming destination is deleted if:
 
-#### Use the API
+- The returned `errors` object is empty.
+- The API responds with `200 OK`.
 
-Group owners can remove a HTTP header using the GraphQL `auditEventsStreamingHeadersDestroy` mutation. You can retrieve the header ID
-by [listing all the custom headers](#list-all-custom-headers) on the group.
+Group owners can remove an HTTP header using the GraphQL `auditEventsStreamingHeadersDestroy` mutation. You can retrieve the header ID
+by [listing all the custom HTTP headers](#use-the-api-1) for the group.
 
 ```graphql
 mutation {
@@ -246,70 +243,6 @@ mutation {
 
 The header is deleted if the returned `errors` object is empty.
 
-#### Use the GitLab UI
-
-> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/91986) in GitLab 15.3 [with a flag](feature_flags.md) named `custom_headers_streaming_audit_events_ui`. Disabled by default.
-
-FLAG:
-On self-managed GitLab, by default the UI for this feature is not available. To make it available per group, ask an administrator to
-[enable the feature flag](../administration/feature_flags.md) named `custom_headers_streaming_audit_events_ui`. On GitLab.com, the UI for this feature is
-not available. The UI for this feature is not ready for production use.
-
-Users with at least the Owner role for a group can delete event streaming destinations:
-
-1. On the top bar, select **Menu > Groups** and find your group.
-1. On the left sidebar, select **Security & Compliance > Audit events**.
-1. On the main area, select **Streams** tab.
-1. Select **{pencil}** at the right side of an item.
-1. Locate the **Custom HTTP headers** table.
-1. Locate the header that you wish to remove.
-1. Select **{remove}** at the right side of the header.
-1. Select **Save** to update the endpoint.
-
-### List all custom headers
-
-List all custom HTTP headers with the API or GitLab UI.
-
-#### Use the API
-
-You can list all custom headers for a top-level group as well as their value and ID using the GraphQL `externalAuditEventDestinations` query. The ID
-value returned by this query is what you need to pass to the `deletion` mutation.
-
-```graphql
-query {
-  group(fullPath: "your-group") {
-    id
-    externalAuditEventDestinations {
-      nodes {
-        destinationUrl
-        id
-        headers {
-          nodes {
-            key
-            value
-            id
-          }
-        }
-      }
-    }
-  }
-}
-```
-
-#### Use the GitLab UI
-
-FLAG:
-On self-managed GitLab, by default the UI for this feature is not available. To make it available per group, ask an administrator to
-[enable the feature flag](../administration/feature_flags.md) named `custom_headers_streaming_audit_events_ui`. On GitLab.com, the UI for this feature is
-not available. The UI for this feature is not ready for production use.
-
-Users with at least the Owner role for a group can add event streaming destinations and custom HTTP headers for it:
-
-1. On the top bar, select **Menu > Groups** and find your group.
-1. On the left sidebar, select **Security & Compliance > Audit events**.
-1. On the main area, select **Streams** tab.
-1. Select **{pencil}** at the right side of an item.
-
 ## Verify event authenticity
 
 > [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/345424) in GitLab 14.8.
@@ -324,11 +257,11 @@ the destination's value when [listing streaming destinations](#list-streaming-de
 
 > [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/360814) in GitLab 15.2.
 
-Users with at least the Owner role for a group can list event streaming destinations and see the verification tokens:
+Users with the Owner role for a group can list streaming destinations and see the verification tokens:
 
 1. On the top bar, select **Menu > Groups** and find your group.
 1. On the left sidebar, select **Security & Compliance > Audit events**.
-1. On the main area, select **Streams**.
+1. On the main area, select the **Streams**.
 1. View the verification token on the right side of each item.
 
 ## Audit event streaming on Git operations
@@ -350,7 +283,7 @@ Streaming audit events can be sent when signed-in users push or pull a project's
 
 Audit events are not captured for users that are not signed in. For example, when downloading a public project.
 
-To configure streaming audit events for Git operations, see [Add a new event streaming destination](#add-a-new-event-streaming-destination).
+To configure streaming audit events for Git operations, see [Add a new streaming destination](#add-a-new-streaming-destination).
 
 ### Headers
 
@@ -432,7 +365,7 @@ Push:
 }
 ```
 
-#### Example payloads for SSH events with Deploy Key
+### Example payloads for SSH events with Deploy Key
 
 > [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/363876) in GitLab 15.3.
 
@@ -534,7 +467,7 @@ Push:
 }
 ```
 
-#### Example payloads for HTTP and HTTPS events with Deploy Token
+### Example payloads for HTTP and HTTPS events with Deploy Token
 
 Fetch:
 
diff --git a/doc/administration/audit_events.md b/doc/administration/audit_events.md
index 3282bb5195d..0aa766aa0d4 100644
--- a/doc/administration/audit_events.md
+++ b/doc/administration/audit_events.md
@@ -272,7 +272,7 @@ Don't see the event you want in any of the epics linked above? You can either:
 - Use the **Audit Event Proposal** issue template to
   [create an issue](https://gitlab.com/gitlab-org/gitlab/-/issues/new?issuable_template=Audit%20Event%20Proposal) to
   request it.
-- [Add it yourself](../development/audit_event_guide/).
+- [Add it yourself](../development/audit_event_guide/index.md).
 
 ### Removed events
 
diff --git a/doc/administration/monitoring/prometheus/gitlab_metrics.md b/doc/administration/monitoring/prometheus/gitlab_metrics.md
index 16851e5e2b5..a2def8a9f64 100644
--- a/doc/administration/monitoring/prometheus/gitlab_metrics.md
+++ b/doc/administration/monitoring/prometheus/gitlab_metrics.md
@@ -390,8 +390,8 @@ Some basic Ruby runtime metrics are available:
 ## Redis metrics
 
 These client metrics are meant to complement Redis server metrics.
-These metrics are broken down per [Redis
-instance](https://docs.gitlab.com/omnibus/settings/redis.html#running-with-multiple-redis-instances).
+These metrics are broken down per 
+[Redis instance](https://docs.gitlab.com/omnibus/settings/redis.html#running-with-multiple-redis-instances).
 These metrics all have a `storage` label which indicates the Redis
 instance (`cache`, `shared_state`, and so on).
 
diff --git a/doc/development/distributed_tracing.md b/doc/development/distributed_tracing.md
index 116071cdfd9..f49d024095d 100644
--- a/doc/development/distributed_tracing.md
+++ b/doc/development/distributed_tracing.md
@@ -73,14 +73,14 @@ In this example, we have the following hypothetical values:
 
 - `driver`: the driver such a Jaeger.
 - `param_name`, `param_value`: these are driver specific configuration values. Configuration
-  parameters for Jaeger are documented [further on in this
-  document](#2-configure-the-gitlab_tracing-environment-variable) they should be URL encoded.
+  parameters for Jaeger are documented [further on in this document](#2-configure-the-gitlab_tracing-environment-variable) 
+  they should be URL encoded.
   Multiple values should be separated by `&` characters like a URL.
 
 ## Using Jaeger in the GitLab Development Kit
 
-The first tracing implementation that GitLab supports is Jaeger, and the [GitLab Development
-Kit](https://gitlab.com/gitlab-org/gitlab-development-kit/) supports distributed tracing with
+The first tracing implementation that GitLab supports is Jaeger, and the 
+[GitLab Development Kit](https://gitlab.com/gitlab-org/gitlab-development-kit/) supports distributed tracing with
 Jaeger out-of-the-box.
 
 The easiest way to access tracing from a GDK environment is through the
@@ -116,8 +116,8 @@ Jaeger has many configuration options, but is very easy to start in an "all-in-o
 memory for trace storage (and is therefore non-persistent). The main advantage of "all-in-one" mode
 being ease of use.
 
-For more detailed configuration options, refer to the [Jaeger
-documentation](https://www.jaegertracing.io/docs/1.9/getting-started/).
+For more detailed configuration options, refer to the 
+[Jaeger documentation](https://www.jaegertracing.io/docs/1.9/getting-started/).
 
 #### Using Docker
 
@@ -201,8 +201,8 @@ If `GITLAB_TRACING` is not configured correctly, this issue is logged:
 ```
 
 By default, GitLab ships with the Jaeger tracer, but other tracers can be included at compile time.
-Details of how this can be done are included in the [LabKit tracing
-documentation](https://pkg.go.dev/gitlab.com/gitlab-org/labkit/tracing).
+Details of how this can be done are included in the 
+[LabKit tracing documentation](https://pkg.go.dev/gitlab.com/gitlab-org/labkit/tracing).
 
 If no log messages about tracing are emitted, the `GITLAB_TRACING` environment variable is likely
 not set.
diff --git a/doc/development/logging.md b/doc/development/logging.md
index 7f013edee79..f1fa7f4c8c9 100644
--- a/doc/development/logging.md
+++ b/doc/development/logging.md
@@ -44,8 +44,7 @@ These logs suffer from a number of problems:
 Note that currently on GitLab.com, any messages in `production.log` aren't
 indexed by Elasticsearch due to the sheer volume and noise. They
 do end up in Google Stackdriver, but it is still harder to search for
-logs there. See the [GitLab.com logging
-documentation](https://gitlab.com/gitlab-com/runbooks/-/tree/master/docs/logging)
+logs there. See the [GitLab.com logging documentation](https://gitlab.com/gitlab-com/runbooks/-/tree/master/docs/logging)
 for more details.
 
 ## Use structured (JSON) logging
@@ -386,18 +385,18 @@ end
 ## Additional steps with new log files
 
 1. Consider log retention settings. By default, Omnibus rotates any
-   logs in `/var/log/gitlab/gitlab-rails/*.log` every hour and [keep at
-   most 30 compressed files](https://docs.gitlab.com/omnibus/settings/logs.html#logrotate).
+   logs in `/var/log/gitlab/gitlab-rails/*.log` every hour and 
+   [keep at most 30 compressed files](https://docs.gitlab.com/omnibus/settings/logs.html#logrotate).
    On GitLab.com, that setting is only 6 compressed files. These settings should suffice
    for most users, but you may need to tweak them in [Omnibus GitLab](https://gitlab.com/gitlab-org/omnibus-gitlab).
 
-1. If you add a new file, submit an issue to the [production
-   tracker](https://gitlab.com/gitlab-com/gl-infra/production/-/issues) or
+1. If you add a new file, submit an issue to the
+   [production tracker](https://gitlab.com/gitlab-com/gl-infra/production/-/issues) or
    a merge request to the [`gitlab_fluentd`](https://gitlab.com/gitlab-cookbooks/gitlab_fluentd)
    project. See [this example](https://gitlab.com/gitlab-cookbooks/gitlab_fluentd/-/merge_requests/51/diffs).
 
-1. Be sure to update the [GitLab CE/EE documentation](../administration/logs/index.md) and the [GitLab.com
-   runbooks](https://gitlab.com/gitlab-com/runbooks/blob/master/docs/logging/README.md).
+1. Be sure to update the [GitLab CE/EE documentation](../administration/logs/index.md) and the 
+   [GitLab.com runbooks](https://gitlab.com/gitlab-com/runbooks/blob/master/docs/logging/README.md).
 
 ## Control logging visibility
 
diff --git a/doc/user/usage_quotas.md b/doc/user/usage_quotas.md
index b85cab1cf47..6044049b260 100644
--- a/doc/user/usage_quotas.md
+++ b/doc/user/usage_quotas.md
@@ -39,16 +39,19 @@ To prevent exceeding the namespace storage quota, you can:
 Starting October 19, 2022, a storage limit will be enforced on all GitLab Free namespaces.
 We will start with a large limit enforcement and eventually reduce it to 5 GB.
 
+Impacted users are notified via email and in-app notifications will begin 2022-08-22. 
+Only GitLab SaaS users are impacted - the limits are not applicable to self-managed users.
+
 The following table describes the enforcement schedule, which is subject to change.
 
-| Target enforcement date | Limit | Expected Impact | Status |
-| ------ | ------ | ------ | ------ |
-| October 19, 2022 | 45,000 GB | LOW | Pending (**{hourglass}**)|
-| October 20, 2022 | 7,500 GB | LOW | Pending (**{hourglass}**)|
-| October 24, 2022 | 500 GB | MEDIUM | Pending (**{hourglass}**)|
-| October 27, 2022 | 75 GB | MEDIUM HIGH | Pending (**{hourglass}**)|
-| November 2, 2022 | 10 GB | HIGH | Pending (**{hourglass}**)|
-| November 9, 2022 | 5 GB | VERY HIGH | Pending (**{hourglass}**)|
+| Target enforcement date | Limit | Status |
+| ----------------------- | ----- | ------ |
+| October 19, 2022 | 45,000 GB | Pending (**{hourglass}**)|
+| October 20, 2022 | 7,500 GB | Pending (**{hourglass}**)|
+| October 24, 2022 | 500 GB | Pending (**{hourglass}**)|
+| October 27, 2022 | 75 GB | Pending (**{hourglass}**)|
+| November 2, 2022 | 10 GB | Pending (**{hourglass}**)|
+| November 9, 2022 | 5 GB | Pending (**{hourglass}**)|
 
 Namespaces that reach the enforced limit will have their projects locked. To unlock your project, you will have to [manage its storage](#manage-your-storage-usage).