Merge pull request #668 from ktsaou/master

[netdata.git] / charts.d / sensors.chart.sh

diff --git a/charts.d/sensors.chart.sh b/charts.d/sensors.chart.sh
index 76032a660cd999ff47204722d3110d8ba38ef760..06a35af2d961530516e539d09a4db7db14e745db 100755 (executable)
--- a/charts.d/sensors.chart.sh
+++ b/charts.d/sensors.chart.sh
@@ -21,6 +21,10 @@ sensors_source_update=1
 # the default is to collect it at every iteration of charts.d
 sensors_update_every=
 
+sensors_priority=90000
+
+declare -A sensors_excluded=()
+
 sensors_find_all_files() {
        find $1 -maxdepth $sensors_sys_depth -name \*_input -o -name temp 2>/dev/null
 }
@@ -39,23 +43,28 @@ sensors_check() {
        #  - 0 to enable the chart
        #  - 1 to disable the chart
 
-       [ ! -z "$( sensors_find_all_files $sensors_sys_dir )" ] && return 0
-       return 1
+       [ -z "$( sensors_find_all_files $sensors_sys_dir )" ] && echo >&2 "$PROGRAM_NAME: sensors: no sensors found in '$sensors_sys_dir'." && return 1
+       return 0
 }
 
 sensors_check_files() {
        # we only need sensors that report a non-zero value
+       # also remove not needed sensors
 
-       local f= v=
+       local f= v= excluded=
        for f in $*
        do
                [ ! -f "$f" ] && continue
+               for ex in ${sensors_excluded[@]}; do
+                       [[ $f =~ .*$ex$ ]] && excluded='1' && break
+               done
 
-               v="$( cat $f )"
+               [ "$excluded" != "1" ] && v="$( cat $f )" || v=0
                v=$(( v + 1 - 1 ))
                [ $v -ne 0 ] && echo "$f" && continue
-               
-               echo >&2 "charts.d: sensors: $f gives zero values"
+               excluded=
+
+               echo >&2 "$PROGRAM_NAME: sensors: $f gives zero values"
        done
 }
 
@@ -74,7 +83,7 @@ sensors_check_temp_type() {
                v=$(( v + 1 - 1 ))
                [ $v -ne 0 ] && echo "$f" && continue
 
-               echo >&2 "charts.d: sensors: $f is disabled"
+               echo >&2 "$PROGRAM_NAME: sensors: $f is disabled"
        done
 }
 
@@ -127,7 +136,7 @@ sensors_create() {
                                        files="$( sensors_check_files $files )"
                                        files="$( sensors_check_temp_type $files )"
                                        [ -z "$files" ] && continue
-                                       echo "CHART sensors.temp_$id '' '$name Temperature' 'Celcius' '$device' '' line 6000 $sensors_update_every"
+                                       echo "CHART sensors.temp_$id '' '$name Temperature' 'Celsius' 'temperature' 'sensors.temp' line $((sensors_priority + 1)) $sensors_update_every"
                                        echo >>$TMP_DIR/sensors.sh "echo \"BEGIN sensors.temp_$id \$1\""
                                        divisor=1000
                                        ;;
@@ -136,7 +145,7 @@ sensors_create() {
                                        files="$( ls $path/in*_input 2>/dev/null )"
                                        files="$( sensors_check_files $files )"
                                        [ -z "$files" ] && continue
-                                       echo "CHART sensors.volt_$id '' '$name Voltage' 'Volts' '$device' '' line 6001 $sensors_update_every"
+                                       echo "CHART sensors.volt_$id '' '$name Voltage' 'Volts' 'voltage' 'sensors.volt' line $((sensors_priority + 2)) $sensors_update_every"
                                        echo >>$TMP_DIR/sensors.sh "echo \"BEGIN sensors.volt_$id \$1\""
                                        divisor=1000
                                        ;;
@@ -145,7 +154,7 @@ sensors_create() {
                                        files="$( ls $path/curr*_input 2>/dev/null )"
                                        files="$( sensors_check_files $files )"
                                        [ -z "$files" ] && continue
-                                       echo "CHART sensors.curr_$id '' '$name Current' 'Ampere' '$device' '' line 6002 $sensors_update_every"
+                                       echo "CHART sensors.curr_$id '' '$name Current' 'Ampere' 'current' 'sensors.curr' line $((sensors_priority + 3)) $sensors_update_every"
                                        echo >>$TMP_DIR/sensors.sh "echo \"BEGIN sensors.curr_$id \$1\""
                                        divisor=1000
                                        ;;
@@ -154,7 +163,7 @@ sensors_create() {
                                        files="$( ls $path/power*_input 2>/dev/null )"
                                        files="$( sensors_check_files $files )"
                                        [ -z "$files" ] && continue
-                                       echo "CHART sensors.power_$id '' '$name Power' 'Watt' '$device' '' line 6003 $sensors_update_every"
+                                       echo "CHART sensors.power_$id '' '$name Power' 'Watt' 'power' 'sensors.power' line $((sensors_priority + 4)) $sensors_update_every"
                                        echo >>$TMP_DIR/sensors.sh "echo \"BEGIN sensors.power_$id \$1\""
                                        divisor=1000000
                                        ;;
@@ -163,7 +172,7 @@ sensors_create() {
                                        files="$( ls $path/fan*_input 2>/dev/null )"
                                        files="$( sensors_check_files $files )"
                                        [ -z "$files" ] && continue
-                                       echo "CHART sensors.fan_$id '' '$name Fans Speed' 'Rotations / Minute' '$device' '' line 6004 $sensors_update_every"
+                                       echo "CHART sensors.fan_$id '' '$name Fans Speed' 'Rotations / Minute' 'fans' 'sensors.fans' line $((sensors_priority + 5)) $sensors_update_every"
                                        echo >>$TMP_DIR/sensors.sh "echo \"BEGIN sensors.fan_$id \$1\""
                                        ;;
 
@@ -171,7 +180,7 @@ sensors_create() {
                                        files="$( ls $path/energy*_input 2>/dev/null )"
                                        files="$( sensors_check_files $files )"
                                        [ -z "$files" ] && continue
-                                       echo "CHART sensors.energy_$id '' '$name Energy' 'Joule' '$device' '' areastack 6005 $sensors_update_every"
+                                       echo "CHART sensors.energy_$id '' '$name Energy' 'Joule' 'energy' 'sensors.energy' areastack $((sensors_priority + 6)) $sensors_update_every"
                                        echo >>$TMP_DIR/sensors.sh "echo \"BEGIN sensors.energy_$id \$1\""
                                        algorithm="incremental"
                                        divisor=1000000
@@ -181,7 +190,7 @@ sensors_create() {
                                        files="$( ls $path/humidity*_input 2>/dev/null )"
                                        files="$( sensors_check_files $files )"
                                        [ -z "$files" ] && continue
-                                       echo "CHART sensors.humidity_$id '' '$name Humidity' 'Percent' '$device' '' line 6006 $sensors_update_every"
+                                       echo "CHART sensors.humidity_$id '' '$name Humidity' 'Percent' 'humidity' 'sensors.humidity' line $((sensors_priority + 7)) $sensors_update_every"
                                        echo >>$TMP_DIR/sensors.sh "echo \"BEGIN sensors.humidity_$id \$1\""
                                        divisor=1000
                                        ;;
@@ -204,7 +213,7 @@ sensors_create() {
                                fi
 
                                echo "DIMENSION $fid '$labelname' $algorithm $multiplier $divisor"
-                               echo >>$TMP_DIR/sensors.sh "printf \"SET $fid = \"; cat $file "
+                               echo >>$TMP_DIR/sensors.sh "echo \"SET $fid = \"\$(< $file )"
                        done
 
                        echo >>$TMP_DIR/sensors.sh "echo END"