From eaec088dc5e9a164d2d163c63312ad1d6668e1d0 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Thu, 17 Feb 2022 00:14:12 +0000 Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master --- ...application_settings_service_usage_data_center.yml | 2 +- doc/administration/gitaly/praefect.md | 11 +++++++---- doc/development/ee_features.md | 4 +++- doc/operations/incident_management/incidents.md | 3 ++- .../dependency_scanning/analyzers.md | 2 ++ 5 files changed, 15 insertions(+), 7 deletions(-) diff --git a/config/feature_flags/development/admin_application_settings_service_usage_data_center.yml b/config/feature_flags/development/admin_application_settings_service_usage_data_center.yml index 6e8f48070d5..465f9061eb4 100644 --- a/config/feature_flags/development/admin_application_settings_service_usage_data_center.yml +++ b/config/feature_flags/development/admin_application_settings_service_usage_data_center.yml @@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/351268 milestone: '14.8' type: development group: group::product intelligence -default_enabled: false +default_enabled: true diff --git a/doc/administration/gitaly/praefect.md b/doc/administration/gitaly/praefect.md index 0ba25c9285d..8f17835b8a3 100644 --- a/doc/administration/gitaly/praefect.md +++ b/doc/administration/gitaly/praefect.md @@ -597,8 +597,8 @@ On the **Praefect** node: Praefect supports TLS encryption. To communicate with a Praefect instance that listens for secure connections, you must: -- Use a `tls://` URL scheme in the `gitaly_address` of the corresponding storage entry - in the GitLab configuration. +- Ensure Gitaly is [configured for TLS](configure_gitaly.md#enable-tls-support) and use a `tls://` URL scheme in the `gitaly_address` + of the corresponding storage entry in the GitLab configuration. - Bring your own certificates because this isn't provided automatically. The certificate corresponding to each Praefect server must be installed on that Praefect server. @@ -666,7 +666,7 @@ To configure Praefect with TLS: ```ruby git_data_dirs({ "default" => { - "gitaly_address" => 'tls://PRAEFECT_LOADBALANCER_HOST:2305', + "gitaly_address" => 'tls://PRAEFECT_LOADBALANCER_HOST:3305', "gitaly_token" => 'PRAEFECT_EXTERNAL_TOKEN' } }) @@ -984,7 +984,10 @@ Particular attention should be shown to: balancer. - `PRAEFECT_EXTERNAL_TOKEN` with the real secret - If you are using TLS, the `gitaly_address` should begin with `tls://`. + If you are using TLS: + + - The `gitaly_address` should begin with `tls://` instead. + - The port should be changed to `3305`. ```ruby git_data_dirs({ diff --git a/doc/development/ee_features.md b/doc/development/ee_features.md index 9f705f2c6f1..17e35d34ec7 100644 --- a/doc/development/ee_features.md +++ b/doc/development/ee_features.md @@ -11,8 +11,10 @@ info: To determine the technical writer assigned to the Stage/Group associated w - **Write documentation.**: Add documentation to the `doc/` directory. Describe the feature and include screenshots, if applicable. Indicate [what editions](documentation/styleguide/index.md#product-tier-badges) the feature applies to. -- **Submit a MR to the `www-gitlab-com` project.**: Add the new feature to the + +- **Submit a MR to the [`www-gitlab-com`](https://gitlab.com/gitlab-com/www-gitlab-com) project.**: Add the new feature to the [EE features list](https://about.gitlab.com/features/). + ## Act as CE when unlicensed diff --git a/doc/operations/incident_management/incidents.md b/doc/operations/incident_management/incidents.md index bcfcce09dd7..e142d060d87 100644 --- a/doc/operations/incident_management/incidents.md +++ b/doc/operations/incident_management/incidents.md @@ -21,6 +21,7 @@ You can create an incident manually or automatically. > - [Moved](https://gitlab.com/gitlab-org/monitor/monitor/-/issues/24) to GitLab Free in 13.3. > - [Permission changed](https://gitlab.com/gitlab-org/gitlab/-/issues/336624) from Guest to Reporter in GitLab 14.5. +> - Automatic application of the `incident` label [removed](https://gitlab.com/gitlab-org/gitlab/-/issues/290964) in GitLab 14.8. If you have at least Reporter [permissions](../../user/permissions.md), you can create an incident manually from the Incidents List or the Issues List. @@ -47,7 +48,7 @@ To create an incident from the Issues List: ### Create incidents automatically **(ULTIMATE)** With at least the Maintainer role, you can enable - GitLab to create incident automatically whenever an alert is triggered: +GitLab to create incident automatically whenever an alert is triggered: 1. Navigate to **Settings > Monitor > Incidents** and expand **Incidents**. 1. Check the **Create an incident** checkbox. diff --git a/doc/user/application_security/dependency_scanning/analyzers.md b/doc/user/application_security/dependency_scanning/analyzers.md index 2bcd7b74b0d..551488c0dc0 100644 --- a/doc/user/application_security/dependency_scanning/analyzers.md +++ b/doc/user/application_security/dependency_scanning/analyzers.md @@ -29,6 +29,8 @@ Dependency Scanning supports the following official analyzers: The analyzers are published as Docker images, which Dependency Scanning uses to launch dedicated containers for each analysis. +The Dependency Scanning analyzers' current major version number is 2. + Dependency Scanning is pre-configured with a set of **default images** that are maintained by GitLab, but users can also integrate their own **custom images**.