X-Git-Url: https://arthur.barton.de/gitweb/?a=blobdiff_plain;f=charts.d%2Fsensors.chart.sh;h=125c925da7f6c031fcbf45bdc78a76cf552bd561;hb=b060bae83cc36fdc4f14120228e4c9b0d1ec42e8;hp=a70c7c49caafbaa10412305c499577c0e161ae5e;hpb=da3ef5f1bb5ad7af52acf859b39e98e811ec7788;p=netdata.git

diff --git a/charts.d/sensors.chart.sh b/charts.d/sensors.chart.sh
old mode 100755
new mode 100644
index a70c7c49..125c925d
--- a/charts.d/sensors.chart.sh
+++ b/charts.d/sensors.chart.sh
@@ -1,17 +1,38 @@
-#!/bin/sh
+# no need for shebang - this file is loaded from charts.d.plugin
+
+# netdata
+# real-time performance and health monitoring, done right!
+# (C) 2016 Costa Tsaousis <costa@tsaousis.gr>
+# GPL v3+
+#
+
+# sensors docs
+# https://www.kernel.org/doc/Documentation/hwmon/sysfs-interface
 
 # if this chart is called X.chart.sh, then all functions and global variables
 # must start with X_
 
-sensors_sys_dir="/sys/class/hwmon"
-sensors_sys_depth=3
+# the directory the kernel keeps sensor data
+sensors_sys_dir="${NETDATA_HOST_PREFIX}/sys/devices"
+
+# how deep in the tree to check for sensor data
+sensors_sys_depth=10
 
-# _update_every is a special variable - it holds the number of seconds
-# between the calls of the _update() function
+# if set to 1, the script will overwrite internal
+# script functions with code generated ones
+# leave to 1, is faster
+sensors_source_update=1
+
+# how frequently to collect sensor data
+# 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 -L $1 -maxdepth $sensors_sys_depth -name temp\?_input -o -name temp -o -name in\?_input -o -name fan\?_input 2>/dev/null
+	find $1 -maxdepth $sensors_sys_depth -name \*_input -o -name temp 2>/dev/null
 }
 
 sensors_find_all_dirs() {
@@ -28,15 +49,58 @@ 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 )" ] && error "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= excluded=
+	for f in $*
+	do
+		[ ! -f "$f" ] && continue
+		for ex in ${sensors_excluded[@]}; do
+			[[ $f =~ .*$ex$ ]] && excluded='1' && break
+		done
+
+		[ "$excluded" != "1" ] && v="$( cat $f )" || v=0
+		v=$(( v + 1 - 1 ))
+		[ $v -ne 0 ] && echo "$f" && continue
+		excluded=
+
+		error "$f gives zero values"
+	done
+}
+
+sensors_check_temp_type() {
+	# valid temp types are 1 to 6
+	# disabled sensors have the value 0
+
+	local f= t= v=
+	for f in $*
+	do
+		t=$( echo $f | sed "s|_input$|_type|g" )
+		[ "$f" = "$t" ] && echo "$f" && continue
+		[ ! -f "$t" ] && echo "$f" && continue
+
+		v="$( cat $t )"
+		v=$(( v + 1 - 1 ))
+		[ $v -ne 0 ] && echo "$f" && continue
+
+		error "$f is disabled"
+	done
 }
 
 # _create is called once, to create the charts
 sensors_create() {
 	local path= dir= name= x= file= lfile= labelname= labelid= device= subsystem= id= type= mode= files= multiplier= divisor=
 
-	echo >$TMP_DIR/temp.sh "sensors_update() {"
+	# we create a script with the source of the
+	# sensors_update() function
+	# - the highest speed we can achieve -
+	[ $sensors_source_update -eq 1 ] && echo >$TMP_DIR/sensors.sh "sensors_update() {"
 
 	for path in $( sensors_find_all_dirs $sensors_sys_dir | sort -u )
 	do
@@ -63,35 +127,78 @@ sensors_create() {
 
 		id="$( fixid "$device.$subsystem.$dir" )"
 
-		echo >&2 "charts.d: sensors on path='$path', dir='$dir', device='$device', subsystem='$subsystem', id='$id', name='$name'"
+		debug "path='$path', dir='$dir', device='$device', subsystem='$subsystem', id='$id', name='$name'"
 
-		for mode in temperature voltage fans
+		for mode in temperature voltage fans power current energy humidity
 		do
 			files=
 			multiplier=1
 			divisor=1
+			algorithm="absolute"
+
 			case $mode in
 				temperature)
-					files="$( find -H $path -name temp\?_input -o -name temp | sort -u)"
+					files="$( ls $path/temp*_input 2>/dev/null; ls $path/temp 2>/dev/null )"
+					files="$( sensors_check_files $files )"
+					files="$( sensors_check_temp_type $files )"
 					[ -z "$files" ] && continue
-					echo "CHART sensors.temp_${id} '' '${name} Temperature' 'Temperature' 'Celcius Degrees' '' line 6000 $sensors_update_every"
-					echo >>$TMP_DIR/temp.sh "echo \"BEGIN sensors.temp_${id} \$1\""
+					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
 					;;
 
 				voltage)
-					files="$( find -H $path -name in\?_input )"
+					files="$( ls $path/in*_input 2>/dev/null )"
+					files="$( sensors_check_files $files )"
+					[ -z "$files" ] && continue
+					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
+					;;
+
+				current)
+					files="$( ls $path/curr*_input 2>/dev/null )"
+					files="$( sensors_check_files $files )"
 					[ -z "$files" ] && continue
-					echo "CHART sensors.volt_${id} '' '${name} Voltage' 'Voltage' 'Volts' '' line 6001 $sensors_update_every"
-					echo >>$TMP_DIR/temp.sh "echo \"BEGIN sensors.volt_${id} \$1\""
+					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
 					;;
 
+				power)
+					files="$( ls $path/power*_input 2>/dev/null )"
+					files="$( sensors_check_files $files )"
+					[ -z "$files" ] && continue
+					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
+					;;
+
 				fans)
-					files="$( find -H $path -name fan\?_input )"
+					files="$( ls $path/fan*_input 2>/dev/null )"
+					files="$( sensors_check_files $files )"
 					[ -z "$files" ] && continue
-					echo "CHART sensors.fan_${id} '' '${name} Fans Speed' 'Fans' 'Rotations Per Minute (RPM)' '' line 6002 $sensors_update_every"
-					echo >>$TMP_DIR/temp.sh "echo \"BEGIN sensors.fan_${id} \$1\""
+					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\""
+					;;
+
+				energy)
+					files="$( ls $path/energy*_input 2>/dev/null )"
+					files="$( sensors_check_files $files )"
+					[ -z "$files" ] && continue
+					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
+					;;
+
+				humidity)
+					files="$( ls $path/humidity*_input 2>/dev/null )"
+					files="$( sensors_check_files $files )"
+					[ -z "$files" ] && continue
+					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
 					;;
 
 				*)
@@ -111,17 +218,18 @@ sensors_create() {
 					labelname="$( cat "$path/$lfile" )"
 				fi
 
-				echo "DIMENSION $fid '$labelname' absolute $multiplier $divisor"
-				echo >>$TMP_DIR/temp.sh "printf \"SET $fid = \"; cat $file "
+				echo "DIMENSION $fid '$labelname' $algorithm $multiplier $divisor"
+				echo >>$TMP_DIR/sensors.sh "echo \"SET $fid = \"\$(< $file )"
 			done
 
-			echo >>$TMP_DIR/temp.sh "echo END"
+			echo >>$TMP_DIR/sensors.sh "echo END"
 		done
 	done
 
-	echo >>$TMP_DIR/temp.sh "}"
-	cat >&2 $TMP_DIR/temp.sh
-	. $TMP_DIR/temp.sh
+	[ $sensors_source_update -eq 1 ] && echo >>$TMP_DIR/sensors.sh "}"
+
+	# ok, load the function sensors_update() we created
+	[ $sensors_source_update -eq 1 ] && . $TMP_DIR/sensors.sh
 
 	return 0
 }
@@ -135,7 +243,7 @@ sensors_update() {
 	# for each dimension
 	# remember: KEEP IT SIMPLE AND SHORT
 
-#	. $TMP_DIR/temp.sh $1
+	[ $sensors_source_update -eq 0 ] && . $TMP_DIR/sensors.sh $1
 
 	return 0
 }