Skip to content

Commit 703ee85

Browse files
committed
Add rabbitmq_endpoint label to rabbitmq_identity_info
1 parent 3a17473 commit 703ee85

File tree

1 file changed

+12
-8
lines changed

1 file changed

+12
-8
lines changed

deps/rabbitmq_prometheus/src/collectors/prometheus_rabbitmq_core_metrics_collector.erl

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -304,22 +304,25 @@ collect_mf('detailed', Callback) ->
304304
collect(true, ?DETAILED_METRIC_NAME_PREFIX, vhosts_filter_from_pdict(), enabled_mfs_from_pdict(?METRICS_RAW), Callback),
305305
collect(true, ?CLUSTER_METRIC_NAME_PREFIX, vhosts_filter_from_pdict(), enabled_mfs_from_pdict(?METRICS_CLUSTER), Callback),
306306
%% identity is here to enable filtering on a cluster name (as already happens in existing dashboards)
307-
emit_identity_info(Callback),
307+
emit_identity_info(<<"detailed">>, Callback),
308308
ok;
309309
collect_mf('per-object', Callback) ->
310310
collect(true, ?METRIC_NAME_PREFIX, false, ?METRICS_RAW, Callback),
311311
totals(Callback),
312-
emit_identity_info(Callback),
312+
emit_identity_info(<<"per-object">>, Callback),
313313
ok;
314314
collect_mf('memory-breakdown', Callback) ->
315315
collect(false, ?METRIC_NAME_PREFIX, false, ?METRICS_MEMORY_BREAKDOWN, Callback),
316-
emit_identity_info(Callback),
316+
emit_identity_info(<<"memory-breakdown">>, Callback),
317317
ok;
318318
collect_mf(_Registry, Callback) ->
319319
PerObjectMetrics = application:get_env(rabbitmq_prometheus, return_per_object_metrics, false),
320320
collect(PerObjectMetrics, ?METRIC_NAME_PREFIX, false, ?METRICS_RAW, Callback),
321321
totals(Callback),
322-
emit_identity_info(Callback),
322+
case PerObjectMetrics of
323+
true -> emit_identity_info(<<"per-object">>, Callback);
324+
false -> emit_identity_info(<<"aggregated">>, Callback)
325+
end,
323326
ok.
324327

325328
collect(PerObjectMetrics, Prefix, VHostsFilter, IncludedMFs, Callback) ->
@@ -336,9 +339,9 @@ totals(Callback) ->
336339
end || {Table, Name, Type, Help} <- ?TOTALS],
337340
ok.
338341

339-
emit_identity_info(Callback) ->
342+
emit_identity_info(Endpoint, Callback) ->
340343
add_metric_family(build_info(), Callback),
341-
add_metric_family(identity_info(), Callback),
344+
add_metric_family(identity_info(Endpoint), Callback),
342345
ok.
343346

344347
%% Aggregated `auth``_attempt_detailed_metrics` and
@@ -387,7 +390,7 @@ build_info() ->
387390
}]
388391
}.
389392

390-
identity_info() ->
393+
identity_info(Endpoint) ->
391394
{
392395
identity_info,
393396
untyped,
@@ -396,7 +399,8 @@ identity_info() ->
396399
[
397400
{rabbitmq_node, node()},
398401
{rabbitmq_cluster, rabbit_nodes:cluster_name()},
399-
{rabbitmq_cluster_permanent_id, rabbit_nodes:persistent_cluster_id()}
402+
{rabbitmq_cluster_permanent_id, rabbit_nodes:persistent_cluster_id()},
403+
{rabbitmq_endpoint, Endpoint}
400404
],
401405
1
402406
}]

0 commit comments

Comments
 (0)