@@ -304,22 +304,25 @@ collect_mf('detailed', Callback) ->
304
304
collect (true , ? DETAILED_METRIC_NAME_PREFIX , vhosts_filter_from_pdict (), enabled_mfs_from_pdict (? METRICS_RAW ), Callback ),
305
305
collect (true , ? CLUSTER_METRIC_NAME_PREFIX , vhosts_filter_from_pdict (), enabled_mfs_from_pdict (? METRICS_CLUSTER ), Callback ),
306
306
% % 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 ),
308
308
ok ;
309
309
collect_mf ('per-object' , Callback ) ->
310
310
collect (true , ? METRIC_NAME_PREFIX , false , ? METRICS_RAW , Callback ),
311
311
totals (Callback ),
312
- emit_identity_info (Callback ),
312
+ emit_identity_info (<< " per-object " >>, Callback ),
313
313
ok ;
314
314
collect_mf ('memory-breakdown' , Callback ) ->
315
315
collect (false , ? METRIC_NAME_PREFIX , false , ? METRICS_MEMORY_BREAKDOWN , Callback ),
316
- emit_identity_info (Callback ),
316
+ emit_identity_info (<< " memory-breakdown " >>, Callback ),
317
317
ok ;
318
318
collect_mf (_Registry , Callback ) ->
319
319
PerObjectMetrics = application :get_env (rabbitmq_prometheus , return_per_object_metrics , false ),
320
320
collect (PerObjectMetrics , ? METRIC_NAME_PREFIX , false , ? METRICS_RAW , Callback ),
321
321
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 ,
323
326
ok .
324
327
325
328
collect (PerObjectMetrics , Prefix , VHostsFilter , IncludedMFs , Callback ) ->
@@ -336,9 +339,9 @@ totals(Callback) ->
336
339
end || {Table , Name , Type , Help } <- ? TOTALS ],
337
340
ok .
338
341
339
- emit_identity_info (Callback ) ->
342
+ emit_identity_info (Endpoint , Callback ) ->
340
343
add_metric_family (build_info (), Callback ),
341
- add_metric_family (identity_info (), Callback ),
344
+ add_metric_family (identity_info (Endpoint ), Callback ),
342
345
ok .
343
346
344
347
% % Aggregated `auth``_attempt_detailed_metrics` and
@@ -387,7 +390,7 @@ build_info() ->
387
390
}]
388
391
}.
389
392
390
- identity_info () ->
393
+ identity_info (Endpoint ) ->
391
394
{
392
395
identity_info ,
393
396
untyped ,
@@ -396,7 +399,8 @@ identity_info() ->
396
399
[
397
400
{rabbitmq_node , node ()},
398
401
{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 }
400
404
],
401
405
1
402
406
}]
0 commit comments