Merge pull request #3563 from rabbitmq/mergify/bp/v3.8.x/pr-3561

feat(prom): expose cluster id in identity (backport #3554) (backport #3561)
rabbitmq · Oct 12, 2021 · 6e825e3 · 6e825e3
2 parents 9a481e9 + 3c8bb1c
commit 6e825e3
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 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
@@ -288,6 +288,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
@@ -276,6 +276,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),
-Original file line number
+Diff line change
@@ Expand Up / @@ -288,6 +288,7 @@ identity_info() -> @@
                 [
                     {rabbitmq_node, node()},
                     {rabbitmq_cluster, rabbit_nodes:cluster_name()}
+                    {rabbitmq_cluster_permanent_id, rabbit_nodes:persistent_cluster_id()}
                 ],
             }]
@@ Expand Down @@