| 1 | --- munin-1.4.3/plugins/node.d/ejabberd_.in 2009-12-30 07:55:55.000000000 -0500 |
|---|
| 2 | +++ /opt/munin/lib/plugins/ejabberd_ 2010-02-18 23:32:24.000000000 -0500 |
|---|
| 3 | @@ -1,4 +1,4 @@ |
|---|
| 4 | -#!@@GOODSH@@ |
|---|
| 5 | +#!/bin/sh |
|---|
| 6 | # -*- sh -*- |
|---|
| 7 | |
|---|
| 8 | : << =cut |
|---|
| 9 | @@ -93,7 +93,8 @@ |
|---|
| 10 | |
|---|
| 11 | =cut |
|---|
| 12 | |
|---|
| 13 | -EJCTL=$(which ejabberdctl 2>/dev/null) |
|---|
| 14 | +#EJCTL=$(which ejabberdctl 2>/dev/null) |
|---|
| 15 | +EJCTL="chroot /usr/chroot-ejabberd /usr/local/ejabberd-2.1.0/bin/ejabberdctl" |
|---|
| 16 | |
|---|
| 17 | if [ "$1" = "autoconf" ]; then |
|---|
| 18 | if [ -n "$EJCTL" -a -x "$EJCTL" ]; then |
|---|
| 19 | @@ -118,11 +119,11 @@ |
|---|
| 20 | |
|---|
| 21 | # trying to autodetect running vhosts. |
|---|
| 22 | if [ -z "$vhosts" ]; then |
|---|
| 23 | - for CFGPATH in /etc/ejabberd /usr/local/ejabberd/etc; do |
|---|
| 24 | + CFGPATH=/usr/chroot-ejabberd/usr/local/ejabberd-2.1.0/conf |
|---|
| 25 | if [ -f "$CFGPATH/ejabberd.cfg" ]; then |
|---|
| 26 | - EJCFG=$CFGPATH/ejabberd.cfg; |
|---|
| 27 | + EJCFG=$CFGPATH/ejabberd.cfg |
|---|
| 28 | fi |
|---|
| 29 | - done |
|---|
| 30 | + |
|---|
| 31 | if [ -z "$EJCFG" ]; then |
|---|
| 32 | echo "Unable to find ejabberd.cfg. Exiting." >&2 |
|---|
| 33 | exit -1 |
|---|
| 34 | @@ -237,8 +238,8 @@ |
|---|
| 35 | if [ "$MODE" = "users" ]; then |
|---|
| 36 | for host in $vhosts; do |
|---|
| 37 | formathost=$(echo $host | tr '.' '_') |
|---|
| 38 | - echo "connected_users_$formathost.value $($EJCTL vhost $host stats onlineusers)"; |
|---|
| 39 | - echo "connected_unique_users_$formathost.value $($EJCTL connected-users | awk -v var=$host -F/ '{users[$1]} END {for (user in users) {if (index(user,var)) {count++}} print count}')"; |
|---|
| 40 | + echo "connected_users_$formathost.value $($EJCTL stats_host onlineusers $host)"; |
|---|
| 41 | + echo "connected_unique_users_$formathost.value $($EJCTL connected_users | awk -v var=$host -F/ '{users[$1]} END {for (user in users) {if (index(user,var)) {count++}} print count}')"; |
|---|
| 42 | done |
|---|
| 43 | exit 0 |
|---|
| 44 | fi |
|---|
| 45 | @@ -246,7 +247,7 @@ |
|---|
| 46 | if [ "$MODE" = "registrations" ]; then |
|---|
| 47 | for host in $vhosts; do |
|---|
| 48 | formathost=$(echo $host | tr '.' '_') |
|---|
| 49 | - num=$($EJCTL vhost $host stats registeredusers) |
|---|
| 50 | + num=$($EJCTL stats_host registeredusers $host) |
|---|
| 51 | if [ "$?" != 0 ]; then |
|---|
| 52 | num="U" |
|---|
| 53 | fi |
|---|
| 54 | @@ -259,7 +260,7 @@ |
|---|
| 55 | for host in $vhosts; do |
|---|
| 56 | formathost=$(echo $host | tr '.' '_') |
|---|
| 57 | for status in $statuses; do |
|---|
| 58 | - num=$($EJCTL vhost $host status-num $status) |
|---|
| 59 | + num=$($EJCTL status_num_host $host $status) |
|---|
| 60 | if [ "$?" != 0 ]; then |
|---|
| 61 | num="U" |
|---|
| 62 | fi |
|---|
| 63 | @@ -284,12 +285,12 @@ |
|---|
| 64 | for host in $vhosts; do |
|---|
| 65 | for num in $days; do |
|---|
| 66 | formathost=$(echo $host | tr '.' '_') |
|---|
| 67 | - echo "usersindays_${formathost}_${num}.value $($EJCTL vhost $host num-active-users $num)"; |
|---|
| 68 | + echo "usersindays_${formathost}_${num}.value $($EJCTL num_active_users $host $num)"; |
|---|
| 69 | done; |
|---|
| 70 | done; |
|---|
| 71 | exit 0 |
|---|
| 72 | fi |
|---|
| 73 | |
|---|
| 74 | if [ "$MODE" = "uptime" ]; then |
|---|
| 75 | - echo "uptime.value $($EJCTL stats uptime-seconds | awk '{printf "%.2f", $1/86400}')" |
|---|
| 76 | + echo "uptime.value $($EJCTL stats uptimeseconds | awk '{printf "%.2f", $1/86400}')" |
|---|
| 77 | fi |
|---|
