From 1223aaed0972b814e0308951e64bfafd4718f842 Mon Sep 17 00:00:00 2001 From: Anh Thi Lan Nguyen Date: Fri, 7 Jun 2024 14:40:20 +0700 Subject: [PATCH] Include virtual host limits and metadata in definitions exported from the management UI --- deps/rabbit/src/rabbit_vhost.erl | 1 + deps/rabbit/src/vhost.erl | 1 + deps/rabbitmq_management/src/rabbit_mgmt_wm_definitions.erl | 2 +- deps/rabbitmq_management/src/rabbit_mgmt_wm_vhosts.erl | 2 +- 4 files changed, 4 insertions(+), 2 deletions(-) diff --git a/deps/rabbit/src/rabbit_vhost.erl b/deps/rabbit/src/rabbit_vhost.erl index 80882bf524e5..8f410c67fcf2 100644 --- a/deps/rabbit/src/rabbit_vhost.erl +++ b/deps/rabbit/src/rabbit_vhost.erl @@ -604,6 +604,7 @@ i(cluster_state, VHost) -> vhost_cluster_state(vhost:get_name(VHost)); i(description, VHost) -> vhost:get_description(VHost); i(tags, VHost) -> vhost:get_tags(VHost); i(default_queue_type, VHost) -> vhost:get_default_queue_type(VHost); +i(limits, VHost) -> vhost:get_limits(VHost); i(metadata, VHost) -> vhost:get_metadata(VHost); i(Item, VHost) -> rabbit_log:error("Don't know how to compute a virtual host info item '~ts' for virtual host '~tp'", [Item, VHost]), diff --git a/deps/rabbit/src/vhost.erl b/deps/rabbit/src/vhost.erl index 9091441dd273..dca0c892c248 100644 --- a/deps/rabbit/src/vhost.erl +++ b/deps/rabbit/src/vhost.erl @@ -119,6 +119,7 @@ info_keys() -> description, tags, default_queue_type, + limits, metadata, tracing, cluster_state]. diff --git a/deps/rabbitmq_management/src/rabbit_mgmt_wm_definitions.erl b/deps/rabbitmq_management/src/rabbit_mgmt_wm_definitions.erl index 06f98b1408a3..f62b75550f05 100644 --- a/deps/rabbitmq_management/src/rabbit_mgmt_wm_definitions.erl +++ b/deps/rabbitmq_management/src/rabbit_mgmt_wm_definitions.erl @@ -254,7 +254,7 @@ export_name(_Name) -> true. rw_state() -> [{users, [name, password_hash, hashing_algorithm, tags, limits]}, - {vhosts, [name]}, + {vhosts, [name, limits, metadata]}, {permissions, [user, vhost, configure, write, read]}, {topic_permissions, [user, vhost, exchange, write, read]}, {parameters, [vhost, component, name, value]}, diff --git a/deps/rabbitmq_management/src/rabbit_mgmt_wm_vhosts.erl b/deps/rabbitmq_management/src/rabbit_mgmt_wm_vhosts.erl index 2decdfc9ede9..1ec63b1aa456 100644 --- a/deps/rabbitmq_management/src/rabbit_mgmt_wm_vhosts.erl +++ b/deps/rabbitmq_management/src/rabbit_mgmt_wm_vhosts.erl @@ -64,4 +64,4 @@ augmented(ReqData, #context{user = User}) -> end. basic() -> - rabbit_vhost:info_all([name]). + rabbit_vhost:info_all().