diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-06-04 01:23:33 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-06-04 01:23:33 +0300 |
commit | 6c3124c854cbeef391a38b5ae8330174d78348bf (patch) | |
tree | af77629bc34ccc517ed24d9db35895be5d02d23d /doc/administration | |
parent | 9a8ae3b4e90e56f71bb770463b943512efdcd1d1 (diff) |
Add latest changes from gitlab-org/gitlab@15-0-stable-ee
Diffstat (limited to 'doc/administration')
-rw-r--r-- | doc/administration/audit_event_streaming.md | 22 | ||||
-rw-r--r-- | doc/administration/package_information/postgresql_versions.md | 2 |
2 files changed, 17 insertions, 7 deletions
diff --git a/doc/administration/audit_event_streaming.md b/doc/administration/audit_event_streaming.md index 07979e21038..4678e23dfc9 100644 --- a/doc/administration/audit_event_streaming.md +++ b/doc/administration/audit_event_streaming.md @@ -174,6 +174,8 @@ To configure streaming audit events for Git operations, see [Add a new event str ### Headers +> `X-Gitlab-Audit-Event-Type` [introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/86881) in GitLab 15.0. + Headers are formatted as follows: ```plaintext @@ -181,6 +183,7 @@ POST /logs HTTP/1.1 Host: <DESTINATION_HOST> Content-Type: application/x-www-form-urlencoded X-Gitlab-Event-Streaming-Token: <DESTINATION_TOKEN> +X-Gitlab-Audit-Event-Type: repository_git_operation ``` ### Example payloads for SSH events @@ -211,7 +214,8 @@ Fetch: "target_details": "example-project", "created_at": "2022-02-23T06:21:05.283Z", "target_type": "Project", - "target_id": 29 + "target_id": 29, + "event_type": "repository_git_operation" } ``` @@ -241,7 +245,8 @@ Push: "target_details": "example-project", "created_at": "2022-02-23T06:23:08.746Z", "target_type": "Project", - "target_id": 29 + "target_id": 29, + "event_type": "repository_git_operation" } ``` @@ -273,7 +278,8 @@ Fetch: "target_details": "example-project", "created_at": "2022-02-23T06:25:43.938Z", "target_type": "Project", - "target_id": 29 + "target_id": 29, + "event_type": "repository_git_operation" } ``` @@ -303,7 +309,8 @@ Push: "target_details": "example-project", "created_at": "2022-02-23T06:26:29.294Z", "target_type": "Project", - "target_id": 29 + "target_id": 29, + "event_type": "repository_git_operation" } ``` @@ -332,7 +339,8 @@ Fetch: "target_details": "example-group/example-project", "created_at": "2022-02-23T06:27:17.873Z", "target_type": "Project", - "target_id": 29 + "target_id": 29, + "event_type": "repository_git_operation" } ``` @@ -351,6 +359,7 @@ POST /logs HTTP/1.1 Host: <DESTINATION_HOST> Content-Type: application/x-www-form-urlencoded X-Gitlab-Event-Streaming-Token: <DESTINATION_TOKEN> +X-Gitlab-Audit-Event-Type: audit_operation ``` ### Example payload @@ -376,6 +385,7 @@ X-Gitlab-Event-Streaming-Token: <DESTINATION_TOKEN> "target_details": "merge request title", "created_at": "2022-03-09T06:53:11.181Z", "target_type": "MergeRequest", - "target_id": 20 + "target_id": 20, + "event_type": "audit_operation" } ``` diff --git a/doc/administration/package_information/postgresql_versions.md b/doc/administration/package_information/postgresql_versions.md index 97f93663003..1b3e49cfb82 100644 --- a/doc/administration/package_information/postgresql_versions.md +++ b/doc/administration/package_information/postgresql_versions.md @@ -26,7 +26,7 @@ Read more about update policies and warnings in the PostgreSQL | GitLab version | PostgreSQL versions | Default version for fresh installs | Default version for upgrades | Notes | | -------------- | --------------------- | ---------------------------------- | ---------------------------- | ----- | -| 15.0 | 12.10, 13.6 | 13.6 | 13.6 | Users can manually upgrade to 13.6 following the [upgrade docs](https://docs.gitlab.com/omnibus/settings/database.html#gitlab-150-and-later). | +| 15.0 | 12.10, 13.6 | 13.6 | 12.10 | For upgrades, users can manually upgrade to 13.6 following the [upgrade docs](https://docs.gitlab.com/omnibus/settings/database.html#gitlab-150-and-later). | | 14.1 | 12.7, 13.3 | 12.7 | 12.7 | PostgreSQL 13 available for fresh installations if not using [Geo](../geo/index.md#requirements-for-running-geo) or [Patroni](../postgresql/index.md#postgresql-replication-and-failover-with-omnibus-gitlab). | 14.0 | 12.7 | 12.7 | 12.7 | HA installations with repmgr are no longer supported and will be prevented from upgrading to Omnibus GitLab 14.0 | | 13.8 | 11.9, 12.4 | 12.4 | 12.4 | Package upgrades automatically performed PostgreSQL upgrade for nodes that are not part of a Geo or HA cluster.). | |