Update deps/rabbitmq_prometheus/src/collectors/prometheus_rabbitmq_core_metrics_collector.erl

Co-authored-by: Péter Gömöri <[email protected]>

Author: 2 people

deps/rabbitmq_prometheus/src/collectors/prometheus_rabbitmq_core_metrics_collector.erl

@@ -575,6 +575,8 @@ get_data(Table, false, VHostsFilter) when Table == channel_exchange_metrics;
                                Acc;
                   ({#resource{kind = queue, virtual_host = VHost}, _, _, _, _, _, _, _, _}, Acc) when is_map(VHostsFilter), map_get(VHost, VHostsFilter) == false ->
                                Acc;
+                  ({{#resource{kind = queue, virtual_host = VHost}, #resource{kind = exchange}}, _, _}, Acc) when is_map(VHostsFilter), map_get(VHost, VHostsFilter) == false ->
+                               Acc;
                   ({_, V1}, {T, A1}) ->
                        {T, V1 + A1};
                   ({_, V1, _}, {T, A1}) ->
@@ -610,9 +612,7 @@ get_data(exchange_metrics = Table, true, VHostsFilter) when is_map(VHostsFilter)
         (_Row, Acc) ->
             Acc
     end, [], Table);
-get_data(exchange_metrics, true, _VhostsFilter) ->
-    [];
-get_data(queue_counter_metrics = Table, true, VHostsFilter) when is_map(VHostsFilter)->
+get_data(queue_counter_metrics = Table, true, VHostsFilter) when is_map(VHostsFilter) ->
     ets:foldl(fun
         ({#resource{kind = queue, virtual_host = VHost}, _, _, _, _, _, _, _, _} = Row, Acc) when
             map_get(VHost, VHostsFilter)
@@ -621,9 +621,7 @@ get_data(queue_counter_metrics = Table, true, VHostsFilter) when is_map(VHostsFi
         (_Row, Acc) ->
             Acc
     end, [], Table);
-get_data(queue_counter_metrics, true, _VHostsFilter) ->
-    [];
-get_data(queue_exchange_metrics = Table, true, VHostsFilter) ->
+get_data(queue_exchange_metrics = Table, true, VHostsFilter) when is_map(VHostsFilter) ->
     ets:foldl(fun
         ({{
             #resource{kind = queue, virtual_host = VHost},
@@ -635,8 +633,6 @@ get_data(queue_exchange_metrics = Table, true, VHostsFilter) ->
         (_Row, Acc) ->
             Acc
     end, [], Table);
-get_data(queue_exchange_metrics, true, _VHostsFilter) ->
-    [];
 get_data(queue_coarse_metrics = Table, true, VHostsFilter) when is_map(VHostsFilter) ->
     ets:foldl(fun
                   ({#resource{kind = queue, virtual_host = VHost}, _, _, _, _} = Row, Acc) when map_get(VHost, VHostsFilter) ->