Merge pull request #6557 from rabbitmq/mergify/bp/v3.11.x/pr-6556

Expose effective policy definition via CLI (backport #6556)
rabbitmq · Dec 3, 2022 · 5322e9d · 5322e9d
2 parents e12bde7 + e6154ed
commit 5322e9d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/deps/rabbit/docs/rabbitmqctl.8 b/deps/rabbit/docs/rabbitmqctl.8
@@ -1321,7 +1321,11 @@ Whether the queue will be deleted automatically when no longer used.
 .It Cm arguments
 Queue arguments.
 .It Cm policy
-Effective policy name for the queue.
+Name of the user policy that is applied to the queue.
+.It Cm operator_policy
+Name of the operator policy that is applied to the queue.
+.It Cm effective_policy_definition
+Effective policy definition for the queue: both user and operator policy definitions merged.
 .It Cm pid
 Erlang process identifier of the queue.
 .It Cm owner_pid

diff --git a/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/list_queues_command.ex b/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/list_queues_command.ex
@@ -15,7 +15,8 @@ defmodule RabbitMQ.CLI.Ctl.Commands.ListQueuesCommand do
 
   @default_timeout 60_000
   @info_keys ~w(name durable auto_delete
-            arguments policy pid owner_pid exclusive exclusive_consumer_pid
+            arguments policy operator_policy effective_policy_definition
+            pid owner_pid exclusive exclusive_consumer_pid
             exclusive_consumer_tag messages_ready messages_unacknowledged messages
             messages_ready_ram messages_unacknowledged_ram messages_ram
             messages_persistent message_bytes message_bytes_ready