From 5a0fecc2d51911d30fc3f02d72045630a7e3ba2f Mon Sep 17 00:00:00 2001 From: Anders Kaseorg Date: Fri, 3 Aug 2018 00:14:45 +0000 Subject: [PATCH] munin_plugins: Fix shellcheck warnings. In puppet/zulip_ops/files/munin-plugins/rabbitmq_connections line 66: echo "connections.value $(HOME=$HOME rabbitmqctl list_connections | grep -v "^Listing" | grep -v "done.$" | wc -l)" ^-- SC2126: Consider using grep -c instead of grep|wc -l. In puppet/zulip_ops/files/munin-plugins/rabbitmq_consumers line 32: VHOST=${vhost:-"/"} ^-- SC2034: VHOST appears unused. Verify use (or export if used externally). In puppet/zulip_ops/files/munin-plugins/rabbitmq_messages line 32: VHOST=${vhost:-"/"} ^-- SC2034: VHOST appears unused. Verify use (or export if used externally). In puppet/zulip_ops/files/munin-plugins/rabbitmq_messages_unacknowledged line 32: VHOST=${vhost:-"/"} ^-- SC2034: VHOST appears unused. Verify use (or export if used externally). In puppet/zulip_ops/files/munin-plugins/rabbitmq_messages_uncommitted line 32: VHOST=${vhost:-"/"} ^-- SC2034: VHOST appears unused. Verify use (or export if used externally). In puppet/zulip_ops/files/munin-plugins/rabbitmq_queue_memory line 32: VHOST=${vhost:-"/"} ^-- SC2034: VHOST appears unused. Verify use (or export if used externally). Signed-off-by: Anders Kaseorg --- puppet/zulip_ops/files/munin-plugins/rabbitmq_connections | 2 +- puppet/zulip_ops/files/munin-plugins/rabbitmq_consumers | 2 -- puppet/zulip_ops/files/munin-plugins/rabbitmq_messages | 2 -- .../files/munin-plugins/rabbitmq_messages_unacknowledged | 2 -- .../zulip_ops/files/munin-plugins/rabbitmq_messages_uncommitted | 2 -- puppet/zulip_ops/files/munin-plugins/rabbitmq_queue_memory | 2 -- 6 files changed, 1 insertion(+), 11 deletions(-) diff --git a/puppet/zulip_ops/files/munin-plugins/rabbitmq_connections b/puppet/zulip_ops/files/munin-plugins/rabbitmq_connections index 459e9f0274..618c7cb3ec 100755 --- a/puppet/zulip_ops/files/munin-plugins/rabbitmq_connections +++ b/puppet/zulip_ops/files/munin-plugins/rabbitmq_connections @@ -63,4 +63,4 @@ fi # real work - i.e. display the data. Almost always this will be # "value" subfield for every data field. -echo "connections.value $(HOME=$HOME rabbitmqctl list_connections | grep -v "^Listing" | grep -v "done.$" | wc -l)" +echo "connections.value $(HOME=$HOME rabbitmqctl list_connections | grep -v "^Listing" | grep -cv "done.$")" diff --git a/puppet/zulip_ops/files/munin-plugins/rabbitmq_consumers b/puppet/zulip_ops/files/munin-plugins/rabbitmq_consumers index 15969982cf..d2e7c9f375 100755 --- a/puppet/zulip_ops/files/munin-plugins/rabbitmq_consumers +++ b/puppet/zulip_ops/files/munin-plugins/rabbitmq_consumers @@ -5,7 +5,6 @@ # Usage: Link or copy into /etc/munin/node.d/ # # Parameters -# env.vhost # env.queue_warn # env.queue_crit # @@ -29,7 +28,6 @@ fi # graphs should look. HOME=/tmp/ -VHOST=${vhost:-"/"} QUEUES=$(HOME=$HOME rabbitmqctl list_queues name | \ grep -v '^Listing' | \ grep -v 'done\.$' | sed -e 's/[.=-]/_/g' ) diff --git a/puppet/zulip_ops/files/munin-plugins/rabbitmq_messages b/puppet/zulip_ops/files/munin-plugins/rabbitmq_messages index 0f0210cd94..ac81ac2aa9 100755 --- a/puppet/zulip_ops/files/munin-plugins/rabbitmq_messages +++ b/puppet/zulip_ops/files/munin-plugins/rabbitmq_messages @@ -5,7 +5,6 @@ # Usage: Link or copy into /etc/munin/node.d/ # # Parameters -# env.vhost # env.queue_warn # env.queue_crit # @@ -29,7 +28,6 @@ fi # graphs should look. HOME=/tmp/ -VHOST=${vhost:-"/"} QUEUES=$(HOME=$HOME rabbitmqctl list_queues name | \ grep -v '^Listing' | \ grep -v 'done\.$' | sed -e 's/[.=-]/_/g' ) diff --git a/puppet/zulip_ops/files/munin-plugins/rabbitmq_messages_unacknowledged b/puppet/zulip_ops/files/munin-plugins/rabbitmq_messages_unacknowledged index 7c447e991d..5e7b9bcca4 100755 --- a/puppet/zulip_ops/files/munin-plugins/rabbitmq_messages_unacknowledged +++ b/puppet/zulip_ops/files/munin-plugins/rabbitmq_messages_unacknowledged @@ -5,7 +5,6 @@ # Usage: Link or copy into /etc/munin/node.d/ # # Parameters -# env.vhost # env.queue_warn # env.queue_crit # @@ -29,7 +28,6 @@ fi # graphs should look. HOME=/tmp/ -VHOST=${vhost:-"/"} QUEUES=$(HOME=$HOME rabbitmqctl list_queues name | \ grep -v '^Listing' | \ grep -v 'done\.$' | sed -e 's/[.=-]/_/g' ) diff --git a/puppet/zulip_ops/files/munin-plugins/rabbitmq_messages_uncommitted b/puppet/zulip_ops/files/munin-plugins/rabbitmq_messages_uncommitted index 9fb8fafc40..7032134058 100755 --- a/puppet/zulip_ops/files/munin-plugins/rabbitmq_messages_uncommitted +++ b/puppet/zulip_ops/files/munin-plugins/rabbitmq_messages_uncommitted @@ -5,7 +5,6 @@ # Usage: Link or copy into /etc/munin/node.d/ # # Parameters -# env.vhost # env.queue_warn # env.queue_crit # @@ -29,7 +28,6 @@ fi # graphs should look. HOME=/tmp/ -VHOST=${vhost:-"/"} QUEUES=$(HOME=$HOME rabbitmqctl list_queues name | \ grep -v '^Listing' | \ grep -v 'done\.$' | sed -e 's/[.=-]/_/g' ) diff --git a/puppet/zulip_ops/files/munin-plugins/rabbitmq_queue_memory b/puppet/zulip_ops/files/munin-plugins/rabbitmq_queue_memory index 9b28b65312..4ca01e2eaf 100755 --- a/puppet/zulip_ops/files/munin-plugins/rabbitmq_queue_memory +++ b/puppet/zulip_ops/files/munin-plugins/rabbitmq_queue_memory @@ -5,7 +5,6 @@ # Usage: Link or copy into /etc/munin/node.d/ # # Parameters -# env.vhost # env.queue_warn # env.queue_crit # @@ -29,7 +28,6 @@ fi # graphs should look. HOME=/tmp/ -VHOST=${vhost:-"/"} QUEUES=$(rabbitmqctl list_queues name | \ grep -v '^Listing' | \ grep -v 'done\.$' | sed -e 's/[.=-]/_/g' )