Add latest changes from gitlab-org/gitlab@master

6 files changed, 29 insertions, 3 deletions

diff --git a/doc/user/project/img/labels_delete_v12_1.png b/doc/user/project/img/labels_delete_v12_1.png
deleted file mode 100644
index 566e0519fbe..00000000000
--- a/doc/user/project/img/labels_delete_v12_1.png
+++ /dev/null
diff --git a/doc/user/project/img/labels_list_v12_1.png b/doc/user/project/img/labels_list_v12_1.png
deleted file mode 100644
index 47359d05f7f..00000000000
--- a/doc/user/project/img/labels_list_v12_1.png
+++ /dev/null
diff --git a/doc/user/project/img/labels_new_label_from_sidebar.gif b/doc/user/project/img/labels_new_label_from_sidebar.gif
deleted file mode 100644
index 572b29a86e1..00000000000
--- a/doc/user/project/img/labels_new_label_from_sidebar.gif
+++ /dev/null
diff --git a/doc/user/project/integrations/img/prometheus_dashboard_column_panel_type.png b/doc/user/project/integrations/img/prometheus_dashboard_column_panel_type.png
new file mode 100644
index 00000000000..985f2b04ef3
--- /dev/null
+++ b/doc/user/project/integrations/img/prometheus_dashboard_column_panel_type.png
diff --git a/doc/user/project/integrations/img/prometheus_service_configuration.png b/doc/user/project/integrations/img/prometheus_service_configuration.png
index c7dfe874817..a38d1bce197 100644
--- a/doc/user/project/integrations/img/prometheus_service_configuration.png
+++ b/doc/user/project/integrations/img/prometheus_service_configuration.png
diff --git a/doc/user/project/integrations/prometheus.md b/doc/user/project/integrations/prometheus.md
index d8938d81637..90026833ec6 100644
--- a/doc/user/project/integrations/prometheus.md
+++ b/doc/user/project/integrations/prometheus.md
@@ -96,9 +96,8 @@ to integrate with.
 
 1. Navigate to the [Integrations page](project_services.md#accessing-the-project-services)
 1. Click the **Prometheus** service
-1. Provide the base URL of the your server, for example `http://prometheus.example.com/`.
-   The **Test Settings** button can be used to confirm connectivity from GitLab
-   to the Prometheus server.
+1. Provide the base URL of your server, for example `http://prometheus.example.com/`
+1. Click **Save changes**
 
 ![Configure Prometheus Service](img/prometheus_service_configuration.png)
 
@@ -330,6 +329,33 @@ Note the following properties:
 
 ![anomaly panel type](img/prometheus_dashboard_anomaly_panel_type.png)
 
+#### Column
+
+To add a column panel type to a dashboard, look at the following sample dashboard file:
+
+```yaml
+dashboard: 'Dashboard Title'
+panel_groups:
+  - group: 'Group title'
+    panels:
+      - title: "Column"
+        type: "column"
+        metrics:
+        - id: 1024_memory
+          query: 'avg(sum(container_memory_usage_bytes{container_name!="POD",pod_name=~"^%{ci_environment_slug}-([^c].*|c([^a]|a([^n]|n([^a]|a([^r]|r[^y])))).*|)-(.*)",namespace="%{kube_namespace}"}) by (job)) without (job) / count(avg(container_memory_usage_bytes{container_name!="POD",pod_name=~"^%{ci_environment_slug}-([^c].*|c([^a]|a([^n]|n([^a]|a([^r]|r[^y])))).*|)-(.*)",namespace="%{kube_namespace}"}) without (job)) /1024/1024'
+          unit: MB
+          label: "Memory Usage"
+```
+
+Note the following properties:
+
+| Property | Type | Required | Description |
+| ------ | ------ | ------ | ------ |
+| type | string | yes | Type of panel to be rendered. For column panel types, set to `column` |
+| query_range | yes | yes | For column panel types, you must use a [range query](https://prometheus.io/docs/prometheus/latest/querying/api/#range-queries) |
+
+![anomaly panel type](img/prometheus_dashboard_column_panel_type.png)
+
 ##### Single Stat
 
 To add a single stat panel type to a dashboard, look at the following sample dashboard file: