clones/librenms
1
0
Fork 0
mirror of https://github.com/librenms/librenms.git synced 2024-09-28 22:06:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1435 from paulgear/agent-fixes

Browse Source 
Agent fixes
This commit is contained in:
Daniel Preussker 2015-07-11 11:12:44 +02:00
commit 6b99b79a0a
4 changed files with 26 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
html/includes/graphs/device/agent.inc.php
View File

@ -2,13 +2,12 @@
$scale_min = 0;
include("includes/graphs/common.inc.php");
require "includes/graphs/common.inc.php";
$agent_rrd = $config['rrd_dir'] . "/" . $device['hostname'] . "/agent.rrd";
if (is_file($agent_rrd))
{
$rrd_filename = $agent_rrd;
if (is_file($agent_rrd)) {
$rrd_filename = $agent_rrd;
}
$ds = "time";
@ -19,9 +18,11 @@ $colour_line = "36393D";
$colour_area_max = "FFEE99";
$graph_max = 1;
$multiplier = 1000;
$multiplier_action = "/";
$unit_text = "msec";
$unit_text = "Seconds";
include("includes/graphs/generic_simplex.inc.php");
require "includes/graphs/generic_simplex.inc.php";
?>

16
html/includes/graphs/generic_simplex.inc.php
View File

@ -19,9 +19,12 @@ if ($multiplier)
$rrd_options .= " DEF:".$ds."_max_o=".$rrd_filename.":".$ds.":MAX";
$rrd_options .= " DEF:".$ds."_min_o=".$rrd_filename.":".$ds.":MIN";
$rrd_options .= " CDEF:".$ds."=".$ds."_o,$multiplier,*";
$rrd_options .= " CDEF:".$ds."_max=".$ds."_max_o,$multiplier,*";
$rrd_options .= " CDEF:".$ds."_min=".$ds."_min_o,$multiplier,*";
if (empty($multiplier_action)) {
$multiplier_action = "*";
}
$rrd_options .= " CDEF:".$ds."=".$ds."_o,$multiplier,$multiplier_action";
$rrd_options .= " CDEF:".$ds."_max=".$ds."_max_o,$multiplier,$multiplier_action";
$rrd_options .= " CDEF:".$ds."_min=".$ds."_min_o,$multiplier,$multiplier_action";
} else {
$rrd_options .= " DEF:".$ds."=".$rrd_filename.":".$ds.":AVERAGE";
$rrd_options .= " DEF:".$ds."_max=".$rrd_filename.":".$ds.":MAX";
@ -45,8 +48,11 @@ if($_GET['previous'] == "yes")
$rrd_options .= " DEF:".$ds."_max_oX=".$rrd_filename.":".$ds.":MAX:start=".$prev_from.":end=".$from;
$rrd_options .= " SHIFT:".$ds."_oX:$period";
$rrd_options .= " SHIFT:".$ds."_max_oX:$period";
$rrd_options .= " CDEF:".$ds."X=".$ds."_oX,$multiplier,*";
$rrd_options .= " CDEF:".$ds."_maxX=".$ds."_max_oX,$multiplier,*";
if (empty($multiplier_action)) {
$multiplier_action = "*";
}
$rrd_options .= " CDEF:".$ds."X=".$ds."_oX,$multiplier,$multiplier_action";
$rrd_options .= " CDEF:".$ds."_maxX=".$ds."_max_oX,$multiplier,$multiplier_action";
} else {
$rrd_options .= " DEF:".$ds."X=".$rrd_filename.":".$ds.":AVERAGE:start=".$prev_from.":end=".$from;
$rrd_options .= " DEF:".$ds."_maxX=".$rrd_filename.":".$ds.":MAX:start=".$prev_from.":end=".$from;

8
html/includes/graphs/old_generic_simplex.inc.php
View File

@ -10,8 +10,11 @@ $line_text = str_pad(truncate($line_text,12,''),12);
if ($multiplier)
{
if (empty($multiplier_action)) {
$multiplier_action = "*";
}
$rrd_options .= " DEF:".$ds."_o=".$rrd_filename.":".$ds.":AVERAGE";
$rrd_options .= " CDEF:".$ds."=".$ds."_o,$multiplier,*";
$rrd_options .= " CDEF:".$ds."=".$ds."_o,$multiplier,$multiplier_action";
} else {
$rrd_options .= " DEF:".$ds."=".$rrd_filename.":".$ds.":AVERAGE";
}
@ -29,6 +32,9 @@ if($_GET['previous'] == "yes")
{
if ($multiplier)
{
if (empty($multiplier_action)) {
$multiplier_action = "*";
}
$rrd_options .= " DEF:".$ds."_oX=".$rrd_filename.":".$ds.":AVERAGE:start=".$prev_from.":end=".$from;
$rrd_options .= " SHIFT:".$ds."_oX:$period";
$rrd_options .= " CDEF:".$ds."X=".$ds."_oX,$multiplier,*";

2
includes/definitions.inc.php
View File

@ -1590,7 +1590,7 @@ $config['graph_types']['device']['wifi_clients']['section'] = 'wireless';
$config['graph_types']['device']['wifi_clients']['order'] = '0';
$config['graph_types']['device']['wifi_clients']['descr'] = 'Wireless Clients';
$config['graph_types']['device']['agent']['section'] = 'system';
$config['graph_types']['device']['agent']['section'] = 'poller';
$config['graph_types']['device']['agent']['order'] = '0';
$config['graph_types']['device']['agent']['descr'] = 'Agent Execution Time';