diff --git a/deps/rabbitmq_prometheus/docker/docker-compose-dist-tls.yml b/deps/rabbitmq_prometheus/docker/docker-compose-dist-tls.yml
index 97e114d2f7..4e8d52f4b9 100644
--- a/deps/rabbitmq_prometheus/docker/docker-compose-dist-tls.yml
+++ b/deps/rabbitmq_prometheus/docker/docker-compose-dist-tls.yml
@@ -11,7 +11,7 @@ volumes:
   rabbitmq-prometheus_grafana:
 
 services:
-  rabbitmq-dist-tls0: &rabbitmq
+  rmq0-dist-tls: &rabbitmq
     # https://hub.docker.com/r/pivotalrabbitmq/rabbitmq-prometheus/tags
     image: pivotalrabbitmq/rabbitmq-prometheus:3.8.0-alpha.686-2019.06.13
     networks:
@@ -25,9 +25,9 @@ services:
     # https://www.digitalocean.com/community/tutorials/iptables-essentials-common-firewall-rules-and-commands#block-an-ip-address
     cap_add:
       - ALL
-    hostname: rabbitmq-dist-tls0
+    hostname: rmq0-dist-tls
     environment:
-      RABBITMQ_ERLANG_COOKIE: rabbitmq-dist-tls
+      RABBITMQ_ERLANG_COOKIE: rmq0-dist-tls
     volumes:
       - ./rabbitmq-dist-tls.conf:/etc/rabbitmq/rabbitmq.conf:ro
       - ./rabbitmq-env.conf:/etc/rabbitmq/rabbitmq-env.conf:ro
@@ -39,16 +39,16 @@ services:
       nofile:
         soft: "2000"
         hard: "2000"
-  rabbitmq-dist-tls1:
+  rmq1-dist-tls:
     << : *rabbitmq
-    hostname: rabbitmq-dist-tls1
+    hostname: rmq1-dist-tls
     ports:
       - "5677:5672"
       - "15677:15672"
       - "15697:15692"
-  rabbitmq-dist-tls2:
+  rmq2-dist-tls:
     << : *rabbitmq
-    hostname: rabbitmq-dist-tls2
+    hostname: rmq2-dist-tls
     ports:
       - "5678:5672"
       - "15678:15672"
@@ -59,7 +59,7 @@ services:
     networks:
       - "rabbitmq-prometheus"
     environment:
-      URI: "amqp://guest:guest@rabbitmq-dist-tls0:5672/%2f"
+      URI: "amqp://guest:guest@rmq0-dist-tls:5672/%2f"
       QUEUE_PATTERN: "ha3-stress_dist-%d"
       QUEUE_PATTERN_FROM: 1
       QUEUE_PATTERN_TO: 10
diff --git a/deps/rabbitmq_prometheus/docker/docker-compose-overview.yml b/deps/rabbitmq_prometheus/docker/docker-compose-overview.yml
index afe340c8de..586c77f549 100644
--- a/deps/rabbitmq_prometheus/docker/docker-compose-overview.yml
+++ b/deps/rabbitmq_prometheus/docker/docker-compose-overview.yml
@@ -11,7 +11,7 @@ volumes:
   rabbitmq-prometheus_grafana:
 
 services:
-  rabbitmq0: &rabbitmq
+  rmq0: &rabbitmq
     # https://hub.docker.com/r/pivotalrabbitmq/rabbitmq-prometheus/tags
     image: pivotalrabbitmq/rabbitmq-prometheus:3.8.0-alpha.686-2019.06.13
     networks:
@@ -25,7 +25,7 @@ services:
     # https://www.digitalocean.com/community/tutorials/iptables-essentials-common-firewall-rules-and-commands#block-an-ip-address
     cap_add:
       - ALL
-    hostname: rabbitmq0
+    hostname: rmq0
     environment:
       RABBITMQ_ERLANG_COOKIE: rabbitmq-overview
     volumes:
@@ -36,16 +36,16 @@ services:
       nofile:
         soft: "2000"
         hard: "2000"
-  rabbitmq1:
+  rmq1:
     << : *rabbitmq
-    hostname: rabbitmq1
+    hostname: rmq1
     ports:
       - "5674:5672"
       - "15674:15672"
       - "15694:15692"
-  rabbitmq2:
+  rmq2:
     << : *rabbitmq
-    hostname: rabbitmq2
+    hostname: rmq2
     ports:
       - "5675:5672"
       - "15675:15672"
@@ -56,7 +56,7 @@ services:
     networks:
       - "rabbitmq-prometheus"
     environment:
-      URI: "amqp://guest:guest@rabbitmq0:5672/%2f"
+      URI: "amqp://guest:guest@rmq0:5672/%2f"
       QUEUE: publisher-confirms
       ROUTING_KEY: publisher-confirms
       AUTOACK: "true"
@@ -69,7 +69,7 @@ services:
     networks:
       - "rabbitmq-prometheus"
     environment:
-      URI: "amqp://guest:guest@rabbitmq1:5672/%2f"
+      URI: "amqp://guest:guest@rmq1:5672/%2f"
       VARIABLE_RATE: "2:30,4:30,10:30"
       VARIABLE_SIZE: "100:30,200:30"
       CONSUMERS: 0
@@ -80,7 +80,7 @@ services:
     networks:
       - "rabbitmq-prometheus"
     environment:
-      URI: "amqp://guest:guest@rabbitmq1:5672/%2f"
+      URI: "amqp://guest:guest@rmq1:5672/%2f"
       VARIABLE_RATE: "5:30,10:30,20:30"
       VARIABLE_SIZE: "100:30,200:30"
       CONSUMERS: 0
@@ -90,14 +90,14 @@ services:
     networks:
       - "rabbitmq-prometheus"
     environment:
-      URI: "amqp://guest:guest@rabbitmq2:5672/%2f"
+      URI: "amqp://guest:guest@rmq2:5672/%2f"
       QUEUE: ha3-slow-consumer-persistent
       ROUTING_KEY: slow-consumer-persistent
-      QUEUE_ARGS: x-max-length=1000
+      QUEUE_ARGS: x-max-length=10000
       FLAG: persistent
       AUTO_DELETE: "false"
       SIZE: 51200
-      VARIABLE_RATE: "100:20,0:25"
+      VARIABLE_RATE: "100:20,0:20"
       CONSUMER_RATE: 50
       QOS: 50
       AUTOACK: "false"
@@ -107,7 +107,7 @@ services:
     networks:
       - "rabbitmq-prometheus"
     environment:
-      URI: "amqp://guest:guest@rabbitmq1:5672/%2f"
+      URI: "amqp://guest:guest@rmq1:5672/%2f"
       QUEUE: basic-get
       ROUTING_KEY: basic-get
       VARIABLE_RATE: "1:1,0:30"
@@ -120,7 +120,7 @@ services:
     networks:
       - "rabbitmq-prometheus"
     environment:
-      URI: "amqp://guest:guest@rabbitmq1:5672/%2f"
+      URI: "amqp://guest:guest@rmq1:5672/%2f"
       QUEUE: basic-get
       ROUTING_KEY: basic-get
       PRODUCERS: 0
@@ -136,7 +136,7 @@ services:
     command: /bin/bash -c "while true; do bin/runjava com.rabbitmq.perf.PerfTest; sleep 10; done"
     environment:
       TIME: 60
-      URI: "amqp://guest:guest@rabbitmq0:5672/%2f"
+      URI: "amqp://guest:guest@rmq0:5672/%2f"
       VARIABLE_RATE: "1:10,0:20"
       QUEUE: nack
       QUEUE_ARGS: x-max-length=100
diff --git a/deps/rabbitmq_prometheus/docker/grafana/dashboards/Erlang-Distribution.json b/deps/rabbitmq_prometheus/docker/grafana/dashboards/Erlang-Distribution.json
index cf7aa735cb..3594c51fb6 100644
--- a/deps/rabbitmq_prometheus/docker/grafana/dashboards/Erlang-Distribution.json
+++ b/deps/rabbitmq_prometheus/docker/grafana/dashboards/Erlang-Distribution.json
@@ -486,43 +486,43 @@
       "renderer": "flot",
       "seriesOverrides": [
         {
-          "alias": "/^rabbit@[\\w-]+0/",
+          "alias": "/^rabbit@\\w+0/",
           "color": "#56A64B"
         },
         {
-          "alias": "/^rabbit@[\\w-]+1/",
+          "alias": "/^rabbit@\\w+1/",
           "color": "#F2CC0C"
         },
         {
-          "alias": "/^rabbit@[\\w-]+2/",
+          "alias": "/^rabbit@\\w+2/",
           "color": "#3274D9"
         },
         {
-          "alias": "/^rabbit@[\\w-]+3/",
+          "alias": "/^rabbit@\\w+3/",
           "color": "#A352CC"
         },
         {
-          "alias": "/^rabbit@[\\w-]+4/",
+          "alias": "/^rabbit@\\w+4/",
           "color": "#FF780A"
         },
         {
-          "alias": "/^rabbit@[\\w-]+5/",
+          "alias": "/^rabbit@\\w+5/",
           "color": "#96D98D"
         },
         {
-          "alias": "/^rabbit@[\\w-]+6/",
+          "alias": "/^rabbit@\\w+6/",
           "color": "#FFEE52"
         },
         {
-          "alias": "/^rabbit@[\\w-]+7/",
+          "alias": "/^rabbit@\\w+7/",
           "color": "#8AB8FF"
         },
         {
-          "alias": "/^rabbit@[\\w-]+8/",
+          "alias": "/^rabbit@\\w+8/",
           "color": "#CA95E5"
         },
         {
-          "alias": "/^rabbit@[\\w-]+9/",
+          "alias": "/^rabbit@\\w+9/",
           "color": "#FFB357"
         }
       ],
@@ -637,43 +637,43 @@
       "renderer": "flot",
       "seriesOverrides": [
         {
-          "alias": "/^rabbit@[\\w-]+0/",
+          "alias": "/^rabbit@\\w+0/",
           "color": "#56A64B"
         },
         {
-          "alias": "/^rabbit@[\\w-]+1/",
+          "alias": "/^rabbit@\\w+1/",
           "color": "#F2CC0C"
         },
         {
-          "alias": "/^rabbit@[\\w-]+2/",
+          "alias": "/^rabbit@\\w+2/",
           "color": "#3274D9"
         },
         {
-          "alias": "/^rabbit@[\\w-]+3/",
+          "alias": "/^rabbit@\\w+3/",
           "color": "#A352CC"
         },
         {
-          "alias": "/^rabbit@[\\w-]+4/",
+          "alias": "/^rabbit@\\w+4/",
           "color": "#FF780A"
         },
         {
-          "alias": "/^rabbit@[\\w-]+5/",
+          "alias": "/^rabbit@\\w+5/",
           "color": "#96D98D"
         },
         {
-          "alias": "/^rabbit@[\\w-]+6/",
+          "alias": "/^rabbit@\\w+6/",
           "color": "#FFEE52"
         },
         {
-          "alias": "/^rabbit@[\\w-]+7/",
+          "alias": "/^rabbit@\\w+7/",
           "color": "#8AB8FF"
         },
         {
-          "alias": "/^rabbit@[\\w-]+8/",
+          "alias": "/^rabbit@\\w+8/",
           "color": "#CA95E5"
         },
         {
-          "alias": "/^rabbit@[\\w-]+9/",
+          "alias": "/^rabbit@\\w+9/",
           "color": "#FFB357"
         }
       ],
@@ -768,43 +768,43 @@
       "renderer": "flot",
       "seriesOverrides": [
         {
-          "alias": "/^rabbit@[\\w-]+0/",
+          "alias": "/^rabbit@\\w+0/",
           "color": "#56A64B"
         },
         {
-          "alias": "/^rabbit@[\\w-]+1/",
+          "alias": "/^rabbit@\\w+1/",
           "color": "#F2CC0C"
         },
         {
-          "alias": "/^rabbit@[\\w-]+2/",
+          "alias": "/^rabbit@\\w+2/",
           "color": "#3274D9"
         },
         {
-          "alias": "/^rabbit@[\\w-]+3/",
+          "alias": "/^rabbit@\\w+3/",
           "color": "#A352CC"
         },
         {
-          "alias": "/^rabbit@[\\w-]+4/",
+          "alias": "/^rabbit@\\w+4/",
           "color": "#FF780A"
         },
         {
-          "alias": "/^rabbit@[\\w-]+5/",
+          "alias": "/^rabbit@\\w+5/",
           "color": "#96D98D"
         },
         {
-          "alias": "/^rabbit@[\\w-]+6/",
+          "alias": "/^rabbit@\\w+6/",
           "color": "#FFEE52"
         },
         {
-          "alias": "/^rabbit@[\\w-]+7/",
+          "alias": "/^rabbit@\\w+7/",
           "color": "#8AB8FF"
         },
         {
-          "alias": "/^rabbit@[\\w-]+8/",
+          "alias": "/^rabbit@\\w+8/",
           "color": "#CA95E5"
         },
         {
-          "alias": "/^rabbit@[\\w-]+9/",
+          "alias": "/^rabbit@\\w+9/",
           "color": "#FFB357"
         }
       ],
@@ -899,43 +899,43 @@
       "renderer": "flot",
       "seriesOverrides": [
         {
-          "alias": "/^rabbit@[\\w-]+0/",
+          "alias": "/^rabbit@\\w+0/",
           "color": "#56A64B"
         },
         {
-          "alias": "/^rabbit@[\\w-]+1/",
+          "alias": "/^rabbit@\\w+1/",
           "color": "#F2CC0C"
         },
         {
-          "alias": "/^rabbit@[\\w-]+2/",
+          "alias": "/^rabbit@\\w+2/",
           "color": "#3274D9"
         },
         {
-          "alias": "/^rabbit@[\\w-]+3/",
+          "alias": "/^rabbit@\\w+3/",
           "color": "#A352CC"
         },
         {
-          "alias": "/^rabbit@[\\w-]+4/",
+          "alias": "/^rabbit@\\w+4/",
           "color": "#FF780A"
         },
         {
-          "alias": "/^rabbit@[\\w-]+5/",
+          "alias": "/^rabbit@\\w+5/",
           "color": "#96D98D"
         },
         {
-          "alias": "/^rabbit@[\\w-]+6/",
+          "alias": "/^rabbit@\\w+6/",
           "color": "#FFEE52"
         },
         {
-          "alias": "/^rabbit@[\\w-]+7/",
+          "alias": "/^rabbit@\\w+7/",
           "color": "#8AB8FF"
         },
         {
-          "alias": "/^rabbit@[\\w-]+8/",
+          "alias": "/^rabbit@\\w+8/",
           "color": "#CA95E5"
         },
         {
-          "alias": "/^rabbit@[\\w-]+9/",
+          "alias": "/^rabbit@\\w+9/",
           "color": "#FFB357"
         }
       ],
@@ -1028,43 +1028,43 @@
       "renderer": "flot",
       "seriesOverrides": [
         {
-          "alias": "/^rabbit@[\\w-]+0/",
+          "alias": "/^rabbit@\\w+0/",
           "color": "#56A64B"
         },
         {
-          "alias": "/^rabbit@[\\w-]+1/",
+          "alias": "/^rabbit@\\w+1/",
           "color": "#F2CC0C"
         },
         {
-          "alias": "/^rabbit@[\\w-]+2/",
+          "alias": "/^rabbit@\\w+2/",
           "color": "#3274D9"
         },
         {
-          "alias": "/^rabbit@[\\w-]+3/",
+          "alias": "/^rabbit@\\w+3/",
           "color": "#A352CC"
         },
         {
-          "alias": "/^rabbit@[\\w-]+4/",
+          "alias": "/^rabbit@\\w+4/",
           "color": "#FF780A"
         },
         {
-          "alias": "/^rabbit@[\\w-]+5/",
+          "alias": "/^rabbit@\\w+5/",
           "color": "#96D98D"
         },
         {
-          "alias": "/^rabbit@[\\w-]+6/",
+          "alias": "/^rabbit@\\w+6/",
           "color": "#FFEE52"
         },
         {
-          "alias": "/^rabbit@[\\w-]+7/",
+          "alias": "/^rabbit@\\w+7/",
           "color": "#8AB8FF"
         },
         {
-          "alias": "/^rabbit@[\\w-]+8/",
+          "alias": "/^rabbit@\\w+8/",
           "color": "#CA95E5"
         },
         {
-          "alias": "/^rabbit@[\\w-]+9/",
+          "alias": "/^rabbit@\\w+9/",
           "color": "#FFB357"
         }
       ],
@@ -1157,43 +1157,43 @@
       "renderer": "flot",
       "seriesOverrides": [
         {
-          "alias": "/^rabbit@[\\w-]+0/",
+          "alias": "/^rabbit@\\w+0/",
           "color": "#56A64B"
         },
         {
-          "alias": "/^rabbit@[\\w-]+1/",
+          "alias": "/^rabbit@\\w+1/",
           "color": "#F2CC0C"
         },
         {
-          "alias": "/^rabbit@[\\w-]+2/",
+          "alias": "/^rabbit@\\w+2/",
           "color": "#3274D9"
         },
         {
-          "alias": "/^rabbit@[\\w-]+3/",
+          "alias": "/^rabbit@\\w+3/",
           "color": "#A352CC"
         },
         {
-          "alias": "/^rabbit@[\\w-]+4/",
+          "alias": "/^rabbit@\\w+4/",
           "color": "#FF780A"
         },
         {
-          "alias": "/^rabbit@[\\w-]+5/",
+          "alias": "/^rabbit@\\w+5/",
           "color": "#96D98D"
         },
         {
-          "alias": "/^rabbit@[\\w-]+6/",
+          "alias": "/^rabbit@\\w+6/",
           "color": "#FFEE52"
         },
         {
-          "alias": "/^rabbit@[\\w-]+7/",
+          "alias": "/^rabbit@\\w+7/",
           "color": "#8AB8FF"
         },
         {
-          "alias": "/^rabbit@[\\w-]+8/",
+          "alias": "/^rabbit@\\w+8/",
           "color": "#CA95E5"
         },
         {
-          "alias": "/^rabbit@[\\w-]+9/",
+          "alias": "/^rabbit@\\w+9/",
           "color": "#FFB357"
         }
       ],
@@ -1288,43 +1288,43 @@
       "renderer": "flot",
       "seriesOverrides": [
         {
-          "alias": "/^rabbit@[\\w-]+0/",
+          "alias": "/^rabbit@\\w+0/",
           "color": "#56A64B"
         },
         {
-          "alias": "/^rabbit@[\\w-]+1/",
+          "alias": "/^rabbit@\\w+1/",
           "color": "#F2CC0C"
         },
         {
-          "alias": "/^rabbit@[\\w-]+2/",
+          "alias": "/^rabbit@\\w+2/",
           "color": "#3274D9"
         },
         {
-          "alias": "/^rabbit@[\\w-]+3/",
+          "alias": "/^rabbit@\\w+3/",
           "color": "#A352CC"
         },
         {
-          "alias": "/^rabbit@[\\w-]+4/",
+          "alias": "/^rabbit@\\w+4/",
           "color": "#FF780A"
         },
         {
-          "alias": "/^rabbit@[\\w-]+5/",
+          "alias": "/^rabbit@\\w+5/",
           "color": "#96D98D"
         },
         {
-          "alias": "/^rabbit@[\\w-]+6/",
+          "alias": "/^rabbit@\\w+6/",
           "color": "#FFEE52"
         },
         {
-          "alias": "/^rabbit@[\\w-]+7/",
+          "alias": "/^rabbit@\\w+7/",
           "color": "#8AB8FF"
         },
         {
-          "alias": "/^rabbit@[\\w-]+8/",
+          "alias": "/^rabbit@\\w+8/",
           "color": "#CA95E5"
         },
         {
-          "alias": "/^rabbit@[\\w-]+9/",
+          "alias": "/^rabbit@\\w+9/",
           "color": "#FFB357"
         }
       ],
@@ -1430,43 +1430,43 @@
       "renderer": "flot",
       "seriesOverrides": [
         {
-          "alias": "/^rabbit@[\\w-]+0/",
+          "alias": "/^rabbit@\\w+0/",
           "color": "#56A64B"
         },
         {
-          "alias": "/^rabbit@[\\w-]+1/",
+          "alias": "/^rabbit@\\w+1/",
           "color": "#F2CC0C"
         },
         {
-          "alias": "/^rabbit@[\\w-]+2/",
+          "alias": "/^rabbit@\\w+2/",
           "color": "#3274D9"
         },
         {
-          "alias": "/^rabbit@[\\w-]+3/",
+          "alias": "/^rabbit@\\w+3/",
           "color": "#A352CC"
         },
         {
-          "alias": "/^rabbit@[\\w-]+4/",
+          "alias": "/^rabbit@\\w+4/",
           "color": "#FF780A"
         },
         {
-          "alias": "/^rabbit@[\\w-]+5/",
+          "alias": "/^rabbit@\\w+5/",
           "color": "#96D98D"
         },
         {
-          "alias": "/^rabbit@[\\w-]+6/",
+          "alias": "/^rabbit@\\w+6/",
           "color": "#FFEE52"
         },
         {
-          "alias": "/^rabbit@[\\w-]+7/",
+          "alias": "/^rabbit@\\w+7/",
           "color": "#8AB8FF"
         },
         {
-          "alias": "/^rabbit@[\\w-]+8/",
+          "alias": "/^rabbit@\\w+8/",
           "color": "#CA95E5"
         },
         {
-          "alias": "/^rabbit@[\\w-]+9/",
+          "alias": "/^rabbit@\\w+9/",
           "color": "#FFB357"
         }
       ],
@@ -1909,43 +1909,43 @@
       },
       "seriesOverrides": [
         {
-          "alias": "/^rabbit@[\\w-]+0/",
+          "alias": "/^rabbit@\\w+0/",
           "color": "#56A64B"
         },
         {
-          "alias": "/^rabbit@[\\w-]+1/",
+          "alias": "/^rabbit@\\w+1/",
           "color": "#F2CC0C"
         },
         {
-          "alias": "/^rabbit@[\\w-]+2/",
+          "alias": "/^rabbit@\\w+2/",
           "color": "#3274D9"
         },
         {
-          "alias": "/^rabbit@[\\w-]+3/",
+          "alias": "/^rabbit@\\w+3/",
           "color": "#A352CC"
         },
         {
-          "alias": "/^rabbit@[\\w-]+4/",
+          "alias": "/^rabbit@\\w+4/",
           "color": "#FF780A"
         },
         {
-          "alias": "/^rabbit@[\\w-]+5/",
+          "alias": "/^rabbit@\\w+5/",
           "color": "#96D98D"
         },
         {
-          "alias": "/^rabbit@[\\w-]+6/",
+          "alias": "/^rabbit@\\w+6/",
           "color": "#FFEE52"
         },
         {
-          "alias": "/^rabbit@[\\w-]+7/",
+          "alias": "/^rabbit@\\w+7/",
           "color": "#8AB8FF"
         },
         {
-          "alias": "/^rabbit@[\\w-]+8/",
+          "alias": "/^rabbit@\\w+8/",
           "color": "#CA95E5"
         },
         {
-          "alias": "/^rabbit@[\\w-]+9/",
+          "alias": "/^rabbit@\\w+9/",
           "color": "#FFB357"
         }
       ],
@@ -2045,43 +2045,43 @@
       },
       "seriesOverrides": [
         {
-          "alias": "/^rabbit@[\\w-]+0/",
+          "alias": "/^rabbit@\\w+0/",
           "color": "#56A64B"
         },
         {
-          "alias": "/^rabbit@[\\w-]+1/",
+          "alias": "/^rabbit@\\w+1/",
           "color": "#F2CC0C"
         },
         {
-          "alias": "/^rabbit@[\\w-]+2/",
+          "alias": "/^rabbit@\\w+2/",
           "color": "#3274D9"
         },
         {
-          "alias": "/^rabbit@[\\w-]+3/",
+          "alias": "/^rabbit@\\w+3/",
           "color": "#A352CC"
         },
         {
-          "alias": "/^rabbit@[\\w-]+4/",
+          "alias": "/^rabbit@\\w+4/",
           "color": "#FF780A"
         },
         {
-          "alias": "/^rabbit@[\\w-]+5/",
+          "alias": "/^rabbit@\\w+5/",
           "color": "#96D98D"
         },
         {
-          "alias": "/^rabbit@[\\w-]+6/",
+          "alias": "/^rabbit@\\w+6/",
           "color": "#FFEE52"
         },
         {
-          "alias": "/^rabbit@[\\w-]+7/",
+          "alias": "/^rabbit@\\w+7/",
           "color": "#8AB8FF"
         },
         {
-          "alias": "/^rabbit@[\\w-]+8/",
+          "alias": "/^rabbit@\\w+8/",
           "color": "#CA95E5"
         },
         {
-          "alias": "/^rabbit@[\\w-]+9/",
+          "alias": "/^rabbit@\\w+9/",
           "color": "#FFB357"
         }
       ],
diff --git a/deps/rabbitmq_prometheus/docker/grafana/dashboards/RabbitMQ-Overview.json b/deps/rabbitmq_prometheus/docker/grafana/dashboards/RabbitMQ-Overview.json
index 5d05241905..2e2347b004 100644
--- a/deps/rabbitmq_prometheus/docker/grafana/dashboards/RabbitMQ-Overview.json
+++ b/deps/rabbitmq_prometheus/docker/grafana/dashboards/RabbitMQ-Overview.json
@@ -16,7 +16,7 @@
   "editable": true,
   "gnetId": null,
   "graphTooltip": 1,
-  "iteration": 1560179360116,
+  "iteration": 1560805749014,
   "links": [],
   "panels": [
     {
@@ -729,11 +729,11 @@
       "cacheTimeout": null,
       "dashLength": 10,
       "dashes": false,
-      "description": "Available memory before the memory alarm gets triggered.\n\nIf the value is negative, this means that the host on which RabbitMQ runs has more memory available than RabbitMQ is allowed to use. The memory alarm will be triggered, all publishers will be blocked, RabbitMQ will try to release as much memory as possible.\n\n* [Alarms](https://www.rabbitmq.com/alarms.html)\n* [Memory Alarms](https://www.rabbitmq.com/memory.html)\n* [Reasoning About Memory Use](https://www.rabbitmq.com/memory-use.html)\n* [Blocked Connection Notifications](https://www.rabbitmq.com/connection-blocked.html)",
+      "description": "Available memory before the memory alarm gets triggered and publishers are blocked\n\nIf the value is negative, this means that the host on which RabbitMQ runs has more memory available than RabbitMQ is allowed to use. The memory alarm will be triggered, all publishers will be blocked, RabbitMQ will try to release as much memory as possible.\n\n* [Alarms](https://www.rabbitmq.com/alarms.html)\n* [Memory Alarms](https://www.rabbitmq.com/memory.html)\n* [Reasoning About Memory Use](https://www.rabbitmq.com/memory-use.html)\n* [Blocked Connection Notifications](https://www.rabbitmq.com/connection-blocked.html)",
       "fill": 0,
       "gridPos": {
         "h": 8,
-        "w": 6,
+        "w": 12,
         "x": 0,
         "y": 4
       },
@@ -759,43 +759,43 @@
       "renderer": "flot",
       "seriesOverrides": [
         {
-          "alias": "/^rabbit@[\\w-]+0/",
+          "alias": "/^rabbit@\\w+0/",
           "color": "#56A64B"
         },
         {
-          "alias": "/^rabbit@[\\w-]+1/",
+          "alias": "/^rabbit@\\w+1/",
           "color": "#F2CC0C"
         },
         {
-          "alias": "/^rabbit@[\\w-]+2/",
+          "alias": "/^rabbit@\\w+2/",
           "color": "#3274D9"
         },
         {
-          "alias": "/^rabbit@[\\w-]+3/",
+          "alias": "/^rabbit@\\w+3/",
           "color": "#A352CC"
         },
         {
-          "alias": "/^rabbit@[\\w-]+4/",
+          "alias": "/^rabbit@\\w+4/",
           "color": "#FF780A"
         },
         {
-          "alias": "/^rabbit@[\\w-]+5/",
+          "alias": "/^rabbit@\\w+5/",
           "color": "#96D98D"
         },
         {
-          "alias": "/^rabbit@[\\w-]+6/",
+          "alias": "/^rabbit@\\w+6/",
           "color": "#FFEE52"
         },
         {
-          "alias": "/^rabbit@[\\w-]+7/",
+          "alias": "/^rabbit@\\w+7/",
           "color": "#8AB8FF"
         },
         {
-          "alias": "/^rabbit@[\\w-]+8/",
+          "alias": "/^rabbit@\\w+8/",
           "color": "#CA95E5"
         },
         {
-          "alias": "/^rabbit@[\\w-]+9/",
+          "alias": "/^rabbit@\\w+9/",
           "color": "#FFB357"
         }
       ],
@@ -818,7 +818,7 @@
           "fill": true,
           "line": true,
           "op": "lt",
-          "value": 1073741824,
+          "value": 536870912,
           "yaxis": "left"
         },
         {
@@ -833,7 +833,7 @@
       "timeFrom": null,
       "timeRegions": [],
       "timeShift": null,
-      "title": "Memory available before alarm",
+      "title": "Memory available before publishers blocked",
       "tooltip": {
         "shared": true,
         "sort": 0,
@@ -880,9 +880,9 @@
       "description": "* [Alarms](https://www.rabbitmq.com/alarms.html)\n* [Disk Space Alarms](https://www.rabbitmq.com/disk-alarms.html)\n* [Disk Space](https://www.rabbitmq.com/production-checklist.html#resource-limits-disk-space)\n* [Persistence Configuration](https://www.rabbitmq.com/persistence-conf.html)\n* [Blocked Connection Notifications](https://www.rabbitmq.com/connection-blocked.html)",
       "fill": 0,
       "gridPos": {
-        "h": 8,
+        "h": 4,
         "w": 6,
-        "x": 6,
+        "x": 12,
         "y": 4
       },
       "id": 8,
@@ -907,43 +907,43 @@
       "renderer": "flot",
       "seriesOverrides": [
         {
-          "alias": "/^rabbit@[\\w-]+0/",
+          "alias": "/^rabbit@\\w+0/",
           "color": "#56A64B"
         },
         {
-          "alias": "/^rabbit@[\\w-]+1/",
+          "alias": "/^rabbit@\\w+1/",
           "color": "#F2CC0C"
         },
         {
-          "alias": "/^rabbit@[\\w-]+2/",
+          "alias": "/^rabbit@\\w+2/",
           "color": "#3274D9"
         },
         {
-          "alias": "/^rabbit@[\\w-]+3/",
+          "alias": "/^rabbit@\\w+3/",
           "color": "#A352CC"
         },
         {
-          "alias": "/^rabbit@[\\w-]+4/",
+          "alias": "/^rabbit@\\w+4/",
           "color": "#FF780A"
         },
         {
-          "alias": "/^rabbit@[\\w-]+5/",
+          "alias": "/^rabbit@\\w+5/",
           "color": "#96D98D"
         },
         {
-          "alias": "/^rabbit@[\\w-]+6/",
+          "alias": "/^rabbit@\\w+6/",
           "color": "#FFEE52"
         },
         {
-          "alias": "/^rabbit@[\\w-]+7/",
+          "alias": "/^rabbit@\\w+7/",
           "color": "#8AB8FF"
         },
         {
-          "alias": "/^rabbit@[\\w-]+8/",
+          "alias": "/^rabbit@\\w+8/",
           "color": "#CA95E5"
         },
         {
-          "alias": "/^rabbit@[\\w-]+9/",
+          "alias": "/^rabbit@\\w+9/",
           "color": "#FFB357"
         }
       ],
@@ -981,7 +981,7 @@
       "timeFrom": null,
       "timeRegions": [],
       "timeShift": null,
-      "title": "Disk space available",
+      "title": "Disk space available before publishers blocked",
       "tooltip": {
         "shared": true,
         "sort": 0,
@@ -1030,7 +1030,7 @@
       "gridPos": {
         "h": 4,
         "w": 6,
-        "x": 12,
+        "x": 18,
         "y": 4
       },
       "id": 2,
@@ -1056,43 +1056,43 @@
       "renderer": "flot",
       "seriesOverrides": [
         {
-          "alias": "/^rabbit@[\\w-]+0/",
+          "alias": "/^rabbit@\\w+0/",
           "color": "#56A64B"
         },
         {
-          "alias": "/^rabbit@[\\w-]+1/",
+          "alias": "/^rabbit@\\w+1/",
           "color": "#F2CC0C"
         },
         {
-          "alias": "/^rabbit@[\\w-]+2/",
+          "alias": "/^rabbit@\\w+2/",
           "color": "#3274D9"
         },
         {
-          "alias": "/^rabbit@[\\w-]+3/",
+          "alias": "/^rabbit@\\w+3/",
           "color": "#A352CC"
         },
         {
-          "alias": "/^rabbit@[\\w-]+4/",
+          "alias": "/^rabbit@\\w+4/",
           "color": "#FF780A"
         },
         {
-          "alias": "/^rabbit@[\\w-]+5/",
+          "alias": "/^rabbit@\\w+5/",
           "color": "#96D98D"
         },
         {
-          "alias": "/^rabbit@[\\w-]+6/",
+          "alias": "/^rabbit@\\w+6/",
           "color": "#FFEE52"
         },
         {
-          "alias": "/^rabbit@[\\w-]+7/",
+          "alias": "/^rabbit@\\w+7/",
           "color": "#8AB8FF"
         },
         {
-          "alias": "/^rabbit@[\\w-]+8/",
+          "alias": "/^rabbit@\\w+8/",
           "color": "#CA95E5"
         },
         {
-          "alias": "/^rabbit@[\\w-]+9/",
+          "alias": "/^rabbit@\\w+9/",
           "color": "#FFB357"
         }
       ],
@@ -1130,7 +1130,7 @@
       "timeFrom": null,
       "timeRegions": [],
       "timeShift": null,
-      "title": "File descriptors available",
+      "title": "File descriptors available before publishers blocked",
       "tooltip": {
         "shared": true,
         "sort": 0,
@@ -1177,10 +1177,10 @@
       "description": "All work happens in an Erlang process - it's the basic unit of concurrency. Think of an Erlang process as a lightweight thread. A RabbitMQ queue is an Erlang process. Same for a channel, connection, vhost or message store.",
       "fill": 0,
       "gridPos": {
-        "h": 8,
+        "h": 4,
         "w": 6,
-        "x": 18,
-        "y": 4
+        "x": 12,
+        "y": 8
       },
       "id": 6,
       "legend": {
@@ -1204,43 +1204,43 @@
       "renderer": "flot",
       "seriesOverrides": [
         {
-          "alias": "/^rabbit@[\\w-]+0/",
+          "alias": "/^rabbit@\\w+0/",
           "color": "#56A64B"
         },
         {
-          "alias": "/^rabbit@[\\w-]+1/",
+          "alias": "/^rabbit@\\w+1/",
           "color": "#F2CC0C"
         },
         {
-          "alias": "/^rabbit@[\\w-]+2/",
+          "alias": "/^rabbit@\\w+2/",
           "color": "#3274D9"
         },
         {
-          "alias": "/^rabbit@[\\w-]+3/",
+          "alias": "/^rabbit@\\w+3/",
           "color": "#A352CC"
         },
         {
-          "alias": "/^rabbit@[\\w-]+4/",
+          "alias": "/^rabbit@\\w+4/",
           "color": "#FF780A"
         },
         {
-          "alias": "/^rabbit@[\\w-]+5/",
+          "alias": "/^rabbit@\\w+5/",
           "color": "#96D98D"
         },
         {
-          "alias": "/^rabbit@[\\w-]+6/",
+          "alias": "/^rabbit@\\w+6/",
           "color": "#FFEE52"
         },
         {
-          "alias": "/^rabbit@[\\w-]+7/",
+          "alias": "/^rabbit@\\w+7/",
           "color": "#8AB8FF"
         },
         {
-          "alias": "/^rabbit@[\\w-]+8/",
+          "alias": "/^rabbit@\\w+8/",
           "color": "#CA95E5"
         },
         {
-          "alias": "/^rabbit@[\\w-]+9/",
+          "alias": "/^rabbit@\\w+9/",
           "color": "#FFB357"
         }
       ],
@@ -1278,7 +1278,7 @@
       "timeFrom": null,
       "timeRegions": [],
       "timeShift": null,
-      "title": "Erlang processes available",
+      "title": "Erlang processes available before publishers blocked",
       "tooltip": {
         "shared": true,
         "sort": 0,
@@ -1327,7 +1327,7 @@
       "gridPos": {
         "h": 4,
         "w": 6,
-        "x": 12,
+        "x": 18,
         "y": 8
       },
       "id": 5,
@@ -1352,43 +1352,43 @@
       "renderer": "flot",
       "seriesOverrides": [
         {
-          "alias": "/^rabbit@[\\w-]+0/",
+          "alias": "/^rabbit@\\w+0/",
           "color": "#56A64B"
         },
         {
-          "alias": "/^rabbit@[\\w-]+1/",
+          "alias": "/^rabbit@\\w+1/",
           "color": "#F2CC0C"
         },
         {
-          "alias": "/^rabbit@[\\w-]+2/",
+          "alias": "/^rabbit@\\w+2/",
           "color": "#3274D9"
         },
         {
-          "alias": "/^rabbit@[\\w-]+3/",
+          "alias": "/^rabbit@\\w+3/",
           "color": "#A352CC"
         },
         {
-          "alias": "/^rabbit@[\\w-]+4/",
+          "alias": "/^rabbit@\\w+4/",
           "color": "#FF780A"
         },
         {
-          "alias": "/^rabbit@[\\w-]+5/",
+          "alias": "/^rabbit@\\w+5/",
           "color": "#96D98D"
         },
         {
-          "alias": "/^rabbit@[\\w-]+6/",
+          "alias": "/^rabbit@\\w+6/",
           "color": "#FFEE52"
         },
         {
-          "alias": "/^rabbit@[\\w-]+7/",
+          "alias": "/^rabbit@\\w+7/",
           "color": "#8AB8FF"
         },
         {
-          "alias": "/^rabbit@[\\w-]+8/",
+          "alias": "/^rabbit@\\w+8/",
           "color": "#CA95E5"
         },
         {
-          "alias": "/^rabbit@[\\w-]+9/",
+          "alias": "/^rabbit@\\w+9/",
           "color": "#FFB357"
         }
       ],
@@ -1426,7 +1426,7 @@
       "timeFrom": null,
       "timeRegions": [],
       "timeShift": null,
-      "title": "TCP sockets available",
+      "title": "TCP sockets available before publishers blocked",
       "tooltip": {
         "shared": true,
         "sort": 0,
@@ -1514,43 +1514,43 @@
       "renderer": "flot",
       "seriesOverrides": [
         {
-          "alias": "/^rabbit@[\\w-]+0/",
+          "alias": "/^rabbit@\\w+0/",
           "color": "#56A64B"
         },
         {
-          "alias": "/^rabbit@[\\w-]+1/",
+          "alias": "/^rabbit@\\w+1/",
           "color": "#F2CC0C"
         },
         {
-          "alias": "/^rabbit@[\\w-]+2/",
+          "alias": "/^rabbit@\\w+2/",
           "color": "#3274D9"
         },
         {
-          "alias": "/^rabbit@[\\w-]+3/",
+          "alias": "/^rabbit@\\w+3/",
           "color": "#A352CC"
         },
         {
-          "alias": "/^rabbit@[\\w-]+4/",
+          "alias": "/^rabbit@\\w+4/",
           "color": "#FF780A"
         },
         {
-          "alias": "/^rabbit@[\\w-]+5/",
+          "alias": "/^rabbit@\\w+5/",
           "color": "#96D98D"
         },
         {
-          "alias": "/^rabbit@[\\w-]+6/",
+          "alias": "/^rabbit@\\w+6/",
           "color": "#FFEE52"
         },
         {
-          "alias": "/^rabbit@[\\w-]+7/",
+          "alias": "/^rabbit@\\w+7/",
           "color": "#8AB8FF"
         },
         {
-          "alias": "/^rabbit@[\\w-]+8/",
+          "alias": "/^rabbit@\\w+8/",
           "color": "#CA95E5"
         },
         {
-          "alias": "/^rabbit@[\\w-]+9/",
+          "alias": "/^rabbit@\\w+9/",
           "color": "#FFB357"
         }
       ],
@@ -1646,43 +1646,43 @@
       "renderer": "flot",
       "seriesOverrides": [
         {
-          "alias": "/^rabbit@[\\w-]+0/",
+          "alias": "/^rabbit@\\w+0/",
           "color": "#56A64B"
         },
         {
-          "alias": "/^rabbit@[\\w-]+1/",
+          "alias": "/^rabbit@\\w+1/",
           "color": "#F2CC0C"
         },
         {
-          "alias": "/^rabbit@[\\w-]+2/",
+          "alias": "/^rabbit@\\w+2/",
           "color": "#3274D9"
         },
         {
-          "alias": "/^rabbit@[\\w-]+3/",
+          "alias": "/^rabbit@\\w+3/",
           "color": "#A352CC"
         },
         {
-          "alias": "/^rabbit@[\\w-]+4/",
+          "alias": "/^rabbit@\\w+4/",
           "color": "#FF780A"
         },
         {
-          "alias": "/^rabbit@[\\w-]+5/",
+          "alias": "/^rabbit@\\w+5/",
           "color": "#96D98D"
         },
         {
-          "alias": "/^rabbit@[\\w-]+6/",
+          "alias": "/^rabbit@\\w+6/",
           "color": "#FFEE52"
         },
         {
-          "alias": "/^rabbit@[\\w-]+7/",
+          "alias": "/^rabbit@\\w+7/",
           "color": "#8AB8FF"
         },
         {
-          "alias": "/^rabbit@[\\w-]+8/",
+          "alias": "/^rabbit@\\w+8/",
           "color": "#CA95E5"
         },
         {
-          "alias": "/^rabbit@[\\w-]+9/",
+          "alias": "/^rabbit@\\w+9/",
           "color": "#FFB357"
         }
       ],
@@ -1791,43 +1791,43 @@
       "renderer": "flot",
       "seriesOverrides": [
         {
-          "alias": "/^rabbit@[\\w-]+0/",
+          "alias": "/^rabbit@\\w+0/",
           "color": "#56A64B"
         },
         {
-          "alias": "/^rabbit@[\\w-]+1/",
+          "alias": "/^rabbit@\\w+1/",
           "color": "#F2CC0C"
         },
         {
-          "alias": "/^rabbit@[\\w-]+2/",
+          "alias": "/^rabbit@\\w+2/",
           "color": "#3274D9"
         },
         {
-          "alias": "/^rabbit@[\\w-]+3/",
+          "alias": "/^rabbit@\\w+3/",
           "color": "#A352CC"
         },
         {
-          "alias": "/^rabbit@[\\w-]+4/",
+          "alias": "/^rabbit@\\w+4/",
           "color": "#FF780A"
         },
         {
-          "alias": "/^rabbit@[\\w-]+5/",
+          "alias": "/^rabbit@\\w+5/",
           "color": "#96D98D"
         },
         {
-          "alias": "/^rabbit@[\\w-]+6/",
+          "alias": "/^rabbit@\\w+6/",
           "color": "#FFEE52"
         },
         {
-          "alias": "/^rabbit@[\\w-]+7/",
+          "alias": "/^rabbit@\\w+7/",
           "color": "#8AB8FF"
         },
         {
-          "alias": "/^rabbit@[\\w-]+8/",
+          "alias": "/^rabbit@\\w+8/",
           "color": "#CA95E5"
         },
         {
-          "alias": "/^rabbit@[\\w-]+9/",
+          "alias": "/^rabbit@\\w+9/",
           "color": "#FFB357"
         }
       ],
@@ -1923,43 +1923,43 @@
       "renderer": "flot",
       "seriesOverrides": [
         {
-          "alias": "/^rabbit@[\\w-]+0/",
+          "alias": "/^rabbit@\\w+0/",
           "color": "#56A64B"
         },
         {
-          "alias": "/^rabbit@[\\w-]+1/",
+          "alias": "/^rabbit@\\w+1/",
           "color": "#F2CC0C"
         },
         {
-          "alias": "/^rabbit@[\\w-]+2/",
+          "alias": "/^rabbit@\\w+2/",
           "color": "#3274D9"
         },
         {
-          "alias": "/^rabbit@[\\w-]+3/",
+          "alias": "/^rabbit@\\w+3/",
           "color": "#A352CC"
         },
         {
-          "alias": "/^rabbit@[\\w-]+4/",
+          "alias": "/^rabbit@\\w+4/",
           "color": "#FF780A"
         },
         {
-          "alias": "/^rabbit@[\\w-]+5/",
+          "alias": "/^rabbit@\\w+5/",
           "color": "#96D98D"
         },
         {
-          "alias": "/^rabbit@[\\w-]+6/",
+          "alias": "/^rabbit@\\w+6/",
           "color": "#FFEE52"
         },
         {
-          "alias": "/^rabbit@[\\w-]+7/",
+          "alias": "/^rabbit@\\w+7/",
           "color": "#8AB8FF"
         },
         {
-          "alias": "/^rabbit@[\\w-]+8/",
+          "alias": "/^rabbit@\\w+8/",
           "color": "#CA95E5"
         },
         {
-          "alias": "/^rabbit@[\\w-]+9/",
+          "alias": "/^rabbit@\\w+9/",
           "color": "#FFB357"
         }
       ],
@@ -2160,43 +2160,43 @@
       "renderer": "flot",
       "seriesOverrides": [
         {
-          "alias": "/^rabbit@[\\w-]+0/",
+          "alias": "/^rabbit@\\w+0/",
           "color": "#56A64B"
         },
         {
-          "alias": "/^rabbit@[\\w-]+1/",
+          "alias": "/^rabbit@\\w+1/",
           "color": "#F2CC0C"
         },
         {
-          "alias": "/^rabbit@[\\w-]+2/",
+          "alias": "/^rabbit@\\w+2/",
           "color": "#3274D9"
         },
         {
-          "alias": "/^rabbit@[\\w-]+3/",
+          "alias": "/^rabbit@\\w+3/",
           "color": "#A352CC"
         },
         {
-          "alias": "/^rabbit@[\\w-]+4/",
+          "alias": "/^rabbit@\\w+4/",
           "color": "#FF780A"
         },
         {
-          "alias": "/^rabbit@[\\w-]+5/",
+          "alias": "/^rabbit@\\w+5/",
           "color": "#96D98D"
         },
         {
-          "alias": "/^rabbit@[\\w-]+6/",
+          "alias": "/^rabbit@\\w+6/",
           "color": "#FFEE52"
         },
         {
-          "alias": "/^rabbit@[\\w-]+7/",
+          "alias": "/^rabbit@\\w+7/",
           "color": "#8AB8FF"
         },
         {
-          "alias": "/^rabbit@[\\w-]+8/",
+          "alias": "/^rabbit@\\w+8/",
           "color": "#CA95E5"
         },
         {
-          "alias": "/^rabbit@[\\w-]+9/",
+          "alias": "/^rabbit@\\w+9/",
           "color": "#FFB357"
         }
       ],
@@ -2292,43 +2292,43 @@
       "renderer": "flot",
       "seriesOverrides": [
         {
-          "alias": "/^rabbit@[\\w-]+0/",
+          "alias": "/^rabbit@\\w+0/",
           "color": "#56A64B"
         },
         {
-          "alias": "/^rabbit@[\\w-]+1/",
+          "alias": "/^rabbit@\\w+1/",
           "color": "#F2CC0C"
         },
         {
-          "alias": "/^rabbit@[\\w-]+2/",
+          "alias": "/^rabbit@\\w+2/",
           "color": "#3274D9"
         },
         {
-          "alias": "/^rabbit@[\\w-]+3/",
+          "alias": "/^rabbit@\\w+3/",
           "color": "#A352CC"
         },
         {
-          "alias": "/^rabbit@[\\w-]+4/",
+          "alias": "/^rabbit@\\w+4/",
           "color": "#FF780A"
         },
         {
-          "alias": "/^rabbit@[\\w-]+5/",
+          "alias": "/^rabbit@\\w+5/",
           "color": "#96D98D"
         },
         {
-          "alias": "/^rabbit@[\\w-]+6/",
+          "alias": "/^rabbit@\\w+6/",
           "color": "#FFEE52"
         },
         {
-          "alias": "/^rabbit@[\\w-]+7/",
+          "alias": "/^rabbit@\\w+7/",
           "color": "#8AB8FF"
         },
         {
-          "alias": "/^rabbit@[\\w-]+8/",
+          "alias": "/^rabbit@\\w+8/",
           "color": "#CA95E5"
         },
         {
-          "alias": "/^rabbit@[\\w-]+9/",
+          "alias": "/^rabbit@\\w+9/",
           "color": "#FFB357"
         }
       ],
@@ -2542,43 +2542,43 @@
       "renderer": "flot",
       "seriesOverrides": [
         {
-          "alias": "/^rabbit@[\\w-]+0/",
+          "alias": "/^rabbit@\\w+0/",
           "color": "#56A64B"
         },
         {
-          "alias": "/^rabbit@[\\w-]+1/",
+          "alias": "/^rabbit@\\w+1/",
           "color": "#F2CC0C"
         },
         {
-          "alias": "/^rabbit@[\\w-]+2/",
+          "alias": "/^rabbit@\\w+2/",
           "color": "#3274D9"
         },
         {
-          "alias": "/^rabbit@[\\w-]+3/",
+          "alias": "/^rabbit@\\w+3/",
           "color": "#A352CC"
         },
         {
-          "alias": "/^rabbit@[\\w-]+4/",
+          "alias": "/^rabbit@\\w+4/",
           "color": "#FF780A"
         },
         {
-          "alias": "/^rabbit@[\\w-]+5/",
+          "alias": "/^rabbit@\\w+5/",
           "color": "#96D98D"
         },
         {
-          "alias": "/^rabbit@[\\w-]+6/",
+          "alias": "/^rabbit@\\w+6/",
           "color": "#FFEE52"
         },
         {
-          "alias": "/^rabbit@[\\w-]+7/",
+          "alias": "/^rabbit@\\w+7/",
           "color": "#8AB8FF"
         },
         {
-          "alias": "/^rabbit@[\\w-]+8/",
+          "alias": "/^rabbit@\\w+8/",
           "color": "#CA95E5"
         },
         {
-          "alias": "/^rabbit@[\\w-]+9/",
+          "alias": "/^rabbit@\\w+9/",
           "color": "#FFB357"
         }
       ],
@@ -2674,43 +2674,43 @@
       "renderer": "flot",
       "seriesOverrides": [
         {
-          "alias": "/^rabbit@[\\w-]+0/",
+          "alias": "/^rabbit@\\w+0/",
           "color": "#56A64B"
         },
         {
-          "alias": "/^rabbit@[\\w-]+1/",
+          "alias": "/^rabbit@\\w+1/",
           "color": "#F2CC0C"
         },
         {
-          "alias": "/^rabbit@[\\w-]+2/",
+          "alias": "/^rabbit@\\w+2/",
           "color": "#3274D9"
         },
         {
-          "alias": "/^rabbit@[\\w-]+3/",
+          "alias": "/^rabbit@\\w+3/",
           "color": "#A352CC"
         },
         {
-          "alias": "/^rabbit@[\\w-]+4/",
+          "alias": "/^rabbit@\\w+4/",
           "color": "#FF780A"
         },
         {
-          "alias": "/^rabbit@[\\w-]+5/",
+          "alias": "/^rabbit@\\w+5/",
           "color": "#96D98D"
         },
         {
-          "alias": "/^rabbit@[\\w-]+6/",
+          "alias": "/^rabbit@\\w+6/",
           "color": "#FFEE52"
         },
         {
-          "alias": "/^rabbit@[\\w-]+7/",
+          "alias": "/^rabbit@\\w+7/",
           "color": "#8AB8FF"
         },
         {
-          "alias": "/^rabbit@[\\w-]+8/",
+          "alias": "/^rabbit@\\w+8/",
           "color": "#CA95E5"
         },
         {
-          "alias": "/^rabbit@[\\w-]+9/",
+          "alias": "/^rabbit@\\w+9/",
           "color": "#FFB357"
         }
       ],
@@ -2911,43 +2911,43 @@
       "renderer": "flot",
       "seriesOverrides": [
         {
-          "alias": "/^rabbit@[\\w-]+0/",
+          "alias": "/^rabbit@\\w+0/",
           "color": "#56A64B"
         },
         {
-          "alias": "/^rabbit@[\\w-]+1/",
+          "alias": "/^rabbit@\\w+1/",
           "color": "#F2CC0C"
         },
         {
-          "alias": "/^rabbit@[\\w-]+2/",
+          "alias": "/^rabbit@\\w+2/",
           "color": "#3274D9"
         },
         {
-          "alias": "/^rabbit@[\\w-]+3/",
+          "alias": "/^rabbit@\\w+3/",
           "color": "#A352CC"
         },
         {
-          "alias": "/^rabbit@[\\w-]+4/",
+          "alias": "/^rabbit@\\w+4/",
           "color": "#FF780A"
         },
         {
-          "alias": "/^rabbit@[\\w-]+5/",
+          "alias": "/^rabbit@\\w+5/",
           "color": "#96D98D"
         },
         {
-          "alias": "/^rabbit@[\\w-]+6/",
+          "alias": "/^rabbit@\\w+6/",
           "color": "#FFEE52"
         },
         {
-          "alias": "/^rabbit@[\\w-]+7/",
+          "alias": "/^rabbit@\\w+7/",
           "color": "#8AB8FF"
         },
         {
-          "alias": "/^rabbit@[\\w-]+8/",
+          "alias": "/^rabbit@\\w+8/",
           "color": "#CA95E5"
         },
         {
-          "alias": "/^rabbit@[\\w-]+9/",
+          "alias": "/^rabbit@\\w+9/",
           "color": "#FFB357"
         }
       ],
@@ -3060,43 +3060,43 @@
       "renderer": "flot",
       "seriesOverrides": [
         {
-          "alias": "/^rabbit@[\\w-]+0/",
+          "alias": "/^rabbit@\\w+0/",
           "color": "#56A64B"
         },
         {
-          "alias": "/^rabbit@[\\w-]+1/",
+          "alias": "/^rabbit@\\w+1/",
           "color": "#F2CC0C"
         },
         {
-          "alias": "/^rabbit@[\\w-]+2/",
+          "alias": "/^rabbit@\\w+2/",
           "color": "#3274D9"
         },
         {
-          "alias": "/^rabbit@[\\w-]+3/",
+          "alias": "/^rabbit@\\w+3/",
           "color": "#A352CC"
         },
         {
-          "alias": "/^rabbit@[\\w-]+4/",
+          "alias": "/^rabbit@\\w+4/",
           "color": "#FF780A"
         },
         {
-          "alias": "/^rabbit@[\\w-]+5/",
+          "alias": "/^rabbit@\\w+5/",
           "color": "#96D98D"
         },
         {
-          "alias": "/^rabbit@[\\w-]+6/",
+          "alias": "/^rabbit@\\w+6/",
           "color": "#FFEE52"
         },
         {
-          "alias": "/^rabbit@[\\w-]+7/",
+          "alias": "/^rabbit@\\w+7/",
           "color": "#8AB8FF"
         },
         {
-          "alias": "/^rabbit@[\\w-]+8/",
+          "alias": "/^rabbit@\\w+8/",
           "color": "#CA95E5"
         },
         {
-          "alias": "/^rabbit@[\\w-]+9/",
+          "alias": "/^rabbit@\\w+9/",
           "color": "#FFB357"
         }
       ],
@@ -3297,43 +3297,43 @@
       "renderer": "flot",
       "seriesOverrides": [
         {
-          "alias": "/^rabbit@[\\w-]+0/",
+          "alias": "/^rabbit@\\w+0/",
           "color": "#56A64B"
         },
         {
-          "alias": "/^rabbit@[\\w-]+1/",
+          "alias": "/^rabbit@\\w+1/",
           "color": "#F2CC0C"
         },
         {
-          "alias": "/^rabbit@[\\w-]+2/",
+          "alias": "/^rabbit@\\w+2/",
           "color": "#3274D9"
         },
         {
-          "alias": "/^rabbit@[\\w-]+3/",
+          "alias": "/^rabbit@\\w+3/",
           "color": "#A352CC"
         },
         {
-          "alias": "/^rabbit@[\\w-]+4/",
+          "alias": "/^rabbit@\\w+4/",
           "color": "#FF780A"
         },
         {
-          "alias": "/^rabbit@[\\w-]+5/",
+          "alias": "/^rabbit@\\w+5/",
           "color": "#96D98D"
         },
         {
-          "alias": "/^rabbit@[\\w-]+6/",
+          "alias": "/^rabbit@\\w+6/",
           "color": "#FFEE52"
         },
         {
-          "alias": "/^rabbit@[\\w-]+7/",
+          "alias": "/^rabbit@\\w+7/",
           "color": "#8AB8FF"
         },
         {
-          "alias": "/^rabbit@[\\w-]+8/",
+          "alias": "/^rabbit@\\w+8/",
           "color": "#CA95E5"
         },
         {
-          "alias": "/^rabbit@[\\w-]+9/",
+          "alias": "/^rabbit@\\w+9/",
           "color": "#FFB357"
         }
       ],
@@ -3548,43 +3548,43 @@
       "renderer": "flot",
       "seriesOverrides": [
         {
-          "alias": "/^rabbit@[\\w-]+0/",
+          "alias": "/^rabbit@\\w+0/",
           "color": "#56A64B"
         },
         {
-          "alias": "/^rabbit@[\\w-]+1/",
+          "alias": "/^rabbit@\\w+1/",
           "color": "#F2CC0C"
         },
         {
-          "alias": "/^rabbit@[\\w-]+2/",
+          "alias": "/^rabbit@\\w+2/",
           "color": "#3274D9"
         },
         {
-          "alias": "/^rabbit@[\\w-]+3/",
+          "alias": "/^rabbit@\\w+3/",
           "color": "#A352CC"
         },
         {
-          "alias": "/^rabbit@[\\w-]+4/",
+          "alias": "/^rabbit@\\w+4/",
           "color": "#FF780A"
         },
         {
-          "alias": "/^rabbit@[\\w-]+5/",
+          "alias": "/^rabbit@\\w+5/",
           "color": "#96D98D"
         },
         {
-          "alias": "/^rabbit@[\\w-]+6/",
+          "alias": "/^rabbit@\\w+6/",
           "color": "#FFEE52"
         },
         {
-          "alias": "/^rabbit@[\\w-]+7/",
+          "alias": "/^rabbit@\\w+7/",
           "color": "#8AB8FF"
         },
         {
-          "alias": "/^rabbit@[\\w-]+8/",
+          "alias": "/^rabbit@\\w+8/",
           "color": "#CA95E5"
         },
         {
-          "alias": "/^rabbit@[\\w-]+9/",
+          "alias": "/^rabbit@\\w+9/",
           "color": "#FFB357"
         }
       ],
@@ -3680,43 +3680,43 @@
       "renderer": "flot",
       "seriesOverrides": [
         {
-          "alias": "/^rabbit@[\\w-]+0/",
+          "alias": "/^rabbit@\\w+0/",
           "color": "#56A64B"
         },
         {
-          "alias": "/^rabbit@[\\w-]+1/",
+          "alias": "/^rabbit@\\w+1/",
           "color": "#F2CC0C"
         },
         {
-          "alias": "/^rabbit@[\\w-]+2/",
+          "alias": "/^rabbit@\\w+2/",
           "color": "#3274D9"
         },
         {
-          "alias": "/^rabbit@[\\w-]+3/",
+          "alias": "/^rabbit@\\w+3/",
           "color": "#A352CC"
         },
         {
-          "alias": "/^rabbit@[\\w-]+4/",
+          "alias": "/^rabbit@\\w+4/",
           "color": "#FF780A"
         },
         {
-          "alias": "/^rabbit@[\\w-]+5/",
+          "alias": "/^rabbit@\\w+5/",
           "color": "#96D98D"
         },
         {
-          "alias": "/^rabbit@[\\w-]+6/",
+          "alias": "/^rabbit@\\w+6/",
           "color": "#FFEE52"
         },
         {
-          "alias": "/^rabbit@[\\w-]+7/",
+          "alias": "/^rabbit@\\w+7/",
           "color": "#8AB8FF"
         },
         {
-          "alias": "/^rabbit@[\\w-]+8/",
+          "alias": "/^rabbit@\\w+8/",
           "color": "#CA95E5"
         },
         {
-          "alias": "/^rabbit@[\\w-]+9/",
+          "alias": "/^rabbit@\\w+9/",
           "color": "#FFB357"
         }
       ],
@@ -3829,43 +3829,43 @@
       "renderer": "flot",
       "seriesOverrides": [
         {
-          "alias": "/^rabbit@[\\w-]+0/",
+          "alias": "/^rabbit@\\w+0/",
           "color": "#56A64B"
         },
         {
-          "alias": "/^rabbit@[\\w-]+1/",
+          "alias": "/^rabbit@\\w+1/",
           "color": "#F2CC0C"
         },
         {
-          "alias": "/^rabbit@[\\w-]+2/",
+          "alias": "/^rabbit@\\w+2/",
           "color": "#3274D9"
         },
         {
-          "alias": "/^rabbit@[\\w-]+3/",
+          "alias": "/^rabbit@\\w+3/",
           "color": "#A352CC"
         },
         {
-          "alias": "/^rabbit@[\\w-]+4/",
+          "alias": "/^rabbit@\\w+4/",
           "color": "#FF780A"
         },
         {
-          "alias": "/^rabbit@[\\w-]+5/",
+          "alias": "/^rabbit@\\w+5/",
           "color": "#96D98D"
         },
         {
-          "alias": "/^rabbit@[\\w-]+6/",
+          "alias": "/^rabbit@\\w+6/",
           "color": "#FFEE52"
         },
         {
-          "alias": "/^rabbit@[\\w-]+7/",
+          "alias": "/^rabbit@\\w+7/",
           "color": "#8AB8FF"
         },
         {
-          "alias": "/^rabbit@[\\w-]+8/",
+          "alias": "/^rabbit@\\w+8/",
           "color": "#CA95E5"
         },
         {
-          "alias": "/^rabbit@[\\w-]+9/",
+          "alias": "/^rabbit@\\w+9/",
           "color": "#FFB357"
         }
       ],
@@ -3978,43 +3978,43 @@
       "renderer": "flot",
       "seriesOverrides": [
         {
-          "alias": "/^rabbit@[\\w-]+0/",
+          "alias": "/^rabbit@\\w+0/",
           "color": "#56A64B"
         },
         {
-          "alias": "/^rabbit@[\\w-]+1/",
+          "alias": "/^rabbit@\\w+1/",
           "color": "#F2CC0C"
         },
         {
-          "alias": "/^rabbit@[\\w-]+2/",
+          "alias": "/^rabbit@\\w+2/",
           "color": "#3274D9"
         },
         {
-          "alias": "/^rabbit@[\\w-]+3/",
+          "alias": "/^rabbit@\\w+3/",
           "color": "#A352CC"
         },
         {
-          "alias": "/^rabbit@[\\w-]+4/",
+          "alias": "/^rabbit@\\w+4/",
           "color": "#FF780A"
         },
         {
-          "alias": "/^rabbit@[\\w-]+5/",
+          "alias": "/^rabbit@\\w+5/",
           "color": "#96D98D"
         },
         {
-          "alias": "/^rabbit@[\\w-]+6/",
+          "alias": "/^rabbit@\\w+6/",
           "color": "#FFEE52"
         },
         {
-          "alias": "/^rabbit@[\\w-]+7/",
+          "alias": "/^rabbit@\\w+7/",
           "color": "#8AB8FF"
         },
         {
-          "alias": "/^rabbit@[\\w-]+8/",
+          "alias": "/^rabbit@\\w+8/",
           "color": "#CA95E5"
         },
         {
-          "alias": "/^rabbit@[\\w-]+9/",
+          "alias": "/^rabbit@\\w+9/",
           "color": "#FFB357"
         }
       ],
@@ -4140,43 +4140,43 @@
       "renderer": "flot",
       "seriesOverrides": [
         {
-          "alias": "/^rabbit@[\\w-]+0/",
+          "alias": "/^rabbit@\\w+0/",
           "color": "#56A64B"
         },
         {
-          "alias": "/^rabbit@[\\w-]+1/",
+          "alias": "/^rabbit@\\w+1/",
           "color": "#F2CC0C"
         },
         {
-          "alias": "/^rabbit@[\\w-]+2/",
+          "alias": "/^rabbit@\\w+2/",
           "color": "#3274D9"
         },
         {
-          "alias": "/^rabbit@[\\w-]+3/",
+          "alias": "/^rabbit@\\w+3/",
           "color": "#A352CC"
         },
         {
-          "alias": "/^rabbit@[\\w-]+4/",
+          "alias": "/^rabbit@\\w+4/",
           "color": "#FF780A"
         },
         {
-          "alias": "/^rabbit@[\\w-]+5/",
+          "alias": "/^rabbit@\\w+5/",
           "color": "#96D98D"
         },
         {
-          "alias": "/^rabbit@[\\w-]+6/",
+          "alias": "/^rabbit@\\w+6/",
           "color": "#FFEE52"
         },
         {
-          "alias": "/^rabbit@[\\w-]+7/",
+          "alias": "/^rabbit@\\w+7/",
           "color": "#8AB8FF"
         },
         {
-          "alias": "/^rabbit@[\\w-]+8/",
+          "alias": "/^rabbit@\\w+8/",
           "color": "#CA95E5"
         },
         {
-          "alias": "/^rabbit@[\\w-]+9/",
+          "alias": "/^rabbit@\\w+9/",
           "color": "#FFB357"
         }
       ],
@@ -4272,43 +4272,43 @@
       "renderer": "flot",
       "seriesOverrides": [
         {
-          "alias": "/^rabbit@[\\w-]+0/",
+          "alias": "/^rabbit@\\w+0/",
           "color": "#56A64B"
         },
         {
-          "alias": "/^rabbit@[\\w-]+1/",
+          "alias": "/^rabbit@\\w+1/",
           "color": "#F2CC0C"
         },
         {
-          "alias": "/^rabbit@[\\w-]+2/",
+          "alias": "/^rabbit@\\w+2/",
           "color": "#3274D9"
         },
         {
-          "alias": "/^rabbit@[\\w-]+3/",
+          "alias": "/^rabbit@\\w+3/",
           "color": "#A352CC"
         },
         {
-          "alias": "/^rabbit@[\\w-]+4/",
+          "alias": "/^rabbit@\\w+4/",
           "color": "#FF780A"
         },
         {
-          "alias": "/^rabbit@[\\w-]+5/",
+          "alias": "/^rabbit@\\w+5/",
           "color": "#96D98D"
         },
         {
-          "alias": "/^rabbit@[\\w-]+6/",
+          "alias": "/^rabbit@\\w+6/",
           "color": "#FFEE52"
         },
         {
-          "alias": "/^rabbit@[\\w-]+7/",
+          "alias": "/^rabbit@\\w+7/",
           "color": "#8AB8FF"
         },
         {
-          "alias": "/^rabbit@[\\w-]+8/",
+          "alias": "/^rabbit@\\w+8/",
           "color": "#CA95E5"
         },
         {
-          "alias": "/^rabbit@[\\w-]+9/",
+          "alias": "/^rabbit@\\w+9/",
           "color": "#FFB357"
         }
       ],
@@ -4421,43 +4421,43 @@
       "renderer": "flot",
       "seriesOverrides": [
         {
-          "alias": "/^rabbit@[\\w-]+0/",
+          "alias": "/^rabbit@\\w+0/",
           "color": "#56A64B"
         },
         {
-          "alias": "/^rabbit@[\\w-]+1/",
+          "alias": "/^rabbit@\\w+1/",
           "color": "#F2CC0C"
         },
         {
-          "alias": "/^rabbit@[\\w-]+2/",
+          "alias": "/^rabbit@\\w+2/",
           "color": "#3274D9"
         },
         {
-          "alias": "/^rabbit@[\\w-]+3/",
+          "alias": "/^rabbit@\\w+3/",
           "color": "#A352CC"
         },
         {
-          "alias": "/^rabbit@[\\w-]+4/",
+          "alias": "/^rabbit@\\w+4/",
           "color": "#FF780A"
         },
         {
-          "alias": "/^rabbit@[\\w-]+5/",
+          "alias": "/^rabbit@\\w+5/",
           "color": "#96D98D"
         },
         {
-          "alias": "/^rabbit@[\\w-]+6/",
+          "alias": "/^rabbit@\\w+6/",
           "color": "#FFEE52"
         },
         {
-          "alias": "/^rabbit@[\\w-]+7/",
+          "alias": "/^rabbit@\\w+7/",
           "color": "#8AB8FF"
         },
         {
-          "alias": "/^rabbit@[\\w-]+8/",
+          "alias": "/^rabbit@\\w+8/",
           "color": "#CA95E5"
         },
         {
-          "alias": "/^rabbit@[\\w-]+9/",
+          "alias": "/^rabbit@\\w+9/",
           "color": "#FFB357"
         }
       ],
@@ -4583,43 +4583,43 @@
       "renderer": "flot",
       "seriesOverrides": [
         {
-          "alias": "/^rabbit@[\\w-]+0/",
+          "alias": "/^rabbit@\\w+0/",
           "color": "#56A64B"
         },
         {
-          "alias": "/^rabbit@[\\w-]+1/",
+          "alias": "/^rabbit@\\w+1/",
           "color": "#F2CC0C"
         },
         {
-          "alias": "/^rabbit@[\\w-]+2/",
+          "alias": "/^rabbit@\\w+2/",
           "color": "#3274D9"
         },
         {
-          "alias": "/^rabbit@[\\w-]+3/",
+          "alias": "/^rabbit@\\w+3/",
           "color": "#A352CC"
         },
         {
-          "alias": "/^rabbit@[\\w-]+4/",
+          "alias": "/^rabbit@\\w+4/",
           "color": "#FF780A"
         },
         {
-          "alias": "/^rabbit@[\\w-]+5/",
+          "alias": "/^rabbit@\\w+5/",
           "color": "#96D98D"
         },
         {
-          "alias": "/^rabbit@[\\w-]+6/",
+          "alias": "/^rabbit@\\w+6/",
           "color": "#FFEE52"
         },
         {
-          "alias": "/^rabbit@[\\w-]+7/",
+          "alias": "/^rabbit@\\w+7/",
           "color": "#8AB8FF"
         },
         {
-          "alias": "/^rabbit@[\\w-]+8/",
+          "alias": "/^rabbit@\\w+8/",
           "color": "#CA95E5"
         },
         {
-          "alias": "/^rabbit@[\\w-]+9/",
+          "alias": "/^rabbit@\\w+9/",
           "color": "#FFB357"
         }
       ],
@@ -4715,43 +4715,43 @@
       "renderer": "flot",
       "seriesOverrides": [
         {
-          "alias": "/^rabbit@[\\w-]+0/",
+          "alias": "/^rabbit@\\w+0/",
           "color": "#56A64B"
         },
         {
-          "alias": "/^rabbit@[\\w-]+1/",
+          "alias": "/^rabbit@\\w+1/",
           "color": "#F2CC0C"
         },
         {
-          "alias": "/^rabbit@[\\w-]+2/",
+          "alias": "/^rabbit@\\w+2/",
           "color": "#3274D9"
         },
         {
-          "alias": "/^rabbit@[\\w-]+3/",
+          "alias": "/^rabbit@\\w+3/",
           "color": "#A352CC"
         },
         {
-          "alias": "/^rabbit@[\\w-]+4/",
+          "alias": "/^rabbit@\\w+4/",
           "color": "#FF780A"
         },
         {
-          "alias": "/^rabbit@[\\w-]+5/",
+          "alias": "/^rabbit@\\w+5/",
           "color": "#96D98D"
         },
         {
-          "alias": "/^rabbit@[\\w-]+6/",
+          "alias": "/^rabbit@\\w+6/",
           "color": "#FFEE52"
         },
         {
-          "alias": "/^rabbit@[\\w-]+7/",
+          "alias": "/^rabbit@\\w+7/",
           "color": "#8AB8FF"
         },
         {
-          "alias": "/^rabbit@[\\w-]+8/",
+          "alias": "/^rabbit@\\w+8/",
           "color": "#CA95E5"
         },
         {
-          "alias": "/^rabbit@[\\w-]+9/",
+          "alias": "/^rabbit@\\w+9/",
           "color": "#FFB357"
         }
       ],
@@ -4865,43 +4865,43 @@
       "renderer": "flot",
       "seriesOverrides": [
         {
-          "alias": "/^rabbit@[\\w-]+0/",
+          "alias": "/^rabbit@\\w+0/",
           "color": "#56A64B"
         },
         {
-          "alias": "/^rabbit@[\\w-]+1/",
+          "alias": "/^rabbit@\\w+1/",
           "color": "#F2CC0C"
         },
         {
-          "alias": "/^rabbit@[\\w-]+2/",
+          "alias": "/^rabbit@\\w+2/",
           "color": "#3274D9"
         },
         {
-          "alias": "/^rabbit@[\\w-]+3/",
+          "alias": "/^rabbit@\\w+3/",
           "color": "#A352CC"
         },
         {
-          "alias": "/^rabbit@[\\w-]+4/",
+          "alias": "/^rabbit@\\w+4/",
           "color": "#FF780A"
         },
         {
-          "alias": "/^rabbit@[\\w-]+5/",
+          "alias": "/^rabbit@\\w+5/",
           "color": "#96D98D"
         },
         {
-          "alias": "/^rabbit@[\\w-]+6/",
+          "alias": "/^rabbit@\\w+6/",
           "color": "#FFEE52"
         },
         {
-          "alias": "/^rabbit@[\\w-]+7/",
+          "alias": "/^rabbit@\\w+7/",
           "color": "#8AB8FF"
         },
         {
-          "alias": "/^rabbit@[\\w-]+8/",
+          "alias": "/^rabbit@\\w+8/",
           "color": "#CA95E5"
         },
         {
-          "alias": "/^rabbit@[\\w-]+9/",
+          "alias": "/^rabbit@\\w+9/",
           "color": "#FFB357"
         }
       ],
@@ -5016,7 +5016,7 @@
     ]
   },
   "time": {
-    "from": "now-10m",
+    "from": "now-5m",
     "to": "now"
   },
   "timepicker": {
@@ -5044,5 +5044,5 @@
   "timezone": "",
   "title": "RabbitMQ-Overview",
   "uid": "Kn5xm-gZk",
-  "version": 1
-}
+  "version": 5
+}
\ No newline at end of file
diff --git a/deps/rabbitmq_prometheus/docker/prometheus.yml b/deps/rabbitmq_prometheus/docker/prometheus.yml
index ee27dabc5a..abc7ce1ec4 100644
--- a/deps/rabbitmq_prometheus/docker/prometheus.yml
+++ b/deps/rabbitmq_prometheus/docker/prometheus.yml
@@ -33,9 +33,9 @@ scrape_configs:
   - job_name: 'rabbitmq'
     static_configs:
       - targets:
-          - 'rabbitmq0:15692'
-          - 'rabbitmq1:15692'
-          - 'rabbitmq2:15692'
-          - 'rabbitmq-dist-tls0:15692'
-          - 'rabbitmq-dist-tls1:15692'
-          - 'rabbitmq-dist-tls2:15692'
+          - 'rmq0:15692'
+          - 'rmq1:15692'
+          - 'rmq2:15692'
+          - 'rmq0-dist-tls:15692'
+          - 'rmq1-dist-tls:15692'
+          - 'rmq2-dist-tls:15692'
diff --git a/deps/rabbitmq_prometheus/docker/rabbitmq-dist-tls-definitions.json b/deps/rabbitmq_prometheus/docker/rabbitmq-dist-tls-definitions.json
index f3d1602f0c..cda3418f4b 100644
--- a/deps/rabbitmq_prometheus/docker/rabbitmq-dist-tls-definitions.json
+++ b/deps/rabbitmq_prometheus/docker/rabbitmq-dist-tls-definitions.json
@@ -14,17 +14,9 @@
   "policies": [
     {
       "apply-to": "queues",
-      "definition": {"ha-mode": "nodes", "ha-params": ["rabbit@rabbitmq-dist-tls0","rabbit@rabbitmq-dist-tls1"]},
-      "name": "ha0.1",
-      "pattern": "ha0.1*",
-      "priority": 0,
-      "vhost": "/"
-    },
-    {
-      "apply-to": "queues",
-      "definition": {"ha-mode": "nodes", "ha-params": ["rabbit@rabbitmq-dist-tls0","rabbit@rabbitmq-dist-tls2"]},
-      "name": "ha0.2",
-      "pattern": "ha0.2*",
+      "definition": {"ha-mode": "exactly", "ha-params": 1},
+      "name": "ha1",
+      "pattern": "ha1.*",
       "priority": 0,
       "vhost": "/"
     },
diff --git a/deps/rabbitmq_prometheus/docker/rabbitmq-dist-tls.conf b/deps/rabbitmq_prometheus/docker/rabbitmq-dist-tls.conf
index 2745db3cfb..12a360cbbb 100644
--- a/deps/rabbitmq_prometheus/docker/rabbitmq-dist-tls.conf
+++ b/deps/rabbitmq_prometheus/docker/rabbitmq-dist-tls.conf
@@ -9,9 +9,9 @@ vm_memory_high_watermark_paging_ratio = 0.9
 disk_free_limit.absolute = 2048MiB
 
 cluster_formation.peer_discovery_backend = rabbit_peer_discovery_classic_config
-cluster_formation.classic_config.nodes.1 = rabbit@rabbitmq-dist-tls0
-cluster_formation.classic_config.nodes.2 = rabbit@rabbitmq-dist-tls1
-cluster_formation.classic_config.nodes.3 = rabbit@rabbitmq-dist-tls2
+cluster_formation.classic_config.nodes.1 = rabbit@rmq0-dist-tls
+cluster_formation.classic_config.nodes.2 = rabbit@rmq1-dist-tls
+cluster_formation.classic_config.nodes.3 = rabbit@rmq2-dist-tls
 
 management.load_definitions = /etc/rabbitmq/rabbitmq-definitions.json
 
diff --git a/deps/rabbitmq_prometheus/docker/rabbitmq-overview-definitions.json b/deps/rabbitmq_prometheus/docker/rabbitmq-overview-definitions.json
index 6ec117c3db..0d58b235be 100644
--- a/deps/rabbitmq_prometheus/docker/rabbitmq-overview-definitions.json
+++ b/deps/rabbitmq_prometheus/docker/rabbitmq-overview-definitions.json
@@ -14,17 +14,9 @@
   "policies": [
     {
       "apply-to": "queues",
-      "definition": {"ha-mode": "nodes", "ha-params": ["rabbit@rabbitmq0","rabbit@rabbitmq1"]},
-      "name": "ha0.1",
-      "pattern": "ha0.1*",
-      "priority": 0,
-      "vhost": "/"
-    },
-    {
-      "apply-to": "queues",
-      "definition": {"ha-mode": "nodes", "ha-params": ["rabbit@rabbitmq0","rabbit@rabbitmq2"]},
-      "name": "ha0.2",
-      "pattern": "ha0.2*",
+      "definition": {"ha-mode": "exactly", "ha-params": 1},
+      "name": "ha1",
+      "pattern": "ha1.*",
       "priority": 0,
       "vhost": "/"
     },
diff --git a/deps/rabbitmq_prometheus/docker/rabbitmq-overview.conf b/deps/rabbitmq_prometheus/docker/rabbitmq-overview.conf
index b0793bc904..97212973cb 100644
--- a/deps/rabbitmq_prometheus/docker/rabbitmq-overview.conf
+++ b/deps/rabbitmq_prometheus/docker/rabbitmq-overview.conf
@@ -4,13 +4,13 @@ listeners.tcp.default = 5672
 management.listener.port = 15672
 management.listener.ssl = false
 
-vm_memory_high_watermark.absolute = 1200MiB
-vm_memory_high_watermark_paging_ratio = 0.1
+vm_memory_high_watermark.absolute = 768MiB
+vm_memory_high_watermark_paging_ratio = 0.2
 
 cluster_formation.peer_discovery_backend = rabbit_peer_discovery_classic_config
-cluster_formation.classic_config.nodes.1 = rabbit@rabbitmq0
-cluster_formation.classic_config.nodes.2 = rabbit@rabbitmq1
-cluster_formation.classic_config.nodes.3 = rabbit@rabbitmq2
+cluster_formation.classic_config.nodes.1 = rabbit@rmq0
+cluster_formation.classic_config.nodes.2 = rabbit@rmq1
+cluster_formation.classic_config.nodes.3 = rabbit@rmq2
 
 management.load_definitions = /etc/rabbitmq/rabbitmq-definitions.json