From f24919fe4b80b61e076f8b6589e77a2fe5a9416d Mon Sep 17 00:00:00 2001 From: mdtrooper Date: Thu, 16 Apr 2015 15:25:27 +0200 Subject: [PATCH] Fixed the history data in boolean and string charts. --- pandora_console/include/functions_graph.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pandora_console/include/functions_graph.php b/pandora_console/include/functions_graph.php index df10334c45..557c732d43 100755 --- a/pandora_console/include/functions_graph.php +++ b/pandora_console/include/functions_graph.php @@ -2834,6 +2834,7 @@ function grafico_modulo_boolean_data ($agent_module_id, $period, $show_events, if ($uncompressed_module) { $avg_only = 1; } + $search_in_history_db = db_search_in_history_db($datelimit); // Get event data (contains alert data too) if ($show_unknown == 1 || $show_events == 1 || $show_alerts == 1) { @@ -2864,7 +2865,7 @@ function grafico_modulo_boolean_data ($agent_module_id, $period, $show_events, "utimestamp > $datelimit", "utimestamp < $date", 'order' => 'utimestamp ASC'), - array ('datos', 'utimestamp')); + array ('datos', 'utimestamp'), 'AND', $search_in_history_db); if ($data === false) { $data = array (); } @@ -3545,6 +3546,7 @@ function grafico_modulo_string ($agent_module_id, $period, $show_events, if ($uncompressed_module) { $avg_only = 1; } + $search_in_history_db = db_search_in_history_db($datelimit); // Get event data (contains alert data too) if ($show_events == 1 || $show_alerts == 1) { @@ -3565,7 +3567,7 @@ function grafico_modulo_string ($agent_module_id, $period, $show_events, "utimestamp > $datelimit", "utimestamp < $date", 'order' => 'utimestamp ASC'), - array ('datos', 'utimestamp')); + array ('datos', 'utimestamp'), 'AND', $search_in_history_db); if ($data === false) { $data = array (); }