nils/ebusd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

support dots in name

Browse Source
This commit is contained in:
john30
2016-12-10 16:52:10 +01:00
parent 4738b62091
commit 1f30d82ef3
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
contrib/munin/plugins/ebusd_
+9 -5
View File
@@ -53,12 +53,14 @@ if [ "$1" = "config" ]; then
if [ "x$result" = "x-" -o "x${result##ERR:*}" = "x" ]; then if [ "x$result" = "x-" -o "x${result##ERR:*}" = "x" ]; then
continue continue
fi fi
name=${sensor/:/_}
name=${name/./_}
if [ ! "${sensor%%Energy}" = "$sensor" ]; then if [ ! "${sensor%%Energy}" = "$sensor" ]; then
echo ${prefix}_${sensor/:/_}.label ${sensor/:/ } "[diff]" echo ${prefix}_${name}.label ${sensor/:/ } "[diff]"
echo ${prefix}_${sensor/:/_}.type COUNTER echo ${prefix}_${name}.type COUNTER
echo ${prefix}_${sensor/:/_}.draw AREA echo ${prefix}_${name}.draw AREA
else else
echo ${prefix}_${sensor/:/_}.label ${sensor/:/ } echo ${prefix}_${name}.label ${sensor/:/ }
fi fi
# print_warning ${prefix}_${sensor/:/_} # print_warning ${prefix}_${sensor/:/_}
# print_critical ${prefix}_${sensor/:/_} # print_critical ${prefix}_${sensor/:/_}
@@ -68,6 +70,8 @@ fi
for sensor in $sensors; do for sensor in $sensors; do
result=`echo "read -c ${sensor/:/ }"|nc localhost 8888 2>/dev/null|head -n 1|sed -e 's#;.*$##'` result=`echo "read -c ${sensor/:/ }"|nc localhost 8888 2>/dev/null|head -n 1|sed -e 's#;.*$##'`
if [ ! "x$result" = "x-" ]; then if [ ! "x$result" = "x-" ]; then
echo ${prefix}_${sensor/:/_}.value $result name=${sensor/:/_}
name=${name/./_}
echo ${prefix}_${name}.value $result
fi fi
done done