diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-06-20 09:07:06 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-06-20 09:07:06 +0300 |
commit | dd4c30182c16fe27efbbf4c19594bb292fb4ac48 (patch) | |
tree | 3d2e0235a0ab5333a6a2d4990da409640dd2d26f /doc | |
parent | accf0d7db3d58a62212125703df39e341d327ec6 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc')
-rw-r--r-- | doc/administration/audit_event_streaming/index.md | 19 | ||||
-rw-r--r-- | doc/user/group/compliance_frameworks.md | 3 | ||||
-rw-r--r-- | doc/user/project/merge_requests/approvals/index.md | 4 |
3 files changed, 23 insertions, 3 deletions
diff --git a/doc/administration/audit_event_streaming/index.md b/doc/administration/audit_event_streaming/index.md index 44c6cff7455..22670e95d49 100644 --- a/doc/administration/audit_event_streaming/index.md +++ b/doc/administration/audit_event_streaming/index.md @@ -226,6 +226,25 @@ To list streaming destinations for an instance and see the verification tokens: 1. On the main area, select the **Streams**. 1. View the verification token on the right side of each item. +## Event type filters + +> Event type filtering in the UI with a defined list of audit event types [introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/413581) in GitLab 16.1. + +When this feature is enabled for a group, you can permit users to filter streamed audit events per destination. +If the feature is enabled with no filters, the destination receives all audit events. + +A streaming destination that has an event type filter set has a **filtered** (**{filter}**) label. + +To update a streaming destination's event filters: + +1. On the left sidebar, at the top, select **Search GitLab** (**{search}**) to find your group. +1. Select **Secure > Audit events**. +1. On the main area, select the **Streams** tab. +1. To the right of the item, select **Edit** (**{pencil}**). +1. Select **Filter by stream event**. +1. Select the dropdown list and select or clear the required event types. +1. Select **Save** to update the event filters. + ## Override default content type header By default, streaming destinations use a `content-type` header of `application/x-www-form-urlencoded`. However, you diff --git a/doc/user/group/compliance_frameworks.md b/doc/user/group/compliance_frameworks.md index 0ba329a8963..55d096a654e 100644 --- a/doc/user/group/compliance_frameworks.md +++ b/doc/user/group/compliance_frameworks.md @@ -12,7 +12,8 @@ info: To determine the technical writer assigned to the Stage/Group associated w You can create a compliance framework that is a label to identify that your project has certain compliance requirements or needs additional oversight. The label can optionally enforce [compliance pipeline configuration](#compliance-pipelines) to the projects on which it is -[applied](../project/settings/index.md#add-a-compliance-framework-to-a-project). +applied. Refer to our +applied. For more information, see [Add a compliance framework to a project](../project/settings/index.md#add-a-compliance-framework-to-a-project). Compliance frameworks are created on top-level groups. Group owners can create, edit, and delete compliance frameworks: diff --git a/doc/user/project/merge_requests/approvals/index.md b/doc/user/project/merge_requests/approvals/index.md index 2a574764954..ad4d32535bd 100644 --- a/doc/user/project/merge_requests/approvals/index.md +++ b/doc/user/project/merge_requests/approvals/index.md @@ -115,7 +115,7 @@ FLAG: On self-managed GitLab, by default this feature is available. To hide the feature, ask an administrator to [disable the feature flag](../../../../administration/feature_flags.md) named `invalid_scan_result_policy_prevents_merge`. -Whenever an approval rule cannot be satisfied, the rule is displayed as **(!) Auto approved**. This applies to the following conditions: +Whenever an approval rule cannot be satisfied, the rule is displayed as **Auto approved**. This applies to the following conditions: - The only eligible approver is the author of the merge request. - No eligible approvers (either groups or users) have been assigned to the approval rule. @@ -124,7 +124,7 @@ Whenever an approval rule cannot be satisfied, the rule is displayed as **(!) Au These rules are automatically approved to unblock their respective merge requests, unless they were created through a [scan result policy](../../../application_security/policies/scan-result-policies.md). Invalid approval rules created through a scan result policy are presented with -**(!) Action Required** and are not automatically approved, blocking their respective merge requests. +**Action required** and are not automatically approved, blocking their respective merge requests. ## Related topics |