From 94c7f9f01eed02244c502eefd0331c6513c6893a Mon Sep 17 00:00:00 2001 From: Doctor Date: Mon, 11 Jul 2022 13:49:52 +0200 Subject: [PATCH] Fix rabbitmqctl output filter --- plugins/rabbitmq/rabbitmq_messages | 4 ++-- plugins/rabbitmq/rabbitmq_messages_unacknowledged | 4 ++-- plugins/rabbitmq/rabbitmq_messages_uncommitted | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/plugins/rabbitmq/rabbitmq_messages b/plugins/rabbitmq/rabbitmq_messages index ca7cece9..72cdf0c5 100755 --- a/plugins/rabbitmq/rabbitmq_messages +++ b/plugins/rabbitmq/rabbitmq_messages @@ -31,7 +31,7 @@ fi HOME=/tmp/ VHOST=${vhost:-"/"} QUEUES=$(HOME=$HOME rabbitmqctl list_queues -p $VHOST name | \ - grep -v '^Listing' | \ + grep -vE '^Timeout:|^Listing|^name' | \ grep -v 'done\.$' | sed -e 's/[.=-]/_/g' ) if [ "$1" = "config" ]; then @@ -71,5 +71,5 @@ fi # "value" subfield for every data field. HOME=$HOME rabbitmqctl list_queues -p $VHOST | \ - grep -v "^Listing" | grep -v "done.$" | \ + grep -vE "^Timeout:|^Listing|^name" | grep -v "done.$" | \ perl -nle'($q, $s) = split; $q =~ s/[.=-]/_/g; print("$q.value $s")' diff --git a/plugins/rabbitmq/rabbitmq_messages_unacknowledged b/plugins/rabbitmq/rabbitmq_messages_unacknowledged index a36a0a4d..8a8bdb41 100755 --- a/plugins/rabbitmq/rabbitmq_messages_unacknowledged +++ b/plugins/rabbitmq/rabbitmq_messages_unacknowledged @@ -31,7 +31,7 @@ fi HOME=/tmp/ VHOST=${vhost:-"/"} QUEUES=$(HOME=$HOME rabbitmqctl list_queues -p $VHOST name | \ - grep -v '^Listing' | \ + grep -vE '^Timeout:|^Listing|^name' | \ grep -v 'done\.$' | sed -e 's/[.=-]/_/g' ) if [ "$1" = "config" ]; then @@ -71,5 +71,5 @@ fi # "value" subfield for every data field. HOME=$HOME rabbitmqctl list_queues -p $VHOST name messages_unacknowledged | \ - grep -v "^Listing" | grep -v "done.$" | \ + grep -vE "^Timeout:|^Listing|^name" | grep -v "done.$" | \ perl -nle'($q, $s) = split; $q =~ s/[.=-]/_/g; print("$q.value $s")' diff --git a/plugins/rabbitmq/rabbitmq_messages_uncommitted b/plugins/rabbitmq/rabbitmq_messages_uncommitted index c3e6fadf..251a183a 100755 --- a/plugins/rabbitmq/rabbitmq_messages_uncommitted +++ b/plugins/rabbitmq/rabbitmq_messages_uncommitted @@ -31,7 +31,7 @@ fi HOME=/tmp/ VHOST=${vhost:-"/"} QUEUES=$(HOME=$HOME rabbitmqctl list_queues -p $VHOST name | \ - grep -v '^Listing' | \ + grep -vE '^Timeout:|^Listing|^name' | \ grep -v 'done\.$' | sed -e 's/[.=-]/_/g' ) if [ "$1" = "config" ]; then @@ -71,5 +71,5 @@ fi # "value" subfield for every data field. HOME=$HOME rabbitmqctl list_channels -p $VHOST name messages_uncommitted | \ - grep -v "^Listing" | grep -v "done.$" | \ + grep -vE "^Timeout:|^Listing|^name" | grep -v "done.$" | \ perl -nle'($q, $s) = split; $q =~ s/[.=-]/_/g; print("$q.value $s")'