From 5ea6762f20e0188bbc0e7b81bf5346479e214673 Mon Sep 17 00:00:00 2001 From: Paul Gear Date: Sat, 11 Jul 2015 13:42:14 +1000 Subject: [PATCH 1/5] phpcbf run --- html/includes/graphs/device/agent.inc.php | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/html/includes/graphs/device/agent.inc.php b/html/includes/graphs/device/agent.inc.php index da8a233a8..2503fd58e 100644 --- a/html/includes/graphs/device/agent.inc.php +++ b/html/includes/graphs/device/agent.inc.php @@ -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"; @@ -22,6 +21,6 @@ $graph_max = 1; $unit_text = "msec"; -include("includes/graphs/generic_simplex.inc.php"); +require "includes/graphs/generic_simplex.inc.php"; ?> From c27faafb2309410a73333d4e617eeaf2924da1ec Mon Sep 17 00:00:00 2001 From: Paul Gear Date: Sat, 11 Jul 2015 13:49:47 +1000 Subject: [PATCH 2/5] Move agent execution time graph to poller section --- includes/definitions.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/includes/definitions.inc.php b/includes/definitions.inc.php index d2ea0087e..c51a735b1 100644 --- a/includes/definitions.inc.php +++ b/includes/definitions.inc.php @@ -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'; From c3adf36d882ca1f5615479f54c7ba3f8e8170d5b Mon Sep 17 00:00:00 2001 From: Paul Gear Date: Sat, 11 Jul 2015 13:50:13 +1000 Subject: [PATCH 3/5] Allow dividing as well as multiplying --- html/includes/graphs/generic_simplex.inc.php | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/html/includes/graphs/generic_simplex.inc.php b/html/includes/graphs/generic_simplex.inc.php index ed2562faa..c00497570 100644 --- a/html/includes/graphs/generic_simplex.inc.php +++ b/html/includes/graphs/generic_simplex.inc.php @@ -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 (!isset($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 (!isset($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; From 249707e2c6a394dbab09bff52d0ebf7a1f440b68 Mon Sep 17 00:00:00 2001 From: Paul Gear Date: Sat, 11 Jul 2015 13:54:09 +1000 Subject: [PATCH 4/5] Show agent execution time in seconds Because a graph that shows a value of 1.25k milliseconds doesn't make a lot of sense. --- html/includes/graphs/device/agent.inc.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/html/includes/graphs/device/agent.inc.php b/html/includes/graphs/device/agent.inc.php index 2503fd58e..56a46c10d 100644 --- a/html/includes/graphs/device/agent.inc.php +++ b/html/includes/graphs/device/agent.inc.php @@ -18,8 +18,10 @@ $colour_line = "36393D"; $colour_area_max = "FFEE99"; $graph_max = 1; +$multiplier = 1000; +$multiplier_action = "/"; -$unit_text = "msec"; +$unit_text = "Seconds"; require "includes/graphs/generic_simplex.inc.php"; From 51ff0df11ba6475078a8fc7fab7cb25cd3fa814a Mon Sep 17 00:00:00 2001 From: Paul Gear Date: Sat, 11 Jul 2015 14:09:12 +1000 Subject: [PATCH 5/5] Really allow dividing as well as multiplying --- html/includes/graphs/generic_simplex.inc.php | 4 ++-- html/includes/graphs/old_generic_simplex.inc.php | 8 +++++++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/html/includes/graphs/generic_simplex.inc.php b/html/includes/graphs/generic_simplex.inc.php index c00497570..ddc45ba2a 100644 --- a/html/includes/graphs/generic_simplex.inc.php +++ b/html/includes/graphs/generic_simplex.inc.php @@ -19,7 +19,7 @@ if ($multiplier) $rrd_options .= " DEF:".$ds."_max_o=".$rrd_filename.":".$ds.":MAX"; $rrd_options .= " DEF:".$ds."_min_o=".$rrd_filename.":".$ds.":MIN"; - if (!isset($multiplier_action)) { + if (empty($multiplier_action)) { $multiplier_action = "*"; } $rrd_options .= " CDEF:".$ds."=".$ds."_o,$multiplier,$multiplier_action"; @@ -48,7 +48,7 @@ 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"; - if (!isset($multiplier_action)) { + if (empty($multiplier_action)) { $multiplier_action = "*"; } $rrd_options .= " CDEF:".$ds."X=".$ds."_oX,$multiplier,$multiplier_action"; diff --git a/html/includes/graphs/old_generic_simplex.inc.php b/html/includes/graphs/old_generic_simplex.inc.php index be70e9a87..bbf6f9e02 100644 --- a/html/includes/graphs/old_generic_simplex.inc.php +++ b/html/includes/graphs/old_generic_simplex.inc.php @@ -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,*";