Add latest changes from gitlab-org/gitlab@master

12 files changed, 63 insertions, 15 deletions

diff --git a/doc/.vale/gitlab/Acronyms.yml b/doc/.vale/gitlab/Acronyms.yml
index 21c0c29e4fe..f11ed981052 100644
--- a/doc/.vale/gitlab/Acronyms.yml
+++ b/doc/.vale/gitlab/Acronyms.yml
@@ -19,6 +19,7 @@ exceptions:
   - CSS
   - CSV
   - DNS
+  - EKS
   - GET
   - GNU
   - GPG
diff --git a/doc/api/vulnerability_findings.md b/doc/api/vulnerability_findings.md
index b50504209d0..7fbd58ea62c 100644
--- a/doc/api/vulnerability_findings.md
+++ b/doc/api/vulnerability_findings.md
@@ -47,15 +47,15 @@ GET /projects/:id/vulnerability_findings?pipeline_id=42
 ```
 
 CAUTION: **Deprecation:**
-Beginning with GitLab 12.9, the `undefined` severity level is deprecated and the `undefined` confidence level isn't reported for new vulnerabilities.
+Beginning with GitLab 12.9, the `undefined` severity and confidence level is no longer reported.
 
 | Attribute     | Type           | Required | Description                                                                                                                                                                         |
 | ------------- | -------------- | -------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
 | `id`          | integer/string | yes      | The ID or [URL-encoded path of the project](README.md#namespaced-path-encoding) which the authenticated user is a member of.                                                        |
 | `report_type` | string array   | no       | Returns vulnerability findings belonging to specified report type. Valid values: `sast`, `dast`, `dependency_scanning`, or `container_scanning`. Defaults to all.                   |
 | `scope`       | string         | no       | Returns vulnerability findings for the given scope: `all` or `dismissed`. Defaults to `dismissed`.                                                                                  |
-| `severity`    | string array   | no       | Returns vulnerability findings belonging to specified severity level: `undefined`, `info`, `unknown`, `low`, `medium`, `high`, or `critical`. Defaults to all.                      |
-| `confidence`  | string array   | no       | Returns vulnerability findings belonging to specified confidence level: `undefined`, `ignore`, `unknown`, `experimental`, `low`, `medium`, `high`, or `confirmed`. Defaults to all. |
+| `severity`    | string array   | no       | Returns vulnerability findings belonging to specified severity level: `info`, `unknown`, `low`, `medium`, `high`, or `critical`. Defaults to all.                                   |
+| `confidence`  | string array   | no       | Returns vulnerability findings belonging to specified confidence level: `ignore`, `unknown`, `experimental`, `low`, `medium`, `high`, or `confirmed`. Defaults to all.              |
 | `pipeline_id` | integer/string | no       | Returns vulnerability findings belonging to specified pipeline.                                                                                                                     |
 
 ```shell
diff --git a/doc/development/telemetry/usage_ping.md b/doc/development/telemetry/usage_ping.md
index 44abffe376a..4cd70c39a77 100644
--- a/doc/development/telemetry/usage_ping.md
+++ b/doc/development/telemetry/usage_ping.md
@@ -456,7 +456,8 @@ On GitLab.com, we have DangerBot setup to monitor Telemetry related files and Da
 | `dependency_list_usages_total`                          | `counts`                           |             |                                                   |
 | `epics`                                                 | `counts`                           |             |                                                   |
 | `feature_flags`                                         | `counts`                           |             |                                                   |
-| `geo_nodes`                                             | `counts`                           |             |                                                   |
+| `geo_nodes`                                             | `counts`                           | `geo`       | Number of sites in a Geo deployment               |
+| `geo_event_log_max_id`                                  | `counts`                           | `geo`       | Number of replication events on a Geo primary     |
 | `incident_issues`                                       | `counts`                           | `monitor`   | Issues created by the alert bot                   |
 | `alert_bot_incident_issues`                             | `counts`                           | `monitor`   | Issues created by the alert bot                   |
 | `incident_labeled_issues`                               | `counts`                           | `monitor`   | Issues with the incident label                    |
diff --git a/doc/raketasks/backup_restore.md b/doc/raketasks/backup_restore.md
index 52de4d2430c..e83f51dc84e 100644
--- a/doc/raketasks/backup_restore.md
+++ b/doc/raketasks/backup_restore.md
@@ -803,7 +803,7 @@ restore:
 
 ```shell
 # This command will overwrite the contents of your GitLab database!
-sudo gitlab-backup restore BACKUP=1493107454_2018_04_25_10.6.4-ce
+sudo gitlab-backup restore BACKUP=11493107454_2018_04_25_10.6.4-ce
 ```
 
 NOTE: **Note**
diff --git a/doc/security/img/allowlist_v13_0.png b/doc/security/img/allowlist_v13_0.png
new file mode 100644
index 00000000000..973b53a57a4
--- /dev/null
+++ b/doc/security/img/allowlist_v13_0.png
diff --git a/doc/security/img/whitelist.png b/doc/security/img/whitelist.png
deleted file mode 100644
index 897000e804d..00000000000
--- a/doc/security/img/whitelist.png
+++ /dev/null
diff --git a/doc/security/webhooks.md b/doc/security/webhooks.md
index 6ac0db9ee88..12c46e61873 100644
--- a/doc/security/webhooks.md
+++ b/doc/security/webhooks.md
@@ -52,29 +52,29 @@ NOTE: **Note:**
 set up by administrators. However, you can turn this off by disabling the
 **Allow requests to the local network from system hooks** option.
 
-## Whitelist for local requests
+## Allowlist for local requests
 
 > [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/-/issues/44496) in GitLab 12.2
 
 You can allow certain domains and IP addresses to be accessible to both *system hooks*
 and *webhooks* even when local requests are not allowed by adding them to the
-whitelist. Navigate to **Admin Area > Settings > Network** (`/admin/application_settings/network`)
+allowlist. Navigate to **Admin Area > Settings > Network** (`/admin/application_settings/network`)
 and expand **Outbound requests**:
 
-![Outbound local requests whitelist](img/whitelist.png)
+![Outbound local requests allowlist](img/allowlist_v13_0.png)
 
-The whitelist entries can be separated by semicolons, commas or whitespaces
+The allowed entries can be separated by semicolons, commas or whitespaces
 (including newlines) and be in different formats like hostnames, IP addresses and/or
 IP ranges. IPv6 is supported. Hostnames that contain unicode characters should
 use IDNA encoding.
 
-The whitelist can hold a maximum of 1000 entries. Each entry can be a maximum of
+The allowlist can hold a maximum of 1000 entries. Each entry can be a maximum of
 255 characters.
 
-You can whitelist a particular port by specifying it in the whitelist entry.
+You can allow a particular port by specifying it in the allowlist entry.
 For example `127.0.0.1:8080` will only allow connections to port 8080 on `127.0.0.1`.
-If no port is mentioned, all ports on that IP/domain are whitelisted. An IP range
-will whitelist all ports on all IPs in that range.
+If no port is mentioned, all ports on that IP/domain are allowed. An IP range
+will allow all ports on all IPs in that range.
 
 Example:
 
diff --git a/doc/user/group/issues_analytics/img/issues_table_v13_1.png b/doc/user/group/issues_analytics/img/issues_table_v13_1.png
new file mode 100644
index 00000000000..0f94f1ba2c5
--- /dev/null
+++ b/doc/user/group/issues_analytics/img/issues_table_v13_1.png
diff --git a/doc/user/group/issues_analytics/index.md b/doc/user/group/issues_analytics/index.md
index 84de14da1f1..91bfa4e457f 100644
--- a/doc/user/group/issues_analytics/index.md
+++ b/doc/user/group/issues_analytics/index.md
@@ -35,6 +35,17 @@ shows a total of 15 months for the chart in the GitLab.org group.
 
 ![Issues created per month](img/issues_created_per_month_v12_8.png)
 
+## Drill into the information
+
+> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/196547) in GitLab 13.1.
+
+You can examine details of individual issues by browsing the table
+located below the chart.
+
+The chart displays the top 100 issues based on the global page filters.
+
+![Issues table](img/issues_table_v13_1.png)
+
 <!-- ## Troubleshooting
 
 Include any troubleshooting steps that you can foresee. If you know beforehand what issues
diff --git a/doc/user/project/clusters/add_eks_clusters.md b/doc/user/project/clusters/add_eks_clusters.md
index b9b64df595f..639e04d3896 100644
--- a/doc/user/project/clusters/add_eks_clusters.md
+++ b/doc/user/project/clusters/add_eks_clusters.md
@@ -164,6 +164,41 @@ You will need to add your AWS external ID to the
 [IAM Role in the AWS CLI](https://docs.aws.amazon.com/cli/latest/userguide/cli-configure-role.html#cli-configure-role-xaccount)
 to manage your cluster using `kubectl`.
 
+### Troubleshooting creating a new cluster
+
+The following errors are commonly encountered when creating a new cluster.
+
+#### Error: Request failed with status code 422
+
+When submitting the initial authentication form, GitLab returns a status code 422
+error when it can't determine the role you've provided. Make sure you've
+correctly configured your role with the **Account ID** and **External ID**
+provided by GitLab. In GitLab, make sure to enter the correct **Role ARN**.
+
+#### Could not load Security Groups for this VPC
+
+When populating options in the configuration form, GitLab returns this error
+because GitLab has successfully assumed your provided role, but the role has
+insufficient permissions to retrieve the resources needed for the form. Make sure
+you've assigned the role the correct permissions.
+
+#### `ROLLBACK_FAILED` during cluster creation
+
+The creation process halted because GitLab encountered an error when creating
+one or more resources. You can inspect the associated
+[CloudFormation stack](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/cfn-console-view-stack-data-resources.html)
+to find the specific resources that failed to create.
+
+If the `Cluster` resource failed with the error
+`The provided role doesn't have the Amazon EKS Managed Policies associated with it.`,
+the role specified in **Role name** is not configured correctly.
+
+NOTE: **Note:**
+This role should not be the same as the one created above. If you don't have an
+existing
+[EKS cluster IAM role](https://docs.aws.amazon.com/eks/latest/userguide/service_IAM_role.html),
+you must create one.
+
 ## Existing EKS cluster
 
 To add an existing EKS cluster to your project, group, or instance:
diff --git a/doc/user/project/index.md b/doc/user/project/index.md
index 0332e1cf938..c54008f2c1e 100644
--- a/doc/user/project/index.md
+++ b/doc/user/project/index.md
@@ -100,7 +100,7 @@ When you create a project in GitLab, you'll have access to a large number of
 - [Maven packages](../packages/maven_repository/index.md): your private Maven repository in GitLab. **(PREMIUM)**
 - [NPM packages](../packages/npm_registry/index.md): your private NPM package registry in GitLab. **(PREMIUM)**
 - [Code owners](code_owners.md): specify code owners for certain files **(STARTER)**
-- [License Compliance](../compliance/license_compliance/index.md): approve and blacklist licenses for projects. **(ULTIMATE)**
+- [License Compliance](../compliance/license_compliance/index.md): approve and deny licenses for projects. **(ULTIMATE)**
 - [Dependency List](../application_security/dependency_list/index.md): view project dependencies. **(ULTIMATE)**
 - [Requirements](requirements/index.md): Requirements allow you to create criteria to check your products against. **(ULTIMATE)**
 - [Static Site Editor](static_site_editor/index.md): quickly edit content on static websites without prior knowledge of the codebase or Git commands.
diff --git a/doc/user/project/integrations/prometheus.md b/doc/user/project/integrations/prometheus.md
index 70fd0cb6780..2eae2bc9915 100644
--- a/doc/user/project/integrations/prometheus.md
+++ b/doc/user/project/integrations/prometheus.md
@@ -385,7 +385,7 @@ The following tables outline the details of expected properties.
 
 | Property | Type | Required | Description |
 | -------- | ---- | -------- | ----------- |
-| `variables` | hash | no | Variables can be defined here. |
+| `variables` | hash | yes | Variables can be defined here. |
 
 Read the documentation on [templating](#templating-variables-for-metrics-dashboards).