From 1f30d82ef36229b1a8b2b55d8f82751061cb1e6c Mon Sep 17 00:00:00 2001 From: john30 Date: Tue, 29 Dec 2015 08:12:08 +0100 Subject: [PATCH] support dots in name --- contrib/munin/plugins/ebusd_ | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/contrib/munin/plugins/ebusd_ b/contrib/munin/plugins/ebusd_ index 065495dd..46df47b2 100755 --- a/contrib/munin/plugins/ebusd_ +++ b/contrib/munin/plugins/ebusd_ @@ -53,12 +53,14 @@ if [ "$1" = "config" ]; then if [ "x$result" = "x-" -o "x${result##ERR:*}" = "x" ]; then continue fi + name=${sensor/:/_} + name=${name/./_} if [ ! "${sensor%%Energy}" = "$sensor" ]; then - echo ${prefix}_${sensor/:/_}.label ${sensor/:/ } "[diff]" - echo ${prefix}_${sensor/:/_}.type COUNTER - echo ${prefix}_${sensor/:/_}.draw AREA + echo ${prefix}_${name}.label ${sensor/:/ } "[diff]" + echo ${prefix}_${name}.type COUNTER + echo ${prefix}_${name}.draw AREA else - echo ${prefix}_${sensor/:/_}.label ${sensor/:/ } + echo ${prefix}_${name}.label ${sensor/:/ } fi # print_warning ${prefix}_${sensor/:/_} # print_critical ${prefix}_${sensor/:/_} @@ -68,6 +70,8 @@ fi for sensor in $sensors; do result=`echo "read -c ${sensor/:/ }"|nc localhost 8888 2>/dev/null|head -n 1|sed -e 's#;.*$##'` if [ ! "x$result" = "x-" ]; then - echo ${prefix}_${sensor/:/_}.value $result + name=${sensor/:/_} + name=${name/./_} + echo ${prefix}_${name}.value $result fi done