diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index 469bbfad7b..c00efe465d 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,8 @@ +2010-12-22 Ramon Novoa + + * include/fgraph.php: Read the event_type when drawing module + charts. Fixes bug #3140516. + 2010-12-21 Miguel de Dios * operation/agentes/exportdata.php: fixed the quotes in the script to diff --git a/pandora_console/include/fgraph.php b/pandora_console/include/fgraph.php index 0527addd2c..f9608784a0 100644 --- a/pandora_console/include/fgraph.php +++ b/pandora_console/include/fgraph.php @@ -191,7 +191,7 @@ function graphic_combined_module ($module_list, $weight_list, $period, $width, $ "utimestamp > $datelimit", "utimestamp < $date", 'order' => 'utimestamp ASC'), - array ('evento', 'utimestamp')); + array ('evento', 'utimestamp', 'event_type')); if ($events === false) { $events = array (); } @@ -1185,7 +1185,7 @@ function grafico_modulo_sparse ($agent_module_id, $period, $show_events, "utimestamp > $datelimit", "utimestamp < $date", 'order' => 'utimestamp ASC'), - array ('evento', 'utimestamp')); + array ('evento', 'utimestamp', 'event_type')); if ($events === false) { $events = array (); } @@ -1436,7 +1436,7 @@ function grafico_modulo_boolean ($agent_module_id, $period, $show_events, "utimestamp > $datelimit", "utimestamp < $date", 'order' => 'utimestamp ASC'), - array ('evento', 'utimestamp')); + array ('evento', 'utimestamp', 'event_type')); if ($events === false) { $events = array (); } @@ -1695,7 +1695,7 @@ function grafico_modulo_string ($agent_module_id, $period, $show_events, "utimestamp > $datelimit", "utimestamp < $date", 'order' => 'utimestamp ASC'), - array ('evento', 'utimestamp')); + array ('evento', 'utimestamp', 'event_type')); if ($events === false) { $events = array (); }