nicolas/librenms
1
0
Fork 0
mirror of https://github.com/stylersnico/librenms.git synced 2026-07-28 00:24:21 +02:00
Code Issues Packages Projects Releases Wiki Activity

autoset thresholds for sensors which don't have them

Browse Source 
git-svn-id: http://www.observium.org/svn/observer/trunk@1666 61d68cd4-352d-0410-923a-c4978735b2b8
This commit is contained in:
Adam Amstrong
2010-08-11 12:46:07 +00:00
parent 7c97cf02c9
commit 3b5ed3524e
10 changed files with 98 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
html/includes/graphs/sensor/temperature.inc.php
+5 -5
View File
@@ -11,7 +11,7 @@ include("includes/graphs/common.inc.php");
$rrd_filename = $config['rrd_dir'] . "/" . $device['hostname'] . "/temp-" . safename($sensor['sensor_type']."-".$sensor['sensor_index']) . ".rrd";
$sensor['sensor_descr_fixed'] = substr(str_pad($sensor['sensor_descr'], 22),0,22);
$sensor['sensor_descr_fixed'] = substr(str_pad($sensor['sensor_descr'], 21),0,21);
$sensor['sensor_descr_fixed'] = str_replace(':','\:',str_replace('\*','*',$sensor['sensor_descr_fixed']));
$rrd_options .= " DEF:temp=$rrd_filename:temp:AVERAGE";
@@ -27,10 +27,10 @@ include("includes/graphs/common.inc.php");
# $rrd_options .= " AREA:tempcold#CCCCFF";
# $rrd_options .= " LINE1:temp#cc0000:'" . str_replace(':','\:',str_replace('\*','*',quotemeta($sensor['sensor_descr_fixed'])))."'"; # Ugly hack :(
$rrd_options .= " LINE1:temp#cc0000:'" . $sensor['sensor_descr_fixed']."'";
$rrd_options .= " LINE1:tempwarm#660000";
$rrd_options .= " LINE1.5:temp#cc0000:'" . $sensor['sensor_descr_fixed']."'";
# $rrd_options .= " LINE1.5:tempwarm#660000";
$rrd_options .= " GPRINT:temp:LAST:%4.1lfC";
$rrd_options .= " GPRINT:temp:MIN:%4.1lfC";
$rrd_options .= " GPRINT:temp:MAX:%4.1lfC\\\\l";
$rrd_options .= " GPRINT:temp_min:MIN:%4.1lfC";
$rrd_options .= " GPRINT:temp_max:MAX:%4.1lfC\\\\l";
?>
html/includes/graphs/sensor/voltage.inc.php
+2 -2
View File
@@ -21,7 +21,7 @@ $rrd_options .= " AREA:volt_min#ffffffff";
#$rrd_options .= " AREA:volt#FFFF99";
$rrd_options .= " LINE1.5:volt#cc0000:'" . $sensor['sensor_descr_fixed']."'";
$rrd_options .= " GPRINT:volt:LAST:%3.2lfV";
$rrd_options .= " GPRINT:volt:MAX:%3.2lfV\\\\l";
$rrd_options .= " GPRINT:volt:LAST:%6.2lfV";
$rrd_options .= " GPRINT:volt:MAX:%6.2lfV\\\\l";
?>
html/pages/device/health/temperatures.inc.php
+6 -5
View File
@@ -12,13 +12,14 @@ while($temp = mysql_fetch_array($query)) {
if(!is_integer($row/2)) { $row_colour = $list_colour_a; } else { $row_colour = $list_colour_b; }
echo("<tr class=list-large style=\"background-color: $row_colour; padding: 5px;\">
<td width=450>" . $temp['sensor_descr'] . "</td>
<td >" . $temp['sensor_type'] . "</td>
<td width=50>" . print_temperature($temp['sensor_current'], $temp['sensor_limit']) . " &deg;C</td>
<td width=50>" . $temp['sensor_limit'] . " &deg;C</td>
<td width=400>" . $temp['sensor_descr'] . "</td>
<td width=100>" . $temp['sensor_type'] . "</td>
<td width=50>" . print_temperature($temp['sensor_current'], $temp['sensor_limit']) . "&deg;C</td>
<td width=50>" . $temp['sensor_limit'] . "&deg;C</td>
<td width=50>" . $temp['sensor_limit_low'] . "&deg;C</td>
<td width=350>" . $temp['sensor_notes'] . "</td>
</tr>\n");
echo("<tr bgcolor=$row_colour><td colspan='5'>");
echo("<tr bgcolor=$row_colour><td colspan='6'>");
$graph_type = "sensor_temperature";
html/pages/device/overview/current.inc.php
-5
View File
@@ -9,8 +9,6 @@ if($total = mysql_result(mysql_query("SELECT count(sensor_id) from sensors WHERE
$i = '1';
$currents = mysql_query("SELECT * FROM sensors WHERE sensor_class='current' AND device_id = '" . $device['device_id'] . "'");
echo("<table width=100% valign=top>");
echo("<tr><td width=50%>");
echo("<table width=100% cellspacing=0 cellpadding=2>");
while($current = mysql_fetch_array($currents)) {
if(is_integer($i/2)) { $row_colour = $list_colour_a; } else { $row_colour = $list_colour_b; }
@@ -32,12 +30,9 @@ if($total = mysql_result(mysql_query("SELECT count(sensor_id) from sensors WHERE
$current['sensor_descr'] = truncate($current['sensor_descr'], 25, '');
echo("<tr bgcolor='$row_colour'><td class=tablehead><strong>$current_link_a</strong></td><td width=80 align=right class=tablehead>$current_link_b<td width=80 align=right class=tablehead>$current_link_c</td></tr>");
if($i == $rows) { echo("</table></td><td valign=top><table width=100% cellspacing=0 cellpadding=2>"); }
$i++;
}
echo("</table>");
echo("</td></tr>");
echo("</table>");
echo("</div>");
}
html/pages/device/overview/fanspeeds.inc.php
-5
View File
@@ -9,8 +9,6 @@ if($total = mysql_result(mysql_query("SELECT count(sensor_id) from sensors WHERE
$i = '1';
$fans = mysql_query("SELECT * FROM sensors WHERE sensor_class='fanspeed' AND device_id = '" . $device['device_id'] . "'");
echo("<table width=100% valign=top>");
echo("<tr><td width=50%>");
echo("<table width=100% cellspacing=0 cellpadding=2>");
while($fan = mysql_fetch_array($fans)) {
if(is_integer($i/2)) { $row_colour = $list_colour_a; } else { $row_colour = $list_colour_b; }
@@ -32,12 +30,9 @@ if($total = mysql_result(mysql_query("SELECT count(sensor_id) from sensors WHERE
$fan['sensor_descr'] = truncate($fan['sensor_descr'], 25, '');
echo("<tr bgcolor='$row_colour'><td class=tablehead><strong>$fan_link_a</strong></td><td width=80 align=right class=tablehead>$fan_link_b<td width=80 align=right class=tablehead>$fan_link_c</td></tr>");
if($i == $rows) { echo("</table></td><td valign=top><table width=100% cellspacing=0 cellpadding=2>"); }
$i++;
}
echo("</table>");
echo("</td></tr>");
echo("</table>");
echo("</div>");
}
html/pages/device/overview/frequencies.inc.php
-5
View File
@@ -9,8 +9,6 @@ if($total = mysql_result(mysql_query("SELECT count(sensor_id) from sensors WHERE
$i = '1';
$temps = mysql_query("SELECT * FROM sensors WHERE sensor_class='freq' AND device_id = '" . $device['device_id'] . "' ORDER BY sensor_index");
echo('<table width="100%" valign="top">');
echo('<tr><td width="50%">');
echo('<table width="100%" cellspacing="0" cellpadding="2">');
while($temp = mysql_fetch_array($temps)) {
if(is_integer($i/2)) { $row_colour = $list_colour_a; } else { $row_colour = $list_colour_b; }
@@ -34,12 +32,9 @@ if($total = mysql_result(mysql_query("SELECT count(sensor_id) from sensors WHERE
$temp['sensor_descr'] = truncate($temp['sensor_descr'], 25, '');
echo("<tr bgcolor='$row_colour'><td class=tablehead><strong>$temp_link_a</strong></td><td width=80 align=right class=tablehead>$temp_link_b<td width=80 align=right class=tablehead>$temp_link_c</td></tr>");
if($i == $rows) { echo("</table></td><td valign=top><table width=100% cellspacing=0 cellpadding=2>"); }
$i++;
}
echo("</table>");
echo("</td></tr>");
echo("</table>");
echo("</div>");
}
html/pages/device/overview/temperatures.inc.php
+4 -7
View File
@@ -9,8 +9,6 @@ if($total = mysql_result(mysql_query("SELECT count(sensor_id) from sensors WHERE
$i = '1';
$temps = mysql_query("SELECT * FROM sensors WHERE sensor_class='temperature' AND device_id = '" . $device['device_id'] . "' ORDER BY sensor_index");
echo('<table width="100%" valign="top">');
echo('<tr><td width="50%">');
echo('<table width="100%" cellspacing="0" cellpadding="2">');
while($temp = mysql_fetch_array($temps)) {
if(is_integer($i/2)) { $row_colour = $list_colour_a; } else { $row_colour = $list_colour_b; }
@@ -23,23 +21,22 @@ if($total = mysql_result(mysql_query("SELECT count(sensor_id) from sensors WHERE
$temp_month = "graph.php?id=" . $temp['sensor_id'] . "&type=".$graph_type."&from=$month&to=$now&width=300&height=100";
$temp_year = "graph.php?id=" . $temp['sensor_id'] . "&type=".$graph_type."&from=$year&to=$now&width=300&height=100";
$temp_minigraph = "<img src='graph.php?id=" . $temp['sensor_id'] . "&type=".$graph_type."&from=$day&to=$now&width=80&height=20&bg=$graph_colour' align='absmiddle'>";
$temp_minigraph_b = "<img src='graph.php?id=" . $temp['sensor_id'] . "&type=".$graph_type."&from=$week&to=$now&width=80&height=20&bg=$graph_colour' align='absmiddle'>";
$temp_link = "<a href='device/".$device['device_id']."/health/temperatures/' onmouseover=\"return ";
$temp_link .= "overlib('<div class=list-large>".$device['hostname']." - ".$temp['sensor_descr'];
$temp_link .= "</div><div style=\'width: 750px\'><img src=\'$temp_day\'><img src=\'$temp_week\'><img src=\'$temp_month\'><img src=\'$temp_year\'></div>', RIGHT".$config['overlib_defaults'].");\" onmouseout=\"return nd();\" >";
$temp_link_c = $temp_link . "<span style='color: $temp_colour'>" . round($temp['sensor_current'],0) . "&deg;C</span></a>";
$temp_link_b = $temp_link . $temp_minigraph . "</a>";
$temp_link_b = $temp_link . $temp_minigraph . " " . $temp_minigraph_b . "</a>";
$temp_link_a = $temp_link . $temp['sensor_descr'] . "</a>";
$temp['sensor_descr'] = truncate($temp['sensor_descr'], 25, '');
echo("<tr bgcolor='$row_colour'><td class=tablehead><strong>$temp_link_a</strong></td><td width=80 align=right class=tablehead>$temp_link_b<td width=80 align=right class=tablehead>$temp_link_c</td></tr>");
if($i == $rows) { echo("</table></td><td valign=top><table width=100% cellspacing=0 cellpadding=2>"); }
echo("<tr bgcolor='$row_colour'><td class=tablehead><strong>$temp_link_a</strong></td><td width=170 align=right class=tablehead>$temp_link_b<td width=80 align=right class=tablehead>$temp_link_c</td></tr>");
$i++;
}
echo("</table>");
echo("</td></tr>");
echo("</table>");
echo("</div>");
}
html/pages/device/overview/voltages.inc.php
-5
View File
@@ -9,8 +9,6 @@ if($total = mysql_result(mysql_query("SELECT count(sensor_id) from sensors WHERE
$i = '1';
$volts = mysql_query("SELECT * FROM sensors WHERE sensor_class='voltage' AND device_id = '" . $device['device_id'] . "'");
echo("<table width=100% valign=top>");
echo("<tr><td width=50%>");
echo("<table width=100% cellspacing=0 cellpadding=2>");
while($volt = mysql_fetch_array($volts)) {
if(is_integer($i/2)) { $row_colour = $list_colour_a; } else { $row_colour = $list_colour_b; }
@@ -32,12 +30,9 @@ if($total = mysql_result(mysql_query("SELECT count(sensor_id) from sensors WHERE
$volt['sensor_descr'] = truncate($volt['sensor_descr'], 25, '');
echo("<tr bgcolor='$row_colour'><td class=tablehead><strong>$volt_link_a</strong></td><td width=80 align=right class=tablehead>$volt_link_b<td width=80 align=right class=tablehead>$volt_link_c</td></tr>");
if($i == $rows) { echo("</table></td><td valign=top><table width=100% cellspacing=0 cellpadding=2>"); }
$i++;
}
echo("</table>");
echo("</td></tr>");
echo("</table>");
echo("</div>");
}