Skip to content

Commit 64e0812

Browse files
Update deps/rabbitmq_prometheus/src/collectors/prometheus_rabbitmq_core_metrics_collector.erl
Co-authored-by: Péter Gömöri <[email protected]>
1 parent 3ed2e30 commit 64e0812

File tree

1 file changed

+4
-8
lines changed

1 file changed

+4
-8
lines changed

deps/rabbitmq_prometheus/src/collectors/prometheus_rabbitmq_core_metrics_collector.erl

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -577,6 +577,8 @@ get_data(Table, false, VHostsFilter) when Table == channel_exchange_metrics;
577577
Acc;
578578
({#resource{kind = queue, virtual_host = VHost}, _, _, _, _, _, _, _, _}, Acc) when is_map(VHostsFilter), map_get(VHost, VHostsFilter) == false ->
579579
Acc;
580+
({{#resource{kind = queue, virtual_host = VHost}, #resource{kind = exchange}}, _, _}, Acc) when is_map(VHostsFilter), map_get(VHost, VHostsFilter) == false ->
581+
Acc;
580582
({_, V1}, {T, A1}) ->
581583
{T, V1 + A1};
582584
({_, V1, _}, {T, A1}) ->
@@ -612,9 +614,7 @@ get_data(exchange_metrics = Table, true, VHostsFilter) when is_map(VHostsFilter)
612614
(_Row, Acc) ->
613615
Acc
614616
end, [], Table);
615-
get_data(exchange_metrics, true, _VhostsFilter) ->
616-
[];
617-
get_data(queue_counter_metrics = Table, true, VHostsFilter) when is_map(VHostsFilter)->
617+
get_data(queue_counter_metrics = Table, true, VHostsFilter) when is_map(VHostsFilter) ->
618618
ets:foldl(fun
619619
({#resource{kind = queue, virtual_host = VHost}, _, _, _, _, _, _, _, _} = Row, Acc) when
620620
map_get(VHost, VHostsFilter)
@@ -623,9 +623,7 @@ get_data(queue_counter_metrics = Table, true, VHostsFilter) when is_map(VHostsFi
623623
(_Row, Acc) ->
624624
Acc
625625
end, [], Table);
626-
get_data(queue_counter_metrics, true, _VHostsFilter) ->
627-
[];
628-
get_data(queue_exchange_metrics = Table, true, VHostsFilter) ->
626+
get_data(queue_exchange_metrics = Table, true, VHostsFilter) when is_map(VHostsFilter) ->
629627
ets:foldl(fun
630628
({{
631629
#resource{kind = queue, virtual_host = VHost},
@@ -637,8 +635,6 @@ get_data(queue_exchange_metrics = Table, true, VHostsFilter) ->
637635
(_Row, Acc) ->
638636
Acc
639637
end, [], Table);
640-
get_data(queue_exchange_metrics, true, _VHostsFilter) ->
641-
[];
642638
get_data(queue_coarse_metrics = Table, true, VHostsFilter) when is_map(VHostsFilter) ->
643639
ets:foldl(fun
644640
({#resource{kind = queue, virtual_host = VHost}, _, _, _, _} = Row, Acc) when map_get(VHost, VHostsFilter) ->

0 commit comments

Comments
 (0)