tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed the history data in boolean and string charts.

This commit is contained in:
mdtrooper 2015-04-16 15:25:27 +02:00
parent 48a0a167cc
commit f24919fe4b
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pandora_console/include/functions_graph.php
View File

@ -2834,6 +2834,7 @@ function grafico_modulo_boolean_data ($agent_module_id, $period, $show_events,
if ($uncompressed_module) { if ($uncompressed_module) {
$avg_only = 1; $avg_only = 1;
} }
$search_in_history_db = db_search_in_history_db($datelimit);
// Get event data (contains alert data too) // Get event data (contains alert data too)
if ($show_unknown == 1 || $show_events == 1 || $show_alerts == 1) { 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 > $datelimit",
"utimestamp < $date", "utimestamp < $date",
'order' => 'utimestamp ASC'), 'order' => 'utimestamp ASC'),
array ('datos', 'utimestamp')); array ('datos', 'utimestamp'), 'AND', $search_in_history_db);
if ($data === false) { if ($data === false) {
$data = array (); $data = array ();
} }
@ -3545,6 +3546,7 @@ function grafico_modulo_string ($agent_module_id, $period, $show_events,
if ($uncompressed_module) { if ($uncompressed_module) {
$avg_only = 1; $avg_only = 1;
} }
$search_in_history_db = db_search_in_history_db($datelimit);
// Get event data (contains alert data too) // Get event data (contains alert data too)
if ($show_events == 1 || $show_alerts == 1) { if ($show_events == 1 || $show_alerts == 1) {
@ -3565,7 +3567,7 @@ function grafico_modulo_string ($agent_module_id, $period, $show_events,
"utimestamp > $datelimit", "utimestamp > $datelimit",
"utimestamp < $date", "utimestamp < $date",
'order' => 'utimestamp ASC'), 'order' => 'utimestamp ASC'),
array ('datos', 'utimestamp')); array ('datos', 'utimestamp'), 'AND', $search_in_history_db);
if ($data === false) { if ($data === false) {
$data = array (); $data = array ();
} }