added all possible sensors (temperature, voltage, current, energy, power, humidity, fans)
Costa Tsaousis (ktsaou) committed
Oct 3, 2015 at 21:28 UTC
df1913cea2e08a9a02ecb623bec218cec546de3f
1 file changed
+64
-11
charts.d/sensors.chart.sh
+64
-11
@@ -3,15 +3,15 @@
3
# if this chart is called X.chart.sh, then all functions and global variables
4
# must start with X_
5
6
-sensors_sys_dir="/sys/class/hwmon"
7
-sensors_sys_depth=3
6
+sensors_sys_dir="/sys/devices"
7
+sensors_sys_depth=10
8
9
# _update_every is a special variable - it holds the number of seconds
10
# between the calls of the _update() function
11
sensors_update_every=
12
13
sensors_find_all_files() {
14
- find -L $1 -maxdepth $sensors_sys_depth -name temp\?_input -o -name temp -o -name in\?_input -o -name fan\?_input 2>/dev/null
14
+ find $1 -maxdepth $sensors_sys_depth -name \*_input -o -name temp 2>/dev/null
15
}
16
17
sensors_find_all_dirs() {
@@ -32,6 +32,17 @@ sensors_check() {
32
return 1
33
}
34
35
+sensors_check_files() {
36
+ local f= v=
37
+ for f in $*
38
+ do
39
+ echo >&2 "checking $f"
40
+ v="$( cat $f )"
41
+ v=$(( v + 1 - 1 ))
42
+ [ $v -ne 0 ] && echo "$f"
43
+ done
44
+}
45
+
46
# _create is called once, to create the charts
47
sensors_create() {
48
local path= dir= name= x= file= lfile= labelname= labelid= device= subsystem= id= type= mode= files= multiplier= divisor=
@@ -65,35 +76,77 @@ sensors_create() {
76
77
echo >&2 "charts.d: sensors on path='$path', dir='$dir', device='$device', subsystem='$subsystem', id='$id', name='$name'"
78
68
- for mode in temperature voltage fans
79
+ for mode in temperature voltage fans power current energy humidity
80
do
81
files=
82
multiplier=1
83
divisor=1
84
+ algorithm="absolute"
85
+
86
case $mode in
87
temperature)
75
- files="$( find -H $path -name temp\?_input -o -name temp | sort -u)"
88
+ files="$( ls $path/temp*_input 2>/dev/null; ls $path/temp 2>/dev/null )"
89
+ files="$( sensors_check_files $files )"
90
[ -z "$files" ] && continue
77
- echo "CHART sensors.temp_${id} '' '${name} Temperature' 'Temperature' 'Celcius Degrees' '' line 6000 $sensors_update_every"
91
+ echo "CHART sensors.temp_${id} '' '${name} Temperature' 'Celcius' '${device}' '' line 6000 $sensors_update_every"
92
echo >>$TMP_DIR/temp.sh "echo \"BEGIN sensors.temp_${id} \$1\""
93
divisor=1000
94
;;
95
96
voltage)
83
- files="$( find -H $path -name in\?_input )"
97
+ files="$( ls $path/in*_input 2>/dev/null )"
98
+ files="$( sensors_check_files $files )"
99
[ -z "$files" ] && continue
85
- echo "CHART sensors.volt_${id} '' '${name} Voltage' 'Voltage' 'Volts' '' line 6001 $sensors_update_every"
100
+ echo "CHART sensors.volt_${id} '' '${name} Voltage' 'Volts' '${device}' '' line 6001 $sensors_update_every"
101
echo >>$TMP_DIR/temp.sh "echo \"BEGIN sensors.volt_${id} \$1\""
102
divisor=1000
103
;;
104
105
+ current)
106
+ files="$( ls $path/curr*_input 2>/dev/null )"
107
+ files="$( sensors_check_files $files )"
108
+ [ -z "$files" ] && continue
109
+ echo "CHART sensors.curr_${id} '' '${name} Current' 'Ampere' '${device}' '' line 6002 $sensors_update_every"
110
+ echo >>$TMP_DIR/temp.sh "echo \"BEGIN sensors.curr_${id} \$1\""
111
+ divisor=1000
112
+ ;;
113
+
114
+ power)
115
+ files="$( ls $path/power*_input 2>/dev/null )"
116
+ files="$( sensors_check_files $files )"
117
+ [ -z "$files" ] && continue
118
+ echo "CHART sensors.power_${id} '' '${name} Power' 'Watt' '${device}' '' line 6003 $sensors_update_every"
119
+ echo >>$TMP_DIR/temp.sh "echo \"BEGIN sensors.power_${id} \$1\""
120
+ divisor=1000000
121
+ ;;
122
+
123
fans)
91
- files="$( find -H $path -name fan\?_input )"
124
+ files="$( ls $path/fan*_input 2>/dev/null )"
125
+ files="$( sensors_check_files $files )"
126
[ -z "$files" ] && continue
93
- echo "CHART sensors.fan_${id} '' '${name} Fans Speed' 'Fans' 'Rotations Per Minute (RPM)' '' line 6002 $sensors_update_every"
127
+ echo "CHART sensors.fan_${id} '' '${name} Fans Speed' 'Rotations / Minute' '${device}' '' line 6004 $sensors_update_every"
128
echo >>$TMP_DIR/temp.sh "echo \"BEGIN sensors.fan_${id} \$1\""
129
;;
130
131
+ emergy)
132
+ files="$( ls $path/energy*_input 2>/dev/null )"
133
+ files="$( sensors_check_files $files )"
134
+ [ -z "$files" ] && continue
135
+ echo "CHART sensors.energy_${id} '' '${name} Energy' 'Joule' '${device}' '' areastack 6005 $sensors_update_every"
136
+ echo >>$TMP_DIR/temp.sh "echo \"BEGIN sensors.energy_${id} \$1\""
137
+ algorithm="incremental"
138
+ divisor=1000000
139
+ ;;
140
+
141
+ humidity)
142
+ files="$( ls $path/humidity*_input 2>/dev/null )"
143
+ files="$( sensors_check_files $files )"
144
+ [ -z "$files" ] && continue
145
+ echo "CHART sensors.humidity_${id} '' '${name} Humidity' 'Percent' '${device}' '' line 6006 $sensors_update_every"
146
+ echo >>$TMP_DIR/temp.sh "echo \"BEGIN sensors.humidity_${id} \$1\""
147
+ divisor=1000
148
+ ;;
149
+
150
*)
151
continue
152
;;
@@ -111,7 +164,7 @@ sensors_create() {
164
labelname="$( cat "$path/$lfile" )"
165
fi
166
114
- echo "DIMENSION $fid '$labelname' absolute $multiplier $divisor"
167
+ echo "DIMENSION $fid '$labelname' $algorithm $multiplier $divisor"
168
echo >>$TMP_DIR/temp.sh "printf \"SET $fid = \"; cat $file "
169
done
170