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

2012-05-30 Dario Rodriguez <dario@artica.es> 

* include/functions_reporting.php: Fixed group view,
        unkown agent count was wrong.

	MERGED PANDORA 4.0.2



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6363 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
darode 2012-05-30 08:30:40 +00:00
parent 6968fad2db
commit 3a7a821b7a
2 changed files with 29 additions and 6 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 @@
2012-05-30 Dario Rodriguez <dario@artica.es>
* include/functions_reporting.php: Fixed group view,
unkown agent count was wrong.
MERGED PANDORA 4.0.2
2012-05-30 Hirofumi Kosaka <kosaka@rworks.jp>
* godmode/db/db_main.php: Tiny bug fix. The number of log4x

28
pandora_console/include/functions_reporting.php
View File

@ -912,22 +912,38 @@ function reporting_get_group_stats ($id_group = 0) {
switch ($config["dbtype"]) {
case "mysql":
$data["agents_unknown"] += db_get_sql ("SELECT COUNT(*)
$agents_in_group = db_get_all_rows_sql ("SELECT id_agente
FROM tagente
WHERE id_grupo IN $group_clause AND disabled = 0 AND ultimo_contacto < NOW() - (intervalo * 2)");
WHERE id_grupo IN $group_clause AND disabled = 0");
break;
case "postgresql":
$data["agents_unknown"] += db_get_sql ("SELECT COUNT(*)
$agents_in_group = db_get_all_rows_sql ("SELECT id_agente
FROM tagente
WHERE id_grupo IN $group_clause AND disabled = 0 AND ceil(date_part('epoch', ultimo_contacto)) < ceil(date_part('epoch', NOW())) - (intervalo * 2)");
WHERE id_grupo IN $group_clause AND disabled = 0");
break;
case "oracle":
$data["agents_unknown"] += db_get_sql ("SELECT COUNT(*)
$agents_in_group = db_get_all_rows_sql ("SELECT id_agente
FROM tagente
WHERE id_grupo IN $group_clause AND disabled = 0 AND ultimo_contacto < CURRENT_TIMESTAMP - (intervalo * 2)");
WHERE id_grupo IN $group_clause AND disabled = 0");
break;
}
//Count unkown agents, forget agent without modules
if (!$agents_in_group) {
$agents_in_group = array();
}
$data["agents_unknown"] = 0;
foreach ($agents_in_group as $id) {
$info = reporting_get_agent_module_info($id['id_agente']);
//If the agent has modules then is counted
if ($info['monitor_unknown']) {
$data["agents_unknown"]++;
}
}
//Calculate other metrics
$data["total_agents"] += db_get_sql ("SELECT COUNT(*)
FROM tagente WHERE id_grupo IN $group_clause AND disabled = 0");