diff options
| author | Michael Klishin <klishinm@vmware.com> | 2021-10-12 20:12:57 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-12 20:12:57 +0300 |
| commit | be225d2102953b8f25005b8a9c91cfeb126267b6 (patch) | |
| tree | 3b089eec13765dadc7eca9529dafefd14ed1729b | |
| parent | 04c9aa24a82d0309ae06c3e838cd9afac87bb3db (diff) | |
| parent | a8400eaa67581a5985ad1dc092c5f385531bc3a4 (diff) | |
| download | rabbitmq-server-git-be225d2102953b8f25005b8a9c91cfeb126267b6.tar.gz | |
Merge pull request #3561 from rabbitmq/mergify/bp/v3.9.x/pr-3554
feat(prom): expose cluster id in identity (backport #3554)
| -rw-r--r-- | deps/rabbitmq_prometheus/src/collectors/prometheus_rabbitmq_core_metrics_collector.erl | 1 | ||||
| -rw-r--r-- | deps/rabbitmq_prometheus/test/rabbit_prometheus_http_SUITE.erl | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/deps/rabbitmq_prometheus/src/collectors/prometheus_rabbitmq_core_metrics_collector.erl b/deps/rabbitmq_prometheus/src/collectors/prometheus_rabbitmq_core_metrics_collector.erl index 2e46eae4fd..bbde8af329 100644 --- a/deps/rabbitmq_prometheus/src/collectors/prometheus_rabbitmq_core_metrics_collector.erl +++ b/deps/rabbitmq_prometheus/src/collectors/prometheus_rabbitmq_core_metrics_collector.erl @@ -321,6 +321,7 @@ identity_info() -> [ {rabbitmq_node, node()}, {rabbitmq_cluster, rabbit_nodes:cluster_name()} + {rabbitmq_cluster_permanent_id, rabbit_nodes:persistent_cluster_id()} ], 1 }] diff --git a/deps/rabbitmq_prometheus/test/rabbit_prometheus_http_SUITE.erl b/deps/rabbitmq_prometheus/test/rabbit_prometheus_http_SUITE.erl index e2380932de..8c683e645e 100644 --- a/deps/rabbitmq_prometheus/test/rabbit_prometheus_http_SUITE.erl +++ b/deps/rabbitmq_prometheus/test/rabbit_prometheus_http_SUITE.erl @@ -376,6 +376,7 @@ identity_info_test(Config) -> ?assertEqual(match, re:run(Body, "^rabbitmq_identity_info{", [{capture, none}, multiline])), ?assertEqual(match, re:run(Body, "rabbitmq_node=", [{capture, none}])), ?assertEqual(match, re:run(Body, "rabbitmq_cluster=", [{capture, none}])). + ?assertEqual(match, re:run(Body, "rabbitmq_cluster_permanent_id=", [{capture, none}])). specific_erlang_metrics_present_test(Config) -> {_Headers, Body} = http_get_with_pal(Config, [], 200), |