commit 35318ddd2f45baa4050032bef0db6289d8184c8f
author Ildar Svetlov <isvetlov@mirantis.com> Mon Aug 05 13:40:06 2019 +0400
committer Ildar Svetlov <isvetlov@mirantis.com> Mon Aug 05 13:41:10 2019 +0400
tree e0975097d7379bec90dca8ee2e9a6f48dea79a6b
parent 291033c83389c4dbc37974c002ab0111c1c5fc80

Extend job label regexp

Change-Id: I0e2c11d69a2712a3a5552bd798e152a91722eb57
Related-PROD: PROD-32392

jenkins/files/grafana_dashboards/jenkins_prometheus.json

diff --git a/jenkins/files/grafana_dashboards/jenkins_prometheus.json b/jenkins/files/grafana_dashboards/jenkins_prometheus.json
index 253c8b2..a5bbe86 100644
--- a/jenkins/files/grafana_dashboards/jenkins_prometheus.json
+++ b/jenkins/files/grafana_dashboards/jenkins_prometheus.json
@@ -502,7 +502,7 @@
       "tableColumn": "",
       "targets": [
         {
-          "expr": "(vm_memory_total_max{job=\"jenkins\",host=~\"$host\"} - vm_memory_total_used{job=\"jenkins\",host=~\"$host\"}) / vm_memory_total_max{job=\"jenkins\",host=~\"$host\"} * 100.0",
+          "expr": "(vm_memory_total_max{job=~\"jenkins.*\",host=~\"$host\"} - vm_memory_total_used{job=~\"jenkins.*\",host=~\"$host\"}) / vm_memory_total_max{job=~\"jenkins.*\",host=~\"$host\"} * 100.0",
           "format": "time_series",
           "intervalFactor": 1,
           "refId": "A",
@@ -587,7 +587,7 @@
       "tableColumn": "",
       "targets": [
         {
-          "expr": "vm_uptime_milliseconds{job=\"jenkins\",host=~\"$host\"}",
+          "expr": "vm_uptime_milliseconds{job=~\"jenkins.*\",host=~\"$host\"}",
           "format": "time_series",
           "intervalFactor": 1,
           "refId": "A",
@@ -1236,7 +1236,7 @@
       "steppedLine": false,
       "targets": [
         {
-          "expr": "vm_cpu_load{job=\"jenkins\",host=~\"$host\"}",
+          "expr": "vm_cpu_load{job=~\"jenkins.*\",host=~\"$host\"}",
           "format": "time_series",
           "intervalFactor": 2,
           "legendFormat": "{{ host }}",