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

2012-07-16 Juan Manuel Ramon <juanmanuel.ramon@artica.es> 

* include/constants.php
	 operation/tree.php: Fixed filters, counts and info displayed
	 in monitor and policy tree view. 



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6778 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
juanmanuelr 2012-07-16 13:48:59 +00:00
parent 986a0cc60a
commit b3242413f1
3 changed files with 44 additions and 11 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-07-16 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* include/constants.php
operation/tree.php: Fixed filters, counts and info displayed
in monitor and policy tree view.
2012-07-16 Dario Rodriguez <dario.rodriguez@artica.es>
* include/functions_groups.php: Included void agents on

1
pandora_console/include/constants.php
View File

@ -183,6 +183,7 @@ define ('STATUS_AGENT_WARNING', 'agent_warning.png');
define ('STATUS_AGENT_DOWN', 'agent_down.png');
define ('STATUS_AGENT_OK', 'agent_ok.png');
define ('STATUS_AGENT_NO_DATA', 'agent_no_data.png');
define ('STATUS_AGENT_NO_MONITORS', 'agent_no_monitors.png');
//For alerts
define ('STATUS_ALERT_FIRED', 'alert_fired.png');
define ('STATUS_ALERT_NOT_FIRED', 'alert_not_fired.png');

48
pandora_console/operation/tree.php
View File

@ -324,6 +324,24 @@ if (is_ajax ())
false,
true);
if ($id != 0) {
// Skip agents without modules
$sql .= ' AND tagente.id_agente IN
(SELECT tagente.id_agente
FROM tagente, tagente_modulo, tagente_estado
WHERE tagente.id_agente = tagente_modulo.id_agente
AND tagente_modulo.id_agente_modulo = tagente_estado.id_agente_modulo
AND tagente.disabled = 0
AND tagente_modulo.disabled = 0
AND tagente_estado.utimestamp != 0
AND tagente_modulo.id_policy_module != 0
AND tagente.id_agente IN (SELECT id_agent FROM tpolicy_agents WHERE id_policy = ' . $id . ')
group by tagente.id_agente
having COUNT(*) > 0)';
}
break;
case 'module':
//Replace separator token "articapandora_32_pandoraartica_" for " "
@ -405,10 +423,10 @@ if (is_ajax ())
$filter = "tagente_modulo.id_policy_module = 0";
if ($id) {
$filter = "tagente_modulo.id_policy_module != 0";
$filter = "tagente_modulo.id_policy_module = " . $id . " ";
}
$filter .= " AND disabled = 0";
$filter .= " AND tagente_modulo.disabled = 0 ";
$agent_info["monitor_alertsfired"] = agents_get_alerts_fired ($row["id_agente"], $filter);
@ -579,6 +597,8 @@ if (is_ajax ())
if ($id_father != 0)
$whereQuery = ' AND t1.id_policy_module IN
(SELECT id FROM tpolicy_modules WHERE id_policy = ' . $id_father . ')';
else
$whereQuery = ' AND t1.id_policy_module = 0 ';
$sql = 'SELECT *
FROM tagente_modulo AS t1
@ -777,8 +797,10 @@ function printTree_($type) {
$fgroups[$fg['id_grupo']] = "";
}
//We only want groups with agents, so we need the intesect of both arrays.
$avariableGroups = array_intersect_key($avariableGroups, $fgroups);
// We only want groups with agents, so we need the intesect of both arrays.
// Not for policies, we need all groups
if ($type != 'policies')
$avariableGroups = array_intersect_key($avariableGroups, $fgroups);
$avariableGroupsIds = implode(',',array_keys($avariableGroups));
if($avariableGroupsIds == ''){
@ -940,21 +962,25 @@ function printTree_($type) {
$sql = "SELECT DISTINCT tpolicies.id, tpolicies.name FROM tpolicies, tpolicy_modules, tagente_estado, tagente, tagente_modulo WHERE
tagente.id_agente = tagente_estado.id_agente AND tagente_modulo.id_agente = tagente_estado.id_agente AND tagente_modulo.id_agente_modulo = tagente_estado.id_agente_modulo AND
tagente_estado.utimestamp != 0 AND tagente_modulo.id_policy_module != 0 AND tpolicy_modules.id = tagente_modulo.id_policy_module AND tpolicies.id = tpolicy_modules.id_policy AND
tpolicies.id_group IN ($groups) AND tagente.nombre LIKE '%$search_free%'";
tagente.id_grupo IN ($groups) AND tagente.nombre LIKE '%$search_free%' AND tagente.disabled = 0 AND tagente_modulo.disabled = 0";
$list = db_get_all_rows_sql($sql);
if ($list !== false)
array_push($list, array('id' => 0, 'name' => 'No policy'));
if ($list === false)
$list = array();
array_push($list, array('id' => 0, 'name' => 'No policy'));
} else {
$list = db_get_all_rows_sql("SELECT DISTINCT tpolicies.id, tpolicies.name FROM tpolicies, tpolicy_modules, tagente_estado, tagente, tagente_modulo WHERE
tagente.id_agente = tagente_estado.id_agente AND tagente_modulo.id_agente = tagente_estado.id_agente AND tagente_modulo.id_agente_modulo = tagente_estado.id_agente_modulo AND
tagente_estado.utimestamp != 0 AND tagente_modulo.id_policy_module != 0 AND tpolicy_modules.id = tagente_modulo.id_policy_module AND tpolicies.id = tpolicy_modules.id_policy AND
tpolicies.id_group IN ($groups)");
tagente.id_grupo IN ($groups) AND tagente.disabled = 0 AND tagente_modulo.disabled = 0");
if ($list !== false)
array_push($list, array('id' => 0, 'name' => 'No policy'));
if ($list === false)
$list = array();
array_push($list, array('id' => 0, 'name' => 'No policy'));
}
break;