===================================================================
RCS file: /cvs/nagios/check_hw_sensors/sensorsd.conf,v
retrieving revision 1.1
retrieving revision 1.6
diff -u -r1.1 -r1.6
--- nagios/check_hw_sensors/sensorsd.conf	2006/05/03 22:48:42	1.1
+++ nagios/check_hw_sensors/sensorsd.conf	2006/12/05 16:26:27	1.6
@@ -1,95 +1,42 @@
-# $OpenBSD: sensorsd.conf,v 1.1 2006/05/03 21:48:42 andrew Exp $
 # $RedRiver$
-
-#
-# Sample sensorsd.conf file. See sensorsd.conf(5) for details.
-# This one has examples for use with nagios check_hw_sensors
-# Actual sensors on a 2450 are below.
-#
-
-# hw.sensors.0=esm0, Motherboard, raw, 0
-# hw.sensors.1=esm0, CPU 1, OK, temp, 28.00 degC / 82.40 degF
-hw.sensors.1:high=50C:warn.high=40C
-
-# hw.sensors.2=esm0, CPU 2, OK, temp, 30.00 degC / 86.00 degF
-hw.sensors.2:high=50C:warn.high=40C
-
-# hw.sensors.3=esm0, Mainboard, OK, temp, 21.50 degC / 70.70 degF
-hw.sensors.3:high=40C:warn.high=30C
-
-# hw.sensors.4=esm0, CPU 1 Core, OK, volts_dc, 1.69 V
-hw.sensors.4:high=1.85V:warn.high=1.8V:low=1.60V:warn.low=1.65V
-
-# hw.sensors.5=esm0, CPU 2 Core, OK, volts_dc, 1.70 V
-hw.sensors.5:high=1.85V:warn.high=1.8V:low=1.60V:warn.low=1.65V
-
-# hw.sensors.6=esm0, Motherboard +5V, OK, volts_dc, 4.95 V
-hw.sensors.6:high=5.1V:warn.high=5.05V:low=4.90V:warn.low=4.85V
-
-# hw.sensors.7=esm0, Motherboard +12V, OK, volts_dc, 11.94 V
-hw.sensors.7:high=12.15V:warn.high=12.1V:low=11.8V:warn.low=11.85V
-
-# hw.sensors.8=esm0, Motherboard +3.3V, OK, volts_dc, 3.27 V
-hw.sensors.8:high=3.5V:warn.high=3.4V:low=3.15V:warn.low=3.2V
-
-# hw.sensors.9=esm0, Motherboard +2.5V, OK, volts_dc, 2.48 V
-hw.sensors.9:high=2.75V:warn.high=2.6V:low=2.25V:warn.low=2.4V
-
-# hw.sensors.10=esm0, Motherboard GTL Term, OK, volts_dc, 1.49 V
-hw.sensors.10:high=1.75V:warn.high=1.6V:low=1.25V:warn.low=1.4V
-
-# hw.sensors.11=esm0, Motherboard Battery, OK, volts_dc, 2.93 V
-hw.sensors.11:high=3.1V:warn.high=3.05V:low=2.75V:warn.low=2.8V
-
-# hw.sensors.12=esm0, Chassis Intrusion, indicator, Off
-hw.sensors.12:crit=Off:warn=Off
-
-# hw.sensors.13=esm0, Fan 1, OK, fanrpm, 3526 RPM
-hw.sensors.13:low=3000:warn.low=3250
-
-# hw.sensors.14=esm0, Fan 2, OK, fanrpm, 3569 RPM
-hw.sensors.14:low=3000:warn.low=3250
-
-# hw.sensors.15=esm0, Fan 3, OK, fanrpm, 3563 RPM
-hw.sensors.15:low=3000:warn.low=3250
-
-# hw.sensors.16=esm0, Backplane, raw, 0
-# hw.sensors.17=esm0, Backplane Top, OK, temp, 14.50 degC / 58.10 degF
-hw.sensors.17:high=35C:warn.high=25C
-
-# hw.sensors.18=esm0, Backplane Bottom, OK, temp, 22.00 degC / 71.60 degF
-hw.sensors.18:high=40C:warn.high=30C
-
-# hw.sensors.19=esm0, Backplane +5V, OK, volts_dc, 4.97 V
-hw.sensors.19:high=5.1V:warn.high=5.05V:low=4.90V:warn.low=4.85V
-
-# hw.sensors.20=esm0, Backplane SCSI A Connected, indicator, On
-hw.sensors.20:crit=On:warn=On
-
-# hw.sensors.21=esm0, Backplane SCSI A External, OK, volts_dc, 4.70 V
-hw.sensors.21:high=5.1V:warn.high=5.05V:low=4.60V:warn.low=4.65V
-
-# hw.sensors.22=esm0, Backplane SCSI B Connected, indicator, Off
-hw.sensors.22:crit=Off:warn=Off
-
-# hw.sensors.23=esm0, Drive 0, drive, online
-hw.sensors.23:crit=online,empty:warn=online
-
-# hw.sensors.24=esm0, Drive 1, drive, online
-hw.sensors.24:crit=online,empty:warn=online
-
-# hw.sensors.25=esm0, Drive 2, drive, empty
-hw.sensors.25:crit=online,empty:warn=online,empty
-
-# hw.sensors.26=esm0, Drive 3, drive, empty
-hw.sensors.26:crit=online,empty:warn=online,empty
-
-# hw.sensors.27=esm0, Backplane Control 2, raw, 17
-# hw.sensors.28=esm0, Backplane +3.3V, OK, volts_dc, 3.28 V
-hw.sensors.28:high=3.5V:warn.high=3.4V:low=3.2V:warn.low=3.25V
-
-# hw.sensors.29=safte0, temp0, OK, temp, 14.44 degC / 58.00 degF
-hw.sensors.29:high=35C:warn.high=25C
-
-# hw.sensors.30=safte0, temp1, OK, temp, 22.22 degC / 72.00 degF
-hw.sensors.30:high=40C:warn.high=30C
+# hw.sensors.0=esm0, CPU 1, 39.00 degC, OK
+# hw.sensors.1=esm0, CPU 2, 37.00 degC, OK
+# hw.sensors.2=esm0, Mainboard, 29.50 degC, OK
+# hw.sensors.3=esm0, CPU 1 Core, 1.74 V DC, OK
+# hw.sensors.4=esm0, CPU 2 Core, 1.73 V DC, OK
+# hw.sensors.5=esm0, Motherboard +5V, 4.94 V DC, OK
+# hw.sensors.6=esm0, Motherboard +12V, 11.90 V DC, OK
+# hw.sensors.7=esm0, Motherboard +3.3V, 3.22 V DC, OK
+# hw.sensors.8=esm0, Motherboard +2.5V, 2.49 V DC, OK
+# hw.sensors.9=esm0, Motherboard GTL Term, 1.49 V DC, OK
+# hw.sensors.10=esm0, Motherboard Battery, 2.98 V DC, OK
+# hw.sensors.11=esm0, Chassis Intrusion, Off
+hw.sensors.11:crit=Off
+# hw.sensors.12=esm0, Fan 1, 3586 RPM, OK
+# hw.sensors.13=esm0, Fan 2, 3539 RPM, OK
+# hw.sensors.14=esm0, Fan 3, 3536 RPM, OK
+# hw.sensors.15=esm0, Backplane, 0 raw
+# hw.sensors.16=esm0, Backplane Top, 28.00 degC, OK
+# hw.sensors.17=esm0, Backplane Bottom, 30.50 degC, OK
+# hw.sensors.18=esm0, Backplane +5V, 4.94 V DC, OK
+# hw.sensors.19=esm0, Backplane +12V, 11.81 V DC, OK
+# hw.sensors.20=esm0, Backplane SCSI A Connected, On
+hw.sensors.20:crit=On
+# hw.sensors.21=esm0, Backplane SCSI A External, 4.61 V DC, OK
+# hw.sensors.22=esm0, Backplane SCSI B Connected, Off
+# hw.sensors.23=esm0, Drive 0, drive online
+hw.sensors.23:crit=online
+# hw.sensors.24=esm0, Drive 1, drive online
+hw.sensors.24:crit=online
+# hw.sensors.25=esm0, Drive 2, drive online
+hw.sensors.25:crit=online
+# hw.sensors.26=esm0, Drive 3, drive online
+hw.sensors.26:crit=online
+# hw.sensors.27=esm0, Drive 4, drive online
+hw.sensors.27:crit=online
+# hw.sensors.28=esm0, Backplane Control 2, 1 raw
+# hw.sensors.29=esm0, Backplane +3.3V, 3.28 V DC, OK
+# hw.sensors.30=ami0, sd0, drive online, OK
+# hw.sensors.31=ami0, sd1, drive online, OK
+# hw.sensors.32=safte0, Temp0, 27.78 degC, OK
+# hw.sensors.33=safte0, Temp1, 30.56 degC, OK