some sensor unification, rename sensor rrds and rename the DS, add testing IPMI support (no web-part yet) - tested against Intel RMM3 and working. some further cleanups as well.

git-svn-id: http://www.observium.org/svn/observer/trunk@1758 61d68cd4-352d-0410-923a-c4978735b2b8
This commit is contained in:
Tom Laermans
2010-12-15 17:54:42 +00:00
parent 500ed09299
commit 06d2a707d5
25 changed files with 293 additions and 182 deletions
+2 -2
View File
@@ -1,6 +1,6 @@
<?php
$query = "SELECT * FROM sensors WHERE sensor_class='current' AND device_id = '" . $device['device_id'] . "'";
$query = "SELECT * FROM sensors WHERE sensor_class='current' AND device_id = '" . $device['device_id'] . "' AND poller_type='snmp'";
$current_data = mysql_query($query);
while($dbcurrent = mysql_fetch_array($current_data)) {
@@ -16,7 +16,7 @@ while($dbcurrent = mysql_fetch_array($current_data)) {
if (!is_file($currentrrd)) {
`rrdtool create $currentrrd \
--step 300 \
DS:current:GAUGE:600:-273:1000 \
DS:sensor:GAUGE:600:-273:1000 \
RRA:AVERAGE:0.5:1:1200 \
RRA:MIN:0.5:12:2400 \
RRA:MAX:0.5:12:2400 \