mirror of
https://github.com/librenms/librenms.git
synced 2024-10-07 16:52:45 +00:00
moar graph cleanups
git-svn-id: http://www.observium.org/svn/observer/trunk@1906 61d68cd4-352d-0410-923a-c4978735b2b8
This commit is contained in:
@@ -3,7 +3,7 @@
|
||||
$sql = mysql_query("SELECT * FROM `processors` where `processor_id` = '".mres($id)."'");
|
||||
$proc = mysql_fetch_assoc($sql);
|
||||
|
||||
if(is_numeric($proc['device_id']) && ($config['allow_unauth_graphs'] || device_permitted($proc['device_id'])))
|
||||
if (is_numeric($proc['device_id']) && ($config['allow_unauth_graphs'] || device_permitted($proc['device_id'])))
|
||||
{
|
||||
$device = device_by_id_cache($proc['device_id']);
|
||||
$rrd_filename = $config['rrd_dir'] . "/".$device['hostname']."/" . safename("processor-" . $proc['processor_type'] . "-" . $proc['processor_index'] . ".rrd");
|
||||
@@ -12,4 +12,4 @@ if(is_numeric($proc['device_id']) && ($config['allow_unauth_graphs'] || device_p
|
||||
$auth = TRUE;
|
||||
}
|
||||
|
||||
?>
|
||||
?>
|
@@ -4,26 +4,27 @@ $scale_max = "100";
|
||||
|
||||
include("includes/graphs/common.inc.php");
|
||||
|
||||
$iter = "1";
|
||||
$iter = "1";
|
||||
|
||||
$rrd_options .= " COMMENT:' Cur Max\\n'";
|
||||
$rrd_options .= " COMMENT:' Cur Max\\n'";
|
||||
|
||||
if($iter=="1") {$colour="CC0000";} elseif($iter=="2") {$colour="008C00";} elseif($iter=="3") {$colour="4096EE";
|
||||
} elseif($iter=="4") {$colour="73880A";} elseif($iter=="5") {$colour="D01F3C";} elseif($iter=="6") {$colour="36393D";
|
||||
} elseif($iter=="7") {$colour="FF0084"; unset($iter); }
|
||||
$descr = substr(str_pad(short_hrDeviceDescr($proc['processor_descr']), 28),0,28);
|
||||
$descr = str_replace(":", "\:", $descr);
|
||||
if ($iter=="1") { $colour="CC0000"; } elseif ($iter=="2") { $colour="008C00"; } elseif ($iter=="3") { $colour="4096EE"; }
|
||||
elseif ($iter=="4") { $colour="73880A"; } elseif ($iter=="5") { $colour="D01F3C"; } elseif ($iter=="6") { $colour="36393D"; }
|
||||
elseif ($iter=="7") { $colour="FF0084"; unset($iter); }
|
||||
|
||||
$rrd_options .= " DEF:proc" . $proc['hrDeviceIndex'] . "=".$rrd_filename.":usage:AVERAGE ";
|
||||
$rrd_options .= " DEF:proc_max=".$rrd_filename.":usage:MAX";
|
||||
$rrd_options .= " DEF:proc_min=".$rrd_filename.":usage:MIN";
|
||||
$descr = substr(str_pad(short_hrDeviceDescr($proc['processor_descr']), 28),0,28);
|
||||
$descr = str_replace(":", "\:", $descr);
|
||||
|
||||
$rrd_options .= " AREA:proc_max#c5c5c5";
|
||||
$rrd_options .= " AREA:proc_min#ffffffff";
|
||||
$rrd_options .= " DEF:proc" . $proc['hrDeviceIndex'] . "=".$rrd_filename.":usage:AVERAGE ";
|
||||
$rrd_options .= " DEF:proc_max=".$rrd_filename.":usage:MAX";
|
||||
$rrd_options .= " DEF:proc_min=".$rrd_filename.":usage:MIN";
|
||||
|
||||
$rrd_options .= " LINE1:proc" . $proc['hrDeviceIndex'] . "#" . $colour . ":'" . $descr . "' ";
|
||||
$rrd_options .= " GPRINT:proc" . $proc['hrDeviceIndex'] . ":LAST:%3.0lf%%";
|
||||
$rrd_options .= " GPRINT:proc" . $proc['hrDeviceIndex'] . ":MAX:%3.0lf%%\\\l ";
|
||||
$iter++;
|
||||
$rrd_options .= " AREA:proc_max#c5c5c5";
|
||||
$rrd_options .= " AREA:proc_min#ffffffff";
|
||||
|
||||
?>
|
||||
$rrd_options .= " LINE1:proc" . $proc['hrDeviceIndex'] . "#" . $colour . ":'" . $descr . "' ";
|
||||
$rrd_options .= " GPRINT:proc" . $proc['hrDeviceIndex'] . ":LAST:%3.0lf%%";
|
||||
$rrd_options .= " GPRINT:proc" . $proc['hrDeviceIndex'] . ":MAX:%3.0lf%%\\\l ";
|
||||
$iter++;
|
||||
|
||||
?>
|
Reference in New Issue
Block a user