diff --git a/prometheus/bind9-full.json b/prometheus/bind9-full.json
index ee04716..614ab72 100644
--- a/prometheus/bind9-full.json
+++ b/prometheus/bind9-full.json
@@ -121,13 +121,13 @@
       "steppedLine": false,
       "targets": [
         {
-          "expr": "sum (irate(bind_incoming_queries_total{instance=~\"$host:$port\"}[5m]))",
+          "expr": "sum (rate(bind_incoming_queries_total{instance=~\"$host:$port\"}[$__rate_interval]))",
           "interval": "",
           "legendFormat": "Incoming",
           "refId": "A"
         },
         {
-          "expr": "sum (irate(bind_resolver_queries_total{instance=~\"$host:$port\"}[5m]))",
+          "expr": "sum (rate(bind_resolver_queries_total{instance=~\"$host:$port\"}[$__rate_interval]))",
           "interval": "",
           "legendFormat": "Outgoing",
           "refId": "B"
@@ -220,7 +220,7 @@
       "steppedLine": false,
       "targets": [
         {
-          "expr": "irate(bind_incoming_queries_total{instance=~\"$host:$port\"}[5m])",
+          "expr": "rate(bind_incoming_queries_total{instance=~\"$host:$port\"}[$__rate_interval])",
           "interval": "",
           "legendFormat": "{{ type }}",
           "refId": "A"
@@ -313,7 +313,7 @@
       "steppedLine": false,
       "targets": [
         {
-          "expr": "irate(bind_resolver_queries_total{instance=~\"$host:$port\",view=~\"$view\"}[5m])",
+          "expr": "rate(bind_resolver_queries_total{instance=~\"$host:$port\",view=~\"$view\"}[$__rate_interval])",
           "interval": "",
           "legendFormat": "{{ type }} {{ view }}",
           "refId": "A"
@@ -406,7 +406,7 @@
       "steppedLine": false,
       "targets": [
         {
-          "expr": "irate(bind_incoming_requests_total{instance=~\"$host:$port\"}[5m])",
+          "expr": "rate(bind_incoming_requests_total{instance=~\"$host:$port\"}[$__rate_interval])",
           "interval": "",
           "legendFormat": "{{ opcode }}",
           "refId": "A"
@@ -507,7 +507,7 @@
       "steppedLine": false,
       "targets": [
         {
-          "expr": "irate(bind_responses_total{instance=~\"$host:$port\"}[5m])",
+          "expr": "rate(bind_responses_total{instance=~\"$host:$port\"}[$__rate_interval])",
           "interval": "",
           "legendFormat": "{{ result }}",
           "refId": "B"
@@ -787,7 +787,7 @@
           "steppedLine": false,
           "targets": [
             {
-              "expr": "irate(bind_resolver_query_retries_total{instance=~\"$host:$port\",view=~\"$view\"}[5m])",
+              "expr": "rate(bind_resolver_query_retries_total{instance=~\"$host:$port\",view=~\"$view\"}[$__rate_interval])",
               "interval": "",
               "legendFormat": "queries retry {{ view }} ",
               "refId": "B"
@@ -880,19 +880,19 @@
           "steppedLine": false,
           "targets": [
             {
-              "expr": "irate(bind_query_duplicates_total{instance=~\"$host:$port\"}[5m])",
+              "expr": "rate(bind_query_duplicates_total{instance=~\"$host:$port\"}[$__rate_interval])",
               "interval": "",
               "legendFormat": "Duplicated queries received",
               "refId": "A"
             },
             {
-              "expr": "irate(bind_query_errors_total{instance=~\"$host:$port\"}[5m])",
+              "expr": "rate(bind_query_errors_total{instance=~\"$host:$port\"}[$__rate_interval])",
               "interval": "",
               "legendFormat": "{{ error }} queries",
               "refId": "B"
             },
             {
-              "expr": "irate(bind_query_recursions_total{instance=~\"$host:$port\"}[5m])",
+              "expr": "rate(bind_query_recursions_total{instance=~\"$host:$port\"}[$__rate_interval])",
               "interval": "",
               "legendFormat": "Queries causing recursionries received",
               "refId": "C"
@@ -987,7 +987,7 @@
           "steppedLine": false,
           "targets": [
             {
-              "expr": "irate(bind_resolver_response_errors_total{instance=~\"$host:$port\",view=~\"$view\"}[5m])",
+              "expr": "rate(bind_resolver_response_errors_total{instance=~\"$host:$port\",view=~\"$view\"}[$__rate_interval])",
               "interval": "",
               "legendFormat": "{{ error }} {{ view }}",
               "refId": "B"
@@ -1082,13 +1082,13 @@
           "steppedLine": false,
           "targets": [
             {
-              "expr": "irate(bind_resolver_query_errors_total{instance=~\"$host:$port\",view=~\"$view\"}[5m])",
+              "expr": "rate(bind_resolver_query_errors_total{instance=~\"$host:$port\",view=~\"$view\"}[$__rate_interval])",
               "interval": "",
               "legendFormat": "{{ error }} {{ view }}",
               "refId": "B"
             },
             {
-              "expr": "irate(bind_resolver_query_edns0_errors_total{instance=~\"$host:$port\",view=~\"$view\"}[5m])",
+              "expr": "rate(bind_resolver_query_edns0_errors_total{instance=~\"$host:$port\",view=~\"$view\"}[$__rate_interval])",
               "interval": "",
               "legendFormat": "EDNS(0) error {{ view }}",
               "refId": "A"
@@ -1198,7 +1198,7 @@
           "steppedLine": false,
           "targets": [
             {
-              "expr": "irate(bind_resolver_query_duration_seconds_bucket{instance=~\"$host:$port\",view=~\"$view\"}[5m])",
+              "expr": "rate(bind_resolver_query_duration_seconds_bucket{instance=~\"$host:$port\",view=~\"$view\"}[$__rate_interval])",
               "interval": "",
               "legendFormat": "{{ le }} round-trip {{ view }}",
               "refId": "B"
@@ -1293,13 +1293,13 @@
           "steppedLine": false,
           "targets": [
             {
-              "expr": "irate(bind_resolver_query_duration_seconds_count{instance=~\"$host:$port\",view=~\"$view\"}[5m])",
+              "expr": "rate(bind_resolver_query_duration_seconds_count{instance=~\"$host:$port\",view=~\"$view\"}[$__rate_interval])",
               "interval": "",
               "legendFormat": "count {{ view }} ",
               "refId": "A"
             },
             {
-              "expr": "irate(bind_resolver_query_duration_seconds_sum{instance=~\"$host:$port\",view=~\"$view\"}[5m])",
+              "expr": "rate(bind_resolver_query_duration_seconds_sum{instance=~\"$host:$port\",view=~\"$view\"}[$__rate_interval])",
               "interval": "",
               "legendFormat": "sum {{ view }}",
               "refId": "B"
@@ -1394,7 +1394,7 @@
           "steppedLine": false,
           "targets": [
             {
-              "expr": "irate(bind_resolver_cache_rrsets{instance=~\"$host:$port\",view=~\"$view\"}[5m])",
+              "expr": "rate(bind_resolver_cache_rrsets{instance=~\"$host:$port\",view=~\"$view\"}[$__rate_interval])",
               "interval": "",
               "legendFormat": "{{ type }} {{ view }}",
               "refId": "A"
@@ -1489,19 +1489,19 @@
           "steppedLine": false,
           "targets": [
             {
-              "expr": "irate(bind_resolver_response_truncated_total{instance=~\"$host:$port\",view=~\"$view\"}[5m])",
+              "expr": "rate(bind_resolver_response_truncated_total{instance=~\"$host:$port\",view=~\"$view\"}[$__rate_interval])",
               "interval": "",
               "legendFormat": "truncated {{ view }}",
               "refId": "B"
             },
             {
-              "expr": "irate(bind_resolver_response_mismatch_total{instance=~\"$host:$port\",view=~\"$view\"}[5m])",
+              "expr": "rate(bind_resolver_response_mismatch_total{instance=~\"$host:$port\",view=~\"$view\"}[$__rate_interval])",
               "interval": "",
               "legendFormat": "mismatch  {{ view }}",
               "refId": "A"
             },
             {
-              "expr": "irate(bind_resolver_response_lame_total{instance=~\"$host:$port\",view=~\"$view\"}[5m])",
+              "expr": "rate(bind_resolver_response_lame_total{instance=~\"$host:$port\",view=~\"$view\"}[$__rate_interval])",
               "interval": "",
               "legendFormat": "lame  {{ view }}",
               "refId": "C"
@@ -1618,13 +1618,13 @@
           "steppedLine": false,
           "targets": [
             {
-              "expr": "irate(bind_resolver_dnssec_validation_errors_total{instance=~\"$host:$port\",view=~\"$view\"}[5m])",
+              "expr": "rate(bind_resolver_dnssec_validation_errors_total{instance=~\"$host:$port\",view=~\"$view\"}[$__rate_interval])",
               "interval": "",
               "legendFormat": "Errors {{ view }}",
               "refId": "B"
             },
             {
-              "expr": "sum by (instance, view)(irate(bind_resolver_dnssec_validation_success_total{instance=~\"$host:$port\",view=~\"$view\"}[5m]))",
+              "expr": "sum by (instance, view)(rate(bind_resolver_dnssec_validation_success_total{instance=~\"$host:$port\",view=~\"$view\"}[$__rate_interval]))",
               "interval": "",
               "legendFormat": "Sucess {{ view }}",
               "refId": "A"
diff --git a/prometheus/haproxy-2-full.json b/prometheus/haproxy-2-full.json
index 9d2d5c8..08c6a7e 100644
--- a/prometheus/haproxy-2-full.json
+++ b/prometheus/haproxy-2-full.json
@@ -157,7 +157,7 @@
       "steppedLine": false,
       "targets": [
         {
-          "expr": "sum(irate(haproxy_frontend_http_responses_total{proxy=~\"$frontend\",code=~\"$code\",instance=\"$host\"}[5m])) by (code)",
+          "expr": "sum(rate(haproxy_frontend_http_responses_total{proxy=~\"$frontend\",code=~\"$code\",instance=\"$host\"}[$__rate_interval])) by (code)",
           "interval": "$interval",
           "intervalFactor": 1,
           "legendFormat": "Front {{ code }}",
@@ -166,7 +166,7 @@
           "step": 240
         },
         {
-          "expr": "sum(irate(haproxy_backend_http_responses_total{proxy=~\"$backend\",code=~\"$code\",instance=\"$host\"}[5m])) by (code)",
+          "expr": "sum(rate(haproxy_backend_http_responses_total{proxy=~\"$backend\",code=~\"$code\",instance=\"$host\"}[$__rate_interval])) by (code)",
           "interval": "$interval",
           "intervalFactor": 1,
           "legendFormat": "Back {{ code }}",
@@ -276,7 +276,7 @@
       "steppedLine": false,
       "targets": [
         {
-          "expr": "sum(irate(haproxy_frontend_bytes_in_total{proxy=~\"$frontend\",instance=\"$host\"}[5m])*8) by (instance)",
+          "expr": "sum(rate(haproxy_frontend_bytes_in_total{proxy=~\"$frontend\",instance=\"$host\"}[$__rate_interval])*8) by (instance)",
           "interval": "$interval",
           "intervalFactor": 1,
           "legendFormat": "IN Front",
@@ -285,7 +285,7 @@
           "step": 240
         },
         {
-          "expr": "sum(irate(haproxy_frontend_bytes_out_total{proxy=~\"$frontend\",instance=\"$host\"}[5m])*8) by (instance)",
+          "expr": "sum(rate(haproxy_frontend_bytes_out_total{proxy=~\"$frontend\",instance=\"$host\"}[$__rate_interval])*8) by (instance)",
           "interval": "$interval",
           "intervalFactor": 2,
           "legendFormat": "OUT Front",
@@ -293,14 +293,14 @@
           "step": 240
         },
         {
-          "expr": "sum(irate(haproxy_backend_bytes_in_total{proxy=~\"$backend\",instance=\"$host\"}[5m])*8) by (instance)",
+          "expr": "sum(rate(haproxy_backend_bytes_in_total{proxy=~\"$backend\",instance=\"$host\"}[$__rate_interval])*8) by (instance)",
           "intervalFactor": 2,
           "legendFormat": "IN Back",
           "refId": "C",
           "step": 240
         },
         {
-          "expr": "sum(irate(haproxy_backend_bytes_out_total{proxy=~\"$backend\",instance=\"$host\"}[5m])*8) by (instance)",
+          "expr": "sum(rate(haproxy_backend_bytes_out_total{proxy=~\"$backend\",instance=\"$host\"}[$__rate_interval])*8) by (instance)",
           "intervalFactor": 2,
           "legendFormat": "OUT Back",
           "refId": "D",
@@ -407,7 +407,7 @@
       "steppedLine": false,
       "targets": [
         {
-          "expr": "sum(irate(haproxy_frontend_connections_total{proxy=~\"$frontend\",instance=\"$host\"}[5m])) by (instance)",
+          "expr": "sum(rate(haproxy_frontend_connections_total{proxy=~\"$frontend\",instance=\"$host\"}[$__rate_interval])) by (instance)",
           "interval": "$interval",
           "intervalFactor": 1,
           "legendFormat": "Front",
@@ -416,7 +416,7 @@
           "step": 240
         },
         {
-          "expr": "sum(irate(haproxy_backend_connection_errors_total{proxy=~\"$backend\",instance=\"$host\"}[5m])) by (instance)",
+          "expr": "sum(rate(haproxy_backend_connection_errors_total{proxy=~\"$backend\",instance=\"$host\"}[$__rate_interval])) by (instance)",
           "hide": false,
           "interval": "$interval",
           "intervalFactor": 1,
@@ -535,7 +535,7 @@
       "steppedLine": false,
       "targets": [
         {
-          "expr": "sum(irate(haproxy_frontend_http_requests_total{proxy=~\"$frontend\",instance=\"$host\"}[5m])) by (instance)",
+          "expr": "sum(rate(haproxy_frontend_http_requests_total{proxy=~\"$frontend\",instance=\"$host\"}[$__rate_interval])) by (instance)",
           "interval": "$interval",
           "intervalFactor": 1,
           "legendFormat": "Front requests",
@@ -544,7 +544,7 @@
           "step": 240
         },
         {
-          "expr": "sum(irate(haproxy_frontend_request_errors_total{proxy=~\"$frontend\",instance=\"$host\"}[5m])) by (instance)",
+          "expr": "sum(rate(haproxy_frontend_request_errors_total{proxy=~\"$frontend\",instance=\"$host\"}[$__rate_interval])) by (instance)",
           "interval": "$interval",
           "intervalFactor": 1,
           "legendFormat": "Front requests errors",
@@ -553,7 +553,7 @@
           "step": 240
         },
         {
-          "expr": "sum(irate(haproxy_frontend_requests_denied_total{proxy=~\"$frontend\",instance=\"$host\"}[5m])) by (instance)",
+          "expr": "sum(rate(haproxy_frontend_requests_denied_total{proxy=~\"$frontend\",instance=\"$host\"}[$__rate_interval])) by (instance)",
           "interval": "$interval",
           "intervalFactor": 2,
           "legendFormat": "Front request denied",
@@ -561,7 +561,7 @@
           "step": 240
         },
         {
-          "expr": "sum(irate(haproxy_backend_redispatch_warnings_total{proxy=~\"$backend\",instance=\"$host\"}[5m])) by (instance)",
+          "expr": "sum(rate(haproxy_backend_redispatch_warnings_total{proxy=~\"$backend\",instance=\"$host\"}[$__rate_interval])) by (instance)",
           "interval": "$interval",
           "intervalFactor": 2,
           "legendFormat": "Back redispatch warnings",
@@ -569,7 +569,7 @@
           "step": 240
         },
         {
-          "expr": "sum(irate(haproxy_backend_retry_warnings_total{proxy=~\"$backend\",instance=\"$host\"}[5m])) by (instance)",
+          "expr": "sum(rate(haproxy_backend_retry_warnings_total{proxy=~\"$backend\",instance=\"$host\"}[$__rate_interval])) by (instance)",
           "interval": "$interval",
           "intervalFactor": 2,
           "legendFormat": "Back retry warnings",
@@ -577,7 +577,7 @@
           "step": 240
         },
         {
-          "expr": "sum(irate(haproxy_backend_response_errors_total{proxy=~\"$backend\",instance=\"$host\"}[5m])) by (instance)",
+          "expr": "sum(rate(haproxy_backend_response_errors_total{proxy=~\"$backend\",instance=\"$host\"}[$__rate_interval])) by (instance)",
           "interval": "$interval",
           "intervalFactor": 1,
           "legendFormat": "Back response errors",
@@ -594,7 +594,7 @@
           "step": 240
         },
         {
-          "expr": "sum(irate(haproxy_backend_http_requests_total{proxy=~\"$backend\",instance=\"$host\"}[5m])) by (instance)",
+          "expr": "sum(rate(haproxy_backend_http_requests_total{proxy=~\"$backend\",instance=\"$host\"}[$__rate_interval])) by (instance)",
           "interval": "$interval",
           "intervalFactor": 1,
           "legendFormat": "Back requests",
@@ -702,7 +702,7 @@
       "steppedLine": false,
       "targets": [
         {
-          "expr": "sum(irate(haproxy_frontend_current_sessions{proxy=~\"$frontend\",instance=\"$host\"}[5m])) by (instance)",
+          "expr": "sum(rate(haproxy_frontend_current_sessions{proxy=~\"$frontend\",instance=\"$host\"}[$__rate_interval])) by (instance)",
           "interval": "$interval",
           "intervalFactor": 1,
           "legendFormat": "Front",
@@ -711,7 +711,7 @@
           "step": 240
         },
         {
-          "expr": "sum(irate(haproxy_backend_current_sessions{proxy=~\"$frontend\",instance=\"$host\"}[5m])) by (instance)",
+          "expr": "sum(rate(haproxy_backend_current_sessions{proxy=~\"$frontend\",instance=\"$host\"}[$__rate_interval])) by (instance)",
           "interval": "$interval",
           "intervalFactor": 1,
           "legendFormat": "Back",
@@ -1044,7 +1044,7 @@
           "steppedLine": false,
           "targets": [
             {
-              "expr": "irate(haproxy_frontend_bytes_in_total{proxy=~\"$frontend\",instance=\"$host\"}[5m])*8",
+              "expr": "rate(haproxy_frontend_bytes_in_total{proxy=~\"$frontend\",instance=\"$host\"}[$__rate_interval])*8",
               "interval": "$interval",
               "intervalFactor": 1,
               "legendFormat": "IN {{ proxy }}",
@@ -1053,7 +1053,7 @@
               "step": 240
             },
             {
-              "expr": "irate(haproxy_frontend_bytes_out_total{proxy=~\"$frontend\",instance=\"$host\"}[5m])*8",
+              "expr": "rate(haproxy_frontend_bytes_out_total{proxy=~\"$frontend\",instance=\"$host\"}[$__rate_interval])*8",
               "interval": "$interval",
               "intervalFactor": 2,
               "legendFormat": "OUT {{ proxy }}",
@@ -1161,7 +1161,7 @@
           "steppedLine": false,
           "targets": [
             {
-              "expr": "irate(haproxy_backend_bytes_in_total{proxy=~\"$backend\",instance=\"$host\"}[5m])*8",
+              "expr": "rate(haproxy_backend_bytes_in_total{proxy=~\"$backend\",instance=\"$host\"}[$__rate_interval])*8",
               "interval": "$interval",
               "intervalFactor": 1,
               "legendFormat": "IN {{ proxy }}",
@@ -1170,7 +1170,7 @@
               "step": 240
             },
             {
-              "expr": "irate(haproxy_backend_bytes_out_total{proxy=~\"$backend\",instance=\"$host\"}[5m])*8",
+              "expr": "rate(haproxy_backend_bytes_out_total{proxy=~\"$backend\",instance=\"$host\"}[$__rate_interval])*8",
               "interval": "$interval",
               "intervalFactor": 2,
               "legendFormat": "OUT {{ proxy }}",
@@ -1277,7 +1277,7 @@
           "steppedLine": false,
           "targets": [
             {
-              "expr": "irate(haproxy_frontend_connections_total{proxy=~\"$frontend\",instance=\"$host\"}[5m])",
+              "expr": "rate(haproxy_frontend_connections_total{proxy=~\"$frontend\",instance=\"$host\"}[$__rate_interval])",
               "interval": "$interval",
               "intervalFactor": 1,
               "legendFormat": "Successful {{ proxy }}",
@@ -1286,7 +1286,7 @@
               "step": 240
             },
             {
-              "expr": "irate(haproxy_frontend_denied_connections_total{proxy=~\"$frontend\",instance=\"$host\"}[5m])",
+              "expr": "rate(haproxy_frontend_denied_connections_total{proxy=~\"$frontend\",instance=\"$host\"}[$__rate_interval])",
               "interval": "$interval",
               "intervalFactor": 1,
               "legendFormat": "Denied {{ proxy }}",
@@ -1394,7 +1394,7 @@
           "steppedLine": false,
           "targets": [
             {
-              "expr": "irate(haproxy_backend_connection_attempts_total{proxy=~\"$backend\",instance=\"$host\"}[5m])",
+              "expr": "rate(haproxy_backend_connection_attempts_total{proxy=~\"$backend\",instance=\"$host\"}[$__rate_interval])",
               "hide": false,
               "interval": "$interval",
               "intervalFactor": 1,
@@ -1404,7 +1404,7 @@
               "step": 240
             },
             {
-              "expr": "irate(haproxy_backend_connection_errors_total{proxy=~\"$backend\",instance=\"$host\"}[5m])",
+              "expr": "rate(haproxy_backend_connection_errors_total{proxy=~\"$backend\",instance=\"$host\"}[$__rate_interval])",
               "interval": "$interval",
               "intervalFactor": 2,
               "legendFormat": "Error {{ proxy }}",
@@ -1607,7 +1607,7 @@
           "steppedLine": false,
           "targets": [
             {
-              "expr": "irate(haproxy_backend_connection_reuses_total{proxy=~\"$backend\",instance=\"$host\"}[5m])",
+              "expr": "rate(haproxy_backend_connection_reuses_total{proxy=~\"$backend\",instance=\"$host\"}[$__rate_interval])",
               "interval": "$interval",
               "intervalFactor": 2,
               "legendFormat": "Reuses {{ proxy }}",
@@ -1949,7 +1949,7 @@
           "steppedLine": false,
           "targets": [
             {
-              "expr": "irate(haproxy_backend_http_requests_total{proxy=~\"$frontend\",instance=\"$host\"}[5m])",
+              "expr": "rate(haproxy_backend_http_requests_total{proxy=~\"$frontend\",instance=\"$host\"}[$__rate_interval])",
               "interval": "$interval",
               "intervalFactor": 1,
               "legendFormat": "Total {{ proxy }}",
@@ -1958,7 +1958,7 @@
               "step": 240
             },
             {
-              "expr": "irate(haproxy_backend_requests_denied_total{proxy=~\"$frontend\", instance=\"$host\"}[5m])",
+              "expr": "rate(haproxy_backend_requests_denied_total{proxy=~\"$frontend\", instance=\"$host\"}[$__rate_interval])",
               "interval": "$interval",
               "intervalFactor": 2,
               "legendFormat": "Denied {{ proxy }}",
@@ -2070,7 +2070,7 @@
           "steppedLine": false,
           "targets": [
             {
-              "expr": "irate(haproxy_frontend_http_requests_total{proxy=~\"$frontend\",instance=\"$host\"}[5m])",
+              "expr": "rate(haproxy_frontend_http_requests_total{proxy=~\"$frontend\",instance=\"$host\"}[$__rate_interval])",
               "interval": "$interval",
               "intervalFactor": 1,
               "legendFormat": "Total {{ proxy }}",
@@ -2079,7 +2079,7 @@
               "step": 240
             },
             {
-              "expr": "irate(haproxy_frontend_request_errors_total{proxy=~\"$frontend\", instance=\"$host\"}[5m])",
+              "expr": "rate(haproxy_frontend_request_errors_total{proxy=~\"$frontend\", instance=\"$host\"}[$__rate_interval])",
               "interval": "$interval",
               "intervalFactor": 2,
               "legendFormat": "Error {{ proxy }}",
@@ -2087,7 +2087,7 @@
               "step": 240
             },
             {
-              "expr": "irate(haproxy_frontend_requests_denied_total{proxy=~\"$frontend\", instance=\"$host\"}[5m])",
+              "expr": "rate(haproxy_frontend_requests_denied_total{proxy=~\"$frontend\", instance=\"$host\"}[$__rate_interval])",
               "interval": "$interval",
               "intervalFactor": 2,
               "legendFormat": "Denied {{ proxy }}",
@@ -2190,7 +2190,7 @@
           "steppedLine": false,
           "targets": [
             {
-              "expr": "irate(haproxy_backend_responses_denied_total{proxy=~\"$backend\", instance=\"$host\"}[5m])",
+              "expr": "rate(haproxy_backend_responses_denied_total{proxy=~\"$backend\", instance=\"$host\"}[$__rate_interval])",
               "interval": "$interval",
               "intervalFactor": 1,
               "legendFormat": "Denied {{ proxy }}",
@@ -2298,7 +2298,7 @@
           "steppedLine": false,
           "targets": [
             {
-              "expr": "irate(haproxy_frontend_responses_denied_total{proxy=~\"$frontend\",instance=\"$host\"}[5m])",
+              "expr": "rate(haproxy_frontend_responses_denied_total{proxy=~\"$frontend\",instance=\"$host\"}[$__rate_interval])",
               "interval": "$interval",
               "intervalFactor": 1,
               "legendFormat": "Denied {{ proxy }}",
@@ -2408,7 +2408,7 @@
           "steppedLine": false,
           "targets": [
             {
-              "expr": "irate(haproxy_backend_redispatch_warnings_total{proxy=~\"$backend\", instance=\"$host\"}[5m])",
+              "expr": "rate(haproxy_backend_redispatch_warnings_total{proxy=~\"$backend\", instance=\"$host\"}[$__rate_interval])",
               "interval": "$interval",
               "intervalFactor": 1,
               "legendFormat": "Redispatch {{ proxy }}",
@@ -2417,7 +2417,7 @@
               "step": 240
             },
             {
-              "expr": "irate(haproxy_backend_retry_warnings_total{proxy=~\"$backend\", instance=\"$host\"}[5m])",
+              "expr": "rate(haproxy_backend_retry_warnings_total{proxy=~\"$backend\", instance=\"$host\"}[$__rate_interval])",
               "interval": "$interval",
               "intervalFactor": 2,
               "legendFormat": "Retry {{ proxy }}",
@@ -2425,7 +2425,7 @@
               "step": 240
             },
             {
-              "expr": "irate(haproxy_backend_response_errors_total{proxy=~\"$backend\", instance=\"$host\"}[5m])",
+              "expr": "rate(haproxy_backend_response_errors_total{proxy=~\"$backend\", instance=\"$host\"}[$__rate_interval])",
               "interval": "$interval",
               "intervalFactor": 2,
               "legendFormat": "Error {{ proxy }}",
@@ -3485,7 +3485,7 @@
           "steppedLine": false,
           "targets": [
             {
-              "expr": "irate(haproxy_frontend_http_responses_total{proxy=~\"$frontend\", code=~\"$code\",instance=\"$host\"}[5m])",
+              "expr": "rate(haproxy_frontend_http_responses_total{proxy=~\"$frontend\", code=~\"$code\",instance=\"$host\"}[$__rate_interval])",
               "interval": "$interval",
               "intervalFactor": 1,
               "legendFormat": "{{ code }} {{ proxy }} ",
@@ -3587,7 +3587,7 @@
           "steppedLine": false,
           "targets": [
             {
-              "expr": "irate(haproxy_backend_http_responses_total{proxy=~\"$backend\", code=~\"$code\",instance=\"$host\"}[5m])",
+              "expr": "rate(haproxy_backend_http_responses_total{proxy=~\"$backend\", code=~\"$code\",instance=\"$host\"}[$__rate_interval])",
               "interval": "$interval",
               "intervalFactor": 1,
               "legendFormat": "{{ code }} {{ proxy }}",
@@ -3689,7 +3689,7 @@
           "steppedLine": false,
           "targets": [
             {
-              "expr": "irate(haproxy_server_http_responses_total{proxy=~\"$backend\",server=~\"$server\",code=~\"$code\",instance=\"$host\"}[5m])",
+              "expr": "rate(haproxy_server_http_responses_total{proxy=~\"$backend\",server=~\"$server\",code=~\"$code\",instance=\"$host\"}[$__rate_interval])",
               "interval": "$interval",
               "intervalFactor": 1,
               "legendFormat": "{{ code }} {{ proxy }} {{ server }}",
@@ -3813,7 +3813,7 @@
           "steppedLine": false,
           "targets": [
             {
-              "expr": "irate(haproxy_frontend_sessions_total{proxy=~\"$frontend\",instance=\"$host\"}[5m])",
+              "expr": "rate(haproxy_frontend_sessions_total{proxy=~\"$frontend\",instance=\"$host\"}[$__rate_interval])",
               "hide": false,
               "interval": "$interval",
               "intervalFactor": 1,
@@ -3823,7 +3823,7 @@
               "step": 240
             },
             {
-              "expr": "irate(haproxy_frontend_denied_sessions_total{proxy=~\"$frontend\",instance=\"$host\"}[5m])",
+              "expr": "rate(haproxy_frontend_denied_sessions_total{proxy=~\"$frontend\",instance=\"$host\"}[$__rate_interval])",
               "hide": false,
               "interval": "$interval",
               "intervalFactor": 1,
@@ -3936,7 +3936,7 @@
           "steppedLine": false,
           "targets": [
             {
-              "expr": "irate(haproxy_backend_sessions_total{proxy=~\"$backend\",instance=\"$host\"}[5m])",
+              "expr": "rate(haproxy_backend_sessions_total{proxy=~\"$backend\",instance=\"$host\"}[$__rate_interval])",
               "hide": false,
               "interval": "$interval",
               "intervalFactor": 1,
@@ -4503,7 +4503,7 @@
           "steppedLine": false,
           "targets": [
             {
-              "expr": "irate(haproxy_backend_failed_header_rewriting_total{proxy=~\"$frontend\",instance=\"$host\"}[5m])",
+              "expr": "rate(haproxy_backend_failed_header_rewriting_total{proxy=~\"$frontend\",instance=\"$host\"}[$__rate_interval])",
               "interval": "$interval",
               "intervalFactor": 1,
               "legendFormat": "{{ proxy }}",
@@ -4605,7 +4605,7 @@
           "steppedLine": false,
           "targets": [
             {
-              "expr": "irate(haproxy_frontend_failed_header_rewriting_total{proxy=~\"$frontend\",instance=\"$host\"}[5m])",
+              "expr": "rate(haproxy_frontend_failed_header_rewriting_total{proxy=~\"$frontend\",instance=\"$host\"}[$__rate_interval])",
               "interval": "$interval",
               "intervalFactor": 1,
               "legendFormat": "{{ proxy }}",
@@ -4718,7 +4718,7 @@
           "steppedLine": false,
           "targets": [
             {
-              "expr": "irate(haproxy_backend_last_session_seconds{proxy=~\"$frontend\",instance=\"$host\"}[5m])",
+              "expr": "rate(haproxy_backend_last_session_seconds{proxy=~\"$frontend\",instance=\"$host\"}[$__rate_interval])",
               "interval": "$interval",
               "intervalFactor": 1,
               "legendFormat": "{{ proxy }}",
@@ -4929,7 +4929,7 @@
           "steppedLine": false,
           "targets": [
             {
-              "expr": "irate(haproxy_backend_client_aborts_total{proxy=~\"$frontend\",instance=\"$host\"}[5m])",
+              "expr": "rate(haproxy_backend_client_aborts_total{proxy=~\"$frontend\",instance=\"$host\"}[$__rate_interval])",
               "interval": "$interval",
               "intervalFactor": 1,
               "legendFormat": "By client {{ proxy }}",
@@ -4938,7 +4938,7 @@
               "step": 240
             },
             {
-              "expr": "irate(haproxy_backend_server_aborts_total{proxy=~\"$frontend\",instance=\"$host\"}[5m])",
+              "expr": "rate(haproxy_backend_server_aborts_total{proxy=~\"$frontend\",instance=\"$host\"}[$__rate_interval])",
               "interval": "$interval",
               "intervalFactor": 1,
               "legendFormat": "By server {{ proxy }}",
@@ -5171,7 +5171,7 @@
           "steppedLine": false,
           "targets": [
             {
-              "expr": "irate(haproxy_backend_check_up_down_total{proxy=~\"$backend\", instance=\"$host\"}[5m])",
+              "expr": "rate(haproxy_backend_check_up_down_total{proxy=~\"$backend\", instance=\"$host\"}[$__rate_interval])",
               "interval": "$interval",
               "intervalFactor": 1,
               "legendFormat": "{{ proxy }}",
@@ -5398,7 +5398,7 @@
           "steppedLine": false,
           "targets": [
             {
-              "expr": "irate(haproxy_frontend_http_cache_lookups_total{proxy=~\"$backend\", instance=\"$host\"}[5m])",
+              "expr": "rate(haproxy_frontend_http_cache_lookups_total{proxy=~\"$backend\", instance=\"$host\"}[$__rate_interval])",
               "interval": "$interval",
               "intervalFactor": 1,
               "legendFormat": "Lookups {{ proxy }} ",
@@ -5407,7 +5407,7 @@
               "step": 240
             },
             {
-              "expr": "irate(haproxy_frontend_http_cache_hits_total{proxy=~\"$backend\", instance=\"$host\"}[5m])",
+              "expr": "rate(haproxy_frontend_http_cache_hits_total{proxy=~\"$backend\", instance=\"$host\"}[$__rate_interval])",
               "interval": "$interval",
               "intervalFactor": 1,
               "legendFormat": "Hits {{ proxy }} ",
@@ -5516,7 +5516,7 @@
           "steppedLine": false,
           "targets": [
             {
-              "expr": "irate(haproxy_backend_http_cache_lookups_total{proxy=~\"$backend\", instance=\"$host\"}[5m])",
+              "expr": "rate(haproxy_backend_http_cache_lookups_total{proxy=~\"$backend\", instance=\"$host\"}[$__rate_interval])",
               "interval": "$interval",
               "intervalFactor": 1,
               "legendFormat": "Lookups {{ proxy }} ",
@@ -5525,7 +5525,7 @@
               "step": 240
             },
             {
-              "expr": "irate(haproxy_backend_http_cache_hits_total{proxy=~\"$backend\", instance=\"$host\"}[5m])",
+              "expr": "rate(haproxy_backend_http_cache_hits_total{proxy=~\"$backend\", instance=\"$host\"}[$__rate_interval])",
               "interval": "$interval",
               "intervalFactor": 1,
               "legendFormat": "Hits {{ proxy }} ",
@@ -5639,7 +5639,7 @@
           "steppedLine": false,
           "targets": [
             {
-              "expr": "irate(haproxy_frontend_http_comp_bytes_in_total{proxy=~\"$backend\", instance=\"$host\"}[5m])",
+              "expr": "rate(haproxy_frontend_http_comp_bytes_in_total{proxy=~\"$backend\", instance=\"$host\"}[$__rate_interval])",
               "interval": "$interval",
               "intervalFactor": 1,
               "legendFormat": "Bytes fed {{ proxy }} ",
@@ -5648,7 +5648,7 @@
               "step": 240
             },
             {
-              "expr": "irate(haproxy_frontend_http_comp_bytes_out_total{proxy=~\"$backend\", instance=\"$host\"}[5m])",
+              "expr": "rate(haproxy_frontend_http_comp_bytes_out_total{proxy=~\"$backend\", instance=\"$host\"}[$__rate_interval])",
               "interval": "$interval",
               "intervalFactor": 1,
               "legendFormat": "Bytes emitted {{ proxy }} ",
@@ -5657,7 +5657,7 @@
               "step": 240
             },
             {
-              "expr": "irate(haproxy_frontend_http_comp_bytes_bypassed_total{proxy=~\"$backend\", instance=\"$host\"}[5m])",
+              "expr": "rate(haproxy_frontend_http_comp_bytes_bypassed_total{proxy=~\"$backend\", instance=\"$host\"}[$__rate_interval])",
               "interval": "$interval",
               "intervalFactor": 1,
               "legendFormat": "Bytes bypassed  {{ proxy }} ",
@@ -5771,7 +5771,7 @@
           "steppedLine": false,
           "targets": [
             {
-              "expr": "irate(haproxy_backend_http_comp_bytes_in_total{proxy=~\"$backend\", instance=\"$host\"}[5m])",
+              "expr": "rate(haproxy_backend_http_comp_bytes_in_total{proxy=~\"$backend\", instance=\"$host\"}[$__rate_interval])",
               "interval": "$interval",
               "intervalFactor": 1,
               "legendFormat": "Bytes fed {{ proxy }} ",
@@ -5780,7 +5780,7 @@
               "step": 240
             },
             {
-              "expr": "irate(haproxy_backend_http_comp_bytes_out_total{proxy=~\"$backend\", instance=\"$host\"}[5m])",
+              "expr": "rate(haproxy_backend_http_comp_bytes_out_total{proxy=~\"$backend\", instance=\"$host\"}[$__rate_interval])",
               "interval": "$interval",
               "intervalFactor": 1,
               "legendFormat": "Bytes emitted {{ proxy }} ",
@@ -5789,7 +5789,7 @@
               "step": 240
             },
             {
-              "expr": "irate(haproxy_backend_http_comp_bytes_bypassed_total{proxy=~\"$backend\", instance=\"$host\"}[5m])",
+              "expr": "rate(haproxy_backend_http_comp_bytes_bypassed_total{proxy=~\"$backend\", instance=\"$host\"}[$__rate_interval])",
               "interval": "$interval",
               "intervalFactor": 1,
               "legendFormat": "Bytes bypassed  {{ proxy }} ",
@@ -5892,7 +5892,7 @@
           "steppedLine": false,
           "targets": [
             {
-              "expr": "irate(haproxy_frontend_http_comp_responses_total{proxy=~\"$backend\", instance=\"$host\"}[5m])",
+              "expr": "rate(haproxy_frontend_http_comp_responses_total{proxy=~\"$backend\", instance=\"$host\"}[$__rate_interval])",
               "interval": "$interval",
               "intervalFactor": 1,
               "legendFormat": "{{ proxy }} ",
@@ -5995,7 +5995,7 @@
           "steppedLine": false,
           "targets": [
             {
-              "expr": "irate(haproxy_backend_http_comp_responses_total{proxy=~\"$backend\", instance=\"$host\"}[5m])",
+              "expr": "rate(haproxy_backend_http_comp_responses_total{proxy=~\"$backend\", instance=\"$host\"}[$__rate_interval])",
               "interval": "$interval",
               "intervalFactor": 1,
               "legendFormat": "{{ proxy }} ",
@@ -6314,7 +6314,7 @@
           "steppedLine": false,
           "targets": [
             {
-              "expr": "irate(haproxy_frontend_internal_errors_total{proxy=~\"$backend\",instance=\"$host\"}[5m])",
+              "expr": "rate(haproxy_frontend_internal_errors_total{proxy=~\"$backend\",instance=\"$host\"}[$__rate_interval])",
               "interval": "$interval",
               "intervalFactor": 1,
               "legendFormat": "{{ proxy }}",
@@ -6415,7 +6415,7 @@
           "steppedLine": false,
           "targets": [
             {
-              "expr": "irate(haproxy_backend_internal_errors_total{proxy=~\"$backend\",instance=\"$host\"}[5m])",
+              "expr": "rate(haproxy_backend_internal_errors_total{proxy=~\"$backend\",instance=\"$host\"}[$__rate_interval])",
               "interval": "$interval",
               "intervalFactor": 1,
               "legendFormat": "{{ proxy }}",
@@ -6739,7 +6739,7 @@
           "steppedLine": false,
           "targets": [
             {
-              "expr": "irate(haproxy_server_bytes_in_total{proxy=~\"$backend\",server=~\"$server\",instance=\"$host\"}[5m])*8",
+              "expr": "rate(haproxy_server_bytes_in_total{proxy=~\"$backend\",server=~\"$server\",instance=\"$host\"}[$__rate_interval])*8",
               "interval": "$interval",
               "intervalFactor": 1,
               "legendFormat": "IN {{ proxy }} / {{ server }}",
@@ -6748,7 +6748,7 @@
               "step": 240
             },
             {
-              "expr": "irate(haproxy_server_bytes_out_total{proxy=~\"$backend\",server=~\"$server\",instance=\"$host\"}[5m])*8",
+              "expr": "rate(haproxy_server_bytes_out_total{proxy=~\"$backend\",server=~\"$server\",instance=\"$host\"}[$__rate_interval])*8",
               "hide": false,
               "interval": "$interval",
               "intervalFactor": 2,
@@ -6856,7 +6856,7 @@
           "steppedLine": false,
           "targets": [
             {
-              "expr": "irate(haproxy_server_connection_attempts_total{proxy=~\"$backend\",server=~\"$server\",instance=\"$host\"}[5m])",
+              "expr": "rate(haproxy_server_connection_attempts_total{proxy=~\"$backend\",server=~\"$server\",instance=\"$host\"}[$__rate_interval])",
               "hide": false,
               "interval": "$interval",
               "intervalFactor": 1,
@@ -6866,7 +6866,7 @@
               "step": 240
             },
             {
-              "expr": "irate(haproxy_server_connection_errors_total{proxy=~\"$backend\",server=~\"$server\",instance=\"$host\"}[5m])",
+              "expr": "rate(haproxy_server_connection_errors_total{proxy=~\"$backend\",server=~\"$server\",instance=\"$host\"}[$__rate_interval])",
               "interval": "$interval",
               "intervalFactor": 2,
               "legendFormat": "Error {{ proxy }} / {{ server }}",
@@ -6967,7 +6967,7 @@
           "steppedLine": false,
           "targets": [
             {
-              "expr": "irate(haproxy_server_connection_reuses_total{proxy=~\"$backend\",server=~\"$server\",instance=\"$host\"}[5m])",
+              "expr": "rate(haproxy_server_connection_reuses_total{proxy=~\"$backend\",server=~\"$server\",instance=\"$host\"}[$__rate_interval])",
               "interval": "$interval",
               "intervalFactor": 2,
               "legendFormat": "Reuses {{ proxy }} / {{ server }}",
@@ -7074,7 +7074,7 @@
           "steppedLine": false,
           "targets": [
             {
-              "expr": "irate(haproxy_server_server_idle_connections_current{proxy=~\"$backend\",server=~\"$server\",instance=\"$host\"}[5m])",
+              "expr": "rate(haproxy_server_server_idle_connections_current{proxy=~\"$backend\",server=~\"$server\",instance=\"$host\"}[$__rate_interval])",
               "interval": "$interval",
               "intervalFactor": 2,
               "legendFormat": "Available idle connections {{ proxy }} / {{ server }}",
@@ -7082,7 +7082,7 @@
               "step": 240
             },
             {
-              "expr": "irate(haproxy_server_server_idle_connections_limit{proxy=~\"$backend\",server=~\"$server\",instance=\"$host\"}[5m])",
+              "expr": "rate(haproxy_server_server_idle_connections_limit{proxy=~\"$backend\",server=~\"$server\",instance=\"$host\"}[$__rate_interval])",
               "interval": "$interval",
               "intervalFactor": 2,
               "legendFormat": "Limit available idle connections {{ proxy }} / {{ server }}{{ proxy }}",
@@ -7200,7 +7200,7 @@
           "steppedLine": false,
           "targets": [
             {
-              "expr": "irate(haproxy_server_responses_denied_total{proxy=~\"$backend\", instance=\"$host\"}[5m])",
+              "expr": "rate(haproxy_server_responses_denied_total{proxy=~\"$backend\", instance=\"$host\"}[$__rate_interval])",
               "interval": "$interval",
               "intervalFactor": 1,
               "legendFormat": "Denied {{ proxy }} / {{ server }}",
@@ -7310,7 +7310,7 @@
           "steppedLine": false,
           "targets": [
             {
-              "expr": "irate(haproxy_server_redispatch_warnings_total{proxy=~\"$backend\",server=~\"$server\",instance=\"$host\"}[5m])",
+              "expr": "rate(haproxy_server_redispatch_warnings_total{proxy=~\"$backend\",server=~\"$server\",instance=\"$host\"}[$__rate_interval])",
               "hide": false,
               "interval": "$interval",
               "intervalFactor": 2,
@@ -7319,7 +7319,7 @@
               "step": 240
             },
             {
-              "expr": "irate(haproxy_server_retry_warnings_total{proxy=~\"$backend\",server=~\"$server\",instance=\"$host\"}[5m])",
+              "expr": "rate(haproxy_server_retry_warnings_total{proxy=~\"$backend\",server=~\"$server\",instance=\"$host\"}[$__rate_interval])",
               "hide": false,
               "interval": "$interval",
               "intervalFactor": 1,
@@ -7329,7 +7329,7 @@
               "step": 240
             },
             {
-              "expr": "irate(haproxy_server_response_errors_total{proxy=~\"$backend\",server=~\"$server\",instance=\"$host\"}[5m])",
+              "expr": "rate(haproxy_server_response_errors_total{proxy=~\"$backend\",server=~\"$server\",instance=\"$host\"}[$__rate_interval])",
               "hide": false,
               "interval": "$interval",
               "intervalFactor": 2,
@@ -7431,7 +7431,7 @@
           "steppedLine": false,
           "targets": [
             {
-              "expr": "irate(haproxy_server_current_queue{proxy=~\"$backend\",server=~\"$server\",instance=\"$host\"}[5m])",
+              "expr": "rate(haproxy_server_current_queue{proxy=~\"$backend\",server=~\"$server\",instance=\"$host\"}[$__rate_interval])",
               "interval": "$interval",
               "intervalFactor": 1,
               "legendFormat": "Current {{ proxy }} / {{ server }}",
@@ -8275,7 +8275,7 @@
           "steppedLine": false,
           "targets": [
             {
-              "expr": "irate(haproxy_server_queue_time_average_seconds{proxy=~\"$backend\",server=~\"$server\",instance=\"$host\"}[5m])",
+              "expr": "rate(haproxy_server_queue_time_average_seconds{proxy=~\"$backend\",server=~\"$server\",instance=\"$host\"}[$__rate_interval])",
               "interval": "$interval",
               "intervalFactor": 1,
               "legendFormat": "{{ proxy }} / {{ server }}",
@@ -8377,7 +8377,7 @@
           "steppedLine": false,
           "targets": [
             {
-              "expr": "irate(haproxy_server_max_queue_time_seconds{proxy=~\"$backend\",server=~\"$server\",instance=\"$host\"}[5m])",
+              "expr": "rate(haproxy_server_max_queue_time_seconds{proxy=~\"$backend\",server=~\"$server\",instance=\"$host\"}[$__rate_interval])",
               "interval": "$interval",
               "intervalFactor": 1,
               "legendFormat": "{{ proxy }} / {{ server }}",
@@ -8510,7 +8510,7 @@
               "step": 240
             },
             {
-              "expr": "irate(haproxy_server_sessions_total{proxy=~\"$backend\",server=~\"$server\",instance=\"$host\"}[5m])",
+              "expr": "rate(haproxy_server_sessions_total{proxy=~\"$backend\",server=~\"$server\",instance=\"$host\"}[$__rate_interval])",
               "interval": "$interval",
               "intervalFactor": 1,
               "legendFormat": "Total {{ proxy }} / {{ server }}",
@@ -8519,7 +8519,7 @@
               "step": 240
             },
             {
-              "expr": "irate(haproxy_server_max_sessions{proxy=~\"$backend\",instance=\"$host\"}[5m])",
+              "expr": "rate(haproxy_server_max_sessions{proxy=~\"$backend\",instance=\"$host\"}[$__rate_interval])",
               "hide": true,
               "interval": "$interval",
               "intervalFactor": 1,
@@ -8642,7 +8642,7 @@
           "steppedLine": false,
           "targets": [
             {
-              "expr": "irate(haproxy_server_failed_header_rewriting_total{proxy=~\"$frontend\",server=~\"$server\",instance=\"$host\"}[5m])",
+              "expr": "rate(haproxy_server_failed_header_rewriting_total{proxy=~\"$frontend\",server=~\"$server\",instance=\"$host\"}[$__rate_interval])",
               "interval": "$interval",
               "intervalFactor": 1,
               "legendFormat": "{{ proxy }} /  {{ server }}",
@@ -8979,7 +8979,7 @@
           "steppedLine": false,
           "targets": [
             {
-              "expr": "irate(haproxy_server_check_up_down_total{proxy=~\"$backend\",server=~\"$server\",instance=\"$host\"}[5m])",
+              "expr": "rate(haproxy_server_check_up_down_total{proxy=~\"$backend\",server=~\"$server\",instance=\"$host\"}[$__rate_interval])",
               "interval": "$interval",
               "intervalFactor": 1,
               "legendFormat": "{{ proxy }} / {{ server }}",
@@ -9082,7 +9082,7 @@
           "steppedLine": false,
           "targets": [
             {
-              "expr": "irate(haproxy_server_check_failures_total{proxy=~\"$backend\",server=~\"$server\",instance=\"$host\"}[5m])",
+              "expr": "rate(haproxy_server_check_failures_total{proxy=~\"$backend\",server=~\"$server\",instance=\"$host\"}[$__rate_interval])",
               "interval": "$interval",
               "intervalFactor": 1,
               "legendFormat": "{{ proxy }} / {{ server }}",
@@ -9391,7 +9391,7 @@
           "steppedLine": false,
           "targets": [
             {
-              "expr": "irate(haproxy_server_last_session_seconds{proxy=~\"$backend\", server=~\"$server\",instance=\"$host\"}[5m])",
+              "expr": "rate(haproxy_server_last_session_seconds{proxy=~\"$backend\", server=~\"$server\",instance=\"$host\"}[$__rate_interval])",
               "interval": "$interval",
               "intervalFactor": 1,
               "legendFormat": "{{ proxy }} / {{ server }}",
@@ -9616,7 +9616,7 @@
           "steppedLine": false,
           "targets": [
             {
-              "expr": "irate(haproxy_server_internal_errors_total{proxy=~\"$backend\",instance=\"$host\"}[5m])",
+              "expr": "rate(haproxy_server_internal_errors_total{proxy=~\"$backend\",instance=\"$host\"}[$__rate_interval])",
               "interval": "$interval",
               "intervalFactor": 1,
               "legendFormat": "{{ proxy }}",
@@ -9868,7 +9868,7 @@
               "step": 240
             },
             {
-              "expr": "irate(haproxy_process_connections_total{instance=\"$host\"}[5m])",
+              "expr": "rate(haproxy_process_connections_total{instance=\"$host\"}[$__rate_interval])",
               "hide": false,
               "interval": "$interval",
               "intervalFactor": 1,
@@ -9878,7 +9878,7 @@
               "step": 240
             },
             {
-              "expr": "irate(haproxy_process_requests_total{instance=\"$host\"}[5m])",
+              "expr": "rate(haproxy_process_requests_total{instance=\"$host\"}[$__rate_interval])",
               "hide": false,
               "interval": "$interval",
               "intervalFactor": 1,
@@ -10366,7 +10366,7 @@
           "steppedLine": false,
           "targets": [
             {
-              "expr": "irate(haproxy_process_http_comp_bytes_in_total{instance=\"$host\"}[5m])",
+              "expr": "rate(haproxy_process_http_comp_bytes_in_total{instance=\"$host\"}[$__rate_interval])",
               "interval": "$interval",
               "intervalFactor": 1,
               "legendFormat": "Number of bytes per second over last elapsed second, before http compression",
@@ -10375,7 +10375,7 @@
               "step": 240
             },
             {
-              "expr": "irate(haproxy_process_http_comp_bytes_out_total{instance=\"$host\"}[5m])",
+              "expr": "rate(haproxy_process_http_comp_bytes_out_total{instance=\"$host\"}[$__rate_interval])",
               "interval": "$interval",
               "intervalFactor": 1,
               "legendFormat": "Number of bytes per second over last elapsed second, after http compression",
@@ -10507,7 +10507,7 @@
           "steppedLine": false,
           "targets": [
             {
-              "expr": "irate(haproxy_process_ssl_cache_lookups_total{instance=\"$host\"}[5m])",
+              "expr": "rate(haproxy_process_ssl_cache_lookups_total{instance=\"$host\"}[$__rate_interval])",
               "interval": "$interval",
               "intervalFactor": 1,
               "legendFormat": "Total number of SSL session cache lookups",
@@ -10516,7 +10516,7 @@
               "step": 240
             },
             {
-              "expr": "irate(haproxy_process_ssl_cache_misses_total{instance=\"$host\"}[5m])",
+              "expr": "rate(haproxy_process_ssl_cache_misses_total{instance=\"$host\"}[$__rate_interval])",
               "interval": "$interval",
               "intervalFactor": 1,
               "legendFormat": "Total number of SSL session cache misses",
@@ -10911,7 +10911,7 @@
               "step": 240
             },
             {
-              "expr": "irate(haproxy_process_ssl_connections_total{instance=\"$host\"}[5m])",
+              "expr": "rate(haproxy_process_ssl_connections_total{instance=\"$host\"}[$__rate_interval])",
               "hide": true,
               "interval": "$interval",
               "intervalFactor": 1,
@@ -11145,7 +11145,7 @@
               "step": 240
             },
             {
-              "expr": "irate(haproxy_process_pool_allocated_bytes{instance=\"$host\"}[5m])",
+              "expr": "rate(haproxy_process_pool_allocated_bytes{instance=\"$host\"}[$__rate_interval])",
               "interval": "$interval",
               "intervalFactor": 1,
               "legendFormat": "Total amount of memory allocated in pools (in bytes)",
@@ -11154,7 +11154,7 @@
               "step": 240
             },
             {
-              "expr": "irate(haproxy_process_pool_used_bytes{instance=\"$host\"}[5m])",
+              "expr": "rate(haproxy_process_pool_used_bytes{instance=\"$host\"}[$__rate_interval])",
               "interval": "$interval",
               "intervalFactor": 1,
               "legendFormat": "Total amount of memory used in pools (in bytes)",
@@ -11253,7 +11253,7 @@
           "steppedLine": false,
           "targets": [
             {
-              "expr": "irate(haproxy_process_current_tasks{instance=\"$host\"}[5m])",
+              "expr": "rate(haproxy_process_current_tasks{instance=\"$host\"}[$__rate_interval])",
               "interval": "$interval",
               "intervalFactor": 1,
               "legendFormat": "Current number of tasks",
@@ -11499,7 +11499,7 @@
               "step": 240
             },
             {
-              "expr": "irate(haproxy_process_pipes_used_total{instance=\"$host\"}[5m])",
+              "expr": "rate(haproxy_process_pipes_used_total{instance=\"$host\"}[$__rate_interval])",
               "interval": "$interval",
               "intervalFactor": 1,
               "legendFormat": "Number of pipes in used",
@@ -11508,7 +11508,7 @@
               "step": 240
             },
             {
-              "expr": "irate(haproxy_process_pipes_free_total{instance=\"$host\"}[5m])",
+              "expr": "rate(haproxy_process_pipes_free_total{instance=\"$host\"}[$__rate_interval])",
               "interval": "$interval",
               "intervalFactor": 1,
               "legendFormat": "Number of pipes unused",
@@ -11919,7 +11919,7 @@
           "steppedLine": false,
           "targets": [
             {
-              "expr": "irate(haproxy_process_jobs{instance=\"$host\"}[5m])",
+              "expr": "rate(haproxy_process_jobs{instance=\"$host\"}[$__rate_interval])",
               "interval": "$interval",
               "intervalFactor": 1,
               "legendFormat": "Current number of active jobs (listeners, sessions, open devices)",
@@ -11928,7 +11928,7 @@
               "step": 240
             },
             {
-              "expr": "irate(haproxy_process_unstoppable_jobs{instance=\"$host\"}[5m])",
+              "expr": "rate(haproxy_process_unstoppable_jobs{instance=\"$host\"}[$__rate_interval])",
               "interval": "$interval",
               "intervalFactor": 1,
               "legendFormat": "Current number of active jobs that can't be stopped during a soft stop",
@@ -11937,7 +11937,7 @@
               "step": 240
             },
             {
-              "expr": "irate(haproxy_process_listeners{instance=\"$host\"}[5m])",
+              "expr": "rate(haproxy_process_listeners{instance=\"$host\"}[$__rate_interval])",
               "interval": "$interval",
               "intervalFactor": 1,
               "legendFormat": "Current number of active listeners",
diff --git a/prometheus/nfs-full.json b/prometheus/nfs-full.json
index 3731920..a3a161d 100644
--- a/prometheus/nfs-full.json
+++ b/prometheus/nfs-full.json
@@ -82,7 +82,7 @@
           "steppedLine": false,
           "targets": [
             {
-              "expr": "irate(node_nfs_connections_total{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+              "expr": "rate(node_nfs_connections_total{instance=~\"$node:$port\",job=~\"$job\"}[$__rate_interval])",
               "format": "time_series",
               "hide": false,
               "intervalFactor": 2,
@@ -165,7 +165,7 @@
           "steppedLine": false,
           "targets": [
             {
-              "expr": "irate(node_nfsd_connections_total{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+              "expr": "rate(node_nfsd_connections_total{instance=~\"$node:$port\",job=~\"$job\"}[$__rate_interval])",
               "format": "time_series",
               "hide": false,
               "intervalFactor": 2,
@@ -249,7 +249,7 @@
           "steppedLine": false,
           "targets": [
             {
-              "expr": "irate(node_nfs_packets_total{protocol=\"tcp\",instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+              "expr": "rate(node_nfs_packets_total{protocol=\"tcp\",instance=~\"$node:$port\",job=~\"$job\"}[$__rate_interval])",
               "format": "time_series",
               "intervalFactor": 2,
               "legendFormat": "TCP - NFS network packets (sent+received)",
@@ -257,7 +257,7 @@
               "step": 240
             },
             {
-              "expr": "irate(node_nfs_packets_total{protocol=\"udp\",instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+              "expr": "rate(node_nfs_packets_total{protocol=\"udp\",instance=~\"$node:$port\",job=~\"$job\"}[$__rate_interval])",
               "format": "time_series",
               "intervalFactor": 2,
               "legendFormat": "UDP - NFS network packets (sent+received)",
@@ -340,7 +340,7 @@
           "steppedLine": false,
           "targets": [
             {
-              "expr": "irate(node_nfsd_packets_total{proto=\"tcp\",instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+              "expr": "rate(node_nfsd_packets_total{proto=\"tcp\",instance=~\"$node:$port\",job=~\"$job\"}[$__rate_interval])",
               "format": "time_series",
               "intervalFactor": 2,
               "legendFormat": "TCP - NFSd network packets (sent+received)",
@@ -348,7 +348,7 @@
               "step": 240
             },
             {
-              "expr": "irate(node_nfsd_packets_total{proto=\"udp\",instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+              "expr": "rate(node_nfsd_packets_total{proto=\"udp\",instance=~\"$node:$port\",job=~\"$job\"}[$__rate_interval])",
               "format": "time_series",
               "intervalFactor": 2,
               "legendFormat": "UDP - NFSd network packets (sent+received)",
@@ -430,7 +430,7 @@
           "steppedLine": false,
           "targets": [
             {
-              "expr": "irate(node_nfs_rpc_authentication_refreshes_total{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+              "expr": "rate(node_nfs_rpc_authentication_refreshes_total{instance=~\"$node:$port\",job=~\"$job\"}[$__rate_interval])",
               "format": "time_series",
               "hide": false,
               "intervalFactor": 2,
@@ -439,7 +439,7 @@
               "step": 240
             },
             {
-              "expr": "irate(node_nfs_rpc_retransmissions_total{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+              "expr": "rate(node_nfs_rpc_retransmissions_total{instance=~\"$node:$port\",job=~\"$job\"}[$__rate_interval])",
               "format": "time_series",
               "hide": false,
               "intervalFactor": 2,
@@ -448,7 +448,7 @@
               "step": 240
             },
             {
-              "expr": "irate(node_nfs_rpcs_total{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+              "expr": "rate(node_nfs_rpcs_total{instance=~\"$node:$port\",job=~\"$job\"}[$__rate_interval])",
               "format": "time_series",
               "hide": false,
               "intervalFactor": 2,
@@ -536,7 +536,7 @@
           "steppedLine": false,
           "targets": [
             {
-              "expr": "irate(node_nfsd_rpc_errors_total{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+              "expr": "rate(node_nfsd_rpc_errors_total{instance=~\"$node:$port\",job=~\"$job\"}[$__rate_interval])",
               "format": "time_series",
               "hide": false,
               "intervalFactor": 2,
@@ -545,7 +545,7 @@
               "step": 240
             },
             {
-              "expr": "irate(node_nfsd_server_rpcs_total{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+              "expr": "rate(node_nfsd_server_rpcs_total{instance=~\"$node:$port\",job=~\"$job\"}[$__rate_interval])",
               "format": "time_series",
               "hide": false,
               "intervalFactor": 2,
@@ -634,7 +634,7 @@
           "steppedLine": false,
           "targets": [
             {
-              "expr": "irate(node_nfsd_disk_bytes_read_total{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+              "expr": "rate(node_nfsd_disk_bytes_read_total{instance=~\"$node:$port\",job=~\"$job\"}[$__rate_interval])",
               "format": "time_series",
               "intervalFactor": 2,
               "legendFormat": "NFSd bytes read",
@@ -642,7 +642,7 @@
               "step": 240
             },
             {
-              "expr": "irate(node_nfsd_disk_bytes_written_total{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+              "expr": "rate(node_nfsd_disk_bytes_written_total{instance=~\"$node:$port\",job=~\"$job\"}[$__rate_interval])",
               "format": "time_series",
               "intervalFactor": 2,
               "legendFormat": "NFSd bytes written",
@@ -724,7 +724,7 @@
           "steppedLine": false,
           "targets": [
             {
-              "expr": "irate(node_nfsd_file_handles_stale_total{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+              "expr": "rate(node_nfsd_file_handles_stale_total{instance=~\"$node:$port\",job=~\"$job\"}[$__rate_interval])",
               "format": "time_series",
               "hide": false,
               "intervalFactor": 2,
@@ -807,7 +807,7 @@
           "steppedLine": false,
           "targets": [
             {
-              "expr": "irate(node_nfsd_read_ahead_cache_not_found_total{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+              "expr": "rate(node_nfsd_read_ahead_cache_not_found_total{instance=~\"$node:$port\",job=~\"$job\"}[$__rate_interval])",
               "format": "time_series",
               "hide": false,
               "intervalFactor": 2,
@@ -816,7 +816,7 @@
               "step": 240
             },
             {
-              "expr": "irate(node_nfsd_reply_cache_hits_total{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+              "expr": "rate(node_nfsd_reply_cache_hits_total{instance=~\"$node:$port\",job=~\"$job\"}[$__rate_interval])",
               "format": "time_series",
               "hide": false,
               "intervalFactor": 2,
@@ -825,7 +825,7 @@
               "step": 240
             },
             {
-              "expr": "irate(node_nfsd_reply_cache_misses_total{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+              "expr": "rate(node_nfsd_reply_cache_misses_total{instance=~\"$node:$port\",job=~\"$job\"}[$__rate_interval])",
               "format": "time_series",
               "hide": false,
               "intervalFactor": 2,
@@ -834,7 +834,7 @@
               "step": 240
             },
             {
-              "expr": "irate(node_nfsd_reply_cache_nocache_total{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+              "expr": "rate(node_nfsd_reply_cache_nocache_total{instance=~\"$node:$port\",job=~\"$job\"}[$__rate_interval])",
               "format": "time_series",
               "hide": false,
               "intervalFactor": 2,
@@ -917,7 +917,7 @@
           "steppedLine": false,
           "targets": [
             {
-              "expr": "irate(node_nfsd_server_threads{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+              "expr": "rate(node_nfsd_server_threads{instance=~\"$node:$port\",job=~\"$job\"}[$__rate_interval])",
               "format": "time_series",
               "hide": false,
               "intervalFactor": 2,
@@ -1009,63 +1009,63 @@
           "steppedLine": false,
           "targets": [
             {
-              "expr": "irate(node_nfs_requests_total{method='Create',proto='2',instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+              "expr": "rate(node_nfs_requests_total{method='Create',proto='2',instance=~\"$node:$port\",job=~\"$job\"}[$__rate_interval])",
               "intervalFactor": 2,
               "legendFormat": "{{ method }}",
               "refId": "A",
               "step": 240
             },
             {
-              "expr": "irate(node_nfs_requests_total{method='FsStat',proto='2',instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+              "expr": "rate(node_nfs_requests_total{method='FsStat',proto='2',instance=~\"$node:$port\",job=~\"$job\"}[$__rate_interval])",
               "intervalFactor": 2,
               "legendFormat": "{{ method }}",
               "refId": "B",
               "step": 240
             },
             {
-              "expr": "irate(node_nfs_requests_total{method='GetAttr',proto='2',instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+              "expr": "rate(node_nfs_requests_total{method='GetAttr',proto='2',instance=~\"$node:$port\",job=~\"$job\"}[$__rate_interval])",
               "intervalFactor": 2,
               "legendFormat": "{{ method }}",
               "refId": "C",
               "step": 240
             },
             {
-              "expr": "irate(node_nfs_requests_total{method='Link',proto='2',instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+              "expr": "rate(node_nfs_requests_total{method='Link',proto='2',instance=~\"$node:$port\",job=~\"$job\"}[$__rate_interval])",
               "intervalFactor": 2,
               "legendFormat": "{{ method }}",
               "refId": "D",
               "step": 240
             },
             {
-              "expr": "irate(node_nfs_requests_total{method='Lookup',proto='2',instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+              "expr": "rate(node_nfs_requests_total{method='Lookup',proto='2',instance=~\"$node:$port\",job=~\"$job\"}[$__rate_interval])",
               "intervalFactor": 2,
               "legendFormat": "{{ method }}",
               "refId": "E",
               "step": 240
             },
             {
-              "expr": "irate(node_nfs_requests_total{method='MkDir',proto='2',instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+              "expr": "rate(node_nfs_requests_total{method='MkDir',proto='2',instance=~\"$node:$port\",job=~\"$job\"}[$__rate_interval])",
               "intervalFactor": 2,
               "legendFormat": "{{ method }}",
               "refId": "F",
               "step": 240
             },
             {
-              "expr": "irate(node_nfs_requests_total{method='Null',proto='2',instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+              "expr": "rate(node_nfs_requests_total{method='Null',proto='2',instance=~\"$node:$port\",job=~\"$job\"}[$__rate_interval])",
               "intervalFactor": 2,
               "legendFormat": "{{ method }}",
               "refId": "G",
               "step": 240
             },
             {
-              "expr": "irate(node_nfs_requests_total{method='Read',proto='2',instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+              "expr": "rate(node_nfs_requests_total{method='Read',proto='2',instance=~\"$node:$port\",job=~\"$job\"}[$__rate_interval])",
               "intervalFactor": 2,
               "legendFormat": "{{ method }}",
               "refId": "H",
               "step": 240
             },
             {
-              "expr": "irate(node_nfs_requests_total{method='ReadDir',proto='2',instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+              "expr": "rate(node_nfs_requests_total{method='ReadDir',proto='2',instance=~\"$node:$port\",job=~\"$job\"}[$__rate_interval])",
               "intervalFactor": 2,
               "legendFormat": "{{ method }}",
               "refId": "I",
@@ -1142,63 +1142,63 @@
           "steppedLine": false,
           "targets": [
             {
-              "expr": "irate(node_nfs_requests_total{method='ReadLink',proto='2',instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+              "expr": "rate(node_nfs_requests_total{method='ReadLink',proto='2',instance=~\"$node:$port\",job=~\"$job\"}[$__rate_interval])",
               "intervalFactor": 2,
               "legendFormat": "{{ method }}",
               "refId": "J",
               "step": 240
             },
             {
-              "expr": "irate(node_nfs_requests_total{method='Remove',proto='2',instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+              "expr": "rate(node_nfs_requests_total{method='Remove',proto='2',instance=~\"$node:$port\",job=~\"$job\"}[$__rate_interval])",
               "intervalFactor": 2,
               "legendFormat": "{{ method }}",
               "refId": "K",
               "step": 240
             },
             {
-              "expr": "irate(node_nfs_requests_total{method='Rename',proto='2',instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+              "expr": "rate(node_nfs_requests_total{method='Rename',proto='2',instance=~\"$node:$port\",job=~\"$job\"}[$__rate_interval])",
               "intervalFactor": 2,
               "legendFormat": "{{ method }}",
               "refId": "L",
               "step": 240
             },
             {
-              "expr": "irate(node_nfs_requests_total{method='RmDir',proto='2',instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+              "expr": "rate(node_nfs_requests_total{method='RmDir',proto='2',instance=~\"$node:$port\",job=~\"$job\"}[$__rate_interval])",
               "intervalFactor": 2,
               "legendFormat": "{{ method }}",
               "refId": "M",
               "step": 240
             },
             {
-              "expr": "irate(node_nfs_requests_total{method='Root',proto='2',instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+              "expr": "rate(node_nfs_requests_total{method='Root',proto='2',instance=~\"$node:$port\",job=~\"$job\"}[$__rate_interval])",
               "intervalFactor": 2,
               "legendFormat": "{{ method }}",
               "refId": "N",
               "step": 240
             },
             {
-              "expr": "irate(node_nfs_requests_total{method='SetAttr',proto='2',instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+              "expr": "rate(node_nfs_requests_total{method='SetAttr',proto='2',instance=~\"$node:$port\",job=~\"$job\"}[$__rate_interval])",
               "intervalFactor": 2,
               "legendFormat": "{{ method }}",
               "refId": "O",
               "step": 240
             },
             {
-              "expr": "irate(node_nfs_requests_total{method='SymLink',proto='2',instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+              "expr": "rate(node_nfs_requests_total{method='SymLink',proto='2',instance=~\"$node:$port\",job=~\"$job\"}[$__rate_interval])",
               "intervalFactor": 2,
               "legendFormat": "{{ method }}",
               "refId": "P",
               "step": 240
             },
             {
-              "expr": "irate(node_nfs_requests_total{method='WrCache',proto='2',instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+              "expr": "rate(node_nfs_requests_total{method='WrCache',proto='2',instance=~\"$node:$port\",job=~\"$job\"}[$__rate_interval])",
               "intervalFactor": 2,
               "legendFormat": "{{ method }}",
               "refId": "Q",
               "step": 240
             },
             {
-              "expr": "irate(node_nfs_requests_total{method='Write',proto='2',instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+              "expr": "rate(node_nfs_requests_total{method='Write',proto='2',instance=~\"$node:$port\",job=~\"$job\"}[$__rate_interval])",
               "intervalFactor": 2,
               "legendFormat": "{{ method }}",
               "refId": "R",
@@ -1287,56 +1287,56 @@
           "steppedLine": false,
           "targets": [
             {
-              "expr": "irate(node_nfsd_requests_total{method='Create',proto='2',instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+              "expr": "rate(node_nfsd_requests_total{method='Create',proto='2',instance=~\"$node:$port\",job=~\"$job\"}[$__rate_interval])",
               "intervalFactor": 2,
               "legendFormat": "{{ method }}",
               "refId": "A",
               "step": 240
             },
             {
-              "expr": "irate(node_nfsd_requests_total{method='FsStat',proto='2',instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+              "expr": "rate(node_nfsd_requests_total{method='FsStat',proto='2',instance=~\"$node:$port\",job=~\"$job\"}[$__rate_interval])",
               "intervalFactor": 2,
               "legendFormat": "{{ method }}",
               "refId": "B",
               "step": 240
             },
             {
-              "expr": "irate(node_nfsd_requests_total{method='GetAttr',proto='2',instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+              "expr": "rate(node_nfsd_requests_total{method='GetAttr',proto='2',instance=~\"$node:$port\",job=~\"$job\"}[$__rate_interval])",
               "intervalFactor": 2,
               "legendFormat": "{{ method }}",
               "refId": "C",
               "step": 240
             },
             {
-              "expr": "irate(node_nfsd_requests_total{method='Link',proto='2',instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+              "expr": "rate(node_nfsd_requests_total{method='Link',proto='2',instance=~\"$node:$port\",job=~\"$job\"}[$__rate_interval])",
               "intervalFactor": 2,
               "legendFormat": "{{ method }}",
               "refId": "D",
               "step": 240
             },
             {
-              "expr": "irate(node_nfsd_requests_total{method='Lookup',proto='2',instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+              "expr": "rate(node_nfsd_requests_total{method='Lookup',proto='2',instance=~\"$node:$port\",job=~\"$job\"}[$__rate_interval])",
               "intervalFactor": 2,
               "legendFormat": "{{ method }}",
               "refId": "E",
               "step": 240
             },
             {
-              "expr": "irate(node_nfsd_requests_total{method='MkDir',proto='2',instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+              "expr": "rate(node_nfsd_requests_total{method='MkDir',proto='2',instance=~\"$node:$port\",job=~\"$job\"}[$__rate_interval])",
               "intervalFactor": 2,
               "legendFormat": "{{ method }}",
               "refId": "F",
               "step": 240
             },
             {
-              "expr": "irate(node_nfsd_requests_total{method='Read',proto='2',instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+              "expr": "rate(node_nfsd_requests_total{method='Read',proto='2',instance=~\"$node:$port\",job=~\"$job\"}[$__rate_interval])",
               "intervalFactor": 2,
               "legendFormat": "{{ method }}",
               "refId": "G",
               "step": 240
             },
             {
-              "expr": "irate(node_nfsd_requests_total{method='ReadDir',proto='2',instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+              "expr": "rate(node_nfsd_requests_total{method='ReadDir',proto='2',instance=~\"$node:$port\",job=~\"$job\"}[$__rate_interval])",
               "intervalFactor": 2,
               "legendFormat": "{{ method }}",
               "refId": "H",
@@ -1413,56 +1413,56 @@
           "steppedLine": false,
           "targets": [
             {
-              "expr": "irate(node_nfsd_requests_total{method='ReadLink',proto='2',instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+              "expr": "rate(node_nfsd_requests_total{method='ReadLink',proto='2',instance=~\"$node:$port\",job=~\"$job\"}[$__rate_interval])",
               "intervalFactor": 2,
               "legendFormat": "{{ method }}",
               "refId": "I",
               "step": 240
             },
             {
-              "expr": "irate(node_nfsd_requests_total{method='Remove',proto='2',instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+              "expr": "rate(node_nfsd_requests_total{method='Remove',proto='2',instance=~\"$node:$port\",job=~\"$job\"}[$__rate_interval])",
               "intervalFactor": 2,
               "legendFormat": "{{ method }}",
               "refId": "J",
               "step": 240
             },
             {
-              "expr": "irate(node_nfsd_requests_total{method='Rename',proto='2',instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+              "expr": "rate(node_nfsd_requests_total{method='Rename',proto='2',instance=~\"$node:$port\",job=~\"$job\"}[$__rate_interval])",
               "intervalFactor": 2,
               "legendFormat": "{{ method }}",
               "refId": "K",
               "step": 240
             },
             {
-              "expr": "irate(node_nfsd_requests_total{method='RmDir',proto='2',instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+              "expr": "rate(node_nfsd_requests_total{method='RmDir',proto='2',instance=~\"$node:$port\",job=~\"$job\"}[$__rate_interval])",
               "intervalFactor": 2,
               "legendFormat": "{{ method }}",
               "refId": "L",
               "step": 240
             },
             {
-              "expr": "irate(node_nfsd_requests_total{method='Root',proto='2',instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+              "expr": "rate(node_nfsd_requests_total{method='Root',proto='2',instance=~\"$node:$port\",job=~\"$job\"}[$__rate_interval])",
               "intervalFactor": 2,
               "legendFormat": "{{ method }}",
               "refId": "M",
               "step": 240
             },
             {
-              "expr": "irate(node_nfsd_requests_total{method='SetAttr',proto='2',instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+              "expr": "rate(node_nfsd_requests_total{method='SetAttr',proto='2',instance=~\"$node:$port\",job=~\"$job\"}[$__rate_interval])",
               "intervalFactor": 2,
               "legendFormat": "{{ method }}",
               "refId": "N",
               "step": 240
             },
             {
-              "expr": "irate(node_nfsd_requests_total{method='SymLink',proto='2',instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+              "expr": "rate(node_nfsd_requests_total{method='SymLink',proto='2',instance=~\"$node:$port\",job=~\"$job\"}[$__rate_interval])",
               "intervalFactor": 2,
               "legendFormat": "{{ method }}",
               "refId": "O",
               "step": 240
             },
             {
-              "expr": "irate(node_nfsd_requests_total{method='Write',proto='2',instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+              "expr": "rate(node_nfsd_requests_total{method='Write',proto='2',instance=~\"$node:$port\",job=~\"$job\"}[$__rate_interval])",
               "intervalFactor": 2,
               "legendFormat": "{{ method }}",
               "refId": "P",
@@ -1551,77 +1551,77 @@
           "steppedLine": false,
           "targets": [
             {
-              "expr": "irate(node_nfs_requests_total{method='Access',proto='3',instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+              "expr": "rate(node_nfs_requests_total{method='Access',proto='3',instance=~\"$node:$port\",job=~\"$job\"}[$__rate_interval])",
               "intervalFactor": 2,
               "legendFormat": "{{ method }}",
               "refId": "A",
               "step": 240
             },
             {
-              "expr": "irate(node_nfs_requests_total{method='Commit',proto='3',instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+              "expr": "rate(node_nfs_requests_total{method='Commit',proto='3',instance=~\"$node:$port\",job=~\"$job\"}[$__rate_interval])",
               "intervalFactor": 2,
               "legendFormat": "{{ method }}",
               "refId": "B",
               "step": 240
             },
             {
-              "expr": "irate(node_nfs_requests_total{method='Create',proto='3',instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+              "expr": "rate(node_nfs_requests_total{method='Create',proto='3',instance=~\"$node:$port\",job=~\"$job\"}[$__rate_interval])",
               "intervalFactor": 2,
               "legendFormat": "{{ method }}",
               "refId": "C",
               "step": 240
             },
             {
-              "expr": "irate(node_nfs_requests_total{method='FsInfo',proto='3',instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+              "expr": "rate(node_nfs_requests_total{method='FsInfo',proto='3',instance=~\"$node:$port\",job=~\"$job\"}[$__rate_interval])",
               "intervalFactor": 2,
               "legendFormat": "{{ method }}",
               "refId": "D",
               "step": 240
             },
             {
-              "expr": "irate(node_nfs_requests_total{method='FsStat',proto='3',instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+              "expr": "rate(node_nfs_requests_total{method='FsStat',proto='3',instance=~\"$node:$port\",job=~\"$job\"}[$__rate_interval])",
               "intervalFactor": 2,
               "legendFormat": "{{ method }}",
               "refId": "E",
               "step": 240
             },
             {
-              "expr": "irate(node_nfs_requests_total{method='GetAttr',proto='3',instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+              "expr": "rate(node_nfs_requests_total{method='GetAttr',proto='3',instance=~\"$node:$port\",job=~\"$job\"}[$__rate_interval])",
               "intervalFactor": 2,
               "legendFormat": "{{ method }}",
               "refId": "F",
               "step": 240
             },
             {
-              "expr": "irate(node_nfs_requests_total{method='Link',proto='3',instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+              "expr": "rate(node_nfs_requests_total{method='Link',proto='3',instance=~\"$node:$port\",job=~\"$job\"}[$__rate_interval])",
               "intervalFactor": 2,
               "legendFormat": "{{ method }}",
               "refId": "G",
               "step": 240
             },
             {
-              "expr": "irate(node_nfs_requests_total{method='Lookup',proto='3',instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+              "expr": "rate(node_nfs_requests_total{method='Lookup',proto='3',instance=~\"$node:$port\",job=~\"$job\"}[$__rate_interval])",
               "intervalFactor": 2,
               "legendFormat": "{{ method }}",
               "refId": "H",
               "step": 240
             },
             {
-              "expr": "irate(node_nfs_requests_total{method='MkDir',proto='3',instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+              "expr": "rate(node_nfs_requests_total{method='MkDir',proto='3',instance=~\"$node:$port\",job=~\"$job\"}[$__rate_interval])",
               "intervalFactor": 2,
               "legendFormat": "{{ method }}",
               "refId": "I",
               "step": 240
             },
             {
-              "expr": "irate(node_nfs_requests_total{method='MkNod',proto='3',instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+              "expr": "rate(node_nfs_requests_total{method='MkNod',proto='3',instance=~\"$node:$port\",job=~\"$job\"}[$__rate_interval])",
               "intervalFactor": 2,
               "legendFormat": "{{ method }}",
               "refId": "J",
               "step": 240
             },
             {
-              "expr": "irate(node_nfs_requests_total{method='Null',proto='3',instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+              "expr": "rate(node_nfs_requests_total{method='Null',proto='3',instance=~\"$node:$port\",job=~\"$job\"}[$__rate_interval])",
               "intervalFactor": 2,
               "legendFormat": "{{ method }}",
               "refId": "K",
@@ -1698,77 +1698,77 @@
           "steppedLine": false,
           "targets": [
             {
-              "expr": "irate(node_nfs_requests_total{method='PathConf',proto='3',instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+              "expr": "rate(node_nfs_requests_total{method='PathConf',proto='3',instance=~\"$node:$port\",job=~\"$job\"}[$__rate_interval])",
               "intervalFactor": 2,
               "legendFormat": "{{ method }}",
               "refId": "L",
               "step": 240
             },
             {
-              "expr": "irate(node_nfs_requests_total{method='Read',proto='3',instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+              "expr": "rate(node_nfs_requests_total{method='Read',proto='3',instance=~\"$node:$port\",job=~\"$job\"}[$__rate_interval])",
               "intervalFactor": 2,
               "legendFormat": "{{ method }}",
               "refId": "M",
               "step": 240
             },
             {
-              "expr": "irate(node_nfs_requests_total{method='ReadDir',proto='3',instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+              "expr": "rate(node_nfs_requests_total{method='ReadDir',proto='3',instance=~\"$node:$port\",job=~\"$job\"}[$__rate_interval])",
               "intervalFactor": 2,
               "legendFormat": "{{ method }}",
               "refId": "N",
               "step": 240
             },
             {
-              "expr": "irate(node_nfs_requests_total{method='ReadDirPlus',proto='3',instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+              "expr": "rate(node_nfs_requests_total{method='ReadDirPlus',proto='3',instance=~\"$node:$port\",job=~\"$job\"}[$__rate_interval])",
               "intervalFactor": 2,
               "legendFormat": "{{ method }}",
               "refId": "O",
               "step": 240
             },
             {
-              "expr": "irate(node_nfs_requests_total{method='ReadLink',proto='3',instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+              "expr": "rate(node_nfs_requests_total{method='ReadLink',proto='3',instance=~\"$node:$port\",job=~\"$job\"}[$__rate_interval])",
               "intervalFactor": 2,
               "legendFormat": "{{ method }}",
               "refId": "P",
               "step": 240
             },
             {
-              "expr": "irate(node_nfs_requests_total{method='Rename',proto='3',instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+              "expr": "rate(node_nfs_requests_total{method='Rename',proto='3',instance=~\"$node:$port\",job=~\"$job\"}[$__rate_interval])",
               "intervalFactor": 2,
               "legendFormat": "{{ method }}",
               "refId": "Q",
               "step": 240
             },
             {
-              "expr": "irate(node_nfs_requests_total{method='RmDir',proto='3',instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+              "expr": "rate(node_nfs_requests_total{method='RmDir',proto='3',instance=~\"$node:$port\",job=~\"$job\"}[$__rate_interval])",
               "intervalFactor": 2,
               "legendFormat": "{{ method }}",
               "refId": "R",
               "step": 240
             },
             {
-              "expr": "irate(node_nfs_requests_total{method='SetAttr',proto='3',instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+              "expr": "rate(node_nfs_requests_total{method='SetAttr',proto='3',instance=~\"$node:$port\",job=~\"$job\"}[$__rate_interval])",
               "intervalFactor": 2,
               "legendFormat": "{{ method }}",
               "refId": "S",
               "step": 240
             },
             {
-              "expr": "irate(node_nfs_requests_total{method='SymLink',proto='3',instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+              "expr": "rate(node_nfs_requests_total{method='SymLink',proto='3',instance=~\"$node:$port\",job=~\"$job\"}[$__rate_interval])",
               "intervalFactor": 2,
               "legendFormat": "{{ method }}",
               "refId": "T",
               "step": 240
             },
             {
-              "expr": "irate(node_nfs_requests_total{method='Write',proto='3',instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+              "expr": "rate(node_nfs_requests_total{method='Write',proto='3',instance=~\"$node:$port\",job=~\"$job\"}[$__rate_interval])",
               "intervalFactor": 2,
               "legendFormat": "{{ method }}",
               "refId": "U",
               "step": 240
             },
             {
-              "expr": "irate(node_nfs_requests_total{method='Remove',proto='3',instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+              "expr": "rate(node_nfs_requests_total{method='Remove',proto='3',instance=~\"$node:$port\",job=~\"$job\"}[$__rate_interval])",
               "intervalFactor": 2,
               "legendFormat": "{{ method }}",
               "refId": "A",
@@ -1857,77 +1857,77 @@
           "steppedLine": false,
           "targets": [
             {
-              "expr": "irate(node_nfsd_requests_total{method='Access',proto='3',instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+              "expr": "rate(node_nfsd_requests_total{method='Access',proto='3',instance=~\"$node:$port\",job=~\"$job\"}[$__rate_interval])",
               "intervalFactor": 2,
               "legendFormat": "{{ method }}",
               "refId": "A",
               "step": 240
             },
             {
-              "expr": "irate(node_nfsd_requests_total{method='Commit',proto='3',instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+              "expr": "rate(node_nfsd_requests_total{method='Commit',proto='3',instance=~\"$node:$port\",job=~\"$job\"}[$__rate_interval])",
               "intervalFactor": 2,
               "legendFormat": "{{ method }}",
               "refId": "B",
               "step": 240
             },
             {
-              "expr": "irate(node_nfsd_requests_total{method='Create',proto='3',instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+              "expr": "rate(node_nfsd_requests_total{method='Create',proto='3',instance=~\"$node:$port\",job=~\"$job\"}[$__rate_interval])",
               "intervalFactor": 2,
               "legendFormat": "{{ method }}",
               "refId": "C",
               "step": 240
             },
             {
-              "expr": "irate(node_nfsd_requests_total{method='FsInfo',proto='3',instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+              "expr": "rate(node_nfsd_requests_total{method='FsInfo',proto='3',instance=~\"$node:$port\",job=~\"$job\"}[$__rate_interval])",
               "intervalFactor": 2,
               "legendFormat": "{{ method }}",
               "refId": "D",
               "step": 240
             },
             {
-              "expr": "irate(node_nfsd_requests_total{method='FsStat',proto='3',instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+              "expr": "rate(node_nfsd_requests_total{method='FsStat',proto='3',instance=~\"$node:$port\",job=~\"$job\"}[$__rate_interval])",
               "intervalFactor": 2,
               "legendFormat": "{{ method }}",
               "refId": "E",
               "step": 240
             },
             {
-              "expr": "irate(node_nfsd_requests_total{method='GetAttr',proto='3',instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+              "expr": "rate(node_nfsd_requests_total{method='GetAttr',proto='3',instance=~\"$node:$port\",job=~\"$job\"}[$__rate_interval])",
               "intervalFactor": 2,
               "legendFormat": "{{ method }}",
               "refId": "F",
               "step": 240
             },
             {
-              "expr": "irate(node_nfsd_requests_total{method='Link',proto='3',instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+              "expr": "rate(node_nfsd_requests_total{method='Link',proto='3',instance=~\"$node:$port\",job=~\"$job\"}[$__rate_interval])",
               "intervalFactor": 2,
               "legendFormat": "{{ method }}",
               "refId": "G",
               "step": 240
             },
             {
-              "expr": "irate(node_nfsd_requests_total{method='Lookup',proto='3',instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+              "expr": "rate(node_nfsd_requests_total{method='Lookup',proto='3',instance=~\"$node:$port\",job=~\"$job\"}[$__rate_interval])",
               "intervalFactor": 2,
               "legendFormat": "{{ method }}",
               "refId": "H",
               "step": 240
             },
             {
-              "expr": "irate(node_nfsd_requests_total{method='MkDir',proto='3',instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+              "expr": "rate(node_nfsd_requests_total{method='MkDir',proto='3',instance=~\"$node:$port\",job=~\"$job\"}[$__rate_interval])",
               "intervalFactor": 2,
               "legendFormat": "{{ method }}",
               "refId": "I",
               "step": 240
             },
             {
-              "expr": "irate(node_nfsd_requests_total{method='MkNod',proto='3',instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+              "expr": "rate(node_nfsd_requests_total{method='MkNod',proto='3',instance=~\"$node:$port\",job=~\"$job\"}[$__rate_interval])",
               "intervalFactor": 2,
               "legendFormat": "{{ method }}",
               "refId": "J",
               "step": 240
             },
             {
-              "expr": "irate(node_nfsd_requests_total{method='PathConf',proto='3',instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+              "expr": "rate(node_nfsd_requests_total{method='PathConf',proto='3',instance=~\"$node:$port\",job=~\"$job\"}[$__rate_interval])",
               "intervalFactor": 2,
               "legendFormat": "{{ method }}",
               "refId": "K",
@@ -2004,70 +2004,70 @@
           "steppedLine": false,
           "targets": [
             {
-              "expr": "irate(node_nfsd_requests_total{method='Read',proto='3',instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+              "expr": "rate(node_nfsd_requests_total{method='Read',proto='3',instance=~\"$node:$port\",job=~\"$job\"}[$__rate_interval])",
               "intervalFactor": 2,
               "legendFormat": "{{ method }}",
               "refId": "L",
               "step": 240
             },
             {
-              "expr": "irate(node_nfsd_requests_total{method='ReadDir',proto='3',instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+              "expr": "rate(node_nfsd_requests_total{method='ReadDir',proto='3',instance=~\"$node:$port\",job=~\"$job\"}[$__rate_interval])",
               "intervalFactor": 2,
               "legendFormat": "{{ method }}",
               "refId": "M",
               "step": 240
             },
             {
-              "expr": "irate(node_nfsd_requests_total{method='ReadDirPlus',proto='3',instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+              "expr": "rate(node_nfsd_requests_total{method='ReadDirPlus',proto='3',instance=~\"$node:$port\",job=~\"$job\"}[$__rate_interval])",
               "intervalFactor": 2,
               "legendFormat": "{{ method }}",
               "refId": "N",
               "step": 240
             },
             {
-              "expr": "irate(node_nfsd_requests_total{method='ReadLink',proto='3',instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+              "expr": "rate(node_nfsd_requests_total{method='ReadLink',proto='3',instance=~\"$node:$port\",job=~\"$job\"}[$__rate_interval])",
               "intervalFactor": 2,
               "legendFormat": "{{ method }}",
               "refId": "O",
               "step": 240
             },
             {
-              "expr": "irate(node_nfsd_requests_total{method='Remove',proto='3',instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+              "expr": "rate(node_nfsd_requests_total{method='Remove',proto='3',instance=~\"$node:$port\",job=~\"$job\"}[$__rate_interval])",
               "intervalFactor": 2,
               "legendFormat": "{{ method }}",
               "refId": "P",
               "step": 240
             },
             {
-              "expr": "irate(node_nfsd_requests_total{method='Rename',proto='3',instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+              "expr": "rate(node_nfsd_requests_total{method='Rename',proto='3',instance=~\"$node:$port\",job=~\"$job\"}[$__rate_interval])",
               "intervalFactor": 2,
               "legendFormat": "{{ method }}",
               "refId": "Q",
               "step": 240
             },
             {
-              "expr": "irate(node_nfsd_requests_total{method='RmDir',proto='3',instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+              "expr": "rate(node_nfsd_requests_total{method='RmDir',proto='3',instance=~\"$node:$port\",job=~\"$job\"}[$__rate_interval])",
               "intervalFactor": 2,
               "legendFormat": "{{ method }}",
               "refId": "R",
               "step": 240
             },
             {
-              "expr": "irate(node_nfsd_requests_total{method='SetAttr',proto='3',instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+              "expr": "rate(node_nfsd_requests_total{method='SetAttr',proto='3',instance=~\"$node:$port\",job=~\"$job\"}[$__rate_interval])",
               "intervalFactor": 2,
               "legendFormat": "{{ method }}",
               "refId": "S",
               "step": 240
             },
             {
-              "expr": "irate(node_nfsd_requests_total{method='SymLink',proto='3',instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+              "expr": "rate(node_nfsd_requests_total{method='SymLink',proto='3',instance=~\"$node:$port\",job=~\"$job\"}[$__rate_interval])",
               "intervalFactor": 2,
               "legendFormat": "{{ method }}",
               "refId": "T",
               "step": 240
             },
             {
-              "expr": "irate(node_nfsd_requests_total{method='Write',proto='3',instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+              "expr": "rate(node_nfsd_requests_total{method='Write',proto='3',instance=~\"$node:$port\",job=~\"$job\"}[$__rate_interval])",
               "intervalFactor": 2,
               "legendFormat": "{{ method }}",
               "refId": "U",
@@ -2157,77 +2157,77 @@
           "steppedLine": false,
           "targets": [
             {
-              "expr": "irate(node_nfs_requests_total{method='Access',proto='4',instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+              "expr": "rate(node_nfs_requests_total{method='Access',proto='4',instance=~\"$node:$port\",job=~\"$job\"}[$__rate_interval])",
               "intervalFactor": 2,
               "legendFormat": "{{ method }}",
               "refId": "A",
               "step": 240
             },
             {
-              "expr": "irate(node_nfs_requests_total{method='Commit',proto='4',instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+              "expr": "rate(node_nfs_requests_total{method='Commit',proto='4',instance=~\"$node:$port\",job=~\"$job\"}[$__rate_interval])",
               "intervalFactor": 2,
               "legendFormat": "{{ method }}",
               "refId": "B",
               "step": 240
             },
             {
-              "expr": "irate(node_nfs_requests_total{method='Create',proto='4',instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+              "expr": "rate(node_nfs_requests_total{method='Create',proto='4',instance=~\"$node:$port\",job=~\"$job\"}[$__rate_interval])",
               "intervalFactor": 2,
               "legendFormat": "{{ method }}",
               "refId": "C",
               "step": 240
             },
             {
-              "expr": "irate(node_nfs_requests_total{method='FsInfo',proto='4',instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+              "expr": "rate(node_nfs_requests_total{method='FsInfo',proto='4',instance=~\"$node:$port\",job=~\"$job\"}[$__rate_interval])",
               "intervalFactor": 2,
               "legendFormat": "{{ method }}",
               "refId": "D",
               "step": 240
             },
             {
-              "expr": "irate(node_nfs_requests_total{method='GetAttr',proto='4',instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+              "expr": "rate(node_nfs_requests_total{method='GetAttr',proto='4',instance=~\"$node:$port\",job=~\"$job\"}[$__rate_interval])",
               "intervalFactor": 2,
               "legendFormat": "{{ method }}",
               "refId": "F",
               "step": 240
             },
             {
-              "expr": "irate(node_nfs_requests_total{method='Link',proto='4',instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+              "expr": "rate(node_nfs_requests_total{method='Link',proto='4',instance=~\"$node:$port\",job=~\"$job\"}[$__rate_interval])",
               "intervalFactor": 2,
               "legendFormat": "{{ method }}",
               "refId": "G",
               "step": 240
             },
             {
-              "expr": "irate(node_nfs_requests_total{method='Lookup',proto='4',instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+              "expr": "rate(node_nfs_requests_total{method='Lookup',proto='4',instance=~\"$node:$port\",job=~\"$job\"}[$__rate_interval])",
               "intervalFactor": 2,
               "legendFormat": "{{ method }}",
               "refId": "H",
               "step": 240
             },
             {
-              "expr": "irate(node_nfs_requests_total{method='Null',proto='4',instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+              "expr": "rate(node_nfs_requests_total{method='Null',proto='4',instance=~\"$node:$port\",job=~\"$job\"}[$__rate_interval])",
               "intervalFactor": 2,
               "legendFormat": "{{ method }}",
               "refId": "K",
               "step": 240
             },
             {
-              "expr": "irate(node_nfs_requests_total{method='Allocate',proto='4',instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+              "expr": "rate(node_nfs_requests_total{method='Allocate',proto='4',instance=~\"$node:$port\",job=~\"$job\"}[$__rate_interval])",
               "intervalFactor": 2,
               "legendFormat": "{{ method }}",
               "refId": "E",
               "step": 240
             },
             {
-              "expr": "irate(node_nfs_requests_total{method='BindConnToSession',proto='4',instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+              "expr": "rate(node_nfs_requests_total{method='BindConnToSession',proto='4',instance=~\"$node:$port\",job=~\"$job\"}[$__rate_interval])",
               "intervalFactor": 2,
               "legendFormat": "{{ method }}",
               "refId": "I",
               "step": 240
             },
             {
-              "expr": "irate(node_nfs_requests_total{method='Clone',proto='4',instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+              "expr": "rate(node_nfs_requests_total{method='Clone',proto='4',instance=~\"$node:$port\",job=~\"$job\"}[$__rate_interval])",
               "intervalFactor": 2,
               "legendFormat": "{{ method }}",
               "refId": "J",
@@ -2304,77 +2304,77 @@
           "steppedLine": false,
           "targets": [
             {
-              "expr": "irate(node_nfs_requests_total{method='PathConf',proto='4',instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+              "expr": "rate(node_nfs_requests_total{method='PathConf',proto='4',instance=~\"$node:$port\",job=~\"$job\"}[$__rate_interval])",
               "intervalFactor": 2,
               "legendFormat": "{{ method }}",
               "refId": "L",
               "step": 240
             },
             {
-              "expr": "irate(node_nfs_requests_total{method='Read',proto='4',instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+              "expr": "rate(node_nfs_requests_total{method='Read',proto='4',instance=~\"$node:$port\",job=~\"$job\"}[$__rate_interval])",
               "intervalFactor": 2,
               "legendFormat": "{{ method }}",
               "refId": "M",
               "step": 240
             },
             {
-              "expr": "irate(node_nfs_requests_total{method='ReadDir',proto='4',instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+              "expr": "rate(node_nfs_requests_total{method='ReadDir',proto='4',instance=~\"$node:$port\",job=~\"$job\"}[$__rate_interval])",
               "intervalFactor": 2,
               "legendFormat": "{{ method }}",
               "refId": "N",
               "step": 240
             },
             {
-              "expr": "irate(node_nfs_requests_total{method='ReadLink',proto='4',instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+              "expr": "rate(node_nfs_requests_total{method='ReadLink',proto='4',instance=~\"$node:$port\",job=~\"$job\"}[$__rate_interval])",
               "intervalFactor": 2,
               "legendFormat": "{{ method }}",
               "refId": "P",
               "step": 240
             },
             {
-              "expr": "irate(node_nfs_requests_total{method='Rename',proto='4',instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+              "expr": "rate(node_nfs_requests_total{method='Rename',proto='4',instance=~\"$node:$port\",job=~\"$job\"}[$__rate_interval])",
               "intervalFactor": 2,
               "legendFormat": "{{ method }}",
               "refId": "Q",
               "step": 240
             },
             {
-              "expr": "irate(node_nfs_requests_total{method='Setattr',proto='4',instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+              "expr": "rate(node_nfs_requests_total{method='Setattr',proto='4',instance=~\"$node:$port\",job=~\"$job\"}[$__rate_interval])",
               "intervalFactor": 2,
               "legendFormat": "{{ method }}",
               "refId": "S",
               "step": 240
             },
             {
-              "expr": "irate(node_nfs_requests_total{method='SymLink',proto='4',instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+              "expr": "rate(node_nfs_requests_total{method='SymLink',proto='4',instance=~\"$node:$port\",job=~\"$job\"}[$__rate_interval])",
               "intervalFactor": 2,
               "legendFormat": "{{ method }}",
               "refId": "T",
               "step": 240
             },
             {
-              "expr": "irate(node_nfs_requests_total{method='Write',proto='4',instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+              "expr": "rate(node_nfs_requests_total{method='Write',proto='4',instance=~\"$node:$port\",job=~\"$job\"}[$__rate_interval])",
               "intervalFactor": 2,
               "legendFormat": "{{ method }}",
               "refId": "U",
               "step": 240
             },
             {
-              "expr": "irate(node_nfs_requests_total{method='Close',proto='4',instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+              "expr": "rate(node_nfs_requests_total{method='Close',proto='4',instance=~\"$node:$port\",job=~\"$job\"}[$__rate_interval])",
               "intervalFactor": 2,
               "legendFormat": "{{ method }}",
               "refId": "A",
               "step": 240
             },
             {
-              "expr": "irate(node_nfs_requests_total{method='CreateSession',proto='4',instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+              "expr": "rate(node_nfs_requests_total{method='CreateSession',proto='4',instance=~\"$node:$port\",job=~\"$job\"}[$__rate_interval])",
               "intervalFactor": 2,
               "legendFormat": "{{ method }}",
               "refId": "B",
               "step": 240
             },
             {
-              "expr": "irate(node_nfs_requests_total{method='Read',proto='4',instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+              "expr": "rate(node_nfs_requests_total{method='Read',proto='4',instance=~\"$node:$port\",job=~\"$job\"}[$__rate_interval])",
               "intervalFactor": 2,
               "legendFormat": "{{ method }}",
               "refId": "C",
@@ -2451,70 +2451,70 @@
           "steppedLine": false,
           "targets": [
             {
-              "expr": "irate(node_nfs_requests_total{method='DeAllocate',proto='4',instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+              "expr": "rate(node_nfs_requests_total{method='DeAllocate',proto='4',instance=~\"$node:$port\",job=~\"$job\"}[$__rate_interval])",
               "intervalFactor": 2,
               "legendFormat": "{{ method }}",
               "refId": "L",
               "step": 240
             },
             {
-              "expr": "irate(node_nfs_requests_total{method='DelegReturn',proto='4',instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+              "expr": "rate(node_nfs_requests_total{method='DelegReturn',proto='4',instance=~\"$node:$port\",job=~\"$job\"}[$__rate_interval])",
               "intervalFactor": 2,
               "legendFormat": "{{ method }}",
               "refId": "M",
               "step": 240
             },
             {
-              "expr": "irate(node_nfs_requests_total{method='DestroyClientID',proto='4',instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+              "expr": "rate(node_nfs_requests_total{method='DestroyClientID',proto='4',instance=~\"$node:$port\",job=~\"$job\"}[$__rate_interval])",
               "intervalFactor": 2,
               "legendFormat": "{{ method }}",
               "refId": "N",
               "step": 240
             },
             {
-              "expr": "irate(node_nfs_requests_total{method='DestroySession',proto='4',instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+              "expr": "rate(node_nfs_requests_total{method='DestroySession',proto='4',instance=~\"$node:$port\",job=~\"$job\"}[$__rate_interval])",
               "intervalFactor": 2,
               "legendFormat": "{{ method }}",
               "refId": "P",
               "step": 240
             },
             {
-              "expr": "irate(node_nfs_requests_total{method='ExchangeID',proto='4',instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+              "expr": "rate(node_nfs_requests_total{method='ExchangeID',proto='4',instance=~\"$node:$port\",job=~\"$job\"}[$__rate_interval])",
               "intervalFactor": 2,
               "legendFormat": "{{ method }}",
               "refId": "Q",
               "step": 240
             },
             {
-              "expr": "irate(node_nfs_requests_total{method='FreeStateID',proto='4',instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+              "expr": "rate(node_nfs_requests_total{method='FreeStateID',proto='4',instance=~\"$node:$port\",job=~\"$job\"}[$__rate_interval])",
               "intervalFactor": 2,
               "legendFormat": "{{ method }}",
               "refId": "S",
               "step": 240
             },
             {
-              "expr": "irate(node_nfs_requests_total{method='FsLocations',proto='4',instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+              "expr": "rate(node_nfs_requests_total{method='FsLocations',proto='4',instance=~\"$node:$port\",job=~\"$job\"}[$__rate_interval])",
               "intervalFactor": 2,
               "legendFormat": "{{ method }}",
               "refId": "T",
               "step": 240
             },
             {
-              "expr": "irate(node_nfs_requests_total{method='FsidPresent',proto='4',instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+              "expr": "rate(node_nfs_requests_total{method='FsidPresent',proto='4',instance=~\"$node:$port\",job=~\"$job\"}[$__rate_interval])",
               "intervalFactor": 2,
               "legendFormat": "{{ method }}",
               "refId": "U",
               "step": 240
             },
             {
-              "expr": "irate(node_nfs_requests_total{method='GetACL',proto='4',instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+              "expr": "rate(node_nfs_requests_total{method='GetACL',proto='4',instance=~\"$node:$port\",job=~\"$job\"}[$__rate_interval])",
               "intervalFactor": 2,
               "legendFormat": "{{ method }}",
               "refId": "A",
               "step": 240
             },
             {
-              "expr": "irate(node_nfs_requests_total{method='GetDeviceInfo',proto='4',instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+              "expr": "rate(node_nfs_requests_total{method='GetDeviceInfo',proto='4',instance=~\"$node:$port\",job=~\"$job\"}[$__rate_interval])",
               "intervalFactor": 2,
               "legendFormat": "{{ method }}",
               "refId": "B",
@@ -2591,70 +2591,70 @@
           "steppedLine": false,
           "targets": [
             {
-              "expr": "irate(node_nfs_requests_total{method='GetDeviceList',proto='4',instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+              "expr": "rate(node_nfs_requests_total{method='GetDeviceList',proto='4',instance=~\"$node:$port\",job=~\"$job\"}[$__rate_interval])",
               "intervalFactor": 2,
               "legendFormat": "{{ method }}",
               "refId": "L",
               "step": 240
             },
             {
-              "expr": "irate(node_nfs_requests_total{method='GetLeaseTime',proto='4',instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+              "expr": "rate(node_nfs_requests_total{method='GetLeaseTime',proto='4',instance=~\"$node:$port\",job=~\"$job\"}[$__rate_interval])",
               "intervalFactor": 2,
               "legendFormat": "{{ method }}",
               "refId": "M",
               "step": 240
             },
             {
-              "expr": "irate(node_nfs_requests_total{method='LayoutCommit',proto='4',instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+              "expr": "rate(node_nfs_requests_total{method='LayoutCommit',proto='4',instance=~\"$node:$port\",job=~\"$job\"}[$__rate_interval])",
               "intervalFactor": 2,
               "legendFormat": "{{ method }}",
               "refId": "N",
               "step": 240
             },
             {
-              "expr": "irate(node_nfs_requests_total{method='LayoutGet',proto='4',instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+              "expr": "rate(node_nfs_requests_total{method='LayoutGet',proto='4',instance=~\"$node:$port\",job=~\"$job\"}[$__rate_interval])",
               "intervalFactor": 2,
               "legendFormat": "{{ method }}",
               "refId": "P",
               "step": 240
             },
             {
-              "expr": "irate(node_nfs_requests_total{method='LayoutReturn',proto='4',instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+              "expr": "rate(node_nfs_requests_total{method='LayoutReturn',proto='4',instance=~\"$node:$port\",job=~\"$job\"}[$__rate_interval])",
               "intervalFactor": 2,
               "legendFormat": "{{ method }}",
               "refId": "Q",
               "step": 240
             },
             {
-              "expr": "irate(node_nfs_requests_total{method='LayoutStats',proto='4',instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+              "expr": "rate(node_nfs_requests_total{method='LayoutStats',proto='4',instance=~\"$node:$port\",job=~\"$job\"}[$__rate_interval])",
               "intervalFactor": 2,
               "legendFormat": "{{ method }}",
               "refId": "S",
               "step": 240
             },
             {
-              "expr": "irate(node_nfs_requests_total{method='Lock',proto='4',instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+              "expr": "rate(node_nfs_requests_total{method='Lock',proto='4',instance=~\"$node:$port\",job=~\"$job\"}[$__rate_interval])",
               "intervalFactor": 2,
               "legendFormat": "{{ method }}",
               "refId": "T",
               "step": 240
             },
             {
-              "expr": "irate(node_nfs_requests_total{method='Lockt',proto='4',instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+              "expr": "rate(node_nfs_requests_total{method='Lockt',proto='4',instance=~\"$node:$port\",job=~\"$job\"}[$__rate_interval])",
               "intervalFactor": 2,
               "legendFormat": "{{ method }}",
               "refId": "U",
               "step": 240
             },
             {
-              "expr": "irate(node_nfs_requests_total{method='Locku',proto='4',instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+              "expr": "rate(node_nfs_requests_total{method='Locku',proto='4',instance=~\"$node:$port\",job=~\"$job\"}[$__rate_interval])",
               "intervalFactor": 2,
               "legendFormat": "{{ method }}",
               "refId": "A",
               "step": 240
             },
             {
-              "expr": "irate(node_nfs_requests_total{method='Lookup',proto='4',instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+              "expr": "rate(node_nfs_requests_total{method='Lookup',proto='4',instance=~\"$node:$port\",job=~\"$job\"}[$__rate_interval])",
               "intervalFactor": 2,
               "legendFormat": "{{ method }}",
               "refId": "B",
@@ -2731,70 +2731,70 @@
           "steppedLine": false,
           "targets": [
             {
-              "expr": "irate(node_nfs_requests_total{method='LookupRoot',proto='4',instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+              "expr": "rate(node_nfs_requests_total{method='LookupRoot',proto='4',instance=~\"$node:$port\",job=~\"$job\"}[$__rate_interval])",
               "intervalFactor": 2,
               "legendFormat": "{{ method }}",
               "refId": "L",
               "step": 240
             },
             {
-              "expr": "irate(node_nfs_requests_total{method='Open',proto='4',instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+              "expr": "rate(node_nfs_requests_total{method='Open',proto='4',instance=~\"$node:$port\",job=~\"$job\"}[$__rate_interval])",
               "intervalFactor": 2,
               "legendFormat": "{{ method }}",
               "refId": "M",
               "step": 240
             },
             {
-              "expr": "irate(node_nfs_requests_total{method='OpenConfirmt',proto='4',instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+              "expr": "rate(node_nfs_requests_total{method='OpenConfirmt',proto='4',instance=~\"$node:$port\",job=~\"$job\"}[$__rate_interval])",
               "intervalFactor": 2,
               "legendFormat": "{{ method }}",
               "refId": "N",
               "step": 240
             },
             {
-              "expr": "irate(node_nfs_requests_total{method='OpenDowngrade',proto='4',instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+              "expr": "rate(node_nfs_requests_total{method='OpenDowngrade',proto='4',instance=~\"$node:$port\",job=~\"$job\"}[$__rate_interval])",
               "intervalFactor": 2,
               "legendFormat": "{{ method }}",
               "refId": "P",
               "step": 240
             },
             {
-              "expr": "irate(node_nfs_requests_total{method='OpenNoattr',proto='4',instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+              "expr": "rate(node_nfs_requests_total{method='OpenNoattr',proto='4',instance=~\"$node:$port\",job=~\"$job\"}[$__rate_interval])",
               "intervalFactor": 2,
               "legendFormat": "{{ method }}",
               "refId": "Q",
               "step": 240
             },
             {
-              "expr": "irate(node_nfs_requests_total{method='ReclaimComplete',proto='4',instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+              "expr": "rate(node_nfs_requests_total{method='ReclaimComplete',proto='4',instance=~\"$node:$port\",job=~\"$job\"}[$__rate_interval])",
               "intervalFactor": 2,
               "legendFormat": "{{ method }}",
               "refId": "S",
               "step": 240
             },
             {
-              "expr": "irate(node_nfs_requests_total{method='ReleaseLockowner',proto='4',instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+              "expr": "rate(node_nfs_requests_total{method='ReleaseLockowner',proto='4',instance=~\"$node:$port\",job=~\"$job\"}[$__rate_interval])",
               "intervalFactor": 2,
               "legendFormat": "{{ method }}",
               "refId": "T",
               "step": 240
             },
             {
-              "expr": "irate(node_nfs_requests_total{method='Renew',proto='4',instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+              "expr": "rate(node_nfs_requests_total{method='Renew',proto='4',instance=~\"$node:$port\",job=~\"$job\"}[$__rate_interval])",
               "intervalFactor": 2,
               "legendFormat": "{{ method }}",
               "refId": "U",
               "step": 240
             },
             {
-              "expr": "irate(node_nfs_requests_total{method='Secinfo',proto='4',instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+              "expr": "rate(node_nfs_requests_total{method='Secinfo',proto='4',instance=~\"$node:$port\",job=~\"$job\"}[$__rate_interval])",
               "intervalFactor": 2,
               "legendFormat": "{{ method }}",
               "refId": "A",
               "step": 240
             },
             {
-              "expr": "irate(node_nfs_requests_total{method='SecinfoNoName',proto='4',instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+              "expr": "rate(node_nfs_requests_total{method='SecinfoNoName',proto='4',instance=~\"$node:$port\",job=~\"$job\"}[$__rate_interval])",
               "intervalFactor": 2,
               "legendFormat": "{{ method }}",
               "refId": "B",
@@ -2871,56 +2871,56 @@
           "steppedLine": false,
           "targets": [
             {
-              "expr": "irate(node_nfs_requests_total{method='Seek',proto='4',instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+              "expr": "rate(node_nfs_requests_total{method='Seek',proto='4',instance=~\"$node:$port\",job=~\"$job\"}[$__rate_interval])",
               "intervalFactor": 2,
               "legendFormat": "{{ method }}",
               "refId": "L",
               "step": 240
             },
             {
-              "expr": "irate(node_nfs_requests_total{method='Sequence',proto='4',instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+              "expr": "rate(node_nfs_requests_total{method='Sequence',proto='4',instance=~\"$node:$port\",job=~\"$job\"}[$__rate_interval])",
               "intervalFactor": 2,
               "legendFormat": "{{ method }}",
               "refId": "M",
               "step": 240
             },
             {
-              "expr": "irate(node_nfs_requests_total{method='ServerCaps',proto='4',instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+              "expr": "rate(node_nfs_requests_total{method='ServerCaps',proto='4',instance=~\"$node:$port\",job=~\"$job\"}[$__rate_interval])",
               "intervalFactor": 2,
               "legendFormat": "{{ method }}",
               "refId": "N",
               "step": 240
             },
             {
-              "expr": "irate(node_nfs_requests_total{method='SetACL',proto='4',instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+              "expr": "rate(node_nfs_requests_total{method='SetACL',proto='4',instance=~\"$node:$port\",job=~\"$job\"}[$__rate_interval])",
               "intervalFactor": 2,
               "legendFormat": "{{ method }}",
               "refId": "P",
               "step": 240
             },
             {
-              "expr": "irate(node_nfs_requests_total{method='SetClientID',proto='4',instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+              "expr": "rate(node_nfs_requests_total{method='SetClientID',proto='4',instance=~\"$node:$port\",job=~\"$job\"}[$__rate_interval])",
               "intervalFactor": 2,
               "legendFormat": "{{ method }}",
               "refId": "Q",
               "step": 240
             },
             {
-              "expr": "irate(node_nfs_requests_total{method='SetClientIDConfirm',proto='4',instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+              "expr": "rate(node_nfs_requests_total{method='SetClientIDConfirm',proto='4',instance=~\"$node:$port\",job=~\"$job\"}[$__rate_interval])",
               "intervalFactor": 2,
               "legendFormat": "{{ method }}",
               "refId": "S",
               "step": 240
             },
             {
-              "expr": "irate(node_nfs_requests_total{method='StatFs',proto='4',instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+              "expr": "rate(node_nfs_requests_total{method='StatFs',proto='4',instance=~\"$node:$port\",job=~\"$job\"}[$__rate_interval])",
               "intervalFactor": 2,
               "legendFormat": "{{ method }}",
               "refId": "T",
               "step": 240
             },
             {
-              "expr": "irate(node_nfs_requests_total{method='TestStateID',proto='4',instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+              "expr": "rate(node_nfs_requests_total{method='TestStateID',proto='4',instance=~\"$node:$port\",job=~\"$job\"}[$__rate_interval])",
               "intervalFactor": 2,
               "legendFormat": "{{ method }}",
               "refId": "U",
@@ -3009,70 +3009,70 @@
           "steppedLine": false,
           "targets": [
             {
-              "expr": "irate(node_nfsd_requests_total{method='Access',proto='4',instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+              "expr": "rate(node_nfsd_requests_total{method='Access',proto='4',instance=~\"$node:$port\",job=~\"$job\"}[$__rate_interval])",
               "intervalFactor": 2,
               "legendFormat": "{{ method }}",
               "refId": "A",
               "step": 240
             },
             {
-              "expr": "irate(node_nfsd_requests_total{method='Commit',proto='4',instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+              "expr": "rate(node_nfsd_requests_total{method='Commit',proto='4',instance=~\"$node:$port\",job=~\"$job\"}[$__rate_interval])",
               "intervalFactor": 2,
               "legendFormat": "{{ method }}",
               "refId": "B",
               "step": 240
             },
             {
-              "expr": "irate(node_nfsd_requests_total{method='Create',proto='4',instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+              "expr": "rate(node_nfsd_requests_total{method='Create',proto='4',instance=~\"$node:$port\",job=~\"$job\"}[$__rate_interval])",
               "intervalFactor": 2,
               "legendFormat": "{{ method }}",
               "refId": "C",
               "step": 240
             },
             {
-              "expr": "irate(node_nfsd_requests_total{method='GetAttr',proto='4',instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+              "expr": "rate(node_nfsd_requests_total{method='GetAttr',proto='4',instance=~\"$node:$port\",job=~\"$job\"}[$__rate_interval])",
               "intervalFactor": 2,
               "legendFormat": "{{ method }}",
               "refId": "F",
               "step": 240
             },
             {
-              "expr": "irate(node_nfsd_requests_total{method='Link',proto='4',instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+              "expr": "rate(node_nfsd_requests_total{method='Link',proto='4',instance=~\"$node:$port\",job=~\"$job\"}[$__rate_interval])",
               "intervalFactor": 2,
               "legendFormat": "{{ method }}",
               "refId": "G",
               "step": 240
             },
             {
-              "expr": "irate(node_nfsd_requests_total{method='Lookup',proto='4',instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+              "expr": "rate(node_nfsd_requests_total{method='Lookup',proto='4',instance=~\"$node:$port\",job=~\"$job\"}[$__rate_interval])",
               "intervalFactor": 2,
               "legendFormat": "{{ method }}",
               "refId": "H",
               "step": 240
             },
             {
-              "expr": "irate(node_nfsd_requests_total{method='Close',proto='4',instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+              "expr": "rate(node_nfsd_requests_total{method='Close',proto='4',instance=~\"$node:$port\",job=~\"$job\"}[$__rate_interval])",
               "intervalFactor": 2,
               "legendFormat": "{{ method }}",
               "refId": "D",
               "step": 240
             },
             {
-              "expr": "irate(node_nfsd_requests_total{method='DelegPurge',proto='4',instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+              "expr": "rate(node_nfsd_requests_total{method='DelegPurge',proto='4',instance=~\"$node:$port\",job=~\"$job\"}[$__rate_interval])",
               "intervalFactor": 2,
               "legendFormat": "{{ method }}",
               "refId": "E",
               "step": 240
             },
             {
-              "expr": "irate(node_nfsd_requests_total{method='DelegReturn',proto='4',instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+              "expr": "rate(node_nfsd_requests_total{method='DelegReturn',proto='4',instance=~\"$node:$port\",job=~\"$job\"}[$__rate_interval])",
               "intervalFactor": 2,
               "legendFormat": "{{ method }}",
               "refId": "I",
               "step": 240
             },
             {
-              "expr": "irate(node_nfsd_requests_total{method='GetFH',proto='4',instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+              "expr": "rate(node_nfsd_requests_total{method='GetFH',proto='4',instance=~\"$node:$port\",job=~\"$job\"}[$__rate_interval])",
               "intervalFactor": 2,
               "legendFormat": "{{ method }}",
               "refId": "J",
@@ -3149,70 +3149,70 @@
           "steppedLine": false,
           "targets": [
             {
-              "expr": "irate(node_nfsd_requests_total{method='Read',proto='4',instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+              "expr": "rate(node_nfsd_requests_total{method='Read',proto='4',instance=~\"$node:$port\",job=~\"$job\"}[$__rate_interval])",
               "intervalFactor": 2,
               "legendFormat": "{{ method }}",
               "refId": "L",
               "step": 240
             },
             {
-              "expr": "irate(node_nfsd_requests_total{method='ReadDir',proto='4',instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+              "expr": "rate(node_nfsd_requests_total{method='ReadDir',proto='4',instance=~\"$node:$port\",job=~\"$job\"}[$__rate_interval])",
               "intervalFactor": 2,
               "legendFormat": "{{ method }}",
               "refId": "M",
               "step": 240
             },
             {
-              "expr": "irate(node_nfsd_requests_total{method='ReadLink',proto='4',instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+              "expr": "rate(node_nfsd_requests_total{method='ReadLink',proto='4',instance=~\"$node:$port\",job=~\"$job\"}[$__rate_interval])",
               "intervalFactor": 2,
               "legendFormat": "{{ method }}",
               "refId": "O",
               "step": 240
             },
             {
-              "expr": "irate(node_nfsd_requests_total{method='Remove',proto='4',instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+              "expr": "rate(node_nfsd_requests_total{method='Remove',proto='4',instance=~\"$node:$port\",job=~\"$job\"}[$__rate_interval])",
               "intervalFactor": 2,
               "legendFormat": "{{ method }}",
               "refId": "P",
               "step": 240
             },
             {
-              "expr": "irate(node_nfsd_requests_total{method='Rename',proto='4',instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+              "expr": "rate(node_nfsd_requests_total{method='Rename',proto='4',instance=~\"$node:$port\",job=~\"$job\"}[$__rate_interval])",
               "intervalFactor": 2,
               "legendFormat": "{{ method }}",
               "refId": "Q",
               "step": 240
             },
             {
-              "expr": "irate(node_nfsd_requests_total{method='SetAttr',proto='4',instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+              "expr": "rate(node_nfsd_requests_total{method='SetAttr',proto='4',instance=~\"$node:$port\",job=~\"$job\"}[$__rate_interval])",
               "intervalFactor": 2,
               "legendFormat": "{{ method }}",
               "refId": "S",
               "step": 240
             },
             {
-              "expr": "irate(node_nfsd_requests_total{method='Write',proto='4',instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+              "expr": "rate(node_nfsd_requests_total{method='Write',proto='4',instance=~\"$node:$port\",job=~\"$job\"}[$__rate_interval])",
               "intervalFactor": 2,
               "legendFormat": "{{ method }}",
               "refId": "U",
               "step": 240
             },
             {
-              "expr": "irate(node_nfsd_requests_total{method='Lock',proto='4',instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+              "expr": "rate(node_nfsd_requests_total{method='Lock',proto='4',instance=~\"$node:$port\",job=~\"$job\"}[$__rate_interval])",
               "intervalFactor": 2,
               "legendFormat": "{{ method }}",
               "refId": "A",
               "step": 240
             },
             {
-              "expr": "irate(node_nfsd_requests_total{method='Lockt',proto='4',instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+              "expr": "rate(node_nfsd_requests_total{method='Lockt',proto='4',instance=~\"$node:$port\",job=~\"$job\"}[$__rate_interval])",
               "intervalFactor": 2,
               "legendFormat": "{{ method }}",
               "refId": "B",
               "step": 240
             },
             {
-              "expr": "irate(node_nfsd_requests_total{method='Locku',proto='4',instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+              "expr": "rate(node_nfsd_requests_total{method='Locku',proto='4',instance=~\"$node:$port\",job=~\"$job\"}[$__rate_interval])",
               "intervalFactor": 2,
               "legendFormat": "{{ method }}",
               "refId": "C",
@@ -3289,91 +3289,91 @@
           "steppedLine": false,
           "targets": [
             {
-              "expr": "irate(node_nfsd_requests_total{method='LookupRoot',proto='4',instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+              "expr": "rate(node_nfsd_requests_total{method='LookupRoot',proto='4',instance=~\"$node:$port\",job=~\"$job\"}[$__rate_interval])",
               "intervalFactor": 2,
               "legendFormat": "{{ method }}",
               "refId": "L",
               "step": 240
             },
             {
-              "expr": "irate(node_nfsd_requests_total{method='Nverify',proto='4',instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+              "expr": "rate(node_nfsd_requests_total{method='Nverify',proto='4',instance=~\"$node:$port\",job=~\"$job\"}[$__rate_interval])",
               "intervalFactor": 2,
               "legendFormat": "{{ method }}",
               "refId": "A",
               "step": 240
             },
             {
-              "expr": "irate(node_nfsd_requests_total{method='Open',proto='4',instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+              "expr": "rate(node_nfsd_requests_total{method='Open',proto='4',instance=~\"$node:$port\",job=~\"$job\"}[$__rate_interval])",
               "intervalFactor": 2,
               "legendFormat": "{{ method }}",
               "refId": "B",
               "step": 240
             },
             {
-              "expr": "irate(node_nfsd_requests_total{method='OpenAttr',proto='4',instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+              "expr": "rate(node_nfsd_requests_total{method='OpenAttr',proto='4',instance=~\"$node:$port\",job=~\"$job\"}[$__rate_interval])",
               "intervalFactor": 2,
               "legendFormat": "{{ method }}",
               "refId": "C",
               "step": 240
             },
             {
-              "expr": "irate(node_nfsd_requests_total{method='OpenConfirm',proto='4',instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+              "expr": "rate(node_nfsd_requests_total{method='OpenConfirm',proto='4',instance=~\"$node:$port\",job=~\"$job\"}[$__rate_interval])",
               "intervalFactor": 2,
               "legendFormat": "{{ method }}",
               "refId": "D",
               "step": 240
             },
             {
-              "expr": "irate(node_nfsd_requests_total{method='OpenDgrd',proto='4',instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+              "expr": "rate(node_nfsd_requests_total{method='OpenDgrd',proto='4',instance=~\"$node:$port\",job=~\"$job\"}[$__rate_interval])",
               "intervalFactor": 2,
               "legendFormat": "{{ method }}",
               "refId": "E",
               "step": 240
             },
             {
-              "expr": "irate(node_nfsd_requests_total{method='PutFH',proto='4',instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+              "expr": "rate(node_nfsd_requests_total{method='PutFH',proto='4',instance=~\"$node:$port\",job=~\"$job\"}[$__rate_interval])",
               "intervalFactor": 2,
               "legendFormat": "{{ method }}",
               "refId": "F",
               "step": 240
             },
             {
-              "expr": "irate(node_nfsd_requests_total{method='RelLockOwner',proto='4',instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+              "expr": "rate(node_nfsd_requests_total{method='RelLockOwner',proto='4',instance=~\"$node:$port\",job=~\"$job\"}[$__rate_interval])",
               "intervalFactor": 2,
               "legendFormat": "{{ method }}",
               "refId": "G",
               "step": 240
             },
             {
-              "expr": "irate(node_nfsd_requests_total{method='Renew',proto='4',instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+              "expr": "rate(node_nfsd_requests_total{method='Renew',proto='4',instance=~\"$node:$port\",job=~\"$job\"}[$__rate_interval])",
               "intervalFactor": 2,
               "legendFormat": "{{ method }}",
               "refId": "H",
               "step": 240
             },
             {
-              "expr": "irate(node_nfsd_requests_total{method='RestoreFH',proto='4',instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+              "expr": "rate(node_nfsd_requests_total{method='RestoreFH',proto='4',instance=~\"$node:$port\",job=~\"$job\"}[$__rate_interval])",
               "intervalFactor": 2,
               "legendFormat": "{{ method }}",
               "refId": "I",
               "step": 240
             },
             {
-              "expr": "irate(node_nfsd_requests_total{method='SaveFH',proto='4',instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+              "expr": "rate(node_nfsd_requests_total{method='SaveFH',proto='4',instance=~\"$node:$port\",job=~\"$job\"}[$__rate_interval])",
               "intervalFactor": 2,
               "legendFormat": "{{ method }}",
               "refId": "J",
               "step": 240
             },
             {
-              "expr": "irate(node_nfsd_requests_total{method='SecInfo',proto='4',instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+              "expr": "rate(node_nfsd_requests_total{method='SecInfo',proto='4',instance=~\"$node:$port\",job=~\"$job\"}[$__rate_interval])",
               "intervalFactor": 2,
               "legendFormat": "{{ method }}",
               "refId": "K",
               "step": 240
             },
             {
-              "expr": "irate(node_nfsd_requests_total{method='Verify',proto='4',instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+              "expr": "rate(node_nfsd_requests_total{method='Verify',proto='4',instance=~\"$node:$port\",job=~\"$job\"}[$__rate_interval])",
               "intervalFactor": 2,
               "legendFormat": "{{ method }}",
               "refId": "M",
diff --git a/prometheus/node-exporter-freebsd.json b/prometheus/node-exporter-freebsd.json
index 0b94c83..02c4a51 100644
--- a/prometheus/node-exporter-freebsd.json
+++ b/prometheus/node-exporter-freebsd.json
@@ -139,7 +139,7 @@
       "pluginVersion": "6.7.3",
       "targets": [
         {
-          "expr": "(((count(count(node_cpu_seconds_total{instance=\"$node\",job=\"$job\"}) by (cpu))) - avg(sum by (mode)(irate(node_cpu_seconds_total{mode='idle',instance=\"$node\",job=\"$job\"}[5m])))) * 100) / count(count(node_cpu_seconds_total{instance=\"$node\",job=\"$job\"}) by (cpu))",
+          "expr": "(((count(count(node_cpu_seconds_total{instance=\"$node\",job=\"$job\"}) by (cpu))) - avg(sum by (mode)(rate(node_cpu_seconds_total{mode='idle',instance=\"$node\",job=\"$job\"}[$__rate_interval])))) * 100) / count(count(node_cpu_seconds_total{instance=\"$node\",job=\"$job\"}) by (cpu))",
           "hide": false,
           "interval": "",
           "intervalFactor": 1,
@@ -1091,7 +1091,7 @@
       "steppedLine": false,
       "targets": [
         {
-          "expr": "sum by (instance)(irate(node_cpu_seconds_total{mode=\"system\",instance=\"$node\",job=\"$job\"}[5m])) * 100",
+          "expr": "sum by (instance)(rate(node_cpu_seconds_total{mode=\"system\",instance=\"$node\",job=\"$job\"}[$__rate_interval])) * 100",
           "format": "time_series",
           "hide": false,
           "intervalFactor": 2,
@@ -1100,7 +1100,7 @@
           "step": 240
         },
         {
-          "expr": "sum by (instance)(irate(node_cpu_seconds_total{mode='user',instance=\"$node\",job=\"$job\"}[5m])) * 100",
+          "expr": "sum by (instance)(rate(node_cpu_seconds_total{mode='user',instance=\"$node\",job=\"$job\"}[$__rate_interval])) * 100",
           "format": "time_series",
           "hide": false,
           "intervalFactor": 2,
@@ -1109,7 +1109,7 @@
           "step": 240
         },
         {
-          "expr": "sum by (mode)(irate(node_cpu_seconds_total{mode='idle',instance=\"$node\",job=\"$job\"}[5m])) * 100",
+          "expr": "sum by (mode)(rate(node_cpu_seconds_total{mode='idle',instance=\"$node\",job=\"$job\"}[$__rate_interval])) * 100",
           "format": "time_series",
           "intervalFactor": 2,
           "legendFormat": "Idle - Waiting for something to happen",
@@ -1117,7 +1117,7 @@
           "step": 240
         },
         {
-          "expr": "sum by (mode)(irate(node_cpu_seconds_total{mode='interrupt',instance=\"$node\",job=\"$job\"}[5m])) * 100",
+          "expr": "sum by (mode)(rate(node_cpu_seconds_total{mode='interrupt',instance=\"$node\",job=\"$job\"}[$__rate_interval])) * 100",
           "format": "time_series",
           "intervalFactor": 2,
           "legendFormat": "Interrupt - Servicing interrupts",
@@ -1125,7 +1125,7 @@
           "step": 240
         },
         {
-          "expr": "sum by (mode)(irate(node_cpu_seconds_total{mode='nice',instance=\"$node\",job=\"$job\"}[5m])) * 100",
+          "expr": "sum by (mode)(rate(node_cpu_seconds_total{mode='nice',instance=\"$node\",job=\"$job\"}[$__rate_interval])) * 100",
           "format": "time_series",
           "intervalFactor": 2,
           "legendFormat": "Nice - Niced processes executing in user mode",
@@ -1413,7 +1413,7 @@
       "steppedLine": false,
       "targets": [
         {
-          "expr": "(irate(node_network_receive_bytes_total{instance=\"$node\",job=\"$job\"}[5m]))*8",
+          "expr": "(rate(node_network_receive_bytes_total{instance=\"$node\",job=\"$job\"}[$__rate_interval]))*8",
           "format": "time_series",
           "intervalFactor": 2,
           "legendFormat": "{{device}} - Receive",
@@ -1421,7 +1421,7 @@
           "step": 240
         },
         {
-          "expr": "(irate(node_network_transmit_bytes_total{instance=\"$node\",job=\"$job\"}[5m]))*8",
+          "expr": "(rate(node_network_transmit_bytes_total{instance=\"$node\",job=\"$job\"}[$__rate_interval]))*8",
           "format": "time_series",
           "intervalFactor": 2,
           "legendFormat": "{{device}} - Transmit",
@@ -1524,7 +1524,7 @@
       "steppedLine": false,
       "targets": [
         {
-          "expr": "irate(node_memory_swap_in_bytes_total{instance=\"$node\",job=\"$job\"}[5m])",
+          "expr": "rate(node_memory_swap_in_bytes_total{instance=\"$node\",job=\"$job\"}[$__rate_interval])",
           "format": "time_series",
           "intervalFactor": 2,
           "legendFormat": "Swap in",
@@ -1532,7 +1532,7 @@
           "step": 240
         },
         {
-          "expr": "irate(node_memory_swap_out_bytes_total{instance=\"$node\",job=\"$job\"}[5m])",
+          "expr": "rate(node_memory_swap_out_bytes_total{instance=\"$node\",job=\"$job\"}[$__rate_interval])",
           "format": "time_series",
           "intervalFactor": 2,
           "legendFormat": "Swap out",
@@ -1890,7 +1890,7 @@
           "steppedLine": false,
           "targets": [
             {
-              "expr": "irate(node_network_transmit_packets_total{instance=\"$node\",job=\"$job\"}[5m])",
+              "expr": "rate(node_network_transmit_packets_total{instance=\"$node\",job=\"$job\"}[$__rate_interval])",
               "format": "time_series",
               "intervalFactor": 2,
               "legendFormat": "{{device}} - Transmit packets",
@@ -1898,7 +1898,7 @@
               "step": 240
             },
             {
-              "expr": "irate(node_network_receive_packets_total{instance=\"$node\",job=\"$job\"}[5m])",
+              "expr": "rate(node_network_receive_packets_total{instance=\"$node\",job=\"$job\"}[$__rate_interval])",
               "format": "time_series",
               "intervalFactor": 2,
               "legendFormat": "{{device}} - Receive packets",
@@ -2017,7 +2017,7 @@
           "steppedLine": false,
           "targets": [
             {
-              "expr": "irate(node_network_receive_drop_total{instance=\"$node\",job=\"$job\"}[5m])",
+              "expr": "rate(node_network_receive_drop_total{instance=\"$node\",job=\"$job\"}[$__rate_interval])",
               "format": "time_series",
               "intervalFactor": 2,
               "legendFormat": "{{device}} - Receive drop",
@@ -2025,7 +2025,7 @@
               "step": 240
             },
             {
-              "expr": "irate(node_network_transmit_drop_total{instance=\"$node\",job=\"$job\"}[5m])",
+              "expr": "rate(node_network_transmit_drop_total{instance=\"$node\",job=\"$job\"}[$__rate_interval])",
               "format": "time_series",
               "intervalFactor": 2,
               "legendFormat": "{{device}} - Transmit drop",
@@ -2144,7 +2144,7 @@
           "steppedLine": false,
           "targets": [
             {
-              "expr": "irate(node_network_transmit_errs_total{instance=\"$node\",job=\"$job\"}[5m])",
+              "expr": "rate(node_network_transmit_errs_total{instance=\"$node\",job=\"$job\"}[$__rate_interval])",
               "format": "time_series",
               "intervalFactor": 2,
               "legendFormat": "{{device}} - Transmit errors",
@@ -2152,7 +2152,7 @@
               "step": 240
             },
             {
-              "expr": "irate(node_network_receive_errs_total{instance=\"$node\",job=\"$job\"}[5m])",
+              "expr": "rate(node_network_receive_errs_total{instance=\"$node\",job=\"$job\"}[$__rate_interval])",
               "format": "time_series",
               "intervalFactor": 2,
               "legendFormat": "{{device}} - Receive errors",
@@ -2271,7 +2271,7 @@
           "steppedLine": false,
           "targets": [
             {
-              "expr": "irate(node_network_transmit_multicast_total{instance=\"$node\",job=\"$job\"}[5m])",
+              "expr": "rate(node_network_transmit_multicast_total{instance=\"$node\",job=\"$job\"}[$__rate_interval])",
               "format": "time_series",
               "intervalFactor": 2,
               "legendFormat": "{{device}} - Transmit multicast",
@@ -2279,7 +2279,7 @@
               "step": 240
             },
             {
-              "expr": "irate(node_network_receive_multicast_total{instance=\"$node\",job=\"$job\"}[5m])",
+              "expr": "rate(node_network_receive_multicast_total{instance=\"$node\",job=\"$job\"}[$__rate_interval])",
               "format": "time_series",
               "intervalFactor": 2,
               "legendFormat": "{{device}} - Receive multicast",
@@ -2389,7 +2389,7 @@
           "steppedLine": false,
           "targets": [
             {
-              "expr": "irate(node_exec_context_switches_total{instance=\"$node\",job=\"$job\"}[5m])",
+              "expr": "rate(node_exec_context_switches_total{instance=\"$node\",job=\"$job\"}[$__rate_interval])",
               "format": "time_series",
               "intervalFactor": 2,
               "legendFormat": "Context switches",
@@ -2482,7 +2482,7 @@
           "steppedLine": false,
           "targets": [
             {
-              "expr": "irate(node_exec_device_interrupts_total{instance=\"$node\",job=\"$job\"}[5m])",
+              "expr": "rate(node_exec_device_interrupts_total{instance=\"$node\",job=\"$job\"}[$__rate_interval])",
               "format": "time_series",
               "intervalFactor": 2,
               "legendFormat": "Device Interrupts",
@@ -2490,7 +2490,7 @@
               "step": 240
             },
             {
-              "expr": "irate(node_exec_software_interrupts_total{instance=\"$node\",job=\"$job\"}[5m])",
+              "expr": "rate(node_exec_software_interrupts_total{instance=\"$node\",job=\"$job\"}[$__rate_interval])",
               "format": "time_series",
               "intervalFactor": 2,
               "legendFormat": "Software Interrupts",
@@ -2693,7 +2693,7 @@
           "steppedLine": false,
           "targets": [
             {
-              "expr": "irate(node_exec_system_calls_total{instance=\"$node\",job=\"$job\"}[5m])",
+              "expr": "rate(node_exec_system_calls_total{instance=\"$node\",job=\"$job\"}[$__rate_interval])",
               "format": "time_series",
               "intervalFactor": 2,
               "legendFormat": "System calls",
@@ -2786,7 +2786,7 @@
           "steppedLine": false,
           "targets": [
             {
-              "expr": "irate(node_exec_forks_total{instance=\"$node\",job=\"$job\"}[5m])",
+              "expr": "rate(node_exec_forks_total{instance=\"$node\",job=\"$job\"}[$__rate_interval])",
               "format": "time_series",
               "hide": false,
               "intervalFactor": 2,
@@ -2880,7 +2880,7 @@
           "steppedLine": false,
           "targets": [
             {
-              "expr": "irate(node_exec_traps_total{instance=\"$node\",job=\"$job\"}[5m])",
+              "expr": "rate(node_exec_traps_total{instance=\"$node\",job=\"$job\"}[$__rate_interval])",
               "format": "time_series",
               "intervalFactor": 2,
               "legendFormat": "Traps",
@@ -2978,7 +2978,7 @@
           "steppedLine": false,
           "targets": [
             {
-              "expr": "irate(node_time_seconds{instance=\"$node\",job=\"$job\"}[5m])",
+              "expr": "rate(node_time_seconds{instance=\"$node\",job=\"$job\"}[$__rate_interval])",
               "format": "time_series",
               "interval": "",
               "intervalFactor": 2,
@@ -3410,7 +3410,7 @@
           "steppedLine": false,
           "targets": [
             {
-              "expr": "irate(node_scrape_collector_duration_seconds{instance=\"$node\",job=\"$job\"}[5m])",
+              "expr": "rate(node_scrape_collector_duration_seconds{instance=\"$node\",job=\"$job\"}[$__rate_interval])",
               "format": "time_series",
               "hide": false,
               "intervalFactor": 2,
diff --git a/prometheus/node-exporter-full.json b/prometheus/node-exporter-full.json
index 38c0016..d69fe9a 100644
--- a/prometheus/node-exporter-full.json
+++ b/prometheus/node-exporter-full.json
@@ -143,7 +143,7 @@
       "pluginVersion": "7.3.7",
       "targets": [
         {
-          "expr": "(((count(count(node_cpu_seconds_total{instance=\"$node\",job=\"$job\"}) by (cpu))) - avg(sum by (mode)(irate(node_cpu_seconds_total{mode='idle',instance=\"$node\",job=\"$job\"}[5m])))) * 100) / count(count(node_cpu_seconds_total{instance=\"$node\",job=\"$job\"}) by (cpu))",
+          "expr": "(((count(count(node_cpu_seconds_total{instance=\"$node\",job=\"$job\"}) by (cpu))) - avg(sum by (mode)(rate(node_cpu_seconds_total{mode='idle',instance=\"$node\",job=\"$job\"}[$__rate_interval])))) * 100) / count(count(node_cpu_seconds_total{instance=\"$node\",job=\"$job\"}) by (cpu))",
           "hide": false,
           "intervalFactor": 1,
           "legendFormat": "",
@@ -1097,7 +1097,7 @@
       "steppedLine": false,
       "targets": [
         {
-          "expr": "sum by (instance)(irate(node_cpu_seconds_total{mode=\"system\",instance=\"$node\",job=\"$job\"}[5m])) * 100",
+          "expr": "sum by (instance)(rate(node_cpu_seconds_total{mode=\"system\",instance=\"$node\",job=\"$job\"}[$__rate_interval])) * 100",
           "format": "time_series",
           "hide": false,
           "intervalFactor": 2,
@@ -1106,7 +1106,7 @@
           "step": 240
         },
         {
-          "expr": "sum by (instance)(irate(node_cpu_seconds_total{mode='user',instance=\"$node\",job=\"$job\"}[5m])) * 100",
+          "expr": "sum by (instance)(rate(node_cpu_seconds_total{mode='user',instance=\"$node\",job=\"$job\"}[$__rate_interval])) * 100",
           "format": "time_series",
           "hide": false,
           "intervalFactor": 2,
@@ -1115,7 +1115,7 @@
           "step": 240
         },
         {
-          "expr": "sum by (instance)(irate(node_cpu_seconds_total{mode='iowait',instance=\"$node\",job=\"$job\"}[5m])) * 100",
+          "expr": "sum by (instance)(rate(node_cpu_seconds_total{mode='iowait',instance=\"$node\",job=\"$job\"}[$__rate_interval])) * 100",
           "format": "time_series",
           "intervalFactor": 2,
           "legendFormat": "Busy Iowait",
@@ -1123,7 +1123,7 @@
           "step": 240
         },
         {
-          "expr": "sum by (instance)(irate(node_cpu_seconds_total{mode=~\".*irq\",instance=\"$node\",job=\"$job\"}[5m])) * 100",
+          "expr": "sum by (instance)(rate(node_cpu_seconds_total{mode=~\".*irq\",instance=\"$node\",job=\"$job\"}[$__rate_interval])) * 100",
           "format": "time_series",
           "intervalFactor": 2,
           "legendFormat": "Busy IRQs",
@@ -1131,7 +1131,7 @@
           "step": 240
         },
         {
-          "expr": "sum (irate(node_cpu_seconds_total{mode!='idle',mode!='user',mode!='system',mode!='iowait',mode!='irq',mode!='softirq',instance=\"$node\",job=\"$job\"}[5m])) * 100",
+          "expr": "sum (rate(node_cpu_seconds_total{mode!='idle',mode!='user',mode!='system',mode!='iowait',mode!='irq',mode!='softirq',instance=\"$node\",job=\"$job\"}[$__rate_interval])) * 100",
           "format": "time_series",
           "intervalFactor": 2,
           "legendFormat": "Busy Other",
@@ -1139,7 +1139,7 @@
           "step": 240
         },
         {
-          "expr": "sum by (mode)(irate(node_cpu_seconds_total{mode='idle',instance=\"$node\",job=\"$job\"}[5m])) * 100",
+          "expr": "sum by (mode)(rate(node_cpu_seconds_total{mode='idle',instance=\"$node\",job=\"$job\"}[$__rate_interval])) * 100",
           "format": "time_series",
           "intervalFactor": 2,
           "legendFormat": "Idle",
@@ -1456,7 +1456,7 @@
       "steppedLine": false,
       "targets": [
         {
-          "expr": "irate(node_network_receive_bytes_total{instance=\"$node\",job=\"$job\"}[5m])*8",
+          "expr": "rate(node_network_receive_bytes_total{instance=\"$node\",job=\"$job\"}[$__rate_interval])*8",
           "format": "time_series",
           "intervalFactor": 2,
           "legendFormat": "recv {{device}}",
@@ -1464,7 +1464,7 @@
           "step": 240
         },
         {
-          "expr": "irate(node_network_transmit_bytes_total{instance=\"$node\",job=\"$job\"}[5m])*8",
+          "expr": "rate(node_network_transmit_bytes_total{instance=\"$node\",job=\"$job\"}[$__rate_interval])*8",
           "format": "time_series",
           "intervalFactor": 2,
           "legendFormat": "trans {{device}} ",
@@ -1701,7 +1701,7 @@
           "steppedLine": false,
           "targets": [
             {
-              "expr": "sum by (mode)(irate(node_cpu_seconds_total{mode=\"system\",instance=\"$node\",job=\"$job\"}[5m])) * 100",
+              "expr": "sum by (mode)(rate(node_cpu_seconds_total{mode=\"system\",instance=\"$node\",job=\"$job\"}[$__rate_interval])) * 100",
               "format": "time_series",
               "interval": "10s",
               "intervalFactor": 2,
@@ -1710,7 +1710,7 @@
               "step": 240
             },
             {
-              "expr": "sum by (mode)(irate(node_cpu_seconds_total{mode='user',instance=\"$node\",job=\"$job\"}[5m])) * 100",
+              "expr": "sum by (mode)(rate(node_cpu_seconds_total{mode='user',instance=\"$node\",job=\"$job\"}[$__rate_interval])) * 100",
               "format": "time_series",
               "intervalFactor": 2,
               "legendFormat": "User - Normal processes executing in user mode",
@@ -1718,7 +1718,7 @@
               "step": 240
             },
             {
-              "expr": "sum by (mode)(irate(node_cpu_seconds_total{mode='nice',instance=\"$node\",job=\"$job\"}[5m])) * 100",
+              "expr": "sum by (mode)(rate(node_cpu_seconds_total{mode='nice',instance=\"$node\",job=\"$job\"}[$__rate_interval])) * 100",
               "format": "time_series",
               "intervalFactor": 2,
               "legendFormat": "Nice - Niced processes executing in user mode",
@@ -1726,7 +1726,7 @@
               "step": 240
             },
             {
-              "expr": "sum by (mode)(irate(node_cpu_seconds_total{mode='idle',instance=\"$node\",job=\"$job\"}[5m])) * 100",
+              "expr": "sum by (mode)(rate(node_cpu_seconds_total{mode='idle',instance=\"$node\",job=\"$job\"}[$__rate_interval])) * 100",
               "format": "time_series",
               "intervalFactor": 2,
               "legendFormat": "Idle - Waiting for something to happen",
@@ -1734,7 +1734,7 @@
               "step": 240
             },
             {
-              "expr": "sum by (mode)(irate(node_cpu_seconds_total{mode='iowait',instance=\"$node\",job=\"$job\"}[5m])) * 100",
+              "expr": "sum by (mode)(rate(node_cpu_seconds_total{mode='iowait',instance=\"$node\",job=\"$job\"}[$__rate_interval])) * 100",
               "format": "time_series",
               "intervalFactor": 2,
               "legendFormat": "Iowait - Waiting for I/O to complete",
@@ -1742,7 +1742,7 @@
               "step": 240
             },
             {
-              "expr": "sum by (mode)(irate(node_cpu_seconds_total{mode='irq',instance=\"$node\",job=\"$job\"}[5m])) * 100",
+              "expr": "sum by (mode)(rate(node_cpu_seconds_total{mode='irq',instance=\"$node\",job=\"$job\"}[$__rate_interval])) * 100",
               "format": "time_series",
               "intervalFactor": 2,
               "legendFormat": "Irq - Servicing interrupts",
@@ -1750,7 +1750,7 @@
               "step": 240
             },
             {
-              "expr": "sum by (mode)(irate(node_cpu_seconds_total{mode='softirq',instance=\"$node\",job=\"$job\"}[5m])) * 100",
+              "expr": "sum by (mode)(rate(node_cpu_seconds_total{mode='softirq',instance=\"$node\",job=\"$job\"}[$__rate_interval])) * 100",
               "format": "time_series",
               "intervalFactor": 2,
               "legendFormat": "Softirq - Servicing softirqs",
@@ -1758,7 +1758,7 @@
               "step": 240
             },
             {
-              "expr": "sum by (mode)(irate(node_cpu_seconds_total{mode='steal',instance=\"$node\",job=\"$job\"}[5m])) * 100",
+              "expr": "sum by (mode)(rate(node_cpu_seconds_total{mode='steal',instance=\"$node\",job=\"$job\"}[$__rate_interval])) * 100",
               "format": "time_series",
               "intervalFactor": 2,
               "legendFormat": "Steal - Time spent in other operating systems when running in a virtualized environment",
@@ -1766,7 +1766,7 @@
               "step": 240
             },
             {
-              "expr": "sum by (mode)(irate(node_cpu_seconds_total{mode='guest',instance=\"$node\",job=\"$job\"}[5m])) * 100",
+              "expr": "sum by (mode)(rate(node_cpu_seconds_total{mode='guest',instance=\"$node\",job=\"$job\"}[$__rate_interval])) * 100",
               "format": "time_series",
               "intervalFactor": 2,
               "legendFormat": "Guest - Time spent running a virtual CPU for a guest operating system",
@@ -2082,7 +2082,7 @@
           "steppedLine": false,
           "targets": [
             {
-              "expr": "irate(node_network_receive_bytes_total{instance=\"$node\",job=\"$job\"}[5m])*8",
+              "expr": "rate(node_network_receive_bytes_total{instance=\"$node\",job=\"$job\"}[$__rate_interval])*8",
               "format": "time_series",
               "intervalFactor": 2,
               "legendFormat": "{{device}} - Receive",
@@ -2090,7 +2090,7 @@
               "step": 240
             },
             {
-              "expr": "irate(node_network_transmit_bytes_total{instance=\"$node\",job=\"$job\"}[5m])*8",
+              "expr": "rate(node_network_transmit_bytes_total{instance=\"$node\",job=\"$job\"}[$__rate_interval])*8",
               "format": "time_series",
               "intervalFactor": 2,
               "legendFormat": "{{device}} - Transmit",
@@ -2392,14 +2392,14 @@
           "steppedLine": false,
           "targets": [
             {
-              "expr": "irate(node_disk_reads_completed_total{instance=\"$node\",job=\"$job\",device=~\"$diskdevices\"}[5m])",
+              "expr": "rate(node_disk_reads_completed_total{instance=\"$node\",job=\"$job\",device=~\"$diskdevices\"}[$__rate_interval])",
               "intervalFactor": 4,
               "legendFormat": "{{device}} - Reads completed",
               "refId": "A",
               "step": 240
             },
             {
-              "expr": "irate(node_disk_writes_completed_total{instance=\"$node\",job=\"$job\",device=~\"$diskdevices\"}[5m])",
+              "expr": "rate(node_disk_writes_completed_total{instance=\"$node\",job=\"$job\",device=~\"$diskdevices\"}[$__rate_interval])",
               "intervalFactor": 2,
               "legendFormat": "{{device}} - Writes completed",
               "refId": "B",
@@ -2531,7 +2531,7 @@
           "steppedLine": false,
           "targets": [
             {
-              "expr": "irate(node_disk_read_bytes_total{instance=\"$node\",job=\"$job\",device=~\"$diskdevices\"}[5m])",
+              "expr": "rate(node_disk_read_bytes_total{instance=\"$node\",job=\"$job\",device=~\"$diskdevices\"}[$__rate_interval])",
               "format": "time_series",
               "hide": false,
               "intervalFactor": 2,
@@ -2540,7 +2540,7 @@
               "step": 240
             },
             {
-              "expr": "irate(node_disk_written_bytes_total{instance=\"$node\",job=\"$job\",device=~\"$diskdevices\"}[5m])",
+              "expr": "rate(node_disk_written_bytes_total{instance=\"$node\",job=\"$job\",device=~\"$diskdevices\"}[$__rate_interval])",
               "format": "time_series",
               "hide": false,
               "intervalFactor": 2,
@@ -2651,7 +2651,7 @@
           "steppedLine": false,
           "targets": [
             {
-              "expr": "irate(node_disk_io_time_seconds_total{instance=\"$node\",job=\"$job\",device=~\"$diskdevices\"} [5m])",
+              "expr": "rate(node_disk_io_time_seconds_total{instance=\"$node\",job=\"$job\",device=~\"$diskdevices\"} [$__rate_interval])",
               "format": "time_series",
               "hide": false,
               "interval": "",
@@ -4716,7 +4716,7 @@
           "steppedLine": false,
           "targets": [
             {
-              "expr": "irate(node_vmstat_pgpgin{instance=\"$node\",job=\"$job\"}[5m])",
+              "expr": "rate(node_vmstat_pgpgin{instance=\"$node\",job=\"$job\"}[$__rate_interval])",
               "format": "time_series",
               "intervalFactor": 2,
               "legendFormat": "Pagesin - Page in operations",
@@ -4724,7 +4724,7 @@
               "step": 240
             },
             {
-              "expr": "irate(node_vmstat_pgpgout{instance=\"$node\",job=\"$job\"}[5m])",
+              "expr": "rate(node_vmstat_pgpgout{instance=\"$node\",job=\"$job\"}[$__rate_interval])",
               "format": "time_series",
               "intervalFactor": 2,
               "legendFormat": "Pagesout - Page out operations",
@@ -4823,7 +4823,7 @@
           "steppedLine": false,
           "targets": [
             {
-              "expr": "irate(node_vmstat_pswpin{instance=\"$node\",job=\"$job\"}[5m])",
+              "expr": "rate(node_vmstat_pswpin{instance=\"$node\",job=\"$job\"}[$__rate_interval])",
               "format": "time_series",
               "intervalFactor": 2,
               "legendFormat": "Pswpin - Pages swapped in",
@@ -4831,7 +4831,7 @@
               "step": 240
             },
             {
-              "expr": "irate(node_vmstat_pswpout{instance=\"$node\",job=\"$job\"}[5m])",
+              "expr": "rate(node_vmstat_pswpout{instance=\"$node\",job=\"$job\"}[$__rate_interval])",
               "format": "time_series",
               "intervalFactor": 2,
               "legendFormat": "Pswpout - Pages swapped out",
@@ -4952,7 +4952,7 @@
           "steppedLine": false,
           "targets": [
             {
-              "expr": "irate(node_vmstat_pgfault{instance=\"$node\",job=\"$job\"}[5m])",
+              "expr": "rate(node_vmstat_pgfault{instance=\"$node\",job=\"$job\"}[$__rate_interval])",
               "format": "time_series",
               "intervalFactor": 2,
               "legendFormat": "Pgfault - Page major and minor fault operations",
@@ -4960,7 +4960,7 @@
               "step": 240
             },
             {
-              "expr": "irate(node_vmstat_pgmajfault{instance=\"$node\",job=\"$job\"}[5m])",
+              "expr": "rate(node_vmstat_pgmajfault{instance=\"$node\",job=\"$job\"}[$__rate_interval])",
               "format": "time_series",
               "intervalFactor": 2,
               "legendFormat": "Pgmajfault - Major page fault operations",
@@ -4968,7 +4968,7 @@
               "step": 240
             },
             {
-              "expr": "irate(node_vmstat_pgfault{instance=\"$node\",job=\"$job\"}[5m])  - irate(node_vmstat_pgmajfault{instance=\"$node\",job=\"$job\"}[5m])",
+              "expr": "rate(node_vmstat_pgfault{instance=\"$node\",job=\"$job\"}[$__rate_interval])  - rate(node_vmstat_pgmajfault{instance=\"$node\",job=\"$job\"}[$__rate_interval])",
               "format": "time_series",
               "intervalFactor": 2,
               "legendFormat": "Pgminfault - Minor page fault operations",
@@ -5086,7 +5086,7 @@
           "steppedLine": false,
           "targets": [
             {
-              "expr": "irate(node_vmstat_oom_kill{instance=\"$node\",job=\"$job\"}[5m])",
+              "expr": "rate(node_vmstat_oom_kill{instance=\"$node\",job=\"$job\"}[$__rate_interval])",
               "format": "time_series",
               "interval": "",
               "intervalFactor": 2,
@@ -5837,7 +5837,7 @@
           "steppedLine": false,
           "targets": [
             {
-              "expr": "irate(node_forks_total{instance=\"$node\",job=\"$job\"}[5m])",
+              "expr": "rate(node_forks_total{instance=\"$node\",job=\"$job\"}[$__rate_interval])",
               "format": "time_series",
               "hide": false,
               "intervalFactor": 2,
@@ -5937,7 +5937,7 @@
           "steppedLine": false,
           "targets": [
             {
-              "expr": "irate(process_virtual_memory_bytes{instance=\"$node\",job=\"$job\"}[5m])",
+              "expr": "rate(process_virtual_memory_bytes{instance=\"$node\",job=\"$job\"}[$__rate_interval])",
               "hide": false,
               "interval": "",
               "intervalFactor": 2,
@@ -5955,7 +5955,7 @@
               "step": 240
             },
             {
-              "expr": "irate(process_virtual_memory_bytes{instance=\"$node\",job=\"$job\"}[5m])",
+              "expr": "rate(process_virtual_memory_bytes{instance=\"$node\",job=\"$job\"}[$__rate_interval])",
               "hide": false,
               "interval": "",
               "intervalFactor": 2,
@@ -5964,7 +5964,7 @@
               "step": 240
             },
             {
-              "expr": "irate(process_virtual_memory_max_bytes{instance=\"$node\",job=\"$job\"}[5m])",
+              "expr": "rate(process_virtual_memory_max_bytes{instance=\"$node\",job=\"$job\"}[$__rate_interval])",
               "hide": false,
               "interval": "",
               "intervalFactor": 2,
@@ -6176,7 +6176,7 @@
           "steppedLine": false,
           "targets": [
             {
-              "expr": "irate(node_schedstat_running_seconds_total{instance=\"$node\",job=\"$job\"}[5m])",
+              "expr": "rate(node_schedstat_running_seconds_total{instance=\"$node\",job=\"$job\"}[$__rate_interval])",
               "format": "time_series",
               "interval": "",
               "intervalFactor": 2,
@@ -6185,7 +6185,7 @@
               "step": 240
             },
             {
-              "expr": "irate(node_schedstat_waiting_seconds_total{instance=\"$node\",job=\"$job\"}[5m])",
+              "expr": "rate(node_schedstat_waiting_seconds_total{instance=\"$node\",job=\"$job\"}[$__rate_interval])",
               "format": "time_series",
               "interval": "",
               "intervalFactor": 2,
@@ -6409,7 +6409,7 @@
           "steppedLine": false,
           "targets": [
             {
-              "expr": "irate(node_context_switches_total{instance=\"$node\",job=\"$job\"}[5m])",
+              "expr": "rate(node_context_switches_total{instance=\"$node\",job=\"$job\"}[$__rate_interval])",
               "format": "time_series",
               "intervalFactor": 2,
               "legendFormat": "Context switches",
@@ -6417,7 +6417,7 @@
               "step": 240
             },
             {
-              "expr": "irate(node_intr_total{instance=\"$node\",job=\"$job\"}[5m])",
+              "expr": "rate(node_intr_total{instance=\"$node\",job=\"$job\"}[$__rate_interval])",
               "format": "time_series",
               "hide": false,
               "intervalFactor": 2,
@@ -6633,7 +6633,7 @@
           "steppedLine": false,
           "targets": [
             {
-              "expr": "irate(node_interrupts_total{instance=\"$node\",job=\"$job\"}[5m])",
+              "expr": "rate(node_interrupts_total{instance=\"$node\",job=\"$job\"}[$__rate_interval])",
               "format": "time_series",
               "interval": "",
               "intervalFactor": 2,
@@ -6727,7 +6727,7 @@
           "steppedLine": false,
           "targets": [
             {
-              "expr": "irate(node_schedstat_timeslices_total{instance=\"$node\",job=\"$job\"}[5m])",
+              "expr": "rate(node_schedstat_timeslices_total{instance=\"$node\",job=\"$job\"}[$__rate_interval])",
               "format": "time_series",
               "interval": "",
               "intervalFactor": 2,
@@ -6918,7 +6918,7 @@
           "steppedLine": false,
           "targets": [
             {
-              "expr": "irate(process_cpu_seconds_total{instance=\"$node\",job=\"$job\"}[5m])",
+              "expr": "rate(process_cpu_seconds_total{instance=\"$node\",job=\"$job\"}[$__rate_interval])",
               "format": "time_series",
               "interval": "",
               "intervalFactor": 2,
@@ -7508,7 +7508,7 @@
           "steppedLine": false,
           "targets": [
             {
-              "expr": "irate(node_systemd_socket_accepted_connections_total{instance=\"$node\",job=\"$job\"}[5m])",
+              "expr": "rate(node_systemd_socket_accepted_connections_total{instance=\"$node\",job=\"$job\"}[$__rate_interval])",
               "format": "time_series",
               "interval": "",
               "intervalFactor": 2,
@@ -7885,14 +7885,14 @@
           "steppedLine": false,
           "targets": [
             {
-              "expr": "irate(node_disk_reads_completed_total{instance=\"$node\",job=\"$job\"}[5m])",
+              "expr": "rate(node_disk_reads_completed_total{instance=\"$node\",job=\"$job\"}[$__rate_interval])",
               "intervalFactor": 4,
               "legendFormat": "{{device}} - Reads completed",
               "refId": "A",
               "step": 240
             },
             {
-              "expr": "irate(node_disk_writes_completed_total{instance=\"$node\",job=\"$job\"}[5m])",
+              "expr": "rate(node_disk_writes_completed_total{instance=\"$node\",job=\"$job\"}[$__rate_interval])",
               "intervalFactor": 2,
               "legendFormat": "{{device}} - Writes completed",
               "refId": "B",
@@ -8082,7 +8082,7 @@
           "steppedLine": false,
           "targets": [
             {
-              "expr": "irate(node_disk_read_bytes_total{instance=\"$node\",job=\"$job\"}[5m])",
+              "expr": "rate(node_disk_read_bytes_total{instance=\"$node\",job=\"$job\"}[$__rate_interval])",
               "format": "time_series",
               "intervalFactor": 4,
               "legendFormat": "{{device}} - Read bytes",
@@ -8090,7 +8090,7 @@
               "step": 240
             },
             {
-              "expr": "irate(node_disk_written_bytes_total{instance=\"$node\",job=\"$job\"}[5m])",
+              "expr": "rate(node_disk_written_bytes_total{instance=\"$node\",job=\"$job\"}[$__rate_interval])",
               "format": "time_series",
               "intervalFactor": 2,
               "legendFormat": "{{device}} - Written bytes",
@@ -8283,7 +8283,7 @@
           "steppedLine": false,
           "targets": [
             {
-              "expr": "irate(node_disk_read_time_seconds_total{instance=\"$node\",job=\"$job\"}[5m]) / irate(node_disk_reads_completed_total{instance=\"$node\",job=\"$job\"}[5m])",
+              "expr": "rate(node_disk_read_time_seconds_total{instance=\"$node\",job=\"$job\"}[$__rate_interval]) / rate(node_disk_reads_completed_total{instance=\"$node\",job=\"$job\"}[$__rate_interval])",
               "hide": false,
               "interval": "",
               "intervalFactor": 4,
@@ -8292,7 +8292,7 @@
               "step": 240
             },
             {
-              "expr": "irate(node_disk_write_time_seconds_total{instance=\"$node\",job=\"$job\"}[5m]) / irate(node_disk_writes_completed_total{instance=\"$node\",job=\"$job\"}[5m])",
+              "expr": "rate(node_disk_write_time_seconds_total{instance=\"$node\",job=\"$job\"}[$__rate_interval]) / rate(node_disk_writes_completed_total{instance=\"$node\",job=\"$job\"}[$__rate_interval])",
               "hide": false,
               "interval": "",
               "intervalFactor": 2,
@@ -8482,7 +8482,7 @@
           "steppedLine": false,
           "targets": [
             {
-              "expr": "irate(node_disk_io_time_weighted_seconds_total{instance=\"$node\",job=\"$job\"}[5m])",
+              "expr": "rate(node_disk_io_time_weighted_seconds_total{instance=\"$node\",job=\"$job\"}[$__rate_interval])",
               "interval": "",
               "intervalFactor": 4,
               "legendFormat": "{{device}}",
@@ -8675,14 +8675,14 @@
           "steppedLine": false,
           "targets": [
             {
-              "expr": "irate(node_disk_reads_merged_total{instance=\"$node\",job=\"$job\"}[5m])",
+              "expr": "rate(node_disk_reads_merged_total{instance=\"$node\",job=\"$job\"}[$__rate_interval])",
               "intervalFactor": 2,
               "legendFormat": "{{device}} - Read merged",
               "refId": "A",
               "step": 240
             },
             {
-              "expr": "irate(node_disk_writes_merged_total{instance=\"$node\",job=\"$job\"}[5m])",
+              "expr": "rate(node_disk_writes_merged_total{instance=\"$node\",job=\"$job\"}[$__rate_interval])",
               "intervalFactor": 2,
               "legendFormat": "{{device}} - Write merged",
               "refId": "B",
@@ -8870,7 +8870,7 @@
           "steppedLine": false,
           "targets": [
             {
-              "expr": "irate(node_disk_io_time_seconds_total{instance=\"$node\",job=\"$job\"}[5m])",
+              "expr": "rate(node_disk_io_time_seconds_total{instance=\"$node\",job=\"$job\"}[$__rate_interval])",
               "interval": "",
               "intervalFactor": 4,
               "legendFormat": "{{device}} - IO",
@@ -8878,7 +8878,7 @@
               "step": 240
             },
             {
-              "expr": "irate(node_disk_discard_time_seconds_total{instance=\"$node\",job=\"$job\"}[5m])",
+              "expr": "rate(node_disk_discard_time_seconds_total{instance=\"$node\",job=\"$job\"}[$__rate_interval])",
               "interval": "",
               "intervalFactor": 4,
               "legendFormat": "{{device}} - discard",
@@ -9067,7 +9067,7 @@
           "steppedLine": false,
           "targets": [
             {
-              "expr": "irate(node_disk_io_now{instance=\"$node\",job=\"$job\"}[5m])",
+              "expr": "rate(node_disk_io_now{instance=\"$node\",job=\"$job\"}[$__rate_interval])",
               "intervalFactor": 4,
               "legendFormat": "{{device}} - IO now",
               "refId": "A",
@@ -9273,7 +9273,7 @@
           "steppedLine": false,
           "targets": [
             {
-              "expr": "irate(node_disk_discards_completed_total{instance=\"$node\",job=\"$job\"}[5m])",
+              "expr": "rate(node_disk_discards_completed_total{instance=\"$node\",job=\"$job\"}[$__rate_interval])",
               "interval": "",
               "intervalFactor": 4,
               "legendFormat": "{{device}} - Discards completed",
@@ -9281,7 +9281,7 @@
               "step": 240
             },
             {
-              "expr": "irate(node_disk_discards_merged_total{instance=\"$node\",job=\"$job\"}[5m])",
+              "expr": "rate(node_disk_discards_merged_total{instance=\"$node\",job=\"$job\"}[$__rate_interval])",
               "interval": "",
               "intervalFactor": 2,
               "legendFormat": "{{device}} - Discards merged",
@@ -9984,7 +9984,7 @@
           "steppedLine": false,
           "targets": [
             {
-              "expr": "irate(node_network_receive_packets_total{instance=\"$node\",job=\"$job\"}[5m])",
+              "expr": "rate(node_network_receive_packets_total{instance=\"$node\",job=\"$job\"}[$__rate_interval])",
               "format": "time_series",
               "interval": "",
               "intervalFactor": 2,
@@ -9993,7 +9993,7 @@
               "step": 240
             },
             {
-              "expr": "irate(node_network_transmit_packets_total{instance=\"$node\",job=\"$job\"}[5m])",
+              "expr": "rate(node_network_transmit_packets_total{instance=\"$node\",job=\"$job\"}[$__rate_interval])",
               "format": "time_series",
               "interval": "",
               "intervalFactor": 2,
@@ -10097,7 +10097,7 @@
           "steppedLine": false,
           "targets": [
             {
-              "expr": "irate(node_network_receive_errs_total{instance=\"$node\",job=\"$job\"}[5m])",
+              "expr": "rate(node_network_receive_errs_total{instance=\"$node\",job=\"$job\"}[$__rate_interval])",
               "format": "time_series",
               "intervalFactor": 2,
               "legendFormat": "{{device}} - Receive errors",
@@ -10105,7 +10105,7 @@
               "step": 240
             },
             {
-              "expr": "irate(node_network_transmit_errs_total{instance=\"$node\",job=\"$job\"}[5m])",
+              "expr": "rate(node_network_transmit_errs_total{instance=\"$node\",job=\"$job\"}[$__rate_interval])",
               "format": "time_series",
               "intervalFactor": 2,
               "legendFormat": "{{device}} - Rransmit errors",
@@ -10208,7 +10208,7 @@
           "steppedLine": false,
           "targets": [
             {
-              "expr": "irate(node_network_receive_drop_total{instance=\"$node\",job=\"$job\"}[5m])",
+              "expr": "rate(node_network_receive_drop_total{instance=\"$node\",job=\"$job\"}[$__rate_interval])",
               "format": "time_series",
               "intervalFactor": 2,
               "legendFormat": "{{device}} - Receive drop",
@@ -10216,7 +10216,7 @@
               "step": 240
             },
             {
-              "expr": "irate(node_network_transmit_drop_total{instance=\"$node\",job=\"$job\"}[5m])",
+              "expr": "rate(node_network_transmit_drop_total{instance=\"$node\",job=\"$job\"}[$__rate_interval])",
               "format": "time_series",
               "intervalFactor": 2,
               "legendFormat": "{{device}} - Transmit drop",
@@ -10319,7 +10319,7 @@
           "steppedLine": false,
           "targets": [
             {
-              "expr": "irate(node_network_receive_compressed_total{instance=\"$node\",job=\"$job\"}[5m])",
+              "expr": "rate(node_network_receive_compressed_total{instance=\"$node\",job=\"$job\"}[$__rate_interval])",
               "format": "time_series",
               "intervalFactor": 2,
               "legendFormat": "{{device}} - Receive compressed",
@@ -10327,7 +10327,7 @@
               "step": 240
             },
             {
-              "expr": "irate(node_network_transmit_compressed_total{instance=\"$node\",job=\"$job\"}[5m])",
+              "expr": "rate(node_network_transmit_compressed_total{instance=\"$node\",job=\"$job\"}[$__rate_interval])",
               "format": "time_series",
               "intervalFactor": 2,
               "legendFormat": "{{device}} - Transmit compressed",
@@ -10430,7 +10430,7 @@
           "steppedLine": false,
           "targets": [
             {
-              "expr": "irate(node_network_receive_multicast_total{instance=\"$node\",job=\"$job\"}[5m])",
+              "expr": "rate(node_network_receive_multicast_total{instance=\"$node\",job=\"$job\"}[$__rate_interval])",
               "format": "time_series",
               "intervalFactor": 2,
               "legendFormat": "{{device}} - Receive multicast",
@@ -10533,7 +10533,7 @@
           "steppedLine": false,
           "targets": [
             {
-              "expr": "irate(node_network_receive_fifo_total{instance=\"$node\",job=\"$job\"}[5m])",
+              "expr": "rate(node_network_receive_fifo_total{instance=\"$node\",job=\"$job\"}[$__rate_interval])",
               "format": "time_series",
               "intervalFactor": 2,
               "legendFormat": "{{device}} - Receive fifo",
@@ -10541,7 +10541,7 @@
               "step": 240
             },
             {
-              "expr": "irate(node_network_transmit_fifo_total{instance=\"$node\",job=\"$job\"}[5m])",
+              "expr": "rate(node_network_transmit_fifo_total{instance=\"$node\",job=\"$job\"}[$__rate_interval])",
               "format": "time_series",
               "intervalFactor": 2,
               "legendFormat": "{{device}} - Transmit fifo",
@@ -10645,7 +10645,7 @@
           "steppedLine": false,
           "targets": [
             {
-              "expr": "irate(node_network_receive_frame_total{instance=\"$node\",job=\"$job\"}[5m])",
+              "expr": "rate(node_network_receive_frame_total{instance=\"$node\",job=\"$job\"}[$__rate_interval])",
               "format": "time_series",
               "hide": false,
               "intervalFactor": 2,
@@ -10746,7 +10746,7 @@
           "steppedLine": false,
           "targets": [
             {
-              "expr": "irate(node_network_transmit_carrier_total{instance=\"$node\",job=\"$job\"}[5m])",
+              "expr": "rate(node_network_transmit_carrier_total{instance=\"$node\",job=\"$job\"}[$__rate_interval])",
               "format": "time_series",
               "intervalFactor": 2,
               "legendFormat": "{{device}} - Statistic transmit_carrier",
@@ -10849,7 +10849,7 @@
           "steppedLine": false,
           "targets": [
             {
-              "expr": "irate(node_network_transmit_colls_total{instance=\"$node\",job=\"$job\"}[5m])",
+              "expr": "rate(node_network_transmit_colls_total{instance=\"$node\",job=\"$job\"}[$__rate_interval])",
               "format": "time_series",
               "intervalFactor": 2,
               "legendFormat": "{{device}} - Transmit colls",
@@ -11438,7 +11438,7 @@
           "steppedLine": false,
           "targets": [
             {
-              "expr": "irate(node_softnet_processed_total{instance=\"$node\",job=\"$job\"}[5m])",
+              "expr": "rate(node_softnet_processed_total{instance=\"$node\",job=\"$job\"}[$__rate_interval])",
               "format": "time_series",
               "interval": "",
               "intervalFactor": 2,
@@ -11447,7 +11447,7 @@
               "step": 240
             },
             {
-              "expr": "irate(node_softnet_dropped_total{instance=\"$node\",job=\"$job\"}[5m])",
+              "expr": "rate(node_softnet_dropped_total{instance=\"$node\",job=\"$job\"}[$__rate_interval])",
               "format": "time_series",
               "interval": "",
               "intervalFactor": 2,
@@ -11548,7 +11548,7 @@
           "steppedLine": false,
           "targets": [
             {
-              "expr": "irate(node_softnet_times_squeezed_total{instance=\"$node\",job=\"$job\"}[5m])",
+              "expr": "rate(node_softnet_times_squeezed_total{instance=\"$node\",job=\"$job\"}[$__rate_interval])",
               "format": "time_series",
               "interval": "",
               "intervalFactor": 2,
@@ -12363,7 +12363,7 @@
           "steppedLine": false,
           "targets": [
             {
-              "expr": "irate(node_netstat_IpExt_InOctets{instance=\"$node\",job=\"$job\"}[5m])",
+              "expr": "rate(node_netstat_IpExt_InOctets{instance=\"$node\",job=\"$job\"}[$__rate_interval])",
               "format": "time_series",
               "interval": "",
               "intervalFactor": 2,
@@ -12372,7 +12372,7 @@
               "step": 240
             },
             {
-              "expr": "irate(node_netstat_IpExt_OutOctets{instance=\"$node\",job=\"$job\"}[5m])",
+              "expr": "rate(node_netstat_IpExt_OutOctets{instance=\"$node\",job=\"$job\"}[$__rate_interval])",
               "format": "time_series",
               "intervalFactor": 2,
               "legendFormat": "OutOctets - Sent octets",
@@ -12473,7 +12473,7 @@
           "steppedLine": false,
           "targets": [
             {
-              "expr": "irate(node_netstat_Ip_Forwarding{instance=\"$node\",job=\"$job\"}[5m])",
+              "expr": "rate(node_netstat_Ip_Forwarding{instance=\"$node\",job=\"$job\"}[$__rate_interval])",
               "format": "time_series",
               "interval": "",
               "intervalFactor": 2,
@@ -12580,7 +12580,7 @@
           "steppedLine": false,
           "targets": [
             {
-              "expr": "irate(node_netstat_Icmp_InMsgs{instance=\"$node\",job=\"$job\"}[5m])",
+              "expr": "rate(node_netstat_Icmp_InMsgs{instance=\"$node\",job=\"$job\"}[$__rate_interval])",
               "format": "time_series",
               "interval": "",
               "intervalFactor": 2,
@@ -12589,7 +12589,7 @@
               "step": 240
             },
             {
-              "expr": "irate(node_netstat_Icmp_OutMsgs{instance=\"$node\",job=\"$job\"}[5m])",
+              "expr": "rate(node_netstat_Icmp_OutMsgs{instance=\"$node\",job=\"$job\"}[$__rate_interval])",
               "format": "time_series",
               "interval": "",
               "intervalFactor": 2,
@@ -12694,7 +12694,7 @@
           "steppedLine": false,
           "targets": [
             {
-              "expr": "irate(node_netstat_Icmp_InErrors{instance=\"$node\",job=\"$job\"}[5m])",
+              "expr": "rate(node_netstat_Icmp_InErrors{instance=\"$node\",job=\"$job\"}[$__rate_interval])",
               "format": "time_series",
               "interval": "",
               "intervalFactor": 2,
@@ -12803,7 +12803,7 @@
           "steppedLine": false,
           "targets": [
             {
-              "expr": "irate(node_netstat_Udp_InDatagrams{instance=\"$node\",job=\"$job\"}[5m])",
+              "expr": "rate(node_netstat_Udp_InDatagrams{instance=\"$node\",job=\"$job\"}[$__rate_interval])",
               "format": "time_series",
               "interval": "",
               "intervalFactor": 2,
@@ -12812,7 +12812,7 @@
               "step": 240
             },
             {
-              "expr": "irate(node_netstat_Udp_OutDatagrams{instance=\"$node\",job=\"$job\"}[5m])",
+              "expr": "rate(node_netstat_Udp_OutDatagrams{instance=\"$node\",job=\"$job\"}[$__rate_interval])",
               "format": "time_series",
               "interval": "",
               "intervalFactor": 2,
@@ -12911,7 +12911,7 @@
           "steppedLine": false,
           "targets": [
             {
-              "expr": "irate(node_netstat_Udp_InErrors{instance=\"$node\",job=\"$job\"}[5m])",
+              "expr": "rate(node_netstat_Udp_InErrors{instance=\"$node\",job=\"$job\"}[$__rate_interval])",
               "format": "time_series",
               "interval": "",
               "intervalFactor": 2,
@@ -12920,7 +12920,7 @@
               "step": 240
             },
             {
-              "expr": "irate(node_netstat_Udp_NoPorts{instance=\"$node\",job=\"$job\"}[5m])",
+              "expr": "rate(node_netstat_Udp_NoPorts{instance=\"$node\",job=\"$job\"}[$__rate_interval])",
               "format": "time_series",
               "interval": "",
               "intervalFactor": 2,
@@ -12929,13 +12929,13 @@
               "step": 240
             },
             {
-              "expr": "irate(node_netstat_UdpLite_InErrors{instance=\"$node\",job=\"$job\"}[5m])",
+              "expr": "rate(node_netstat_UdpLite_InErrors{instance=\"$node\",job=\"$job\"}[$__rate_interval])",
               "interval": "",
               "legendFormat": "InErrors Lite - UDPLite Datagrams that could not be delivered to an application",
               "refId": "C"
             },
             {
-              "expr": "irate(node_netstat_Udp_RcvbufErrors{instance=\"$node\",job=\"$job\"}[5m])",
+              "expr": "rate(node_netstat_Udp_RcvbufErrors{instance=\"$node\",job=\"$job\"}[$__rate_interval])",
               "format": "time_series",
               "interval": "",
               "intervalFactor": 2,
@@ -12944,7 +12944,7 @@
               "step": 240
             },
             {
-              "expr": "irate(node_netstat_Udp_SndbufErrors{instance=\"$node\",job=\"$job\"}[5m])",
+              "expr": "rate(node_netstat_Udp_SndbufErrors{instance=\"$node\",job=\"$job\"}[$__rate_interval])",
               "format": "time_series",
               "interval": "",
               "intervalFactor": 2,
@@ -13055,7 +13055,7 @@
           "steppedLine": false,
           "targets": [
             {
-              "expr": "irate(node_netstat_Tcp_InSegs{instance=\"$node\",job=\"$job\"}[5m])",
+              "expr": "rate(node_netstat_Tcp_InSegs{instance=\"$node\",job=\"$job\"}[$__rate_interval])",
               "format": "time_series",
               "instant": false,
               "interval": "",
@@ -13065,7 +13065,7 @@
               "step": 240
             },
             {
-              "expr": "irate(node_netstat_Tcp_OutSegs{instance=\"$node\",job=\"$job\"}[5m])",
+              "expr": "rate(node_netstat_Tcp_OutSegs{instance=\"$node\",job=\"$job\"}[$__rate_interval])",
               "format": "time_series",
               "interval": "",
               "intervalFactor": 2,
@@ -13166,7 +13166,7 @@
           "steppedLine": false,
           "targets": [
             {
-              "expr": "irate(node_netstat_TcpExt_ListenOverflows{instance=\"$node\",job=\"$job\"}[5m])",
+              "expr": "rate(node_netstat_TcpExt_ListenOverflows{instance=\"$node\",job=\"$job\"}[$__rate_interval])",
               "format": "time_series",
               "hide": false,
               "interval": "",
@@ -13176,7 +13176,7 @@
               "step": 240
             },
             {
-              "expr": "irate(node_netstat_TcpExt_ListenDrops{instance=\"$node\",job=\"$job\"}[5m])",
+              "expr": "rate(node_netstat_TcpExt_ListenDrops{instance=\"$node\",job=\"$job\"}[$__rate_interval])",
               "format": "time_series",
               "hide": false,
               "interval": "",
@@ -13186,7 +13186,7 @@
               "step": 240
             },
             {
-              "expr": "irate(node_netstat_TcpExt_TCPSynRetrans{instance=\"$node\",job=\"$job\"}[5m])",
+              "expr": "rate(node_netstat_TcpExt_TCPSynRetrans{instance=\"$node\",job=\"$job\"}[$__rate_interval])",
               "format": "time_series",
               "interval": "",
               "intervalFactor": 2,
@@ -13195,13 +13195,13 @@
               "step": 240
             },
             {
-              "expr": "irate(node_netstat_Tcp_RetransSegs{instance=\"$node\",job=\"$job\"}[5m])",
+              "expr": "rate(node_netstat_Tcp_RetransSegs{instance=\"$node\",job=\"$job\"}[$__rate_interval])",
               "interval": "",
               "legendFormat": "RetransSegs - Segments retransmitted - that is, the number of TCP segments transmitted containing one or more previously transmitted octets",
               "refId": "D"
             },
             {
-              "expr": "irate(node_netstat_Tcp_InErrs{instance=\"$node\",job=\"$job\"}[5m])",
+              "expr": "rate(node_netstat_Tcp_InErrs{instance=\"$node\",job=\"$job\"}[$__rate_interval])",
               "interval": "",
               "legendFormat": "InErrs - Segments received in error (e.g., bad TCP checksums)",
               "refId": "E"
@@ -13422,7 +13422,7 @@
           "steppedLine": false,
           "targets": [
             {
-              "expr": "irate(node_netstat_TcpExt_SyncookiesFailed{instance=\"$node\",job=\"$job\"}[5m])",
+              "expr": "rate(node_netstat_TcpExt_SyncookiesFailed{instance=\"$node\",job=\"$job\"}[$__rate_interval])",
               "format": "time_series",
               "hide": false,
               "interval": "",
@@ -13432,7 +13432,7 @@
               "step": 240
             },
             {
-              "expr": "irate(node_netstat_TcpExt_SyncookiesRecv{instance=\"$node\",job=\"$job\"}[5m])",
+              "expr": "rate(node_netstat_TcpExt_SyncookiesRecv{instance=\"$node\",job=\"$job\"}[$__rate_interval])",
               "format": "time_series",
               "hide": false,
               "interval": "",
@@ -13442,7 +13442,7 @@
               "step": 240
             },
             {
-              "expr": "irate(node_netstat_TcpExt_SyncookiesSent{instance=\"$node\",job=\"$job\"}[5m])",
+              "expr": "rate(node_netstat_TcpExt_SyncookiesSent{instance=\"$node\",job=\"$job\"}[$__rate_interval])",
               "format": "time_series",
               "hide": false,
               "interval": "",
@@ -13541,7 +13541,7 @@
           "steppedLine": false,
           "targets": [
             {
-              "expr": "irate(node_netstat_Tcp_ActiveOpens{instance=\"$node\",job=\"$job\"}[5m])",
+              "expr": "rate(node_netstat_Tcp_ActiveOpens{instance=\"$node\",job=\"$job\"}[$__rate_interval])",
               "format": "time_series",
               "interval": "",
               "intervalFactor": 2,
@@ -13550,7 +13550,7 @@
               "step": 240
             },
             {
-              "expr": "irate(node_netstat_Tcp_PassiveOpens{instance=\"$node\",job=\"$job\"}[5m])",
+              "expr": "rate(node_netstat_Tcp_PassiveOpens{instance=\"$node\",job=\"$job\"}[$__rate_interval])",
               "format": "time_series",
               "interval": "",
               "intervalFactor": 2,