fix munin plugins for new versions

2 files changed, 3 insertions, 13 deletions

diff --git a/files/munin/ejabberd_ b/files/munin/ejabberd_
index e68bdf2..84f52bd 100755
--- a/files/munin/ejabberd_
+++ b/files/munin/ejabberd_
@@ -153,7 +153,7 @@ if [ "$MODE" == "registrations" ]; then
     for host in $vhosts; do
 	formathost=$(echo $host | tr '.-' '_')
 	echo -n "registered_$formathost.value "; 
-	num=$($EJCTL vhost $host registered-users)
+	num=$($EJCTL registered-users $host)
         if [ "$?" != 0 ]; then
             echo "U"
         else
diff --git a/manifests/munin.pp b/manifests/munin.pp
index f432eea..1357e98 100644
--- a/manifests/munin.pp
+++ b/manifests/munin.pp
@@ -6,19 +6,9 @@ class ejabberd::munin {
     source => "ejabberd/munin/ejabberd_", 
     ensure => absent,
   }
-  munin::plugin{'ejabberd_users': 
+  munin::plugin{['ejabberd_users','ejabberd_connections','ejabberd_registrations']:
     require => Munin::Plugin::Deploy['ejabberd_'],
     ensure => 'ejabberd_',
-    config => "env.vhosts ${ejabberd_domains}\ntimeout 20\nuser root" 
-  }
-  munin::plugin{'ejabberd_connections': 
-    require => Munin::Plugin::Deploy['ejabberd_'],
-    ensure => 'ejabberd_',
-    config => "env.vhosts ${ejabberd_domains}\nuser root" 
-  }
-  munin::plugin{'ejabberd_registrations': 
-    require => Munin::Plugin::Deploy['ejabberd_'],
-    ensure => 'ejabberd_',
-    config => "env.vhosts ${ejabberd_domains}\nuser root" 
+    config => "env.vhosts ${ejabberd_domains}\ntimeout 20\nuser root\ngroup root"
   }
 }