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

2014-03-28 Miguel de Dios <miguel.dedios@artica.es> 

* include/functions_graph.php: set the zeroes values in the boolean
	graph as zeroes values.
	
	Incident: #665




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9669 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
mdtrooper 2014-03-28 17:13:31 +00:00
parent 52c881d92a
commit caca30521b
2 changed files with 32 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pandora_console/ChangeLog
View File

@ -1,3 +1,10 @@
2014-03-28 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_graph.php: set the zeroes values in the boolean
graph as zeroes values.
Incident: #665
2014-03-28 Juan Manuel Ramon <juanmanuel.ramon@artica.es> 2014-03-28 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* godmode/reporting/map_builder.php * godmode/reporting/map_builder.php

39
pandora_console/include/functions_graph.php
View File

@ -2752,21 +2752,32 @@ function grafico_modulo_boolean_data ($agent_module_id, $period, $show_events,
// Data and zeroes (draw a step) // Data and zeroes (draw a step)
if ($zero == 1 && $count > 0) { if ($zero == 1 && $count > 0) {
if ($avg_only) {
$chart[$timestamp]['sum'.$series_suffix] = $total; //New code set 0 if there is a 0
} //Please check the incident #665
else { //http://192.168.50.2/integria/index.php?sec=incidents&sec2=operation/incidents/incident_dashboard_detail&id=665
$chart[$timestamp]['sum'.$series_suffix] = $total;
$chart[$timestamp + 1] = array ('sum'.$series_suffix => 0,
//'count' => 0, $chart[$timestamp]['sum'.$series_suffix] = 0;
//'timestamp_bottom' => $timestamp,
//'timestamp_top' => $timestamp + $interval,
'min'.$series_suffix => 0,
'max'.$series_suffix => 0,
'event'.$series_suffix => $event_value,
'alert'.$series_suffix => $alert_value);
}
$previous_data = 0; $previous_data = 0;
//Old code that make a AVG
//~ if ($avg_only) {
//~ $chart[$timestamp]['sum'.$series_suffix] = $total;
//~ }
//~ else {
//~ $chart[$timestamp]['sum'.$series_suffix] = $total;
//~ $chart[$timestamp + 1] = array ('sum'.$series_suffix => 0,
//~ //'count' => 0,
//~ //'timestamp_bottom' => $timestamp,
//~ //'timestamp_top' => $timestamp + $interval,
//~ 'min'.$series_suffix => 0,
//~ 'max'.$series_suffix => 0,
//~ 'event'.$series_suffix => $event_value,
//~ 'alert'.$series_suffix => $alert_value);
//~ }
//~ $previous_data = 0;
} }
else if ($zero == 1) { // Just zeros else if ($zero == 1) { // Just zeros
$chart[$timestamp]['sum'.$series_suffix] = 0; $chart[$timestamp]['sum'.$series_suffix] = 0;