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

2014-03-10 Juan Manuel Ramon <juanmanuel.ramon@artica.es> 

* include/functions_reporting.php: sla reports with sla
        completion equal to 100 are ok, not "inside limits".



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9539 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
juanmanuelr 2014-03-10 12:08:59 +00:00
parent 18129d30d7
commit 77068e72d8
2 changed files with 17 additions and 1 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 @@
2014-03-10 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* include/functions_reporting.php: sla reports with sla
completion equal to 100 are ok, not "inside limits".
2014-03-09 Junichi Satoh <junichi@rworks.jp> 2014-03-09 Junichi Satoh <junichi@rworks.jp>
* include/help/ja/help_ipam.php: Added japanese ipam help file. * include/help/ja/help_ipam.php: Added japanese ipam help file.

13
pandora_console/include/functions_reporting.php
View File

@ -3263,10 +3263,15 @@ function reporting_render_report_html_item ($content, $table, $report, $mini = f
} }
$data_graph = array (); $data_graph = array ();
$data_horin_graph = array();
$data_graph[__('Inside limits')] = 0; $data_graph[__('Inside limits')] = 0;
$data_graph[__('Out of limits')] = 0; $data_graph[__('Out of limits')] = 0;
$data_graph[__('On the edge')] = 0; $data_graph[__('On the edge')] = 0;
$data_graph[__('Unknown')] = 0; $data_graph[__('Unknown')] = 0;
$data_horin_graph[__('Inside limits')] = 0;
$data_horin_graph[__('Out of limits')] = 0;
$data_horin_graph[__('On the edge')] = 0;
$data_horin_graph[__('Unknown')] = 0;
$data_graph[__('Plannified downtime')] = 0; $data_graph[__('Plannified downtime')] = 0;
@ -3341,6 +3346,11 @@ function reporting_render_report_html_item ($content, $table, $report, $mini = f
$data_graph[__('Unknown')]++; $data_graph[__('Unknown')]++;
$data_horin_graph[__('Unknown')]['g']++; $data_horin_graph[__('Unknown')]['g']++;
} }
# Fix : 100% accurance is 'inside limits' although 10% was not overrun
else if (($sla_value == 100 && $sla_value >= $sla['sla_limit']) ) {
$data_graph[__('Inside limits')]++;
$data_horin_graph[__('Inside limits')]['g']++;
}
else if ($sla_value <= ($sla['sla_limit']+10) && $sla_value >= ($sla['sla_limit']-10)) { else if ($sla_value <= ($sla['sla_limit']+10) && $sla_value >= ($sla['sla_limit']-10)) {
$data_graph[__('On the edge')]++; $data_graph[__('On the edge')]++;
$data_horin_graph[__('On the edge')]['g']++; $data_horin_graph[__('On the edge')]['g']++;
@ -3393,7 +3403,8 @@ function reporting_render_report_html_item ($content, $table, $report, $mini = f
} }
// Print icon with status including edge // Print icon with status including edge
if ($sla_value > ($sla['sla_limit'] + $edge_interval)) { # Fix : 100% accurance is 'inside limits' although 10% was not overrun
if (($sla_value == 100 && $sla_value >= $sla['sla_limit']) || ($sla_value > ($sla['sla_limit'] + $edge_interval))) {
$data[6] = html_print_image('images/status_sets/default/severity_normal.png',true,array('title'=>__('Inside limits'))); $data[6] = html_print_image('images/status_sets/default/severity_normal.png',true,array('title'=>__('Inside limits')));
} }
elseif (($sla_value <= $sla['sla_limit'] + $edge_interval) elseif (($sla_value <= $sla['sla_limit'] + $edge_interval)