===================================================================
RCS file: /cvs/nagios/check_hw_sensors/sensorsd.conf,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- nagios/check_hw_sensors/sensorsd.conf	2006/10/26 00:30:23	1.5
+++ nagios/check_hw_sensors/sensorsd.conf	2006/12/05 16:26:27	1.6
@@ -1,65 +1,42 @@
-# $RedRiver: sensorsd.conf,v 1.4 2006/10/25 23:21:03 andrew Exp $
-# hw.sensors.3=esm0, Ambient, OK, temp, 21.50 degC / 70.70 degF
-hw.sensors.3:high=28C:warn.high=25C
-
-# hw.sensors.12=esm0, Chassis Intrusion, indicator, Off
-hw.sensors.12:warn=Off
-
-# hw.sensors.29=esm0, Drive 0, drive, online
-hw.sensors.29:crit=online
-# hw.sensors.30=esm0, Drive 1, drive, online
-hw.sensors.30:crit=online
-# hw.sensors.31=esm0, Drive 2, drive, unknown
-# hw.sensors.32=esm0, Drive 3, drive, unknown
-# hw.sensors.33=esm0, Drive 4, drive, online
-hw.sensors.33:crit=online
-# hw.sensors.34=esm0, Drive 5, drive, online
-hw.sensors.34:crit=online
-# hw.sensors.35=esm0, Drive 6, drive, unknown
-# hw.sensors.36=esm0, Drive 7, drive, unknown
-
-# hw.sensors.70=esm0, Power Supply 1 AC, indicator, On
-hw.sensors.70:crit=On
-# hw.sensors.71=esm0, Power Supply 1 SW, indicator, On
-hw.sensors.71:crit=On
-# hw.sensors.72=esm0, Power Supply 1 OK, indicator, On
-hw.sensors.72:crit=On
-# hw.sensors.74=esm0, Power Supply 1 FFAN, indicator, Off
-hw.sensors.74:crit=Off
-# hw.sensors.75=esm0, Power Supply 1 OTMP, indicator, Off
-hw.sensors.75:crit=Off
-
-# hw.sensors.76=esm0, Power Supply 2 AC, indicator, On
-hw.sensors.76:crit=On
-# hw.sensors.77=esm0, Power Supply 2 SW, indicator, On
-hw.sensors.77:crit=On
-# hw.sensors.78=esm0, Power Supply 2 OK, indicator, On
-hw.sensors.78:crit=On
-# hw.sensors.80=esm0, Power Supply 2 FFAN, indicator, Off
-hw.sensors.80:crit=Off
-# hw.sensors.81=esm0, Power Supply 2 OTMP, indicator, Off
-hw.sensors.81:crit=Off
-
-# hw.sensors.82=esm0, Power Supply 3 AC, indicator, On
-hw.sensors.82:crit=On
-# hw.sensors.83=esm0, Power Supply 3 SW, indicator, On
-hw.sensors.83:crit=On
-# hw.sensors.84=esm0, Power Supply 3 OK, indicator, On
-hw.sensors.84:crit=On
-# hw.sensors.86=esm0, Power Supply 3 FFAN, indicator, Off
-hw.sensors.86:crit=Off
-# hw.sensors.87=esm0, Power Supply 3 OTMP, indicator, Off
-hw.sensors.87:crit=Off
-
-# hw.sensors.88=esm0, Fan 1, CRITICAL, fanrpm, 0 RPM
-hw.sensors.88:ignore
-# hw.sensors.89=esm0, Fan 2, CRITICAL, fanrpm, 0 RPM
-hw.sensors.89:ignore
-# hw.sensors.90=esm0, Fan 3, CRITICAL, fanrpm, 0 RPM
-hw.sensors.90:ignore
-# hw.sensors.91=esm0, Fan 4, CRITICAL, fanrpm, 0 RPM
-hw.sensors.91:ignore
-# hw.sensors.92=esm0, Fan 5, CRITICAL, fanrpm, 0 RPM
-hw.sensors.92:ignore
-# hw.sensors.93=esm0, Fan 6, CRITICAL, fanrpm, 0 RPM
-hw.sensors.93:ignore
+# $RedRiver$
+# 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