fix munin plugins for new versions

diff --git a/files/munin/ejabberd_ b/files/munin/ejabberd_
index e68bdf2af3a199f800567f07db6811c0cc68d778..84f52bd0c3206f8cb3abd48cc5786a51600eef20 100755 (executable)
--- 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 f432eea144ccd484758bc21d85f9ba8a13dc7adc..1357e98f3c3963d44201a03a3a528bffd961c4b6 100644 (file)
--- 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"
   }
 }