From 1263c3a2c2e9c33a81c4e5fef0ed21e6c078379f Mon Sep 17 00:00:00 2001
From: Ken Liao <kenliao94@gmail.com>
Date: Thu, 13 Nov 2025 22:23:29 -0800
Subject: [PATCH 1/3] Upgrade docker images for prometheus

(cherry picked from commit 71c86a326fa52be5e843e6dc58c54c39ae373c18)
---
 .../docker/docker-compose-metrics.yml         |  2 +-
 .../docker/docker-compose-overview.yml        |  2 +-
 .../docker/rabbitmq-overview-definitions.json | 27 +------------------
 3 files changed, 3 insertions(+), 28 deletions(-)

diff --git a/deps/rabbitmq_prometheus/docker/docker-compose-metrics.yml b/deps/rabbitmq_prometheus/docker/docker-compose-metrics.yml
index 915d33a03fe0..ecdfd073e5db 100644
--- a/deps/rabbitmq_prometheus/docker/docker-compose-metrics.yml
+++ b/deps/rabbitmq_prometheus/docker/docker-compose-metrics.yml
@@ -62,7 +62,7 @@ services:
     expose:
       - 8080
     # https://hub.docker.com/r/google/cadvisor/tags
-    image: google/cadvisor:v0.33.0
+    image: gcr.io/cadvisor/cadvisor
     networks:
       - "rabbitmq-prometheus"
     volumes:
diff --git a/deps/rabbitmq_prometheus/docker/docker-compose-overview.yml b/deps/rabbitmq_prometheus/docker/docker-compose-overview.yml
index cc440c4a7ff8..ae4199a5d23a 100644
--- a/deps/rabbitmq_prometheus/docker/docker-compose-overview.yml
+++ b/deps/rabbitmq_prometheus/docker/docker-compose-overview.yml
@@ -13,7 +13,7 @@ volumes:
 services:
   rmq0: &rabbitmq
     # https://hub.docker.com/r/pivotalrabbitmq/rabbitmq/tags
-    image: pivotalrabbitmq/rabbitmq:master-otp-max
+    image: rabbitmq:4.0-management
     networks:
       - "rabbitmq-prometheus"
     ports:
diff --git a/deps/rabbitmq_prometheus/docker/rabbitmq-overview-definitions.json b/deps/rabbitmq_prometheus/docker/rabbitmq-overview-definitions.json
index 0d58b235be0d..4134027c95af 100644
--- a/deps/rabbitmq_prometheus/docker/rabbitmq-overview-definitions.json
+++ b/deps/rabbitmq_prometheus/docker/rabbitmq-overview-definitions.json
@@ -11,32 +11,7 @@
       "write": ".*"
     }
   ],
-  "policies": [
-    {
-      "apply-to": "queues",
-      "definition": {"ha-mode": "exactly", "ha-params": 1},
-      "name": "ha1",
-      "pattern": "ha1.*",
-      "priority": 0,
-      "vhost": "/"
-    },
-    {
-      "apply-to": "queues",
-      "definition": {"ha-mode": "exactly", "ha-params": 2},
-      "name": "ha2",
-      "pattern": "ha2.*",
-      "priority": 0,
-      "vhost": "/"
-    },
-    {
-      "apply-to": "queues",
-      "definition": {"ha-mode": "exactly", "ha-params": 3},
-      "name": "ha3",
-      "pattern": "ha3.*",
-      "priority": 0,
-      "vhost": "/"
-    }
-  ],
+  "policies": [],
   "users": [
     {
       "hashing_algorithm": "rabbit_password_hashing_sha256",

From 65d03fc382346f9c89f2890b79cc84b69a17fab5 Mon Sep 17 00:00:00 2001
From: Ken Liao <kenliao94@gmail.com>
Date: Thu, 13 Nov 2025 22:26:44 -0800
Subject: [PATCH 2/3] updated makefile to use docker compose v2

(cherry picked from commit 38b05667062fccb68569f9a405bce506e3189562)
---
 deps/rabbitmq_prometheus/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/deps/rabbitmq_prometheus/Makefile b/deps/rabbitmq_prometheus/Makefile
index 75976e7cea8d..ca52db32a291 100644
--- a/deps/rabbitmq_prometheus/Makefile
+++ b/deps/rabbitmq_prometheus/Makefile
@@ -44,7 +44,7 @@ DOCKER_COMPOSE_FILES := $(wildcard docker/docker-compose-*.yml)
 .PHONY: $(DOCKER_COMPOSE_FILES)
 $(DOCKER_COMPOSE_FILES):
 	@cd docker && \
-	docker-compose --file $(@F) $(RUN) ; \
+	docker compose --file $(@F) $(RUN) ; \
 	true
 .PHONY: down
 down: RUN = down
@@ -53,7 +53,7 @@ down: $(DOCKER_COMPOSE_FILES) # Stop all containers
 # Defined as explicit, individual targets so that autocompletion works
 define DOCKER_COMPOSE_UP
 cd docker && \
-docker-compose --file docker-compose-$(@F).yml up --detach
+docker compose --file docker-compose-$(@F).yml up --detach
 endef
 .PHONY: metrics
 metrics: # Run all metrics containers: Grafana, Prometheus & friends

From fcd26fd8c27248ba142d9f6f7d47802bec5ba91c Mon Sep 17 00:00:00 2001
From: Ken Liao <kenliao94@gmail.com>
Date: Fri, 14 Nov 2025 10:11:56 -0800
Subject: [PATCH 3/3] Use 4-management instead of 4.0-management

(cherry picked from commit 9882a68d64d6925f7ca640424e3f920b5884f5af)
---
 deps/rabbitmq_prometheus/docker/docker-compose-overview.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/deps/rabbitmq_prometheus/docker/docker-compose-overview.yml b/deps/rabbitmq_prometheus/docker/docker-compose-overview.yml
index ae4199a5d23a..1d75633e6562 100644
--- a/deps/rabbitmq_prometheus/docker/docker-compose-overview.yml
+++ b/deps/rabbitmq_prometheus/docker/docker-compose-overview.yml
@@ -13,7 +13,7 @@ volumes:
 services:
   rmq0: &rabbitmq
     # https://hub.docker.com/r/pivotalrabbitmq/rabbitmq/tags
-    image: rabbitmq:4.0-management
+    image: rabbitmq:4-management
     networks:
       - "rabbitmq-prometheus"
     ports: