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

2010-12-22 Ramon Novoa <rnovoa@artica.es> 

* include/fgraph.php: Read the event_type when drawing module
	  charts. Fixes bug #3140516.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3680 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
ramonn 2010-12-22 11:40:45 +00:00
parent 97b037820e
commit 78276d1c42
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pandora_console/ChangeLog
View File

@ -1,3 +1,8 @@
2010-12-22 Ramon Novoa <rnovoa@artica.es>
* include/fgraph.php: Read the event_type when drawing module
charts. Fixes bug #3140516.
2010-12-21 Miguel de Dios <miguel.dedios@artica.es>
* operation/agentes/exportdata.php: fixed the quotes in the script to

8
pandora_console/include/fgraph.php
View File

@ -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 ();
}