Skip to content

Upgrade RabbitMQ Prometheus sample docker images (backport #14953) #14959

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Nov 14, 2025
+5 −30
Merged

Upgrade RabbitMQ Prometheus sample docker images (backport #14953) #14959

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1263c3a
Upgrade docker images for prometheus
kenliao94 Nov 14, 2025
65d03fc
updated makefile to use docker compose v2
kenliao94 Nov 14, 2025
fcd26fd
Use 4-management instead of 4.0-management
kenliao94 Nov 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions deps/rabbitmq_prometheus/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion deps/rabbitmq_prometheus/docker/docker-compose-metrics.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion deps/rabbitmq_prometheus/docker/docker-compose-overview.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
27 changes: 1 addition & 26 deletions deps/rabbitmq_prometheus/docker/rabbitmq-overview-definitions.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
Loading