Skip to content
This repository was archived by the owner on Nov 17, 2020. It is now read-only.

Commit c0f70a0

Browse files
Hide drop_unroutable metric behind a feature flag
For mixed version cluster compatibility per suggestion from @dumbbell. Pair: @dcorbacho. Part of rabbitmq/rabbitmq-server#1904. [#165548314]
1 parent 733c8b8 commit c0f70a0

File tree

1 file changed

+18
-0
lines changed

1 file changed

+18
-0
lines changed

src/rabbit_mgmt_db.erl

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -459,6 +459,7 @@ format_range(Data, Key, Range0, Interval) ->
459459
rabbit_mgmt_stats:format_range(Range0, Now, Table, Interval, InstantRateFun,
460460
SamplesFun).
461461

462+
%% basic.get-empty metric
462463
fetch_slides(Ele, Key, Data)
463464
when Key =:= channel_queue_stats_deliver_stats orelse
464465
Key =:= channel_stats_deliver_stats orelse
@@ -477,6 +478,23 @@ fetch_slides(Ele, Key, Data)
477478
Slide ->
478479
[rabbit_mgmt_data_compat:fill_get_empty_queue_metric(Slide)]
479480
end;
481+
%% drop_unroutable metric
482+
fetch_slides(Ele, Key, Data)
483+
when Key =:= channel_stats_fine_stats orelse
484+
Key =:= channel_exchange_stats_fine_stats orelse
485+
Key =:= vhost_stats_fine_stats orelse
486+
(is_tuple(Key) andalso
487+
(element(1, Key) =:= channel_stats_fine_stats orelse
488+
element(1, Key) =:= channel_exchange_stats_fine_stats orelse
489+
element(1, Key) =:= vhost_stats_fine_stats)) ->
490+
case element(Ele, maps:get(Key, Data)) of
491+
not_found -> [];
492+
Slides when is_list(Slides) ->
493+
[rabbit_mgmt_data_compat:fill_drop_unroutable_metric(S)
494+
|| S <- Slides, not_found =/= S];
495+
Slide ->
496+
[rabbit_mgmt_data_compat:fill_drop_unroutable_metric(Slide)]
497+
end;
480498
fetch_slides(Ele, Key, Data) ->
481499
case element(Ele, maps:get(Key, Data)) of
482500
not_found -> [];

0 commit comments

Comments
 (0)