From 7f8033a5411ff02780d9e7ff4c3f7809250477e7 Mon Sep 17 00:00:00 2001
From: Aron MEZEI <aron.mezei@nws.hu>
Date: Thu, 17 Jan 2013 14:49:45 +0000
Subject: [PATCH] Munin 1.2.5  was throwing errors like: No such field (no
 "label" field defined when running plugin with "config")

fixed the sed expression to match dashes as well .-= -> .=-
updated the perl regexs to match the sed ones
renamed the plugins to work with munin 1.2.5
---
 rabbitmq-connections => rabbitmq_connections                  | 0
 rabbitmq-consumers => rabbitmq_consumers                      | 4 ++--
 rabbitmq-messages => rabbitmq_messages                        | 4 ++--
 ...essages_unacknowledged => rabbitmq_messages_unacknowledged | 4 ++--
 ...itmq-messages_uncommitted => rabbitmq_messages_uncommitted | 4 ++--
 rabbitmq-queue_memory => rabbitmq_queue_memory                | 4 ++--
 6 files changed, 10 insertions(+), 10 deletions(-)
 rename rabbitmq-connections => rabbitmq_connections (100%)
 rename rabbitmq-consumers => rabbitmq_consumers (95%)
 rename rabbitmq-messages => rabbitmq_messages (95%)
 rename rabbitmq-messages_unacknowledged => rabbitmq_messages_unacknowledged (95%)
 rename rabbitmq-messages_uncommitted => rabbitmq_messages_uncommitted (95%)
 rename rabbitmq-queue_memory => rabbitmq_queue_memory (95%)

diff --git a/rabbitmq-connections b/rabbitmq_connections
similarity index 100%
rename from rabbitmq-connections
rename to rabbitmq_connections
diff --git a/rabbitmq-consumers b/rabbitmq_consumers
similarity index 95%
rename from rabbitmq-consumers
rename to rabbitmq_consumers
index 8a884d4..3b603d0 100755
--- a/rabbitmq-consumers
+++ b/rabbitmq_consumers
@@ -32,7 +32,7 @@ HOME=/tmp/
 VHOST=${vhost:-"/"}
 QUEUES=$(HOME=$HOME rabbitmqctl list_queues -p $VHOST name | \
 		grep -v '^Listing' | \
-		grep -v 'done\.$' | sed -e 's/[.-=]/_/g' )
+		grep -v 'done\.$' | sed -e 's/[.=-]/_/g' )
  
 if [ "$1" = "config" ]; then
         QUEUE_WARN=${queue_warn:-100}
@@ -72,4 +72,4 @@ fi
 
 HOME=$HOME rabbitmqctl list_queues -p $VHOST name consumers| \
 	grep -v "^Listing" | grep -v "done.$" | \
-    perl -nle'($q, $s) = split; $q =~ s/[.-=]/_/g; print("$q.value $s")'
+    perl -nle'($q, $s) = split; $q =~ s/[.=-]/_/g; print("$q.value $s")'
diff --git a/rabbitmq-messages b/rabbitmq_messages
similarity index 95%
rename from rabbitmq-messages
rename to rabbitmq_messages
index 61d66d8..68a37da 100755
--- a/rabbitmq-messages
+++ b/rabbitmq_messages
@@ -32,7 +32,7 @@ HOME=/tmp/
 VHOST=${vhost:-"/"}
 QUEUES=$(HOME=$HOME rabbitmqctl list_queues -p $VHOST name | \
 		grep -v '^Listing' | \
-		grep -v 'done\.$' | sed -e 's/[.-=]/_/g' )
+		grep -v 'done\.$' | sed -e 's/[.=-]/_/g' )
  
 if [ "$1" = "config" ]; then
         QUEUE_WARN=${queue_warn:-10000}
@@ -72,4 +72,4 @@ fi
 
 HOME=$HOME rabbitmqctl list_queues -p $VHOST | \
 	grep -v "^Listing" | grep -v "done.$" | \
-	perl -nle'($q, $s) = split; $q =~ s/[.-=]/_/g; print("$q.value $s")'
+	perl -nle'($q, $s) = split; $q =~ s/[.=-]/_/g; print("$q.value $s")'
diff --git a/rabbitmq-messages_unacknowledged b/rabbitmq_messages_unacknowledged
similarity index 95%
rename from rabbitmq-messages_unacknowledged
rename to rabbitmq_messages_unacknowledged
index d0e8e49..62bbcc7 100755
--- a/rabbitmq-messages_unacknowledged
+++ b/rabbitmq_messages_unacknowledged
@@ -32,7 +32,7 @@ HOME=/tmp/
 VHOST=${vhost:-"/"}
 QUEUES=$(HOME=$HOME rabbitmqctl list_queues -p $VHOST name | \
 		grep -v '^Listing' | \
-		grep -v 'done\.$' | sed -e 's/[.-=]/_/g' )
+		grep -v 'done\.$' | sed -e 's/[.=-]/_/g' )
  
 if [ "$1" = "config" ]; then
         QUEUE_WARN=${queue_warn:-10000}
@@ -72,4 +72,4 @@ fi
 
 HOME=$HOME rabbitmqctl list_queues -p $VHOST name messages_unacknowledged | \
 	grep -v "^Listing" | grep -v "done.$" | \
-    perl -nle'($q, $s) = split; $q =~ s/[.-=]/_/g; print("$q.value $s")'
+    perl -nle'($q, $s) = split; $q =~ s/[.=-]/_/g; print("$q.value $s")'
diff --git a/rabbitmq-messages_uncommitted b/rabbitmq_messages_uncommitted
similarity index 95%
rename from rabbitmq-messages_uncommitted
rename to rabbitmq_messages_uncommitted
index 5d6e398..7c2a6be 100755
--- a/rabbitmq-messages_uncommitted
+++ b/rabbitmq_messages_uncommitted
@@ -32,7 +32,7 @@ HOME=/tmp/
 VHOST=${vhost:-"/"}
 QUEUES=$(HOME=$HOME rabbitmqctl list_queues -p $VHOST name | \
 		grep -v '^Listing' | \
-		grep -v 'done\.$' | sed -e 's/[.-=]/_/g' )
+		grep -v 'done\.$' | sed -e 's/[.=-]/_/g' )
  
 if [ "$1" = "config" ]; then
         QUEUE_WARN=${queue_warn:-10000}
@@ -72,4 +72,4 @@ fi
 
 HOME=$HOME rabbitmqctl list_queues -p $VHOST name messages_uncommitted | \
 	grep -v "^Listing" | grep -v "done.$" | \
-    perl -nle'($q, $s) = split; $q =~ s/[.-=]/_/g; print("$q.value $s")'
+    perl -nle'($q, $s) = split; $q =~ s/[.=-]/_/g; print("$q.value $s")'
diff --git a/rabbitmq-queue_memory b/rabbitmq_queue_memory
similarity index 95%
rename from rabbitmq-queue_memory
rename to rabbitmq_queue_memory
index e19438f..554e098 100755
--- a/rabbitmq-queue_memory
+++ b/rabbitmq_queue_memory
@@ -32,7 +32,7 @@ HOME=/tmp/
 VHOST=${vhost:-"/"}
 QUEUES=$(rabbitmqctl list_queues -p $VHOST name | \
 		grep -v '^Listing' | \
-		grep -v 'done\.$' | sed -e 's/[.-=]/_/g' )
+		grep -v 'done\.$' | sed -e 's/[.=-]/_/g' )
  
 if [ "$1" = "config" ]; then
         QUEUE_WARN=${queue_warn:-10000}
@@ -72,4 +72,4 @@ fi
 
 HOME=$HOME rabbitmqctl list_queues -p $VHOST name memory | \
 	grep -v "^Listing" | grep -v "done.$" | \
-    perl -nle'($q, $s) = split; $q =~ s/[.-=]/_/g; print("$q.value $s")'
+    perl -nle'($q, $s) = split; $q =~ s/[.=-]/_/g; print("$q.value $s")'