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

Fixed the agent status filter for the strict ACL users

This commit is contained in:
Alejandro Gallardo Escobar 2015-03-13 13:54:09 +01:00
parent 01600cffb2
commit ba6c8809de
1 changed files with 39 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
pandora_console/include/class/Tree.class.php
View File

@ -1369,6 +1369,11 @@ class Tree {
if ($this->strictACL) {
$agent_filter = array("id" => $agent['id']);
$module_filter = array();
if (isset($this->filter["statusAgent"]))
$agent_filter["status"] = $this->filter["statusAgent"];
if (isset($this->filter["searchAgent"]))
$agent_filter["name"] = $this->filter["searchAgent"];
if (isset($this->filter["statusModule"]))
$module_filter["status"] = $this->filter["statusModule"];
@ -1468,6 +1473,34 @@ class Tree {
$agent['counters']['total'] = (int) tags_get_total_monitors ($agent['rootID'], $this->acltags, $agent_filter, $module_filter);
}
}
if (isset($this->filter["statusAgent"]) && $this->filter["statusAgent"] != AGENT_STATUS_ALL) {
switch ($this->filter["statusAgent"]) {
case AGENT_STATUS_CRITICAL:
if ($agent['counters']['critical'] == 0)
$agent = array();
break;
case AGENT_STATUS_WARNING:
if ($agent['counters']['total'] == 0 || $agent['counters']['critical'] > 0 || $agent['counters']['warning'] == 0)
$agent = array();
break;
case AGENT_STATUS_UNKNOWN:
if ($agent['counters']['critical'] > 0 || $agent['counters']['warning'] > 0 || $agent['counters']['unknown'] == 0)
$agent = array();
break;
case AGENT_STATUS_NOT_INIT:
if ($agent['counters']['total'] != 0 && $agent['counters']['total'] != $agent['counters']['not_init'])
$agent = array();
break;
case AGENT_STATUS_NORMAL:
if ($agent['counters']['critical'] > 0 || $agent['counters']['warning'] > 0 || $agent['counters']['unknown'] > 0 || $agent['counters']['ok'] == 0)
$agent = array();
break;
}
// Leave the function
if (empty($agent))
return;
}
}
// Counters
@ -1799,7 +1832,10 @@ class Tree {
if (! defined ('METACONSOLE')) {
$items = $this->getItems();
$this->processAgents($items);
$processed_items = $items;
// Remove empty entrys
$processed_items = array_filter($items);
// Restart the array keys -> Important!
$processed_items = array_values($processed_items);
}
else {
$rootIDs = $this->rootID;
@ -1814,6 +1850,8 @@ class Tree {
$this->rootID = $rootID;
$newItems = $this->getItems();
$this->processAgents($newItems, $server);
// Remove empty entrys
$newItems = array_filter($newItems);
$items = array_merge($items, $newItems);
metaconsole_restore_db();