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

2012-10-04 Sancho Lerena <slerena@artica.es> 

* include/functions_reporting.php: Fixed AGAIN the prooblem
        with tactical view, users with several groups or ALL group
        doesnt work fine.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7038 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
slerena 2012-10-03 23:34:48 +00:00
parent 7ccf027acd
commit 3f422387c5
2 changed files with 26 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pandora_console/ChangeLog
View File

@ -1,3 +1,9 @@
2012-10-04 Sancho Lerena <slerena@artica.es>
* include/functions_reporting.php: Fixed AGAIN the prooblem
with tactical view, users with several groups or ALL group
doesnt work fine.
2012-10-03 Vanessa Gil <vanessa.gil@artica.es> 2012-10-03 Vanessa Gil <vanessa.gil@artica.es>
* include/functions_api.php: Changed function create * include/functions_api.php: Changed function create

35
pandora_console/include/functions_reporting.php
View File

@ -917,28 +917,28 @@ function reporting_get_group_stats ($id_group = 0) {
} }
// Get unknown agents by using the status code in modules. // Get unknown agents by using the status code in modules.
$data["agents_unknown"] = groups_agent_unknown ($group_array); $data["agents_unknown"] += groups_agent_unknown ($group_array);
// Get monitor NOT INIT, except disabled AND async modules // Get monitor NOT INIT, except disabled AND async modules
$data["monitor_not_init"] = groups_monitor_not_init ($group_array); $data["monitor_not_init"] += groups_monitor_not_init ($group_array);
// Get monitor OK, except disabled and non-init // Get monitor OK, except disabled and non-init
$data["monitor_ok"] = groups_monitor_ok ($group_array); $data["monitor_ok"] += groups_monitor_ok ($group_array);
// Get monitor CRITICAL, except disabled and non-init // Get monitor CRITICAL, except disabled and non-init
$data["monitor_critical"] = groups_monitor_critical ($group_array); $data["monitor_critical"] += groups_monitor_critical ($group_array);
// Get monitor WARNING, except disabled and non-init // Get monitor WARNING, except disabled and non-init
$data["monitor_warning"] = groups_monitor_warning ($group_array); $data["monitor_warning"] += groups_monitor_warning ($group_array);
// Get monitor UNKNOWN, except disabled and non-init // Get monitor UNKNOWN, except disabled and non-init
$data["monitor_unknown"] = groups_monitor_unknown ($group_array); $data["monitor_unknown"] += groups_monitor_unknown ($group_array);
// Get alerts configured, except disabled // Get alerts configured, except disabled
@ -959,9 +959,14 @@ function reporting_get_group_stats ($id_group = 0) {
// Get total count of monitors for this group, except disabled. // Get total count of monitors for this group, except disabled.
$data["monitor_checks"] += $data["monitor_not_init"] + $data["monitor_unknown"] + $data["monitor_warning"] + $data["monitor_critical"] + $data["monitor_ok"]; $data["monitor_checks"] = $data["monitor_not_init"] + $data["monitor_unknown"] + $data["monitor_warning"] + $data["monitor_critical"] + $data["monitor_ok"];
} }
// Get total count of monitors for this group, except disabled.
$data["monitor_checks"] = $data["monitor_not_init"] + $data["monitor_unknown"] + $data["monitor_warning"] + $data["monitor_critical"] + $data["monitor_ok"];
/* /*
Monitor health (percentage) Monitor health (percentage)
Data health (percentage) Data health (percentage)
@ -4949,4 +4954,4 @@ function reporting_template_graphs_get_user ($id_user = 0, $only_names = false,
return $templates; return $templates;
} }
?> ?>