redesigned graph defining system (still seems a bit batshit, but nevermind). lots of improvements to various pollers, only writing RRDs if valid data is returned, etc.

git-svn-id: http://www.observium.org/svn/observer/trunk@1506 61d68cd4-352d-0410-923a-c4978735b2b8
This commit is contained in:
Adam Amstrong
2010-07-28 19:43:02 +00:00
parent 927c92e8dd
commit f29e7b755b
67 changed files with 264 additions and 338 deletions

View File

@@ -12,6 +12,7 @@ if($_GET['debug']) {
include("../config.php");
include("../includes/common.php");
include("../includes/rewrites.php");
include("includes/functions.inc.php");
include("includes/authenticate.inc.php");
if(!$config['allow_unauth_graphs']) {
@@ -47,9 +48,8 @@ if($_GET['debug']) {
$graphfile = $config['temp_dir'] . "/" . strgen() . ".png";
$os = gethostosbyid($device_id);
if($config['os'][$os]['group']) {$os_group = $config['os'][$os]['group'];}
# $os = gethostosbyid($device_id);
# if($config['os'][$os]['group']) {$os_group = $config['os'][$os]['group'];}
# if(is_file($config['install_dir'] . "/html/includes/graphs/".$type."_".$os.".inc.php")) {
# /// Type + OS Specific
# include($config['install_dir'] . "/html/includes/graphs/".$type."_".$os.".inc.php");
@@ -62,6 +62,7 @@ if($_GET['debug']) {
# }
if(is_file($config['install_dir'] . "/html/includes/graphs/$type/$subtype.inc.php")) {
include($config['install_dir'] . "/html/includes/graphs/$type/auth.inc.php");
include($config['install_dir'] . "/html/includes/graphs/$type/$subtype.inc.php");
}