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

diff --git a/charts.d/sensors.chart.sh b/charts.d/sensors.chart.sh
old mode 100755
new mode 100644
index e542b28e..125c925d
--- a/charts.d/sensors.chart.sh
+++ b/charts.d/sensors.chart.sh
@@ -1,16 +1,36 @@
-#!/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/devices"
+# 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
+
+# if set to 1, the script will overwrite internal
+# script functions with code generated ones
+# leave to 1, is faster
 sensors_source_update=1
 
-# _update_every is a special variable - it holds the number of seconds
-# between the calls of the _update() function
+# 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 $1 -maxdepth $sensors_sys_depth -name \*_input -o -name temp 2>/dev/null
 }
@@ -29,23 +49,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 )" ] && 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=
+	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=
+
+		error "$f gives zero values"
 	done
 }
 
@@ -64,7 +89,7 @@ sensors_check_temp_type() {
 		v=$(( v + 1 - 1 ))
 		[ $v -ne 0 ] && echo "$f" && continue
 
-		echo >&2 "charts.d: sensors: $f is disabled"
+		error "$f is disabled"
 	done
 }
 
@@ -75,7 +100,7 @@ sensors_create() {
 	# 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/temp.sh "sensors_update() {"
+	[ $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
@@ -102,7 +127,7 @@ 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 power current energy humidity
 		do
@@ -117,8 +142,8 @@ 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 >>$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
 					;;
 
@@ -126,8 +151,8 @@ 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 >>$TMP_DIR/temp.sh "echo \"BEGIN sensors.volt_${id} \$1\""
+					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
 					;;
 
@@ -135,8 +160,8 @@ 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 >>$TMP_DIR/temp.sh "echo \"BEGIN sensors.curr_${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
 					;;
 
@@ -144,8 +169,8 @@ 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 >>$TMP_DIR/temp.sh "echo \"BEGIN sensors.power_${id} \$1\""
+					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
 					;;
 
@@ -153,16 +178,16 @@ 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 >>$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\""
 					;;
 
-				emergy)
+				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' '${device}' '' areastack 6005 $sensors_update_every"
-					echo >>$TMP_DIR/temp.sh "echo \"BEGIN sensors.energy_${id} \$1\""
+					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
 					;;
@@ -171,8 +196,8 @@ 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 >>$TMP_DIR/temp.sh "echo \"BEGIN sensors.humidity_${id} \$1\""
+					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
 					;;
 
@@ -194,18 +219,17 @@ sensors_create() {
 				fi
 
 				echo "DIMENSION $fid '$labelname' $algorithm $multiplier $divisor"
-				echo >>$TMP_DIR/temp.sh "printf \"SET $fid = \"; cat $file "
+				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
+	[ $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/temp.sh
+	[ $sensors_source_update -eq 1 ] && . $TMP_DIR/sensors.sh
 
 	return 0
 }
@@ -219,7 +243,7 @@ sensors_update() {
 	# for each dimension
 	# remember: KEEP IT SIMPLE AND SHORT
 
-	[ $sensors_source_update -eq 0 ] && . $TMP_DIR/temp.sh $1
+	[ $sensors_source_update -eq 0 ] && . $TMP_DIR/sensors.sh $1
 
 	return 0
 }