Add latest changes from gitlab-org/gitlab@master

1 files changed, 24 insertions, 14 deletions

diff --git a/config/prometheus/pod_metrics.yml b/config/prometheus/pod_metrics.yml
index 29575ec543e..d5c418ba98e 100644
--- a/config/prometheus/pod_metrics.yml
+++ b/config/prometheus/pod_metrics.yml
@@ -1,5 +1,15 @@
-dashboard: 'Pod metrics'
-priority: 10
+dashboard: 'K8s pod health'
+priority: 2
+
+templating:
+  variables:
+    pod:
+      label: 'Pod name'
+      type: metric_label_values
+      options:
+        series_selector: 'container_memory_working_set_bytes'
+        label: 'pod'
+
 panel_groups:
 - group: CPU metrics
   panels:
@@ -8,9 +18,9 @@ panel_groups:
     y_label: "Cores per pod"
     metrics:
     - id: pod_cpu_usage_seconds_total
-      query_range: 'rate(container_cpu_usage_seconds_total{pod_name="{{pod_name}}",container_name="POD"}[5m])'
+      query_range: 'rate(container_cpu_usage_seconds_total{pod="{{pod}}",container="POD"}[5m])'
       unit: "cores"
-      label: pod_name
+      label: pod
 - group: Memory metrics
   panels:
   - title: "Memory usage working set"
@@ -18,9 +28,9 @@ panel_groups:
     y_label: "Working set memory (MiB)"
     metrics:
     - id: pod_memory_working_set
-      query_range: 'container_memory_working_set_bytes{pod_name="{{pod_name}}",container_name="POD"}/1024/1024'
+      query_range: 'container_memory_working_set_bytes{pod="{{pod}}",container="POD"}/1024/1024'
       unit: "MiB"
-      label: pod_name
+      label: pod
 - group: Network metrics
   panels:
   - title: "Network Receive (In)"
@@ -28,17 +38,17 @@ panel_groups:
     y_label: "Received (KiB/sec)"
     metrics:
     - id: pod_network_receive
-      query_range: 'rate(container_network_receive_bytes_total{pod_name="{{pod_name}}",container_name="POD"}[5m])/1024'
+      query_range: 'rate(container_network_receive_bytes_total{pod="{{pod}}",container="POD"}[5m])/1024'
       unit: "KiB / sec"
-      label: pod_name
+      label: pod
   - title: "Network Transmit (Out)"
     type: "line-chart"
     y_label: "Transmitted (KiB/sec)"
     metrics:
     - id: pod_network_transmit
-      query_range: 'rate(container_network_transmit_bytes_total{pod_name="{{pod_name}}",container_name="POD"}[5m])/1024'
+      query_range: 'rate(container_network_transmit_bytes_total{pod="{{pod}}",container="POD"}[5m])/1024'
       unit: "KiB / sec"
-      label: pod_name
+      label: pod
 - group: Disk metrics
   panels:
   - title: "Disk Reads"
@@ -46,14 +56,14 @@ panel_groups:
     y_label: "Disk reads (KiB/sec)"
     metrics:
     - id: pod_disk_reads
-      query_range: 'rate(container_fs_reads_bytes_total{container_name="POD",pod_name="{{pod_name}}"}[5m])/1024'
+      query_range: 'rate(container_fs_reads_bytes_total{container="POD",pod="{{pod}}"}[5m])/1024'
       unit: "KiB / sec"
-      label: pod_name
+      label: pod
   - title: "Disk Writes"
     type: "line-chart"
     y_label: "Disk writes (KiB/sec)"
     metrics:
     - id: pod_disk_writes
-      query_range: 'rate(container_fs_writes_bytes_total{container_name="POD",pod_name="{{pod_name}}"}[5m])/1024'
+      query_range: 'rate(container_fs_writes_bytes_total{container="POD",pod="{{pod}}"}[5m])/1024'
       unit: "KiB / sec"
-      label: pod_name
+      label: pod