mirror/librenms-librenms
1
0
Fork 0
mirror of https://github.com/librenms/librenms.git synced 2024-10-07 16:52:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

all graphs to db*

Browse Source 
git-svn-id: http://www.observium.org/svn/observer/trunk@2309 61d68cd4-352d-0410-923a-c4978735b2b8
This commit is contained in:
Adam Amstrong
2011-05-13 13:27:54 +00:00
parent 38cd6d58cb
commit 952ae3b365
13 changed files with 32 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files
html/includes/graphs/device/mempool.inc.php
+2 -3
View File
@@ -1,7 +1,6 @@
<?php
$device = device_by_id_cache($id);
$query = mysql_query("SELECT * FROM `mempools` where `device_id` = '".$id."'");
include("includes/graphs/common.inc.php");
@@ -10,7 +9,7 @@ $rrd_options .= " -u 100 -l 0 -E -b 1024 ";
$iter = "1"; $i=1;
$rrd_options .= " COMMENT:' Min Cur Max\\n'";
while ($mempool = mysql_fetch_assoc($query))
foreach(dbFetchRows("SELECT * FROM `mempools` where `device_id` = ?", array($id)) as $mempool)
{
# FIXME generic colour function
if ($iter=="1") { $colour="CC0000"; } elseif ($iter=="2") { $colour="008C00"; } elseif ($iter=="3") { $colour="4096EE"; }
@@ -36,4 +35,4 @@ while ($mempool = mysql_fetch_assoc($query))
$rrd_options .= " HRULE:0#999999";
?>
?>
html/includes/graphs/device/processor.inc.php
+1 -1
View File
@@ -1,7 +1,7 @@
<?php
$device = device_by_id_cache($id);
$query = mysql_query("SELECT * FROM `processors` where `device_id` = '".$id."'");
$procs = dbFetchRows("SELECT * FROM `processors` where `device_id` = ?", array($id));
if($config['os'][$device['os']]['processor_stacked'] == 1)
{
html/includes/graphs/device/processor_separate.inc.php
+1 -6
View File
@@ -1,13 +1,8 @@
<?php
#$device = device_by_id_cache($id);
#$query = mysql_query("SELECT * FROM `processors` where `device_id` = '".$id."'");
$i = 0;
while ($proc = mysql_fetch_assoc($query))
foreach ($procs as $proc)
{
$rrd_filename = $config['rrd_dir'] . "/".$device['hostname']."/" . safename("processor-" . $proc['processor_type'] . "-" . $proc['processor_index'] . ".rrd");
html/includes/graphs/device/processor_stack.inc.php
+1 -4
View File
@@ -1,11 +1,8 @@
<?php
#$device = device_by_id_cache($id);
#$query = mysql_query("SELECT * FROM `processors` where `device_id` = '".$id."'");
$i = 0;
while ($proc = mysql_fetch_assoc($query))
foreach ($procs as $proc)
{
$rrd_filename = $config['rrd_dir'] . "/".$device['hostname']."/" . safename("processor-" . $proc['processor_type'] . "-" . $proc['processor_index'] . ".rrd");
html/includes/graphs/device/sensor.inc.php
+2 -2
View File
@@ -7,9 +7,9 @@ if ($_GET['width'] > "300") { $descr_len = "40"; } else { $descr_len = "22"; }
$rrd_options .= " -l 0 -E ";
$iter = "1";
$sql = mysql_query("SELECT * FROM sensors WHERE sensor_class='".$class."' AND device_id = '$id' ORDER BY sensor_index");
$rrd_options .= " COMMENT:'".str_pad($unit_long,$descr_len)." Cur Min Max\\n'";
while ($sensor = mysql_fetch_assoc($sql))
foreach (dbFetchRows("SELECT * FROM `sensors` WHERE `sensor_class` = ? AND `device_id` = ? ORDER BY `sensor_index`", array($class, $id)) as $sensor)
{
# FIXME generic colour function
switch ($iter)
html/includes/graphs/device/storage.inc.php
+2 -3
View File
@@ -8,10 +8,9 @@ include("includes/graphs/common.inc.php");
$device = device_by_id_cache($id);
$iter = "1";
$sql = mysql_query("SELECT * FROM storage where device_id = '$id'");
$rrd_options .= " COMMENT:' Size Used %age\\l'";
while ($storage = mysql_fetch_assoc($sql))
foreach (dbFetchRows("SELECT * FROM storage where device_id = ?", array($id)) as $storage)
{
# FIXME generic colour function
if ($iter=="1") { $colour="CC0000"; } elseif ($iter=="2") { $colour="008C00"; } elseif ($iter=="3") { $colour="4096EE"; }
@@ -32,4 +31,4 @@ while ($storage = mysql_fetch_assoc($sql))
$iter++;
}
?>
?>
html/includes/graphs/device/toner.inc.php
+1 -2
View File
@@ -6,9 +6,8 @@ $device = device_by_id_cache($id);
$rrd_options .= " -l 0 -E ";
$iter = "1";
$sql = mysql_query("SELECT * FROM toner where device_id = '$id'");
$rrd_options .= " COMMENT:'Toner level Cur Min Max\\n'";
while ($toner = mysql_fetch_assoc($sql))
foreach (dbFetchRows("SELECT * FROM toner where device_id = ?", array($id)) as $toner)
{
# FIXME generic colour function
switch ($iter)