Bump to latest RabbitMQ 3.9.0 dev build & Erlang/OTP v22.2.6

Signed-off-by: Gerhard Lazu <gerhard@lazu.co.uk>
This commit is contained in:
Gerhard Lazu 2020-02-06 17:40:46 +00:00
parent 11d676f3e1
commit e91e4ea32b
7 changed files with 20 additions and 8 deletions

View File

@ -1,13 +1,13 @@
TODAY := $(shell date -u +'%Y.%m.%d') TODAY := $(shell date -u +'%Y.%m.%d')
# Use the latest alpha RabbitMQ 3.9 release - https://dl.bintray.com/rabbitmq/all-dev/rabbitmq-server/ # Use the latest alpha RabbitMQ 3.9 release - https://dl.bintray.com/rabbitmq/all-dev/rabbitmq-server/
BASED_ON_RABBITMQ_VERSION := 3.9.0-alpha.191 BASED_ON_RABBITMQ_VERSION := 3.9.0-alpha.212
DOCKER_IMAGE_NAME := pivotalrabbitmq/rabbitmq-prometheus DOCKER_IMAGE_NAME := pivotalrabbitmq/rabbitmq-prometheus
DOCKER_IMAGE_VERSION := $(BASED_ON_RABBITMQ_VERSION)-$(TODAY) DOCKER_IMAGE_VERSION := $(BASED_ON_RABBITMQ_VERSION)-$(TODAY)
# RABBITMQ_VERSION is used in rabbitmq-components.mk to set PROJECT_VERSION # RABBITMQ_VERSION is used in rabbitmq-components.mk to set PROJECT_VERSION
RABBITMQ_VERSION ?= $(DOCKER_IMAGE_VERSION) RABBITMQ_VERSION ?= $(DOCKER_IMAGE_VERSION)
# make find-latest-otp # make find-latest-otp
OTP_VERSION := 22.2.2 OTP_VERSION := 22.2.6
OTP_SHA256 := 92df7d22239b09f7580572305c862da1fb030a97cef7631ba060ac51fa3864cc OTP_SHA256 := 4cf44ed12f657c309a2c00e7806f36f56a88e5b74de6814058796561f3842f66
define PROJECT_ENV define PROJECT_ENV
[ [

View File

@ -13,7 +13,7 @@ volumes:
services: services:
rmq0-dist-tls: &rabbitmq rmq0-dist-tls: &rabbitmq
# https://hub.docker.com/r/pivotalrabbitmq/rabbitmq-prometheus/tags # https://hub.docker.com/r/pivotalrabbitmq/rabbitmq-prometheus/tags
image: pivotalrabbitmq/rabbitmq-prometheus:3.9.0-alpha.191-2020.01.15 image: pivotalrabbitmq/rabbitmq-prometheus:3.9.0-alpha.212-2020.02.06
networks: networks:
- "rabbitmq-prometheus" - "rabbitmq-prometheus"
ports: ports:

View File

@ -13,7 +13,7 @@ volumes:
services: services:
rmq0: &rabbitmq rmq0: &rabbitmq
# https://hub.docker.com/r/pivotalrabbitmq/rabbitmq-prometheus/tags # https://hub.docker.com/r/pivotalrabbitmq/rabbitmq-prometheus/tags
image: pivotalrabbitmq/rabbitmq-prometheus:3.9.0-alpha.191-2020.01.15 image: pivotalrabbitmq/rabbitmq-prometheus:3.9.0-alpha.212-2020.02.06
networks: networks:
- "rabbitmq-prometheus" - "rabbitmq-prometheus"
ports: ports:

View File

@ -13,7 +13,7 @@ volumes:
services: services:
rmq0-qq: &rabbitmq rmq0-qq: &rabbitmq
# https://hub.docker.com/r/pivotalrabbitmq/rabbitmq-prometheus/tags # https://hub.docker.com/r/pivotalrabbitmq/rabbitmq-prometheus/tags
image: pivotalrabbitmq/rabbitmq-prometheus:3.9.0-alpha.191-2020.01.15 image: pivotalrabbitmq/rabbitmq-prometheus:3.9.0-alpha.212-2020.02.06
networks: networks:
- "rabbitmq-prometheus" - "rabbitmq-prometheus"
ports: ports:

View File

@ -43,7 +43,7 @@
"gnetId": null, "gnetId": null,
"graphTooltip": 1, "graphTooltip": 1,
"id": null, "id": null,
"iteration": 1578410270904, "iteration": 1581011566961,
"links": [ "links": [
{ {
"icon": "doc", "icon": "doc",
@ -72,6 +72,7 @@
"x": 0, "x": 0,
"y": 0 "y": 0
}, },
"hiddenSeries": false,
"id": 64, "id": 64,
"legend": { "legend": {
"alignAsTable": true, "alignAsTable": true,
@ -277,6 +278,7 @@
"x": 0, "x": 0,
"y": 9 "y": 9
}, },
"hiddenSeries": false,
"id": 62, "id": 62,
"legend": { "legend": {
"alignAsTable": true, "alignAsTable": true,
@ -417,6 +419,7 @@
"x": 12, "x": 12,
"y": 9 "y": 9
}, },
"hiddenSeries": false,
"id": 63, "id": 63,
"legend": { "legend": {
"alignAsTable": true, "alignAsTable": true,
@ -564,6 +567,7 @@
"x": 0, "x": 0,
"y": 18 "y": 18
}, },
"hiddenSeries": false,
"id": 18, "id": 18,
"legend": { "legend": {
"alignAsTable": true, "alignAsTable": true,
@ -686,7 +690,7 @@
} }
], ],
"refresh": "15s", "refresh": "15s",
"schemaVersion": 20, "schemaVersion": 21,
"style": "dark", "style": "dark",
"tags": [ "tags": [
"rabbitmq-prometheus" "rabbitmq-prometheus"

View File

@ -26,3 +26,7 @@ collect_statistics_interval = 10000
# Run RabbitMQ Management in Management-only mode, no stats # Run RabbitMQ Management in Management-only mode, no stats
# https://github.com/rabbitmq/rabbitmq-management/pull/707 # https://github.com/rabbitmq/rabbitmq-management/pull/707
# management.disable_stats = true # management.disable_stats = true
# Aggregate all metrics
# https://github.com/rabbitmq/rabbitmq-prometheus/pull/28
# prometheus.enable_metrics_aggregation = true

View File

@ -26,3 +26,7 @@ collect_statistics_interval = 10000
# Enable debugging # Enable debugging
# log.console.level = debug # log.console.level = debug
# Aggregate all metrics
# https://github.com/rabbitmq/rabbitmq-prometheus/pull/28
# prometheus.enable_metrics_aggregation = true