root
/
rabbitmq-server
mirror of https://github.com/rabbitmq/rabbitmq-server.git
1
0
Fork 0
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Use different names for *_process_reductions_total metrics 

It is invalid to have multiple metrics with the same name, TYPE & HELP,
but differing labels.

[#167846096]
This commit is contained in:
Gerhard Lazu 2019-08-14 16:17:48 +01:00
parent 75ecd6af1d
commit 4aa3871194
6 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
deps/rabbitmq_prometheus/Makefile vendored
View File

@ -1,6 +1,6 @@
TODAY := $(shell date -u +'%Y.%m.%d')
# Use the latest alpha RabbitMQ 3.8 release - https://dl.bintray.com/rabbitmq/all-dev/rabbitmq-server/
BASED_ON_RABBITMQ_VERSION := 3.8.0-alpha.803
BASED_ON_RABBITMQ_VERSION := 3.8.0-alpha.806
DOCKER_IMAGE_NAME := pivotalrabbitmq/rabbitmq-prometheus
DOCKER_IMAGE_VERSION := $(BASED_ON_RABBITMQ_VERSION)-$(TODAY)
# RABBITMQ_VERSION is used in rabbitmq-components.mk to set PROJECT_VERSION

2
deps/rabbitmq_prometheus/docker/docker-compose-dist-tls.yml vendored
View File

@ -13,7 +13,7 @@ volumes:
services:
rmq0-dist-tls: &rabbitmq
# https://hub.docker.com/r/pivotalrabbitmq/rabbitmq-prometheus/tags
image: pivotalrabbitmq/rabbitmq-prometheus:3.8.0-alpha.803-2019.08.13
image: pivotalrabbitmq/rabbitmq-prometheus:3.8.0-alpha.806-2019.08.14
networks:
- "rabbitmq-prometheus"
ports:

2
deps/rabbitmq_prometheus/docker/docker-compose-overview.yml vendored
View File

@ -13,7 +13,7 @@ volumes:
services:
rmq0: &rabbitmq
# https://hub.docker.com/r/pivotalrabbitmq/rabbitmq-prometheus/tags
image: pivotalrabbitmq/rabbitmq-prometheus:3.8.0-alpha.803-2019.08.13
image: pivotalrabbitmq/rabbitmq-prometheus:3.8.0-alpha.806-2019.08.14
networks:
- "rabbitmq-prometheus"
ports:

2
deps/rabbitmq_prometheus/docker/docker-compose-qq.yml vendored
View File

@ -13,7 +13,7 @@ volumes:
services:
rmq0-qq: &rabbitmq
# https://hub.docker.com/r/pivotalrabbitmq/rabbitmq-prometheus/tags
image: pivotalrabbitmq/rabbitmq-prometheus:3.8.0-alpha.803-2019.08.13
image: pivotalrabbitmq/rabbitmq-prometheus:3.8.0-alpha.806-2019.08.14
networks:
- "rabbitmq-prometheus"
ports:

6
deps/rabbitmq_prometheus/src/collectors/prometheus_rabbitmq_core_metrics_collector.erl vendored
View File

@ -55,7 +55,7 @@
]},
{channel_process_metrics, [
{2, erlang_process_reductions_total, counter, "Total number of Erlang process reductions"}
{2, channel_process_reductions_total, counter, "Total number of channel process reductions"}
]},
{channel_queue_metrics, [
@ -81,7 +81,7 @@
{connection_coarse_metrics, [
{2, connection_incoming_bytes_total, counter, "Total number of bytes received on a connection"},
{3, connection_outgoing_bytes_total, counter, "Total number of bytes sent on a connection"},
{4, erlang_process_reductions_total, counter, "Total number of Erlang process reductions"}
{4, connection_process_reductions_total, counter, "Total number of connection process reductions"}
]},
{connection_metrics, [
@ -153,7 +153,7 @@
{2, queue_messages_ready, gauge, "Messages ready to be delivered to consumers"},
{3, queue_messages_unacked, gauge, "Messages delivered to consumers but not yet acknowledged"},
{4, queue_messages, gauge, "Sum of ready and unacknowledged messages - total queue depth"},
{5, erlang_process_reductions_total, counter, "Total number of Erlang process reductions"}
{5, queue_process_reductions_total, counter, "Total number of queue process reductions"}
]},
{queue_metrics, [

2
deps/rabbitmq_prometheus/test/rabbit_prometheus_http_SUITE.erl vendored
View File

@ -164,7 +164,7 @@ metrics_test(Config) ->
%% Checking that we have the first metric from each ETS table owned by rabbitmq_metrics
?assertEqual(match, re:run(Body, "rabbitmq_channel_consumers{", [{capture, none}])),
?assertEqual(match, re:run(Body, "rabbitmq_channel_messages_published{", [{capture, none}])),
?assertEqual(match, re:run(Body, "rabbitmq_erlang_process_reductions_total{", [{capture, none}])),
?assertEqual(match, re:run(Body, "rabbitmq_channel_process_reductions_total{", [{capture, none}])),
?assertEqual(match, re:run(Body, "rabbitmq_channel_get_ack_total{", [{capture, none}])),
?assertEqual(match, re:run(Body, "rabbitmq_connection_opened_total{", [{capture, none}])),
?assertEqual(match, re:run(Body, "rabbitmq_connection_incoming_bytes_total{", [{capture, none}])),