diff --git a/grafana/files/dashboards/apache/apache_prometheus.json b/grafana/files/dashboards/apache/apache_prometheus.json
index eb2374f..9fc40d8 100644
--- a/grafana/files/dashboards/apache/apache_prometheus.json
+++ b/grafana/files/dashboards/apache/apache_prometheus.json
@@ -1769,7 +1769,7 @@
       "steppedLine": false,
       "targets": [
         {
-          "expr": "irate(apache_TotalkBytes{environment=\"$environment\", host=~\"$host\"}[1m])",
+          "expr": "irate(apache_TotalkBytes{environment=\"$environment\", host=~\"$host\"}[$rate_interval])",
           "format": "time_series",
           "intervalFactor": 2,
           "legendFormat": "{{ host }}",
diff --git a/grafana/files/dashboards/haproxy/haproxy_prometheus.json b/grafana/files/dashboards/haproxy/haproxy_prometheus.json
index e1799b0..3b87134 100644
--- a/grafana/files/dashboards/haproxy/haproxy_prometheus.json
+++ b/grafana/files/dashboards/haproxy/haproxy_prometheus.json
@@ -315,7 +315,7 @@
       "steppedLine": false,
       "targets": [
         {
-          "expr": "avg(sum(haproxy_active_servers{environment=\"$environment\", type=\"server\"}) by (host, proxy) + sum(haproxy_backup_servers{environment=\"$environment\", type=\"server\"}) by (host, proxy)) by (proxy) - avg(sum(haproxy_active_servers{environment=\"$environment\", type=\"backend\"}) by (host, proxy) + sum(haproxy_backup_servers{environment=\"$environment\", type=\"backend\"}) by (host, proxy)) by (proxy) > 0",
+          "expr": "avg(sum(haproxy_active_servers{environment=\"$environment\", type=\"server\"}) by (host, proxy) + sum(haproxy_backup_servers{environment=\"$environment\", type=\"server\"}) by (host, proxy)) by (proxy) - avg(sum(haproxy_active_servers{environment=\"$environment\", type=\"backend\"}) by (host, proxy) + sum(haproxy_backup_servers{environment=\"$environment\", type=\"backend\"}) by (host, proxy)) by (proxy)",
           "format": "heatmap",
           "intervalFactor": 2,
           "legendFormat": "{{proxy}}",
@@ -1138,7 +1138,7 @@
       "steppedLine": false,
       "targets": [
         {
-          "expr": "avg(haproxy_backup_servers{environment=\"$environment\", host=~\"$host\",proxy=~\"$proxy\", sv=\"BACKEND\"}) by (proxy) > 0",
+          "expr": "avg(haproxy_backup_servers{environment=\"$environment\", host=~\"$host\",proxy=~\"$proxy\", sv=\"BACKEND\"}) by (proxy)",
           "format": "time_series",
           "intervalFactor": 2,
           "legendFormat": "{{ proxy }}",
@@ -1232,7 +1232,7 @@
       "steppedLine": false,
       "targets": [
         {
-          "expr": "max(haproxy_server_connections {environment=\"$environment\", host=~\"$host\"}) without(pid) > 0",
+          "expr": "max(haproxy_server_connections {environment=\"$environment\", host=~\"$host\"}) without(pid)",
           "format": "time_series",
           "hide": false,
           "intervalFactor": 2,
@@ -1241,7 +1241,7 @@
           "step": 2
         },
         {
-          "expr": "max(haproxy_server_ssl_connections {environment=\"$environment\", host=~\"$host\"}) without(pid) > 0",
+          "expr": "max(haproxy_server_ssl_connections {environment=\"$environment\", host=~\"$host\"}) without(pid)",
           "format": "time_series",
           "hide": false,
           "intervalFactor": 2,
@@ -1336,7 +1336,7 @@
       "steppedLine": false,
       "targets": [
         {
-          "expr": "max(haproxy_server_tasks{environment=\"$environment\", host=~\"$host\"}) without(pid) > 0",
+          "expr": "max(haproxy_server_tasks{environment=\"$environment\", host=~\"$host\"}) without(pid)",
           "format": "time_series",
           "hide": false,
           "intervalFactor": 2,
@@ -1425,7 +1425,7 @@
       "steppedLine": false,
       "targets": [
         {
-          "expr": "max(haproxy_server_run_queue{environment=\"$environment\", host=~\"$host\"}) without(pid) > 0",
+          "expr": "max(haproxy_server_run_queue{environment=\"$environment\", host=~\"$host\"}) without(pid)",
           "format": "time_series",
           "hide": false,
           "intervalFactor": 2,
@@ -1532,7 +1532,7 @@
       "steppedLine": false,
       "targets": [
         {
-          "expr": "avg(haproxy_req_rate{environment=\"$environment\", sv=\"FRONTEND\", proxy=~\"$proxy\", host=~\"$host\"}) by (host, proxy) > 0",
+          "expr": "avg(haproxy_req_rate{environment=\"$environment\", sv=\"FRONTEND\", proxy=~\"$proxy\", host=~\"$host\"}) by (host, proxy)",
           "format": "time_series",
           "intervalFactor": 2,
           "legendFormat": "{{  proxy }} @{{ host }}",
@@ -1635,7 +1635,7 @@
       "steppedLine": false,
       "targets": [
         {
-          "expr": "rate(haproxy_http_response_2xx{environment=\"$environment\", proxy=~\"$proxy\", host=~\"$host\", sv=\"FRONTEND\"}[$rate_interval]) > 0",
+          "expr": "rate(haproxy_http_response_2xx{environment=\"$environment\", proxy=~\"$proxy\", host=~\"$host\", sv=\"FRONTEND\"}[$rate_interval])",
           "format": "time_series",
           "intervalFactor": 2,
           "legendFormat": "{{proxy}} 2xx @{{host}}",
@@ -1643,7 +1643,7 @@
           "step": 1
         },
         {
-          "expr": "rate(haproxy_http_response_1xx{environment=\"$environment\", proxy=~\"$proxy\", host=~\"$host\", sv=\"FRONTEND\"}[$rate_interval]) > 0",
+          "expr": "rate(haproxy_http_response_1xx{environment=\"$environment\", proxy=~\"$proxy\", host=~\"$host\", sv=\"FRONTEND\"}[$rate_interval]) ",
           "format": "time_series",
           "intervalFactor": 2,
           "legendFormat": "{{proxy}} 1xx @{{host}}",
@@ -1651,7 +1651,7 @@
           "step": 2
         },
         {
-          "expr": "rate(haproxy_http_response_3xx{environment=\"$environment\", proxy=~\"$proxy\", host=~\"$host\", sv=\"FRONTEND\"}[$rate_interval]) > 0",
+          "expr": "rate(haproxy_http_response_3xx{environment=\"$environment\", proxy=~\"$proxy\", host=~\"$host\", sv=\"FRONTEND\"}[$rate_interval]) ",
           "format": "time_series",
           "intervalFactor": 2,
           "legendFormat": "{{proxy}} 3xx @{{host}}",
@@ -1659,7 +1659,7 @@
           "step": 2
         },
         {
-          "expr": "rate(haproxy_http_response_4xx{environment=\"$environment\", proxy=~\"$proxy\", host=~\"$host\", sv=\"FRONTEND\"}[$rate_interval]) > 0",
+          "expr": "rate(haproxy_http_response_4xx{environment=\"$environment\", proxy=~\"$proxy\", host=~\"$host\", sv=\"FRONTEND\"}[$rate_interval]) ",
           "format": "time_series",
           "intervalFactor": 2,
           "legendFormat": "{{proxy}} 4xx @{{host}}",
@@ -1667,7 +1667,7 @@
           "step": 2
         },
         {
-          "expr": "rate(haproxy_http_response_5xx{environment=\"$environment\", proxy=~\"$proxy\", host=~\"$host\", sv=\"FRONTEND\"}[$rate_interval]) > 0",
+          "expr": "rate(haproxy_http_response_5xx{environment=\"$environment\", proxy=~\"$proxy\", host=~\"$host\", sv=\"FRONTEND\"}[$rate_interval]) ",
           "format": "time_series",
           "intervalFactor": 2,
           "legendFormat": "{{proxy}} 5xx @{{host}}",
@@ -1768,7 +1768,7 @@
       "steppedLine": false,
       "targets": [
         {
-          "expr": "rate(haproxy_bin{environment=\"$environment\", sv=\"FRONTEND\",host=~\"$host\", proxy=~\"$proxy\"}[$rate_interval])  >0",
+          "expr": "rate(haproxy_bin{environment=\"$environment\", sv=\"FRONTEND\",host=~\"$host\", proxy=~\"$proxy\"}[$rate_interval])",
           "format": "time_series",
           "intervalFactor": 2,
           "legendFormat": "in {{ proxy }} @{{host}}",
@@ -1776,7 +1776,7 @@
           "step": 1
         },
         {
-          "expr": "rate(haproxy_bout{environment=\"$environment\", sv=\"FRONTEND\",host=~\"$host\", proxy=~\"$proxy\"}[$rate_interval])  >0",
+          "expr": "rate(haproxy_bout{environment=\"$environment\", sv=\"FRONTEND\",host=~\"$host\", proxy=~\"$proxy\"}[$rate_interval])",
           "format": "time_series",
           "intervalFactor": 2,
           "legendFormat": "out {{ proxy }} @{{host}}",
@@ -1871,7 +1871,7 @@
       "steppedLine": false,
       "targets": [
         {
-          "expr": "haproxy_scur{environment=\"$environment\", proxy=~\"$proxy\", host=~\"$host\", sv=\"FRONTEND\"} > 0 ",
+          "expr": "haproxy_scur{environment=\"$environment\", proxy=~\"$proxy\", host=~\"$host\", sv=\"FRONTEND\"}  ",
           "format": "time_series",
           "intervalFactor": 2,
           "legendFormat": "{{ proxy }} @{{host}}",
diff --git a/grafana/files/dashboards/jenkins/jenkins_prometheus.json b/grafana/files/dashboards/jenkins/jenkins_prometheus.json
index e7a1f4a..9cb0257 100644
--- a/grafana/files/dashboards/jenkins/jenkins_prometheus.json
+++ b/grafana/files/dashboards/jenkins/jenkins_prometheus.json
@@ -987,7 +987,7 @@
       "tableColumn": "",
       "targets": [
         {
-          "expr": "rate(jenkins_job_building_duration_count{environment=\"$environment\",host=~\"$host\"}[1m])",
+          "expr": "rate(jenkins_job_building_duration_count{environment=\"$environment\",host=~\"$host\"}[$rate_interval])",
           "format": "time_series",
           "intervalFactor": 1,
           "refId": "A",
@@ -1070,7 +1070,7 @@
       "tableColumn": "",
       "targets": [
         {
-          "expr": "rate(jenkins_job_queuing_duration_count{environment=\"$environment\",host=~\"$host\"}[1m])",
+          "expr": "rate(jenkins_job_queuing_duration_count{environment=\"$environment\",host=~\"$host\"}[$rate_interval])",
           "format": "time_series",
           "intervalFactor": 1,
           "refId": "A",
@@ -1331,6 +1331,54 @@
         "tagsQuery": "",
         "type": "query",
         "useTags": false
+      },
+      {
+        "auto": false,
+        "auto_count": 30,
+        "auto_min": "10s",
+        "current": {
+          "selected": true,
+          "text": "3m",
+          "value": "3m"
+        },
+        "hide": 0,
+        "label": null,
+        "name": "rate_interval",
+        "options": [
+          {
+            "selected": false,
+            "text": "1m",
+            "value": "1m"
+          },
+          {
+            "selected": false,
+            "text": "2m",
+            "value": "2m"
+          },
+          {
+            "selected": true,
+            "text": "3m",
+            "value": "3m"
+          },
+          {
+            "selected": false,
+            "text": "5m",
+            "value": "5m"
+          },
+          {
+            "selected": false,
+            "text": "10m",
+            "value": "10m"
+          },
+          {
+            "selected": false,
+            "text": "15m",
+            "value": "15m"
+          }
+        ],
+        "query": "1m,2m,3m,5m,10m,15m",
+        "refresh": 2,
+        "type": "interval"
       }
     ]
   },