Add latest changes from gitlab-org/gitlab@master

4 files changed, 59 insertions, 2 deletions

diff --git a/doc/user/analytics/dora_metrics.md b/doc/user/analytics/dora_metrics.md
index a2b2762e6da..6933c74f1b3 100644
--- a/doc/user/analytics/dora_metrics.md
+++ b/doc/user/analytics/dora_metrics.md
@@ -104,7 +104,7 @@ To retrieve metrics for change failure rate, use the [GraphQL](../../api/graphql
 
 ### Insights: Custom DORA reporting
 
-Custom charts to visualize DORA data with Insights YAML-based reports.
+Custom charts to visualize DORA data with [Insights YAML-based reports](../../user/project/insights/index.md#dora-query-parameters).
 
 With this new visualization, software leaders can track metrics improvements, understand patterns in their metrics trends, and compare performance between groups and projects.
 
diff --git a/doc/user/infrastructure/iac/index.md b/doc/user/infrastructure/iac/index.md
index 866b16652fa..cd139258349 100644
--- a/doc/user/infrastructure/iac/index.md
+++ b/doc/user/infrastructure/iac/index.md
@@ -91,6 +91,10 @@ To use a Terraform template:
 1. Optional. Override in your `.gitlab-ci.yml` file the attributes present
 in the template you fetched to customize your configuration.
 
+### Terraform template recipes
+
+For GitLab-curated template recipes, see [Terraform template recipes](tf_template_recipes.md).
+
 ## Related topics
 
 - View [the images that contain the `gitlab-terraform` shell script](https://gitlab.com/gitlab-org/terraform-images).
diff --git a/doc/user/infrastructure/iac/tf_template_recipes.md b/doc/user/infrastructure/iac/tf_template_recipes.md
new file mode 100644
index 00000000000..2056a0cfda3
--- /dev/null
+++ b/doc/user/infrastructure/iac/tf_template_recipes.md
@@ -0,0 +1,53 @@
+---
+stage: Configure
+group: Configure
+info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
+---
+
+# Terraform template recipes **(FREE)**
+
+To customize your Terraform integration, you can add the recipes on this page to your pipeline using Terraform templates.
+
+If you'd like to share your own Terraform configuration, consider [contributing a recipe](https://gitlab.com/gitlab-org/gitlab/-/blob/master/doc/user/infrastructure/iac/tf_template_recipes.md) to this page.
+
+## Enable a `terraform destroy` job
+
+To enable a `terraform destroy` job, add the following snippet to your `.gitlab-ci.yml`:
+
+```yaml
+include:
+  - template: Terraform.latest.gitlab-ci.yml
+
+destroy:
+  extends: .terraform:destroy
+```
+
+The `destroy` job is part of the `cleanup` stage. Like the `deploy` job, the `destroy` job is always `manual`
+and is not tied to the default branch.
+
+## Run a custom `terraform` command in a job
+
+To define a job that runs a custom `terraform` command, the `gitlab-terraform` wrapper can be used in any job, like this:
+
+```yaml
+include:
+  - template: Terraform.latest.gitlab-ci.yml
+
+state-list:
+  stage: validate # you can use any stage, just make sure to define it
+  script: gitlab-terraform state list
+```
+
+The `gitlab-terraform` command sets up a `terraform` command and just forward the given arguments.
+
+To run this job in the Terraform state-specific [resource group](../../../ci/resource_groups/index.md), assign the job with `resource_group`:
+
+```yaml
+include:
+  - template: Terraform.latest.gitlab-ci.yml
+
+state-list:
+  stage: validate # you can use any stage, just make sure to define it
+  resource_group: ${TF_STATE_NAME}
+  script: gitlab-terraform state list
+```
diff --git a/doc/user/packages/generic_packages/index.md b/doc/user/packages/generic_packages/index.md
index 563f35f2f4f..9b49f946984 100644
--- a/doc/user/packages/generic_packages/index.md
+++ b/doc/user/packages/generic_packages/index.md
@@ -118,7 +118,7 @@ API or the UI.
 > - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/293755) in GitLab 13.12.
 > - [Required permissions](https://gitlab.com/gitlab-org/gitlab/-/issues/350682) changed from developer to maintainer in GitLab 15.0.
 
-To prevent users from publishing duplicate generic packages, you can use the [GraphQl API](../../../api/graphql/reference/index.md#packagesettings)
+To prevent users from publishing duplicate generic packages, you can use the [GraphQL API](../../../api/graphql/reference/index.md#packagesettings)
 or the UI.
 
 In the UI: