Add latest changes from gitlab-org/gitlab@master

7 files changed, 68 insertions, 4 deletions

diff --git a/doc/api/graphql/reference/gitlab_schema.graphql b/doc/api/graphql/reference/gitlab_schema.graphql
index 583e27f3301..402415b985c 100644
--- a/doc/api/graphql/reference/gitlab_schema.graphql
+++ b/doc/api/graphql/reference/gitlab_schema.graphql
@@ -468,6 +468,11 @@ input CreateEpicInput {
   clientMutationId: String
 
   """
+  Indicates if the epic is confidential. Will be ignored if `confidential_epics` feature flag is disabled
+  """
+  confidential: Boolean
+
+  """
   The description of the epic
   """
   description: String
@@ -2015,6 +2020,11 @@ type Epic implements Noteable {
   closedAt: Time
 
   """
+  Indicates if the epic is confidential
+  """
+  confidential: Boolean
+
+  """
   Timestamp of the epic's creation
   """
   createdAt: Time
@@ -8904,6 +8914,11 @@ input UpdateEpicInput {
   clientMutationId: String
 
   """
+  Indicates if the epic is confidential. Will be ignored if `confidential_epics` feature flag is disabled
+  """
+  confidential: Boolean
+
+  """
   The description of the epic
   """
   description: String
diff --git a/doc/api/graphql/reference/gitlab_schema.json b/doc/api/graphql/reference/gitlab_schema.json
index 79d4088e566..c214d7c3299 100644
--- a/doc/api/graphql/reference/gitlab_schema.json
+++ b/doc/api/graphql/reference/gitlab_schema.json
@@ -1404,6 +1404,16 @@
               "defaultValue": null
             },
             {
+              "name": "confidential",
+              "description": "Indicates if the epic is confidential. Will be ignored if `confidential_epics` feature flag is disabled",
+              "type": {
+                "kind": "SCALAR",
+                "name": "Boolean",
+                "ofType": null
+              },
+              "defaultValue": null
+            },
+            {
               "name": "startDateFixed",
               "description": "The start date of the epic",
               "type": {
@@ -5933,6 +5943,20 @@
               "deprecationReason": null
             },
             {
+              "name": "confidential",
+              "description": "Indicates if the epic is confidential",
+              "args": [
+
+              ],
+              "type": {
+                "kind": "SCALAR",
+                "name": "Boolean",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
               "name": "createdAt",
               "description": "Timestamp of the epic's creation",
               "args": [
@@ -27003,6 +27027,16 @@
               "defaultValue": null
             },
             {
+              "name": "confidential",
+              "description": "Indicates if the epic is confidential. Will be ignored if `confidential_epics` feature flag is disabled",
+              "type": {
+                "kind": "SCALAR",
+                "name": "Boolean",
+                "ofType": null
+              },
+              "defaultValue": null
+            },
+            {
               "name": "startDateFixed",
               "description": "The start date of the epic",
               "type": {
diff --git a/doc/api/graphql/reference/index.md b/doc/api/graphql/reference/index.md
index 43e8677f384..fe5925b95d9 100644
--- a/doc/api/graphql/reference/index.md
+++ b/doc/api/graphql/reference/index.md
@@ -335,6 +335,7 @@ Represents an epic.
 | ---   |  ---- | ----------  |
 | `author` | User! | Author of the epic |
 | `closedAt` | Time | Timestamp of the epic's closure |
+| `confidential` | Boolean | Indicates if the epic is confidential |
 | `createdAt` | Time | Timestamp of the epic's creation |
 | `descendantCounts` | EpicDescendantCount | Number of open and closed descendant epics and issues |
 | `descendantWeightSum` | EpicDescendantWeights | Total weight of open and closed issues in the epic and its descendants |
diff --git a/doc/user/incident_management/index.md b/doc/user/incident_management/index.md
index 829fee47826..2b95128bffd 100644
--- a/doc/user/incident_management/index.md
+++ b/doc/user/incident_management/index.md
@@ -138,6 +138,4 @@ Incident Management features can be easily enabled & disabled via the Project se
 
 #### Auto-creation
 
-GitLab Issues can automatically be created as a result of an Alert notification. An Issue created this way will contain error information to help you further debug the error.
-
-For [GitLab-managed alerting rules](../project/integrations/prometheus.md#setting-up-alerts-for-prometheus-metrics-ultimate), the issue will include an embedded chart for the query corresponding to the alert. The chart will show an hour of data surrounding the starting point of the incident, 30 minutes before and after.
+You can automatically create GitLab issues from an Alert notification. Issues created this way contain error information to help you debug the error. Appropriately configured alerts include an [embedded chart](../project/integrations/prometheus.md#embedding-metrics-based-on-alerts-in-incident-issues) for the query corresponding to the alert.
diff --git a/doc/user/project/integrations/prometheus.md b/doc/user/project/integrations/prometheus.md
index 273ab9095c0..4b07ecd2743 100644
--- a/doc/user/project/integrations/prometheus.md
+++ b/doc/user/project/integrations/prometheus.md
@@ -802,6 +802,22 @@ It is also possible to embed either the default dashboard metrics or individual
 
 ![Embedded Metrics in issue templates](img/embed_metrics_issue_template.png)
 
+### Embedding metrics based on alerts in incident issues
+
+For [GitLab-managed alerting rules](#setting-up-alerts-for-prometheus-metrics-ultimate), the issue will include an embedded chart for the query corresponding to the alert. The chart displays an hour of data surrounding the starting point of the incident, 30 minutes before and after.
+
+For [manually configured Prometheus instances](#manual-configuration-of-prometheus), a chart corresponding to the query can be included if these requirements are met:
+
+- The alert corresponds to an environment managed through GitLab.
+- The alert corresponds to a [range query](https://prometheus.io/docs/prometheus/latest/querying/api/#range-queries).
+- The alert contains the required attributes listed in the chart below.
+
+| Attributes | Required | Description |
+| ---------- | -------- | ----------- |
+| `annotations/gitlab_environment_name` | Yes | Name of the GitLab-managed environment corresponding to the alert |
+| One of `annotations/title`, `annotations/summary`, `labels/alertname` | Yes | Will be used as the chart title |
+| `annotations/gitlab_y_label` | No | Will be used as the chart's y-axis label |
+
 ### Embedding Cluster Health Charts **(ULTIMATE)**
 
 > [Introduced](<https://gitlab.com/gitlab-org/gitlab/issues/40997>) in [GitLab Ultimate](https://about.gitlab.com/pricing/) 12.9.
diff --git a/doc/user/project/issues/img/issue_health_status_dropdown_v12_10.png b/doc/user/project/issues/img/issue_health_status_dropdown_v12_10.png
new file mode 100644
index 00000000000..c0f0a0dfe16
--- /dev/null
+++ b/doc/user/project/issues/img/issue_health_status_dropdown_v12_10.png
diff --git a/doc/user/project/issues/index.md b/doc/user/project/issues/index.md
index c020d6e5802..55e9967a370 100644
--- a/doc/user/project/issues/index.md
+++ b/doc/user/project/issues/index.md
@@ -177,7 +177,7 @@ that's progressing as planned or needs attention to keep on schedule:
 - **Needs attention** (amber)
 - **At risk** (red)
 
-!["On track" health status on an issue](img/issue_health_status_v12_10.png)
+!["On track" health status on an issue](img/issue_health_status_dropdown_v12_10.png)
 
 You can then see issue statuses on the
 [Epic tree](../../group/epics/index.md#issue-health-status-in-epic-tree-ultimate).