a billion changes. **** MAKE SURE TO UPDATE DATABASE AND RUN poll-os.php AND discovery.php -h all **** This is VERY important, as a lot of things have changed! Expect missing files, and another update soon!

git-svn-id: http://www.observium.org/svn/observer/trunk@531 61d68cd4-352d-0410-923a-c4978735b2b8
This commit is contained in:
Adam Amstrong
2009-11-28 09:48:23 +00:00
parent bea6a0667f
commit 7157ec5549
72 changed files with 842 additions and 498 deletions

View File

@@ -0,0 +1,7 @@
<?php
echo("<div class=graphhead>Processor Utilisation</div>");
$graph_type = "device_cpu"; include ("includes/print-device-graph.php");
?>

View File

@@ -0,0 +1,5 @@
<?php
echo("<div class=graphhead>Running Processes</div>");
$graph_type = "device_hrprocesses"; include ("includes/print-device-graph.php");
echo("<br />");
?>

View File

@@ -0,0 +1,9 @@
<?php
if(mysql_result(mysql_query("SELECT count(storage_id) FROM storage WHERE host_id = '" . $device['device_id'] . "'"),0)) {
echo("<div class=graphhead>Storage</div>");
$graph_type = "device_hrstorage"; include ("includes/print-device-graph.php");
echo("<br />");
}
?>

View File

@@ -0,0 +1,5 @@
<?php
echo("<div class=graphhead>Users Logged On</div>");
$graph_type = "device_hrusers"; include ("includes/print-device-graph.php");
echo("<br />");
?>

View File

@@ -0,0 +1,8 @@
<?php
echo("<div class=graphhead>System Load</div>");
$graph_type = "device_load"; include ("includes/print-device-graph.php");
echo("<br />");
?>

View File

@@ -0,0 +1,5 @@
<?php
echo("<div class=graphhead>Memory Utilisation</div>");
$graph_type = "device_memory"; include ("includes/print-device-graph.php");
echo("<br />");
?>

View File

@@ -19,5 +19,4 @@
$graph_type = "device_icmp_informational"; include ("includes/print-device-graph.php");
echo("<br />");
?>

View File

@@ -1,18 +1,12 @@
<?php
echo("<div class=graphhead>CPU Usage</div>");
$graph_type = "device_cpu"; include ("includes/print-device-graph.php");
echo("<br />");
echo("<div class=graphhead>Memory Usage</div>");
$graph_type = "device_memory"; include ("includes/print-device-graph.php");
echo("<br />");
if(mysql_result(mysql_query("SELECT count(*) FROM temperature WHERE temp_host = '" . $device['device_id'] . "'"),0)) {
echo("<div class=graphhead>Temperatures</div>");
$graph_type = "device_temperatures"; include ("includes/print-device-graph.php");
echo("<br />");
}
include("cpu.inc.php");
include("memory.inc.php");
include("temperatures.inc.php");
include("netstats.inc.php");
include("uptime.inc.php");
include("netstats.inc.php");
include("uptime.inc.php");
?>

View File

@@ -1,5 +0,0 @@
<?php
include("os-ios.inc.php");
?>

View File

@@ -0,0 +1,6 @@
<?php
include("graphs/cpu.inc.php");
include("graphs/temperatures.inc.php");
include("graphs/netstats.inc.php");
include("graphs/uptime.inc.php");
?>

View File

@@ -1,5 +0,0 @@
<?php
include("os-unix.inc.php");
?>

View File

@@ -1,4 +1,13 @@
<?php
include("cpu.inc.php");
include("memory.inc.php");
include("hrstorage.inc.php");
include("temperatures.inc.php");
include("netstats.inc.php");
include("laload.inc.php");
include("hrusers.inc.php");
include("hrprocesses.inc.php");
include("uptime.inc.php");
?>

View File

@@ -0,0 +1,18 @@
<?php
include("cpu.inc.php");
include("memory.inc.php");
include("hrstorage.inc.php");
include("temperatures.inc.php");
include("netstats.inc.php");
include("laload.inc.php");
include("hrusers.inc.php");
include("hrprocesses.inc.php");
include("uptime.inc.php");
# $usersgraph = usersgraphWin ($device[hostname] . "-sys.rrd", $device[hostname] . "-users.png", $day, $now, 335, 100);
# $usersgraphm = usersgraphWin ($device[hostname] . "-sys.rrd", $device[hostname] . "-users-m.png", $month, $now, 335, 100);
# $procsgraph = procsgraphWin ($device[hostname] . "-sys.rrd", $device[hostname] . "-procs.png", $day, $now, 335, 100);
# $procsgraphm = procsgraphWin ($device[hostname] . "-sys.rrd", $device[hostname] . "-procs-m.png", $month, $now, 335, 100);
?>

View File

@@ -0,0 +1,7 @@
<?php
if(mysql_result(mysql_query("SELECT count(*) FROM temperature WHERE temp_host = '" . $device['device_id'] . "'"),0)) {
echo("<div class=graphhead>Temperatures</div>");
$graph_type = "device_temperatures"; include ("includes/print-device-graph.php");
echo("<br />");
}
?>

View File

@@ -1,8 +1,5 @@
<?php
echo("<div class=graphhead>Device Uptime</div>");
$graph_type = "device_uptime"; include ("includes/print-device-graph.php");
echo("<br />");
?>