summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormh <mh@immerda.ch>2009-02-01 12:01:19 +0000
committermh <mh@immerda.ch>2009-02-01 12:01:19 +0000
commit805eaef80ade977cb692baa53aba4e3a6220ae93 (patch)
tree1b4eed58e60d128730f3a5ba801c132e5cc3f486
parent3a69b3e284b2f7c7e8a77be327c20e3840ed759b (diff)
downloadpuppet-ejabberd-805eaef80ade977cb692baa53aba4e3a6220ae93.tar.gz
puppet-ejabberd-805eaef80ade977cb692baa53aba4e3a6220ae93.tar.bz2
fixing ejabberd plugin to correctly escape domain names with dashes
-rwxr-xr-xfiles/munin/ejabberd_8
1 files changed, 4 insertions, 4 deletions
diff --git a/files/munin/ejabberd_ b/files/munin/ejabberd_
index 1e5d708..e68bdf2 100755
--- a/files/munin/ejabberd_
+++ b/files/munin/ejabberd_
@@ -110,7 +110,7 @@ if [ "$1" = "config" ]; then
# echo 'connected_users.info Number of logged in users'
# echo 'connected_users.label connected users'
for host in $vhosts; do
- formathost=$(echo $host | tr '.' '_')
+ formathost=$(echo $host | tr '.-' '_')
echo "connected_users_$formathost.label $host connected users";
echo "connected_unique_users_$formathost.label $host unique connected users";
done;
@@ -118,7 +118,7 @@ if [ "$1" = "config" ]; then
echo 'graph_title ejabberd registrations'
echo 'graph_vlabel users'
for host in $vhosts; do
- formathost=$(echo $host | tr '.' '_')
+ formathost=$(echo $host | tr '.-' '_')
echo "registered_$formathost.label $host registered users";
echo "registered_$formathost.info Registered users for vhost $host"
done;
@@ -140,7 +140,7 @@ if [ "$MODE" == "users" ]; then
# $EJCTL connected-users | awk -F/ '{print $1}' | sort | uniq | wc -l
for host in $vhosts; do
- formathost=$(echo $host | tr '.' '_')
+ formathost=$(echo $host | tr '.-' '_')
echo -n "connected_users_$formathost.value ";
$EJCTL connected-users | grep "@$host" | wc -l
echo -n "connected_unique_users_$formathost.value ";
@@ -151,7 +151,7 @@ fi
if [ "$MODE" == "registrations" ]; then
for host in $vhosts; do
- formathost=$(echo $host | tr '.' '_')
+ formathost=$(echo $host | tr '.-' '_')
echo -n "registered_$formathost.value ";
num=$($EJCTL vhost $host registered-users)
if [ "$?" != 0 ]; then