Merge pull request #14959 from rabbitmq/mergify/bp/v4.2.x/pr-14953

Upgrade RabbitMQ Prometheus sample docker images  (backport #14953)

Author: michaelklishin

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

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:

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-management
     networks:
       - "rabbitmq-prometheus"
     ports:

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",