';
diff --git a/pandora_console/include/ajax/module.php b/pandora_console/include/ajax/module.php
index 7f59e1f5d3..275924df36 100755
--- a/pandora_console/include/ajax/module.php
+++ b/pandora_console/include/ajax/module.php
@@ -74,9 +74,9 @@ if ($search_modules) {
$id_agents = json_decode(io_safe_output(get_parameter('id_agents')));
$filter = '%' . get_parameter('q', '') . '%';
$other_filter = json_decode(io_safe_output(get_parameter('other_filter')), true);
-
+ // TODO TAGS agents_get_modules
$modules = agents_get_modules($id_agents, false,
- (array('nombre' => $filter) + $other_filter));
+ (array('tagente_modulo.nombre' => $filter) + $other_filter));
if ($modules === false) $modules = array();
@@ -550,10 +550,18 @@ if ($list_modules) {
// Fix: for tag functionality groups have to be all user_groups (propagate ACL funct!)
$groups = users_get_groups($config["id_user"], $access);
- if($cluster_list != 1){
- $tags_sql = tags_get_acl_tags($config['id_user'],
- array_keys($groups), $access, 'module_condition', 'AND',
- 'tagente_modulo', false, array(), true);
+ $tags_join = "";
+ $tags_sql = "";
+ if($cluster_list != 1) {
+ $tags = tags_get_user_applied_agent_tags ($id_agent, $access);
+ if ($tags === false) {
+ $tags_sql = " AND 1=0";
+ }
+ elseif (is_array($tags)) {
+ $tags_sql = " AND ttag_module.id_tag IN (" . implode(',', $tags) . ")";
+ $tags_join = "LEFT JOIN ttag_module
+ ON ttag_module.id_agente_modulo = tagente_modulo.id_agente_modulo";
+ }
}
$status_filter_monitor = (int)get_parameter('status_filter_monitor', -1);
@@ -571,10 +579,10 @@ if ($list_modules) {
}
if ($status_module_group != -1) {
- $status_module_group_filter = 'id_module_group = ' . $status_module_group;
+ $status_module_group_filter = 'tagente_modulo.id_module_group = ' . $status_module_group;
}
else {
- $status_module_group_filter = 'id_module_group >= 0';
+ $status_module_group_filter = 'tagente_modulo.id_module_group >= 0';
}
$status_text_monitor_sql = '%';
@@ -590,66 +598,22 @@ if ($list_modules) {
}
//Count monitors/modules
- switch ($config["dbtype"]) {
- case "mysql":
- $sql = sprintf("
- SELECT COUNT(*)
- FROM tagente_estado,
- (SELECT *
- FROM tagente_modulo
- WHERE id_agente = %d AND nombre LIKE \"%s\" AND delete_pending = 0
- AND disabled = 0 AND %s) tagente_modulo
- LEFT JOIN tmodule_group
- ON tagente_modulo.id_module_group = tmodule_group.id_mg
- WHERE tagente_estado.id_agente_modulo = tagente_modulo.id_agente_modulo
- AND %s %s
- AND tagente_estado.estado != %d
- AND tagente_modulo.%s
- ORDER BY tagente_modulo.id_module_group , %s %s",
- $id_agente, $status_text_monitor_sql,$status_module_group_filter,$status_filter_sql, $tags_sql, $monitor_filter,
- $status_module_group_filter, $order['field'], $order['order']);
- break;
- case "postgresql":
- $sql = sprintf("
- SELECT COUNT(DISTINCT tagente_modulo.id_module_group)
- FROM tagente_estado,
- (SELECT *
- FROM tagente_modulo
- WHERE id_agente = %d AND nombre LIKE '%s'
- AND delete_pending = 0
- AND disabled = 0 AND %s) tagente_modulo
- LEFT JOIN tmodule_group
- ON tagente_modulo.id_module_group = tmodule_group.id_mg
- WHERE tagente_estado.id_agente_modulo = tagente_modulo.id_agente_modulo
- AND %s %s
- AND tagente_estado.estado != %d
- AND tagente_modulo.%s
- GROUP BY tagente_modulo.id_module_group,
- tagente_modulo.nombre
- ORDER BY tagente_modulo.id_module_group , %s %s",
- $id_agente, $status_text_monitor_sql,$status_module_group_filter,$status_filter_sql,
- $tags_sql, $monitor_filter,$status_module_group_filter,$order['field'],
- $order['order']);
- break;
- case "oracle":
- $sql = sprintf ("
- SELECT COUNT(*)" .
- " FROM tagente_estado, tagente_modulo
- LEFT JOIN tmodule_group
- ON tmodule_group.id_mg = tagente_modulo.id_module_group
- WHERE tagente_estado.id_agente_modulo = tagente_modulo.id_agente_modulo
- AND tagente_modulo.id_agente = %d
- AND tagente_modulo.nombre LIKE '%s'
- AND %s %s
- AND tagente_modulo.delete_pending = 0
- AND tagente_modulo.disabled = 0
- AND tagente_estado.estado != %d
- AND tagente_modulo.%s
- ORDER BY tagente_modulo.id_module_group , %s %s
- ", $id_agente, $status_text_monitor_sql, $status_filter_sql, $tags_sql, $monitor_filter,
- $status_module_group_filter,$order['field'], $order['order']);
- break;
- }
+ $order_sql = $order['field'] . " " . $order['order'];
+ $sql = "SELECT COUNT(*)
+ FROM tagente_modulo
+ $tags_join
+ INNER JOIN tagente_estado
+ ON tagente_modulo.id_agente_modulo = tagente_estado.id_agente_modulo
+ LEFT JOIN tmodule_group
+ ON tagente_modulo.id_module_group = tmodule_group.id_mg
+ WHERE tagente_modulo.id_agente = $id_agente
+ AND nombre LIKE '$status_text_monitor_sql'
+ AND delete_pending = 0
+ AND $status_filter_sql
+ $tags_sql
+ AND tagente_estado.estado != $monitor_filter
+ GROUP BY tagente_modulo.id_agente_modulo
+ ";
$count_modules = db_get_all_rows_sql($sql);
if (isset($count_modules[0]))
@@ -659,68 +623,22 @@ if ($list_modules) {
//Get monitors/modules
// Get all module from agent
- switch ($config["dbtype"]) {
- case "mysql":
- $sql = sprintf("
- SELECT *
- FROM tagente_estado,
- (SELECT *
- FROM tagente_modulo
- WHERE id_agente = %d AND nombre LIKE \"%s\" AND delete_pending = 0
- AND disabled = 0 AND %s) tagente_modulo
- LEFT JOIN tmodule_group
- ON tagente_modulo.id_module_group = tmodule_group.id_mg
- WHERE tagente_estado.id_agente_modulo = tagente_modulo.id_agente_modulo
- AND %s %s
- AND tagente_estado.estado != %d
- AND tagente_modulo.%s
- ORDER BY tmodule_group.name , %s %s",
- $id_agente, $status_text_monitor_sql,$status_module_group_filter,$status_filter_sql, $tags_sql, $monitor_filter,
- $status_module_group_filter, $order['field'], $order['order']);
-
- break;
- case "postgresql":
- $sql = sprintf("
- SELECT *
- FROM tagente_estado,
- (SELECT *
- FROM tagente_modulo
- WHERE id_agente = %d AND nombre LIKE '%s' AND delete_pending = 0
- AND disabled = 0 AND %s) tagente_modulo
- LEFT JOIN tmodule_group
- ON tagente_modulo.id_module_group = tmodule_group.id_mg
- WHERE tagente_estado.id_agente_modulo = tagente_modulo.id_agente_modulo
- AND %s %s
- AND tagente_estado.estado != %d
- AND tagente_modulo.%s
- ORDER BY tmodule_group.name , %s %s",
- $id_agente, $status_text_monitor_sql,$status_module_group_filter,$status_filter_sql, $tags_sql, $monitor_filter,
- $status_module_group_filter, $order['field'], $order['order']);
- break;
- // If Dbms is Oracle then field_list in sql statement has to be recoded. See oracle_list_all_field_table()
- case "oracle":
- $fields_tagente_estado = oracle_list_all_field_table('tagente_estado', 'string');
- $fields_tagente_modulo = oracle_list_all_field_table('tagente_modulo', 'string');
- $fields_tmodule_group = oracle_list_all_field_table('tmodule_group', 'string');
-
- $sql = sprintf ("
- SELECT " . $fields_tagente_estado . ', ' . $fields_tagente_modulo . ', ' . $fields_tmodule_group .
- " FROM tagente_estado, tagente_modulo
- LEFT JOIN tmodule_group
- ON tmodule_group.id_mg = tagente_modulo.id_module_group
- WHERE tagente_estado.id_agente_modulo = tagente_modulo.id_agente_modulo
- AND tagente_modulo.id_agente = %d
- AND tagente_modulo.nombre LIKE '%s'
- AND %s %s
- AND tagente_modulo.delete_pending = 0
- AND tagente_modulo.disabled = 0
- AND tagente_estado.estado != %d
- AND tagente_modulo.%s
- ORDER BY tmodule_group.name , %s %s
- ", $id_agente, $status_text_monitor_sql, $tags_sql, $status_filter_sql, $monitor_filter,
- $status_module_group_filter, $order['field'], $order['order']);
- break;
- }
+ $sql = "SELECT tagente_estado.*, tagente_modulo.*, tmodule_group.*
+ FROM tagente_modulo
+ $tags_join
+ INNER JOIN tagente_estado
+ ON tagente_modulo.id_agente_modulo = tagente_estado.id_agente_modulo
+ LEFT JOIN tmodule_group
+ ON tagente_modulo.id_module_group = tmodule_group.id_mg
+ WHERE tagente_modulo.id_agente = $id_agente
+ AND nombre LIKE '$status_text_monitor_sql'
+ AND delete_pending = 0
+ AND $status_filter_sql
+ $tags_sql
+ AND tagente_estado.estado != $monitor_filter
+ GROUP BY tagente_modulo.id_agente_modulo
+ ORDER BY tmodule_group.name, $order_sql
+ ";
if ($monitors_change_filter) {
$limit = " LIMIT " . $config['block_size'] . " OFFSET 0";
diff --git a/pandora_console/include/ajax/visual_console_builder.ajax.php b/pandora_console/include/ajax/visual_console_builder.ajax.php
index 98be4f174b..7bdddf50b9 100755
--- a/pandora_console/include/ajax/visual_console_builder.ajax.php
+++ b/pandora_console/include/ajax/visual_console_builder.ajax.php
@@ -164,6 +164,8 @@ $clock_animation = get_parameter('clock_animation', 'analogic_1');
$time_format = get_parameter('time_format', 'time');
$timezone = get_parameter('timezone', 'Europe/Madrid');
+$show_last_value = get_parameter('show_last_value', null);
+
switch ($action) {
case 'get_font':
$return = array();
@@ -785,6 +787,9 @@ switch ($action) {
if ($height !== null) {
$values['height'] = $height;
}
+ if ($show_last_value !== null) {
+ $values['show_last_value'] = $show_last_value;
+ }
break;
case 'simple_value':
if ($action == 'update') {
@@ -988,7 +993,6 @@ switch ($action) {
if (isset($elementFields["linked_layout_status_as_service_warning"])) {
$elementFields["linked_layout_status_as_service_warning"] = (float) $elementFields["linked_layout_status_as_service_warning"];
}
-
switch ($type) {
case 'auto_sla_graph':
$elementFields['event_max_time_row'] = $elementFields['period'];
@@ -1054,7 +1058,7 @@ switch ($action) {
$elementFields['id_agent'], false,
array('disabled' => 0,
'id_agente' => $elementFields['id_agent'],
- 'tagente_modulo.id_tipo_modulo IN' => "(17,23,3,10,33)"));
+ 'tagente_modulo.id_tipo_modulo IN' => "(1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,18,17,23,3,10,33)"));
$elementFields['modules_html'] = '
-- ';
foreach ($modules as $id => $name) {
@@ -1281,6 +1285,7 @@ switch ($action) {
$values['image'] = $image;
$values['width'] = $width;
$values['height'] = $height;
+ $values['show_last_value'] = $show_last_value;
break;
case 'group_item':
$values['type'] = GROUP_ITEM;
diff --git a/pandora_console/include/auth/mysql.php b/pandora_console/include/auth/mysql.php
index 835a709ba8..ffd618fb65 100644
--- a/pandora_console/include/auth/mysql.php
+++ b/pandora_console/include/auth/mysql.php
@@ -269,6 +269,56 @@ function process_user_login_remote ($login, $pass, $api = false) {
else {
delete_user_pass_ldap ($login);
}
+
+ $permissions = array();
+ if($config['ldap_advanced_config']){
+ $i = 0;
+
+ $ldap_adv_perms = json_decode(io_safe_output($config['ldap_adv_perms']), true);
+ foreach ($ldap_adv_perms as $ldap_adv_perm) {
+ $attributes = $ldap_adv_perm['groups_ldap'];
+
+ foreach ($attributes as $attr) {
+ $attr = explode('=', $attr, 2);
+ foreach ($sr[$attr[0]] as $s_attr) {
+ if(preg_match('/' . $attr[1] . '/', $s_attr)){
+ $permissions[$i]["profile"] = $ldap_adv_perm['profile'];
+ $permissions[$i]["groups"] = $ldap_adv_perm['group'];
+ $permissions[$i]["tags"] = implode(",",$ldap_adv_perm['tags']);
+ $i++;
+ }
+ }
+ }
+ }
+ } else {
+ $permissions[0]["profile"] = $config['default_remote_profile'];
+ $permissions[0]["groups"][] = $config['default_remote_group'];
+ $permissions[0]["tags"] = $config['default_assign_tags'];
+ }
+ if(empty($permissions)) {
+ $config["auth_error"] = __("User not found in database or incorrect password");
+ return false;
+
+ } else {
+ // check permissions
+ $result = check_permission_ad ($login, $pass, false,
+ $permissions, defined('METACONSOLE'));
+
+ if ($return === "error_permissions") {
+ $config["auth_error"] =
+ __("Problems with configuration permissions. Please contact with Administrator");
+ return false;
+ }
+ else {
+ if ($return === "permissions_changed") {
+ $config["auth_error"] =
+ __("Your permissions have changed. Please, login again.");
+ return false;
+ }
+ }
+
+
+ }
}
return $login;
diff --git a/pandora_console/include/class/Tree.class.php b/pandora_console/include/class/Tree.class.php
index e18cfb599e..05c994df9e 100644
--- a/pandora_console/include/class/Tree.class.php
+++ b/pandora_console/include/class/Tree.class.php
@@ -28,7 +28,6 @@ class Tree {
protected $userGroups;
protected $userGroupsArray;
- protected $acltags = false;
protected $access = false;
protected $L1fieldName = '';
@@ -69,8 +68,6 @@ class Tree {
enterprise_include_once("include/functions_agents.php");
if (is_metaconsole()) enterprise_include_once("meta/include/functions_ui_meta.php");
-
- $this->acltags = tags_get_user_groups_and_tags($config['id_user'], $this->access);
}
public function setFilter($filter) {
@@ -93,12 +90,12 @@ class Tree {
if (empty($this->filter['searchModule'])) {
return "";
}
- return " AND tam.nombre LIKE '%".$this->filter['searchModule']."%' ";
+ return " AND tam.nombre LIKE '%%".$this->filter['searchModule']."%%' ";
}
protected function getAgentSearchFilter() {
if (empty($this->filter['searchAgent'])) return "";
- return " AND LOWER(ta.alias) LIKE LOWER('%".$this->filter['searchAgent']."%')";
+ return " AND LOWER(ta.alias) LIKE LOWER('%%".$this->filter['searchAgent']."%%')";
}
@@ -205,26 +202,19 @@ class Tree {
return "AND ta.$field_filter > 0" . $show_init_condition;
}
- // FIXME: Separate and condition from inner join
protected function getTagJoin () {
- // $parent is the agent id
- $group_id = (int) db_get_value('id_grupo', 'tagente', 'id_agente', $this->id);
- $tag_join = '';
- if (empty($group_id)) {
- // ACL error, this will restrict the module search
- $tag_join = 'INNER JOIN ttag_module tta
- ON 1=0';
- }
- else if (!empty($this->acltags) && isset($this->acltags[$group_id])) {
- $tags_str = $this->acltags[$group_id];
+ return 'INNER JOIN ttag_module ttm
+ ON tam.id_agente_modulo = ttm.id_agente_modulo';
+ }
- if (!empty($tags_str)) {
- $tag_join = sprintf('INNER JOIN ttag_module ttm
- ON tam.id_agente_modulo = ttm.id_agente_modulo
- AND ttm.id_tag IN (%s)', $tags_str);
- }
- }
- return $tag_join;
+ protected function getTagCondition () {
+ $tags = tags_get_user_applied_agent_tags($this->id, "AR");
+ // All tags permision, returns no condition
+ if ($tags === true) return "";
+ // No permision, do not show anything
+ if ($tags === false) return " AND 1=0";
+ $tags_sql = implode(',', $tags);
+ return "AND ttm.id_tag IN ($tags_sql)";;
}
protected function getModuleStatusFilterFromTestado ($state = false, $without_ands = false) {
@@ -268,7 +258,7 @@ class Tree {
protected function getGroupSearchFilter() {
if (empty($this->filter['searchGroup'])) return "";
- return " AND tg.nombre LIKE '%" . $this->filter['searchGroup'] . "%'";
+ return " AND tg.nombre LIKE '%%" . $this->filter['searchGroup'] . "%%'";
}
static function cmpSortNames($a, $b) {
@@ -900,7 +890,8 @@ class Tree {
$module_search_filter = $this->getModuleSearchFilter();
$module_status_filter = $this->getModuleStatusFilterFromTestado();
$agent_filter = "AND ta.id_agente = " . $this->id;
- $tag_join = $this->getTagJoin();
+ $tag_condition = $this->getTagCondition();
+ $tag_join = empty($tag_condition) ? '' : $this->getTagJoin();
$condition = $this->L2condition;
$inner = $this->L2inner;
@@ -909,9 +900,6 @@ class Tree {
tam.id_tipo_modulo, tam.id_modulo, tae.estado, tae.datos,
tam.parent_module_id AS parent, tatm.id AS alerts';
- // has any of this tags.
- $tag_join = '';
-
$sql = "SELECT $columns
FROM tagente_modulo tam
$tag_join
@@ -932,6 +920,7 @@ class Tree {
$agent_status_filter
$module_status_filter
$module_search_filter
+ $tag_condition
ORDER BY tam.nombre ASC, tam.id_agente_modulo ASC";
return $sql;
}
diff --git a/pandora_console/include/class/TreeGroup.class.php b/pandora_console/include/class/TreeGroup.class.php
index af5542e396..ced6b8d442 100644
--- a/pandora_console/include/class/TreeGroup.class.php
+++ b/pandora_console/include/class/TreeGroup.class.php
@@ -20,6 +20,7 @@ require_once($config['homedir']."/include/class/Tree.class.php");
class TreeGroup extends Tree {
protected $propagateCounters = true;
+ protected $displayAllGroups = false;
public function __construct($type, $rootType = '', $id = -1, $rootID = -1, $serverID = false, $childrenMethod = "on_demand", $access = 'AR') {
@@ -44,6 +45,10 @@ class TreeGroup extends Tree {
$this->propagateCounters = (bool)$value;
}
+ public function setDisplayAllGroups($value) {
+ $this->displayAllGroups = (bool)$value;
+ }
+
protected function getData() {
if ($this->id == -1) {
$this->getFirstLevel();
@@ -132,12 +137,13 @@ class TreeGroup extends Tree {
return !$group['have_parent'];
});
// Propagate child counters to her parents
+
if ($this->propagateCounters) {
TreeGroup::processCounters($groups);
// Filter groups and eliminates the reference to empty groups
- $groups = TreeGroup::deleteEmptyGroups($groups);
+ $groups = $this->deleteEmptyGroups($groups);
} else {
- $groups = TreeGroup::deleteEmptyGroupsNotPropagate($groups);
+ $groups = $this->deleteEmptyGroupsNotPropagate($groups);
}
usort($groups, array("Tree", "cmpSortNames"));
@@ -345,7 +351,8 @@ class TreeGroup extends Tree {
*
* @return new_groups A new groups structure without empty groups
*/
- protected static function deleteEmptyGroups ($groups) {
+ protected function deleteEmptyGroups ($groups) {
+ if($this->displayAllGroups) return $groups;
$new_groups = array();
foreach ($groups as $group) {
// If a group is empty, do not add to new_groups.
@@ -354,7 +361,7 @@ class TreeGroup extends Tree {
}
// Tray to remove the children groups
if (!empty($group['children'])) {
- $children = TreeGroup::deleteEmptyGroups ($group['children']);
+ $children = $this->deleteEmptyGroups ($group['children']);
if (empty($children)) unset($group['children']);
else $group['children'] = $children;
}
@@ -363,12 +370,13 @@ class TreeGroup extends Tree {
return $new_groups;
}
- protected static function deleteEmptyGroupsNotPropagate ($groups) {
+ protected function deleteEmptyGroupsNotPropagate ($groups) {
+ if($this->displayAllGroups) return $groups;
$new_groups = array();
foreach ($groups as $group) {
// Tray to remove the children groups
if (!empty($group['children'])) {
- $children = TreeGroup::deleteEmptyGroupsNotPropagate ($group['children']);
+ $children = $this->deleteEmptyGroupsNotPropagate ($group['children']);
if (empty($children)) {
unset($group['children']);
// If a group is empty, do not add to new_groups.
diff --git a/pandora_console/include/class/TreeTag.class.php b/pandora_console/include/class/TreeTag.class.php
index c6562db725..c02fb7ba4a 100644
--- a/pandora_console/include/class/TreeTag.class.php
+++ b/pandora_console/include/class/TreeTag.class.php
@@ -48,6 +48,14 @@ class TreeTag extends Tree {
$this->getThirdLevel();
}
}
+
+ protected function getTagJoin () {
+ return '';
+ }
+
+ protected function getTagCondition () {
+ return '';
+ }
}
?>
diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php
index eee0eda964..73bd8edc1f 100644
--- a/pandora_console/include/config_process.php
+++ b/pandora_console/include/config_process.php
@@ -22,7 +22,7 @@
/**
* Pandora build version and version
*/
-$build_version = 'PC180918';
+$build_version = 'PC181016';
$pandora_version = 'v7.0NG.727';
// Do not overwrite default timezone set if defined.
diff --git a/pandora_console/include/functions_agents.php b/pandora_console/include/functions_agents.php
index 5bdd03a418..2e9ef1f55f 100644
--- a/pandora_console/include/functions_agents.php
+++ b/pandora_console/include/functions_agents.php
@@ -336,32 +336,39 @@ function agents_get_agents ($filter = false, $fields = false,
if (isset($filter['status'])) {
switch ($filter['status']) {
case AGENT_STATUS_NORMAL:
- $status_sql =
- "normal_count = total_count
- AND notinit_count <> total_count";
+ $status_sql = "(
+ critical_count = 0
+ AND warning_count = 0
+ AND unknown_count = 0
+ AND normal_count > 0)";
break;
case AGENT_STATUS_WARNING:
- $status_sql =
- "critical_count = 0 AND warning_count > 0";
+ $status_sql = "(
+ critical_count = 0
+ AND warning_count > 0
+ AND total_count > 0)";
break;
case AGENT_STATUS_CRITICAL:
- $status_sql =
- "critical_count > 0";
+ $status_sql = "critical_count > 0";
break;
case AGENT_STATUS_UNKNOWN:
- $status_sql =
- "critical_count = 0 AND warning_count = 0
- AND unknown_count > 0";
+ $status_sql = "(
+ critical_count = 0
+ AND warning_count = 0
+ AND unknown_count > 0)";
break;
case AGENT_STATUS_NOT_NORMAL:
- $status_sql =
- "(
- normal_count <> total_count
- AND
- (normal_count + notinit_count) <> total_count)";
+ $status_sql = "(
+ critical_count > 0
+ OR warning_count > 0
+ OR unknown_count > 0
+ OR total_count = 0
+ OR total_count = notinit_count)";
break;
case AGENT_STATUS_NOT_INIT:
- $status_sql = "notinit_count = total_count";
+ $status_sql = "(
+ total_count = 0
+ OR total_count = notinit_count)";
break;
}
unset($filter['status']);
@@ -592,7 +599,6 @@ function agents_process_manage_config ($source_id_agent, $destiny_id_agents, $co
$module = modules_get_agentmodule ($id_agent_module);
if ($module === false)
return false;
-
$modules = agents_get_modules ($id_destiny_agent, false,
array ('nombre' => $module['nombre'], 'disabled' => false));
@@ -818,8 +824,9 @@ function agents_get_group_agents (
$filter = array();
if (!$noACL) {
- $id_group = groups_safe_acl($config["id_user"], $id_group, "AR");
-
+ $id_group = $id_group == 0
+ ? array_keys(users_get_groups(false, "AR", false))
+ : groups_safe_acl($config["id_user"], $id_group, "AR");
if (empty ($id_group)) {
//An empty array means the user doesn't have access
return array ();
@@ -915,23 +922,39 @@ function agents_get_group_agents (
if (isset($search['status'])) {
switch ($search['status']) {
case AGENT_STATUS_NORMAL:
- $filter[] = "normal_count = total_count";
+ $filter[] = "(
+ critical_count = 0
+ AND warning_count = 0
+ AND unknown_count = 0
+ AND normal_count > 0)";
break;
case AGENT_STATUS_WARNING:
- $filter[] = "(critical_count = 0 AND warning_count > 0)";
+ $filter[] = "(
+ critical_count = 0
+ AND warning_count > 0
+ AND total_count > 0)";
break;
case AGENT_STATUS_CRITICAL:
$filter[] = "critical_count > 0";
break;
case AGENT_STATUS_UNKNOWN:
- $filter[] = "(critical_count = 0 AND warning_count = 0 AND unknown_count > 0)";
+ $filter[] = "(
+ critical_count = 0
+ AND warning_count = 0
+ AND unknown_count > 0)";
break;
case AGENT_STATUS_NOT_NORMAL:
- $filter[] = "normal_count <> total_count
- AND critical_count = 0 AND warning_count = 0";
+ $filter[] = "(
+ critical_count > 0
+ OR warning_count > 0
+ OR unknown_count > 0
+ OR total_count = 0
+ OR total_count = notinit_count)";
break;
case AGENT_STATUS_NOT_INIT:
- $filter[] = "notinit_count = total_count";
+ $filter[] = "(
+ total_count = 0
+ OR total_count = notinit_count)";
break;
}
unset($search['status']);
@@ -1054,7 +1077,8 @@ function agents_get_modules ($id_agent = null, $details = false,
if (empty($userGroups)) {
return array();
}
- $id_userGroups = $id_groups = array_keys($userGroups);
+ $id_groups = array_keys($userGroups);
+ $id_groups_sql = implode(',', $id_groups);
// =================================================================
// When there is not a agent id. Get a agents of groups that the
@@ -1084,49 +1108,25 @@ function agents_get_modules ($id_agent = null, $details = false,
if (!is_array($id_agent)) {
$id_agent = safe_int ($id_agent, 1);
}
-
- $where = "(
- 1 = (
- SELECT is_admin
- FROM tusuario
- WHERE id_user = '" . $config['id_user'] . "'
- )
- OR
- tagente_modulo.id_agente IN (
- SELECT id_agente
- FROM tagente tas LEFT JOIN tagent_secondary_group tasgs
- ON tas.id_agente = tasgs.id_agent
- WHERE (tas.id_grupo IN (
- " . implode(',', $id_userGroups) . "
- ) OR
- tasgs.id_group IN (
- " . implode(',', $id_userGroups) . "
- )
- )
- )
- OR 0 IN (
- SELECT id_grupo
- FROM tusuario_perfil
- WHERE id_usuario = '" . $config['id_user'] . "'
- AND id_perfil IN (
- SELECT id_perfil
- FROM tperfil WHERE agent_view = 1
- )
- )
+
+ $where = "1 = 1 ";
+ // Groups ACL only when user is not empty
+ if (!users_can_manage_group_all("AR")) {
+ $where = "(
+ tagente.id_grupo IN ($id_groups_sql) OR tasg.id_group IN ($id_groups_sql)
)";
-
- if (! empty ($id_agent)) {
- $where .= sprintf (' AND id_agente IN (%s)', implode (",", (array) $id_agent));
}
-
- $where .= ' AND delete_pending = 0 ';
-
+
+ if (! empty ($id_agent)) {
+ $id_agent_sql = implode (",", (array)$id_agent);
+ $where .= " AND tagente.id_agente IN ($id_agent_sql) ";
+ }
+
if (! empty ($filter)) {
$where .= ' AND ';
if (is_array ($filter)) {
$fields = array ();
-
-
+
//----------------------------------------------------------
// Code for filters as array of arrays
// for example:
@@ -1151,11 +1151,10 @@ function agents_get_modules ($id_agent = null, $details = false,
}
}
//----------------------------------------------------------
-
foreach ($list_filter as $item) {
$field = $item['field'];
$value = $item['value'];
-
+
//Check <> operator
$operatorDistin = false;
if (strlen($value) > 2) {
@@ -1163,119 +1162,91 @@ function agents_get_modules ($id_agent = null, $details = false,
$operatorDistin = true;
}
}
-
+
if ($value[0] == '%') {
- switch ($config['dbtype']) {
- case "mysql":
- case "postgresql":
- array_push ($fields,
- $field . ' LIKE "' . $value . '"');
- break;
- case "oracle":
- array_push ($fields,
- $field . ' LIKE \'' . $value . '\'');
- break;
- }
+ array_push ($fields,
+ $field . ' LIKE "' . $value . '"');
}
else if ($operatorDistin) {
array_push($fields, $field.' <> ' . substr($value, 2));
}
else if (substr($value, -1) == '%') {
- switch ($config['dbtype']) {
- case "mysql":
- case "postgresql":
- array_push ($fields, $field.' LIKE "'.$value.'"');
- break;
- case "oracle":
- array_push ($fields, $field.' LIKE \''.$value.'\'');
- break;
- }
+ array_push ($fields, $field.' LIKE "'.$value.'"');
}
- //else if (strstr($value, '666=666', true) == '') {
else if (strncmp($value, '666=666', 7) == 0) {
- switch ($config['dbtype']) {
- case "mysql":
- case "postgresql":
- array_push ($fields, ' '.$value);
- break;
- case "oracle":
- array_push ($fields, ' '.$value);
- break;
- }
+ array_push ($fields, ' '.$value);
}
else if (preg_match('/\bin\b/i',$field)) {
array_push ($fields, $field.' '.$value);
}
else {
- switch ($config["dbtype"]) {
- case "mysql":
- array_push ($fields, $field.' = "'.$value.'"');
- break;
- case "postgresql":
- array_push ($fields, $field.' = \''.$value.'\'');
- break;
- case "oracle":
- if (is_int ($value) || is_float ($value) || is_double ($value))
- array_push ($fields, $field.' = '.$value.'');
- else
- array_push ($fields, $field.' = \''.$value.'\'');
- break;
- }
+ array_push ($fields, 'tagente_modulo.' . $field.' = "'.$value.'"');
}
}
- $where .= implode (' AND ', $fields);
+ $where .= implode (' AND ', $fields);
}
else {
$where .= $filter;
}
}
-
+
+ $stored_details = $details;
if (empty ($details)) {
- $details = "nombre";
+ $details = "tagente_modulo.nombre";
+ $stored_details = "nombre";
}
- else {
+ else {
+ $details = (array)$details;
$details = io_safe_input ($details);
+ $details = array_map(function ($a) {
+ return preg_match('/tagente_modulo./i', $a) ? $a : 'tagente_modulo.' . $a;
+ },$details
+ );
}
-
- //$where .= " AND id_policy_module = 0 ";
-
+
+ $sql_tags_join = "";
if (tags_has_user_acl_tags($config['id_user'])){
$where_tags = tags_get_acl_tags($config['id_user'], $id_groups, 'AR',
'module_condition', 'AND', 'tagente_modulo', false, array(),
- true);
-
+ true);
$where .= "\n\n" . $where_tags;
+ $sql_tags_join = "INNER JOIN ttag_module
+ ON ttag_module.id_agente_modulo = tagente_modulo.id_agente_modulo";
}
-
+
$sql = sprintf ('SELECT %s%s
FROM tagente_modulo
- WHERE
- %s
- ORDER BY nombre',
- ($details != '*' && $indexed) ? 'id_agente_modulo,' : '',
+ %s
+ INNER JOIN tagente
+ ON tagente.id_agente = tagente_modulo.id_agente
+ LEFT JOIN tagent_secondary_group tasg
+ ON tagente.id_agente = tasg.id_agent
+ WHERE tagente_modulo.delete_pending = 0
+ AND %s
+ GROUP BY tagente_modulo.id_agente_modulo
+ ORDER BY tagente_modulo.nombre',
+ ($details != 'tagente_modulo.*' && $indexed) ? 'tagente_modulo.id_agente_modulo,' : '',
io_safe_output(implode (",", (array) $details)),
+ $sql_tags_join,
$where);
-
-
$result = db_get_all_rows_sql ($sql);
-
-
+
if (empty ($result)) {
return array ();
}
-
+
if (! $indexed)
return $result;
-
+
$modules = array ();
foreach ($result as $module) {
if ($get_not_init_modules || modules_get_agentmodule_is_init($module['id_agente_modulo'])) {
- if (is_array ($details) || $details == '*') {
+ if (is_array ($stored_details) || $stored_details == '*') {
//Just stack the information in array by ID
$modules[$module['id_agente_modulo']] = $module;
}
else {
- $modules[$module['id_agente_modulo']] = $module[$details];
+ $modules[$module['id_agente_modulo']] = $module[$stored_details];
}
}
}
@@ -1377,55 +1348,6 @@ function agents_get_alias_by_name ($name, $case = 'none') {
}
}
-/**
- * Get the number of pandora data packets in the database.
- *
- * In case an array is passed, it will have a value for every agent passed
- * incl. a total otherwise it will just return the total
- *
- * @param mixed Agent id or array of agent id's, 0 for all
- *
- * @return mixed The number of data in the database
- */
-function agents_get_modules_data_count ($id_agent = 0) {
- $id_agent = safe_int ($id_agent, 1);
-
- if (empty ($id_agent)) {
- $id_agent = array ();
- }
- else {
- $id_agent = (array) $id_agent;
- }
-
- $count = array ();
- $count["total"] = 0;
-
- $query[0] = "SELECT COUNT(*) FROM tagente_datos";
-
- foreach ($id_agent as $agent_id) {
- //Init value
- $count[$agent_id] = 0;
- $modules = array_keys (agents_get_modules ($agent_id));
- foreach ($query as $sql) {
- //Add up each table's data
- //Avoid the count over empty array
- if (!empty($modules))
- $count[$agent_id] += (int) db_get_sql ($sql .
- " WHERE id_agente_modulo IN (".implode (",", $modules).")", 0, true);
- }
- //Add total agent count to total count
- $count["total"] += $count[$agent_id];
- }
-
- if ($count["total"] == 0) {
- foreach ($query as $sql) {
- $count["total"] += (int) db_get_sql ($sql, 0, true);
- }
- }
-
- return $count; //Return the array
-}
-
/**
* Check if an agent has alerts fired.
*
@@ -2025,11 +1947,17 @@ function agents_get_agentmodule_group ($id_module) {
* This function gets the group for a given agent
*
* @param int The agent id
+ * @param bool True to use the metaconsole tables
*
* @return int The group id
*/
-function agents_get_agent_group ($id_agent) {
- return (int) db_get_value ('id_grupo', "tagente", 'id_agente', (int) $id_agent);
+function agents_get_agent_group ($id_agent, $force_meta = false) {
+ return (int) db_get_value (
+ 'id_grupo',
+ $force_meta ? "tmetaconsole_agent" : "tagente",
+ 'id_agente',
+ (int) $id_agent
+ );
}
/**
@@ -2173,23 +2101,6 @@ function agents_monitor_total ($id_agent, $filter = '', $disabled = false) {
return db_get_sql ($sql);
}
-//Get alert fired for this agent
-
-function agents_get_alerts_fired ($id_agent, $filter="") {
-
- $modules_agent = agents_get_modules($id_agent, "id_agente_modulo", $filter);
-
- if (empty($modules_agent)) {
- return 0;
- }
-
- $mod_clause = "(".implode(",", $modules_agent).")";
-
- return db_get_sql ("SELECT COUNT(times_fired)
- FROM talert_template_modules
- WHERE times_fired != 0 AND id_agent_module IN ".$mod_clause);
-}
-
//Returns the alert image to display tree view
function agents_tree_view_alert_img ($alert_fired) {
@@ -2424,8 +2335,7 @@ function agents_get_network_interfaces ($agents = false, $agents_filter = false)
else
$columns[] = 'descripcion';
- $filter = " id_agente = $agent_id AND disabled = 0 AND id_tipo_modulo IN (".implode(",", $accepted_module_types).") AND (nombre LIKE '%_ifOperStatus' OR nombre LIKE 'ifOperStatus_%')";
-
+ $filter = " tagente_modulo.id_agente = $agent_id AND tagente_modulo.disabled = 0 AND tagente_modulo.id_tipo_modulo IN (".implode(",", $accepted_module_types).") AND (tagente_modulo.nombre LIKE '%_ifOperStatus' OR tagente_modulo.nombre LIKE 'ifOperStatus_%')";
$modules = agents_get_modules($agent_id, $columns, $filter, true, false);
if (!empty($modules)) {
@@ -2491,10 +2401,10 @@ function agents_get_network_interfaces ($agents = false, $agents_filter = false)
);
if($type_interface){
- $interface_traffic_modules = agents_get_modules($agent_id, $columns, "nombre LIKE '". $interface_name . "_if%Octets'");
+ $interface_traffic_modules = agents_get_modules($agent_id, $columns, "tagente_modulo.nombre LIKE '". $interface_name . "_if%Octets'");
}
else{
- $interface_traffic_modules = agents_get_modules($agent_id, $columns, "nombre LIKE 'if%Octets_$interface_name'");
+ $interface_traffic_modules = agents_get_modules($agent_id, $columns, "tagente_modulo.nombre LIKE 'if%Octets_$interface_name'");
}
if (!empty($interface_traffic_modules) && count($interface_traffic_modules) >= 2) {
@@ -2582,85 +2492,173 @@ function agents_get_agent_custom_field ($agent_id, $custom_field_name) {
return db_get_value_sql($sql);
}
-function select_modules_for_agent_group($id_group, $id_agents,
- $selection, $return = true) {
-
- $agents = implode(",", $id_agents);
-
+function select_modules_for_agent_group(
+ $id_group, $id_agents, $selection, $return = true, $index_by_name = false
+) {
+ global $config;
+ $agents = (empty($id_agents)) ? array() : implode(",", $id_agents);
+
+ $filter_agent_group = "";
$filter_group = "";
$filter_agent = "";
+ $selection_filter = "";
+ $sql_conditions_tags = "";
+ $sql_tags_inner = "";
+
+ $groups = array_keys(users_get_groups(false, "AR", false));
if ($id_group != 0) {
- $filter_group = " AND id_module_group = ". $id_group;
+ $filter_group = " AND tagente_modulo.id_module_group = ". $id_group;
}
if ($agents != null) {
- $filter_agent = " AND id_agente IN (" . $agents . ")";
+ $filter_agent = " AND tagente.id_agente IN (" . $agents . ")";
+ }
+ if (!users_can_manage_group_all("AR")) {
+ $group_string = implode(',', $groups);
+ $filter_agent_group = " AND (
+ tagente.id_grupo IN ($group_string)
+ OR tasg.id_group IN ($group_string)
+ )";
+ }
+ if (!$selection && $agents != null) {
+ $number_agents = count($id_agents);
+ $selection_filter = "HAVING COUNT(id_agente_modulo) = $number_agents";
}
- if ($selection == 1 || (count($id_agents) == 1)) {
- $modules = db_get_all_rows_sql("SELECT DISTINCT nombre, id_agente_modulo
- FROM tagente_modulo
- WHERE 1 = 1" . $filter_agent . $filter_group);
-
- if (empty($modules)) $modules = array();
-
- $found = array();
- foreach ($modules as $i=>$row) {
- $check = $row['nombre'];
- if (@$found[$check]++) {
- unset($modules[$i]);
- }
- }
+ if (tags_has_user_acl_tags(false)){
+ $sql_conditions_tags = tags_get_acl_tags(
+ $config['id_user'], $groups, 'AR',
+ 'module_condition', 'AND', 'tagente_modulo', true, array(),
+ false);
+ $sql_tags_inner = "INNER JOIN ttag_module
+ ON ttag_module.id_agente_modulo = tagente_modulo.id_agente_modulo";
}
- else {
- $modules = db_get_all_rows_sql("SELECT nombre, id_agente_modulo
- FROM tagente_modulo
- WHERE 1 = 1" . $filter_agent . $filter_group);
- if (empty($modules)) $modules = array();
+ $sql = "SELECT * FROM
+ (
+ SELECT DISTINCT(tagente_modulo.id_agente_modulo), tagente_modulo.nombre
+ FROM tagente_modulo
+ $sql_tags_inner
+ INNER JOIN tagente
+ ON tagente.id_agente = tagente_modulo.id_agente
+ LEFT JOIN tagent_secondary_group tasg
+ ON tagente.id_agente = tasg.id_agent
+ WHERE tagente.disabled = 0
+ AND tagente_modulo.disabled = 0
+ $filter_agent_group
+ $filter_group
+ $filter_agent
+ $sql_conditions_tags
+ ) x
+ GROUP BY nombre
+ $selection_filter";
- foreach ($modules as $m) {
- $is_in_all_agents = true;
- $module_name = $m['nombre'];
- foreach ($id_agents as $a) {
- $module_in_agent = db_get_value_filter('id_agente_modulo',
- 'tagente_modulo', array('id_agente' => $a, 'nombre' => $module_name));
- if (!$module_in_agent) {
- $is_in_all_agents = false;
- }
- }
- if ($is_in_all_agents) {
- $modules_to_report[] = $m;
- }
- }
- $modules = $modules_to_report;
+ $modules = db_get_all_rows_sql($sql);
+ if ($modules === false) $modules = array();
- $found = array();
- if (is_array($modules) || is_object($modules)){
- foreach ($modules as $i=>$row) {
- $check = $row['nombre'];
- if (@$found[$check]++) {
- unset($modules[$i]);
- }
- }
- }
- }
- if (is_array($modules) || is_object($modules)){
- foreach ($modules as $k => $v) {
- $modules[$k] = io_safe_output($v);
- }
- }
-
- if($return == false){
- foreach ($modules as $value) {
- $modules_array[$value['id_agente_modulo']] = $value['nombre'];
- }
- return $modules_array;
- }
- else{
+ if ($return) {
echo json_encode($modules);
return;
}
+
+ $modules_array = array();
+ foreach ($modules as $value) {
+ if($index_by_name) {
+ $modules_array[io_safe_output($value['nombre'])] =
+ ui_print_truncate_text(
+ io_safe_output($value['nombre']), 'module_medium', false, true
+ );
+ } else {
+ $modules_array[$value['id_agente_modulo']] = $value['nombre'];
+ }
+ }
+ return $modules_array;
+}
+
+function select_agents_for_module_group(
+ $module_names, $selection, $filter, $access = "AR"
+) {
+ global $config;
+
+ $default_filter = array (
+ 'status' => null
+ );
+
+ $filter = array_merge($default_filter, $filter);
+
+ $module_names_condition = "";
+ $filter_agent_group = "";
+ $selection_filter = "";
+ $sql_conditions_tags = "";
+ $sql_tags_inner = "";
+ $status_filter = "";
+ $module_type_filter = "";
+
+ $groups = array_keys(users_get_groups(false, $access, false));
+
+ // Name
+ if (!users_can_manage_group_all($access)) {
+ $group_string = implode(',', $groups);
+ $filter_agent_group = " AND (
+ tagente.id_grupo IN ($group_string)
+ OR tasg.id_group IN ($group_string)
+ )";
+ }
+
+ // Name filter
+ if ($module_names) {
+ $module_names_sql = implode("','", $module_names);
+ $module_names_condition = " AND tagente_modulo.nombre IN ('$module_names_sql') ";
+ }
+
+ // Common or all modules filter
+ if (!$selection) {
+ $number_modules = count($module_names);
+ $selection_filter = "HAVING COUNT(id_agente) = $number_modules";
+ }
+
+ // Status filter
+ if ($filter['status'] != null) {
+ $status_filter = " AND " . modules_get_state_condition(
+ $filter['status'], "tagente_estado"
+ );
+ }
+
+ // Tags input and ACL conditions
+ if (tags_has_user_acl_tags(false) || $filter['tags'] != null){
+ $sql_conditions_tags = tags_get_acl_tags(
+ $config['id_user'], $groups, $access,
+ 'module_condition', 'AND', 'tagente_modulo', true, array(),
+ false);
+ $sql_tags_inner = "INNER JOIN ttag_module
+ ON ttag_module.id_agente_modulo = tagente_modulo.id_agente_modulo";
+ }
+
+ $sql = "SELECT * FROM
+ (
+ SELECT tagente.id_agente, tagente.alias
+ FROM tagente
+ LEFT JOIN tagent_secondary_group tasg
+ ON tagente.id_agente = tasg.id_agent
+ INNER JOIN tagente_modulo
+ ON tagente.id_agente = tagente_modulo.id_agente
+ $sql_tags_inner
+ LEFT JOIN tagente_estado
+ ON tagente_estado.id_agente_modulo = tagente_modulo.id_agente_modulo
+ WHERE tagente.disabled = 0
+ AND tagente_modulo.disabled = 0
+ $module_names_condition
+ $filter_agent_group
+ $sql_conditions_tags
+ $status_filter
+ $module_type_filter
+ GROUP BY tagente_modulo.id_agente_modulo
+ ) x
+ GROUP BY id_agente
+ $selection_filter";
+ $modules = db_get_all_rows_sql($sql);
+ if ($modules === false) return array();
+ return index_array(db_get_all_rows_sql($sql), 'id_agente', 'alias');
}
/**
@@ -2680,20 +2678,22 @@ function agents_generate_name ($alias, $address = '') {
*
* @param int $id_agent
* @param int $id_group. By default it will search for it in dtabase
+ * @param bool True to use the metaconsole tables
*
* @return Array with the main and secondary groups
*/
-function agents_get_all_groups_agent ($id_agent, $group = false) {
+function agents_get_all_groups_agent ($id_agent, $group = false, $force_meta = false) {
// Cache the agent id groups
static $cache = array();
if (isset($cache[$id_agent])) return $cache[$id_agent];
// Get the group if is not defined
- if ($group === false) $group = agents_get_agent_group($id_agent);
+ if ($group === false) $group = agents_get_agent_group($id_agent, $force_meta);
// If cannot retrieve the group, it means that agent does not exist
if (!$group) return array();
- $secondary_groups = enterprise_hook('agents_get_secondary_groups', array($id_agent));
+ enterprise_include_once('include/functions_agents.php');
+ $secondary_groups = enterprise_hook('agents_get_secondary_groups', array($id_agent, $force_meta));
// Return only an array with the group in open version
if ($secondary_groups == ENTERPRISE_NOT_HOOK) return array($group);
@@ -2755,7 +2755,7 @@ function agents_get_status_clause($state, $show_not_init = true) {
)";
case AGENT_STATUS_NOT_INIT:
return $show_not_init
- ? "(ta.total_count = ta.notinit_count)"
+ ? "(ta.total_count = ta.notinit_count OR ta.total_count = 0)"
: "1=0";
case AGENT_STATUS_NORMAL:
return "(
diff --git a/pandora_console/include/functions_alerts.php b/pandora_console/include/functions_alerts.php
index 84419f5ab4..17cc0c8bde 100644
--- a/pandora_console/include/functions_alerts.php
+++ b/pandora_console/include/functions_alerts.php
@@ -1019,14 +1019,16 @@ function alerts_create_alert_agent_module ($id_agent_module, $id_alert_template,
* @return mixed Affected rows or false if something goes wrong.
*/
function alerts_update_alert_agent_module ($id_alert_agent_module, $values) {
- if (empty ($id_agent_module))
+
+ if (empty ($id_alert_agent_module))
return false;
+
if (! is_array ($values))
return false;
-
+
return (@db_process_sql_update ('talert_template_modules',
$values,
- array ('id' => $id_alert_template))) !== false;
+ array ('id' => $id_alert_agent_module))) !== false;
}
/**
@@ -1311,13 +1313,25 @@ function alerts_delete_alert_agent_module_action ($id_alert_agent_module_action)
*
* @return mixed Actions associated or false if something goes wrong.
*/
-function alerts_get_alert_agent_module_actions ($id_alert_agent_module, $fields = false) {
+function alerts_get_alert_agent_module_actions ($id_alert_agent_module, $fields = false, $server_id = -1) {
if (empty ($id_alert_agent_module))
return false;
-
- $actions = db_get_all_rows_filter ('talert_template_module_actions',
- array ('id_alert_template_module' => $id_alert_agent_module),
- $fields);
+
+ if (defined('METACONSOLE')) {
+ $server = db_get_row ('tmetaconsole_setup', 'id', $server_id);
+
+ if (metaconsole_connect($server) == NOERR) {
+ $actions = db_get_all_rows_filter ('talert_template_module_actions',
+ array ('id_alert_template_module' => $id_alert_agent_module),
+ $fields);
+
+ metaconsole_restore_db ();
+ }
+ } else {
+ $actions = db_get_all_rows_filter ('talert_template_module_actions',
+ array ('id_alert_template_module' => $id_alert_agent_module),
+ $fields);
+ }
if ($actions === false)
return array ();
@@ -1810,23 +1824,6 @@ function get_group_alerts($id_group, $filter = '', $options = false,
FROM tagente_modulo WHERE delete_pending = 0';
}
- if ($strict_user) {
- $groups = users_get_groups($config["id_user"]);
-
- if ($idGroup !== 0) {
- $where_tags = tags_get_acl_tags($config['id_user'], $idGroup, 'AR', 'module_condition', 'AND', 'tagente_modulo', true, array(), true);
- } else {
- $where_tags = tags_get_acl_tags($config['id_user'], array_keys($groups), 'AR', 'module_condition', 'AND', 'tagente_modulo', true, array(), true);
- }
-
- // If there are any errors add imposible condition
- if (in_array($where_tags, array(ERR_WRONG_PARAMETERS, ERR_ACL))) {
- $subQuery .= ' AND 1 = 0';
- }
- else {
- $subQuery .= $where_tags;
- }
- }
}
else {
if ($allModules)
diff --git a/pandora_console/include/functions_api.php b/pandora_console/include/functions_api.php
index 189cc4203b..b71306456e 100644
--- a/pandora_console/include/functions_api.php
+++ b/pandora_console/include/functions_api.php
@@ -1175,11 +1175,14 @@ function api_set_update_agent($id_agent, $thrash2, $other, $thrash3) {
return;
}
}
+ $values_old = db_get_row_filter('tagente',
+ array('id_agente' => $id_agent),
+ array('id_grupo', 'disabled')
+ );
+ $tpolicy_group_old = db_get_all_rows_sql("SELECT id_policy FROM tpolicy_groups
+ WHERE id_group = ".$values_old['id_grupo']);
- $group_old = db_get_sql("SELECT id_grupo FROM tagente WHERE id_agente =" .$id_agent);
- $tpolicy_group_old = db_get_all_rows_sql("SELECT id_policy FROM tpolicy_groups
- WHERE id_group = ".$group_old);
-
+
$return = db_process_sql_update('tagente',
array('alias' => $alias,
'direccion' => $ip,
@@ -1200,8 +1203,16 @@ function api_set_update_agent($id_agent, $thrash2, $other, $thrash3) {
// register ip for this agent in 'taddress'
agents_add_address ($id_agent, $ip);
}
-
+
if($return){
+ // Update config file
+ if (isset($disabled) && $values_old['disabled'] != $disabled) {
+ enterprise_hook(
+ 'config_agents_update_config_token',
+ array($id_agent, 'standby', $disabled)
+ );
+ }
+
if($tpolicy_group_old){
foreach ($tpolicy_group_old as $key => $value) {
$tpolicy_agents_old= db_get_sql("SELECT * FROM tpolicy_agents
@@ -1391,6 +1402,68 @@ function api_set_new_agent($thrash1, $thrash2, $other, $thrash3) {
}
}
+
+function api_set_create_os($thrash1, $thrash2, $other, $thrash3) {
+ global $config;
+
+
+ if (!check_acl($config['id_user'], 0, "AW")) {
+ returnError('forbidden', 'string');
+ return;
+ }
+
+ if (defined ('METACONSOLE')) {
+ return;
+ }
+
+ $values = array();
+
+ $values['name'] = $other['data'][0];
+ $values['description'] = $other['data'][1];
+
+ if (($other['data'][2] !== 0) && ($other['data'][2] != '')) {
+ $values['icon_name'] = $other['data'][2];
+ }
+
+
+
+ $resultOrId = false;
+ if ($other['data'][0] != '') {
+ $resultOrId = db_process_sql_insert('tconfig_os', $values);
+ }
+
+}
+
+function api_set_update_os($id_os, $thrash2, $other, $thrash3) {
+ global $config;
+
+ if (defined ('METACONSOLE')) {
+ return;
+ }
+
+ if (!check_acl($config['id_user'], 0, "AW")) {
+ returnError('forbidden', 'string');
+ return;
+ }
+
+ $values = array();
+ $values['name'] = $other['data'][0];
+ $values['description'] = $other['data'][1];
+
+ if (($other['data'][2] !== 0) && ($other['data'][2] != '')) {
+ $values['icon_name'] = $other['data'][2];;
+ }
+ $result = false;
+
+
+ if ($other['data'][0] != '') {
+
+ $result = db_process_sql_update('tconfig_os', $values, array('id_os' => $id_os));
+ }
+
+}
+
+
/**
*
* Creates a custom field
@@ -1547,10 +1620,6 @@ function api_set_delete_agent($id, $thrash1, $thrast2, $thrash3) {
function api_get_all_agents($thrash1, $thrash2, $other, $returnType) {
global $config;
- if (defined ('METACONSOLE')) {
- return;
- }
-
// Error if user cannot read agents.
if (!check_acl($config['id_user'], 0, "AR")) {
returnError('forbidden', $returnType);
@@ -1599,13 +1668,25 @@ function api_get_all_agents($thrash1, $thrash2, $other, $returnType) {
// Initialization of array
$result_agents = array();
// Filter by state
- $sql = "SELECT id_agente, alias, direccion, comentarios,
+
+ if (defined ('METACONSOLE')) {
+ $sql = "SELECT id_agente, alias, direccion, comentarios,
tconfig_os.name, url_address, nombre
- FROM tconfig_os, tagente
+ FROM tconfig_os, tmetaconsole_agent
LEFT JOIN tagent_secondary_group
- ON tagente.id_agente = tagent_secondary_group.id_agent
- WHERE tagente.id_os = tconfig_os.id_os
+ ON tmetaconsole_agent.id_agente = tagent_secondary_group.id_agent
+ WHERE tmetaconsole_agent.id_os = tconfig_os.id_os
AND disabled = 0 $where AND $groups";
+ }
+ else{
+ $sql = "SELECT id_agente, alias, direccion, comentarios,
+ tconfig_os.name, url_address, nombre
+ FROM tconfig_os, tagente
+ LEFT JOIN tagent_secondary_group
+ ON tagente.id_agente = tagent_secondary_group.id_agent
+ WHERE tagente.id_os = tconfig_os.id_os
+ AND disabled = 0 $where AND $groups";
+ }
$all_agents = db_get_all_rows_sql($sql);
@@ -1674,6 +1755,18 @@ function api_get_all_agents($thrash1, $thrash2, $other, $returnType) {
$result_agents = $all_agents;
}
+ if (empty($returnType)) {
+ $returnType = "string";
+ }
+
+ if (empty($separator)) {
+ $separator = ";";
+ }
+
+ foreach ($result_agents as $key => $value) {
+ $result_agents[$key]['status'] = agents_get_status($result_agents[$key]['id_agente'], true);
+ }
+
if (count($result_agents) > 0 and $result_agents !== false) {
$data = array('type' => 'array', 'data' => $result_agents);
returnData($returnType, $data, $separator);
@@ -7007,10 +7100,11 @@ function otherParameter2Filter($other, $return_as_array = false) {
$idAgent = null;
if (isset($other['data'][2]) && $other['data'][2] != '') {
- $idAgent = agents_get_agent_id($other['data'][2]);
+ $idAgents = agents_get_agent_id_by_alias($other['data'][2]);
if (!empty($idAgent)) {
- $filter['id_agente'] = $idAgent;
+
+ $filter[] = "id_agente IN (" . explode(",", $idAgents) .")";
}
else {
$filter['sql'] = "1=0";
diff --git a/pandora_console/include/functions_events.php b/pandora_console/include/functions_events.php
index f6b6da21cc..39c5fa59ae 100644
--- a/pandora_console/include/functions_events.php
+++ b/pandora_console/include/functions_events.php
@@ -1531,30 +1531,6 @@ function events_get_all_status ($report = false) {
return $fields;
}
-/**
- * Return all event source.
- *
- * @return array event source array.
- */
-function events_get_all_source () {
- $event_table = events_get_events_table(is_metaconsole(),false);
- $fields = array ();
- $fields[''] = __('All');
-
- if (users_is_admin()) {
- $sources = db_get_all_rows_sql("SELECT DISTINCT(source) FROM ". $event_table);
- } else {
- $groups_user = users_get_groups ($config['id_user'], "ER", true);
- $sources = db_get_all_rows_sql("SELECT DISTINCT(source) FROM ". $event_table. " WHERE id_grupo IN (" .implode(",",array_keys($groups_user)) .")");
- }
-
- foreach ($sources as $key => $source) {
- $fields[$source['source']] = $source['source'];
- }
-
- return $fields;
-}
-
/**
* Decode a numeric status into status description.
*
@@ -2240,12 +2216,7 @@ function events_page_details ($event, $server = "") {
$strict_user = (bool) db_get_value("strict_acl", "tusuario", "id_user", $config['id_user']);
if (!empty($agent['id_grupo'])) {
- if ($strict_user) {
- $acl_graph = tags_check_acl_by_module($module["id_agente_modulo"], $config['id_user'], 'RR') === true;
- }
- else {
- $acl_graph = check_acl($config['id_user'], $agent['id_grupo'], "RR");
- }
+ $acl_graph = check_acl($config['id_user'], $agent['id_grupo'], "RR");
}
if ($acl_graph) {
@@ -3554,7 +3525,6 @@ function events_sql_events_grouped_agents($id_agent, $server_id = -1,
else {
$group_array = array_keys($groups);
}
-
$tags_acls_condition = tags_get_acl_tags($id_user, $group_array, 'ER',
'event_condition', 'AND', '', $meta, array(), true); //FORCE CHECK SQL "(TAG = tag1 AND id_grupo = 1)"
@@ -3600,6 +3570,8 @@ function events_list_events_grouped_agents($sql) {
$table = events_get_events_table(is_metaconsole(), $history);
$sql = "select * from $table
+ LEFT JOIN tagent_secondary_group
+ ON tagent_secondary_group.id_agent = tevento.id_agente
WHERE $sql";
$result = db_get_all_rows_sql ($sql);
diff --git a/pandora_console/include/functions_graph.php b/pandora_console/include/functions_graph.php
index e8fa13df9f..4bb4a26b47 100644
--- a/pandora_console/include/functions_graph.php
+++ b/pandora_console/include/functions_graph.php
@@ -20,210 +20,6 @@ include_once($config['homedir'] . "/include/functions_agents.php");
include_once($config['homedir'] . "/include/functions_modules.php");
include_once($config['homedir'] . "/include/functions_users.php");
-function get_graph_statistics ($chart_array) {
- global $config;
-
- /// IMPORTANT!
- ///
- /// The calculus for AVG, MIN and MAX values are in this function
- /// because it must be done based on graph array data not using reporting
- /// function to get coherent data between stats and graph visualization
-
- $stats = array ();
-
- $count = 0;
-
- $size = sizeof($chart_array);
-
- //Initialize stats array
- $stats = array ("avg" => 0, "min" => null, "max" => null, "last" => 0);
-
- foreach ($chart_array as $item) {
-
- //Sum all values later divide by the number of elements
- $stats['avg'] = $stats['avg'] + $item;
-
- //Get minimum
- if ($stats['min'] == null) {
- $stats['min'] = $item;
- }
- else if ($item < $stats['min']) {
- $stats['min'] = $item;
- }
-
- //Get maximum
- if ($stats['max'] == null) {
- $stats['max'] = $item;
- }
- else if ($item > $stats['max']) {
- $stats['max'] = $item;
- }
-
- $count++;
-
- //Get last data
- if ($count == $size) {
- $stats['last'] = $item;
- }
- }
-
- //End the calculus for average
- if ($count > 0) {
-
- $stats['avg'] = $stats['avg'] / $count;
- }
-
- //Format stat data to display properly
- $stats['last'] = remove_right_zeros(number_format($stats['last'], $config['graph_precision']));
- $stats['avg'] = remove_right_zeros(number_format($stats['avg'], $config['graph_precision']));
- $stats['min'] = remove_right_zeros(number_format($stats['min'], $config['graph_precision']));
- $stats['max'] = remove_right_zeros(number_format($stats['max'], $config['graph_precision']));
-
- return $stats;
-}
-
-function get_statwin_graph_statistics ($chart_array, $series_suffix = '') {
-
- /// IMPORTANT!
- ///
- /// The calculus for AVG, MIN and MAX values are in this function
- /// because it must be done based on graph array data not using reporting
- /// function to get coherent data between stats and graph visualization
-
- $stats = array ();
-
- $count = 0;
-
- $size = sizeof($chart_array);
-
- //Initialize stats array
- $stats['sum'] = array ("avg" => 0, "min" => null, "max" => null, "last" => 0);
- $stats['min'] = array ("avg" => 0, "min" => null, "max" => null, "last" => 0);
- $stats['max'] = array ("avg" => 0, "min" => null, "max" => null, "last" => 0);
-
- foreach ($chart_array as $item) {
- if ($series_suffix != '') {
- if (isset($item['sum' . $series_suffix]))
- $item['sum'] = $item['sum' . $series_suffix];
- if (isset($item['min' . $series_suffix]))
- $item['min'] = $item['min' . $series_suffix];
- if (isset($item['max' . $series_suffix]))
- $item['max'] = $item['max' . $series_suffix];
- }
-
- //Get stats for normal graph
- if (isset($item['sum']) && $item['sum']) {
-
- //Sum all values later divide by the number of elements
- $stats['sum']['avg'] = $stats['sum']['avg'] + $item['sum'];
-
- //Get minimum
- if ($stats['sum']['min'] == null) {
- $stats['sum']['min'] = $item['sum'];
- }
- else if ($item['sum'] < $stats['sum']['min']) {
- $stats['sum']['min'] = $item['sum'];
- }
-
- //Get maximum
- if ($stats['sum']['max'] == null) {
- $stats['sum']['max'] = $item['sum'];
- }
- else if ($item['sum'] > $stats['sum']['max']) {
- $stats['sum']['max'] = $item['sum'];
- }
- }
-
- //Get stats for min graph
- if (isset($item['min']) && $item['min']) {
- //Sum all values later divide by the number of elements
- $stats['min']['avg'] = $stats['min']['avg'] + $item['min'];
-
- //Get minimum
- if ($stats['min']['min'] == null) {
- $stats['min']['min'] = $item['min'];
- }
- else if ($item['min'] < $stats['min']['min']) {
- $stats['min']['min'] = $item['min'];
- }
-
- //Get maximum
- if ($stats['min']['max'] == null) {
- $stats['min']['max'] = $item['min'];
- }
- else if ($item['min'] > $stats['min']['max']) {
- $stats['min']['max'] = $item['min'];
- }
- }
-
- //Get stats for max graph
- if (isset($item['max']) && $item['max']) {
- //Sum all values later divide by the number of elements
- $stats['max']['avg'] = $stats['max']['avg'] + $item['max'];
-
- //Get minimum
- if ($stats['max']['min'] == null) {
- $stats['max']['min'] = $item['max'];
- }
- else if ($item['max'] < $stats['max']['min']) {
- $stats['max']['min'] = $item['max'];
- }
-
- //Get maximum
- if ($stats['max']['max'] == null) {
- $stats['max']['max'] = $item['max'];
- }
- else if ($item['max'] > $stats['max']['max']) {
- $stats['max']['max'] = $item['max'];
- }
- }
-
- //Count elements
- $count++;
-
- //Get last data
- if ($count == $size) {
- if (isset($item['sum']) && $item['sum']) {
- $stats['sum']['last'] = $item['sum'];
- }
-
- if (isset($item['min']) && $item['min']) {
- $stats['min']['last'] = $item['min'];
- }
-
- if (isset($item['max']) && $item['max']) {
- $stats['max']['last'] = $item['max'];
- }
- }
- }
-
- //End the calculus for average
- if ($count > 0) {
-
- $stats['sum']['avg'] = $stats['sum']['avg'] / $count;
- $stats['min']['avg'] = $stats['min']['avg'] / $count;
- $stats['max']['avg'] = $stats['max']['avg'] / $count;
- }
-
- //Format stat data to display properly
- $stats['sum']['last'] = round($stats['sum']['last'], 2);
- $stats['sum']['avg'] = round($stats['sum']['avg'], 2);
- $stats['sum']['min'] = round($stats['sum']['min'], 2);
- $stats['sum']['max'] = round($stats['sum']['max'], 2);
-
- $stats['min']['last'] = round($stats['min']['last'], 2);
- $stats['min']['avg'] = round($stats['min']['avg'], 2);
- $stats['min']['min'] = round($stats['min']['min'], 2);
- $stats['min']['max'] = round($stats['min']['max'], 2);
-
- $stats['max']['last'] = round($stats['max']['last'], 2);
- $stats['max']['avg'] = round($stats['max']['avg'], 2);
- $stats['max']['min'] = round($stats['max']['min'], 2);
- $stats['max']['max'] = round($stats['max']['max'], 2);
-
- return $stats;
-}
-
function grafico_modulo_sparse_data_chart (
$agent_module_id,
$date_array,
@@ -2471,6 +2267,7 @@ function graph_event_module ($width = 300, $height = 200, $id_agent) {
// Fix: tag filters implemented! for tag functionality groups have to be all user_groups (propagate ACL funct!)
$groups = users_get_groups($config["id_user"]);
+
$tags_condition = tags_get_acl_tags($config['id_user'], array_keys($groups), 'ER', 'event_condition', 'AND');
$data = array ();
@@ -2623,382 +2420,6 @@ function graph_sla_slicebar ($id, $period, $sla_min, $sla_max, $date, $daysWeek
$config['fontpath'], $round_corner, $home_url, $ttl);
}
-/**
- * Print a pie graph with purge data of agent
- *
- * @param integer id_agent ID of agent to show
- * @param integer width pie graph width
- * @param integer height pie graph height
- */
-function grafico_db_agentes_purge ($id_agent, $width = 380, $height = 300) {
- global $config;
- global $graphic_type;
-
- $filter = array();
-
- if ($id_agent < 1) {
- $query = "";
- }
- else {
- $modules = agents_get_modules($id_agent);
- $module_ids = array_keys($modules);
-
- if (!empty($module_ids))
- $filter['id_agente_modulo'] = $module_ids;
- }
-
- // All data (now)
- $time_now = time();
-
- // 1 day ago
- $time_1day = $time_now - SECONDS_1DAY;
-
- // 1 week ago
- $time_1week = $time_now - SECONDS_1WEEK;
-
- // 1 month ago
- $time_1month = $time_now - SECONDS_1MONTH;
-
- // Three months ago
- $time_3months = $time_now - SECONDS_3MONTHS;
-
- $query_error = false;
-
- // Data from 1 day ago
- $num_1day = 0;
- $num_1day += (int) db_get_sql('SELECT COUNT(*)
- FROM tagente_datos
- WHERE utimestamp > ' . $time_1day);
- $num_1day += (int) db_get_sql('SELECT COUNT(*)
- FROM tagente_datos_string
- WHERE utimestamp > ' . $time_1day);
- $num_1day += (int) db_get_sql('SELECT COUNT(*)
- FROM tagente_datos_log4x
- WHERE utimestamp > ' . $time_1day);
- if ($num_1day >= 0) {
- // Data from 1 week ago
- $num_1week = 0;
- $num_1week += (int) db_get_sql('SELECT COUNT(*)
- FROM tagente_datos
- WHERE utimestamp > ' . $time_1week . '
- AND utimestamp < ' . $time_1day);
- $num_1week += (int) db_get_sql('SELECT COUNT(*)
- FROM tagente_datos_string
- WHERE utimestamp > ' . $time_1week . '
- AND utimestamp < ' . $time_1day);
- $num_1week += (int) db_get_sql('SELECT COUNT(*)
- FROM tagente_datos_log4x
- WHERE utimestamp > ' . $time_1week . '
- AND utimestamp < ' . $time_1day);
- if ($num_1week >= 0) {
- if ($num_1week > 0) {
- $num_1week = 0;
- $num_1week += (int) db_get_sql('SELECT COUNT(*)
- FROM tagente_datos
- WHERE utimestamp > ' . $time_1week);
- $num_1week += (int) db_get_sql('SELECT COUNT(*)
- FROM tagente_datos_string
- WHERE utimestamp > ' . $time_1week);
- $num_1week += (int) db_get_sql('SELECT COUNT(*)
- FROM tagente_datos_log4x
- WHERE utimestamp > ' . $time_1week);
- }
- // Data from 1 month ago
- $num_1month = 0;
- $num_1month += (int) db_get_sql('SELECT COUNT(*)
- FROM tagente_datos
- WHERE utimestamp > ' . $time_1month . '
- AND utimestamp < ' . $time_1week);
- $num_1month += (int) db_get_sql('SELECT COUNT(*)
- FROM tagente_datos_string
- WHERE utimestamp > ' . $time_1month . '
- AND utimestamp < ' . $time_1week);
- $num_1month += (int) db_get_sql('SELECT COUNT(*)
- FROM tagente_datos_log4x
- WHERE utimestamp > ' . $time_1month . '
- AND utimestamp < ' . $time_1week);
- if ($num_1month >= 0) {
- if ($num_1month > 0) {
- $num_1month = 0;
- $num_1month += (int) db_get_sql('SELECT COUNT(*)
- FROM tagente_datos
- WHERE utimestamp > ' . $time_1month);
- $num_1month += (int) db_get_sql('SELECT COUNT(*)
- FROM tagente_datos_string
- WHERE utimestamp > ' . $time_1month);
- $num_1month += (int) db_get_sql('SELECT COUNT(*)
- FROM tagente_datos_log4x
- WHERE utimestamp > ' . $time_1month);
- }
- // Data from 3 months ago
- $num_3months = 0;
- $num_3months += (int) db_get_sql('SELECT COUNT(*)
- FROM tagente_datos
- WHERE utimestamp > ' . $time_3months . '
- AND utimestamp < ' . $time_1month);
- $num_3months += (int) db_get_sql('SELECT COUNT(*)
- FROM tagente_datos
- WHERE utimestamp > ' . $time_3months . '
- AND utimestamp < ' . $time_1month);
- $num_3months += (int) db_get_sql('SELECT COUNT(*)
- FROM tagente_datos
- WHERE utimestamp > ' . $time_3months . '
- AND utimestamp < ' . $time_1month);
- if ($num_3months >= 0) {
- if ($num_3months > 0) {
- $num_3months = 0;
- $num_3months += (int) db_get_sql('SELECT COUNT(*)
- FROM tagente_datos
- WHERE utimestamp > ' . $time_3months);
- $num_3months += (int) db_get_sql('SELECT COUNT(*)
- FROM tagente_datos
- WHERE utimestamp > ' . $time_3months);
- $num_3months += (int) db_get_sql('SELECT COUNT(*)
- FROM tagente_datos
- WHERE utimestamp > ' . $time_3months);
- }
- // All data
- $num_all = 0;
- $num_all += (int) db_get_sql('SELECT COUNT(*)
- FROM tagente_datos
- WHERE utimestamp < ' . $time_3months);
- $num_all += (int) db_get_sql('SELECT COUNT(*)
- FROM tagente_datos
- WHERE utimestamp < ' . $time_3months);
- $num_all += (int) db_get_sql('SELECT COUNT(*)
- FROM tagente_datos
- WHERE utimestamp < ' . $time_3months);
- if ($num_all >= 0) {
- $num_older = $num_all - $num_3months;
- if ($config['history_db_enabled'] == 1) {
- // All data in common and history database
- $num_all_w_history = 0;
- $num_all_w_history += (int) db_get_sql('SELECT COUNT(*)
- FROM tagente_datos
- WHERE utimestamp < ' . $time_3months);
- $num_all_w_history += (int) db_get_sql('SELECT COUNT(*)
- FROM tagente_datos
- WHERE utimestamp < ' . $time_3months);
- $num_all_w_history += (int) db_get_sql('SELECT COUNT(*)
- FROM tagente_datos
- WHERE utimestamp < ' . $time_3months);
- if ($num_all_w_history >= 0) {
- $num_history = $num_all_w_history - $num_all;
- }
- }
- }
- }
- }
- }
- }
- else if (($num_1day == 0) && ($num_1week == 0) && ($num_1month == 0) && ($num_3months == 0) && ($num_all == 0)) {
- //If no data, returns empty
- $query_error = true;
- }
-
- // Error
- if ($query_error || $num_older < 0 || ($config['history_db_enabled'] == 1 && $num_history < 0)
- || (empty($num_1day) && empty($num_1week) && empty($num_1month)
- && empty($num_3months) && empty($num_all)
- && ($config['history_db_enabled'] == 1 && empty($num_all_w_history)))) {
- return html_print_image('images/image_problem_area_small.png', true);
- }
-
- // Data indexes
- $str_1day = __("Today");
- $str_1week = "1 ".__("Week");
- $str_1month = "1 ".__("Month");
- $str_3months = "3 ".__("Months");
- $str_older = "> 3 ".__("Months");
-
- // Filling the data array
- $data = array();
- if (!empty($num_1day))
- $data[$str_1day] = $num_1day;
- if (!empty($num_1week))
- $data[$str_1week] = $num_1week;
- if (!empty($num_1month))
- $data[$str_1month] = $num_1month;
- if (!empty($num_3months))
- $data[$str_3months] = $num_3months;
- if (!empty($num_older))
- $data[$str_older] = $num_older;
- if ($config['history_db_enabled'] == 1 && !empty($num_history)) {
- // In this pie chart only 5 elements are shown, so we need to remove
- // an element. With a history db enabled the >3 months element are dispensable
- if (count($data) >= 5 && isset($data[$str_3months]))
- unset($data[$str_3months]);
-
- $time_historic_db = time() - ((int)$config['history_db_days'] * SECONDS_1DAY);
- $date_human = human_time_comparation($time_historic_db);
- $str_history = "> $date_human (".__("History db").")";
- $data[$str_history] = $num_history;
- }
-
- $water_mark = array(
- 'file' => $config['homedir'] . "/images/logo_vertical_water.png",
- 'url' => ui_get_full_url("images/logo_vertical_water.png", false, false, false)
- );
-
- return pie3d_graph($config['flash_charts'], $data, $width, $height,
- __('Other'), '', $water_mark, $config['fontpath'], $config['font_size']);
-}
-
-/**
- * Print a horizontal bar graph with packets data of agents
- *
- * @param integer width pie graph width
- * @param integer height pie graph height
- */
-function grafico_db_agentes_paquetes($width = 380, $height = 300) {
- global $config;
- global $graphic_type;
-
-
- $data = array ();
- $legend = array ();
-
- $agents = agents_get_group_agents (array_keys (users_get_groups (false, 'RR')), false, "none");
- $count = agents_get_modules_data_count (array_keys ($agents));
- unset ($count["total"]);
- arsort ($count, SORT_NUMERIC);
- $count = array_slice ($count, 0, 8, true);
-
- foreach ($count as $agent_id => $value) {
- $data[$agents[$agent_id]]['g'] = $value;
- }
-
- if($config["fixed_graph"] == false){
- $water_mark = array('file' =>
- $config['homedir'] . "/images/logo_vertical_water.png",
- 'url' => ui_get_full_url("images/logo_vertical_water.png", false, false, false));
- }
-
- return hbar_graph($config['flash_charts'], $data, $width, $height, array(),
- $legend, "", "", true, "", $water_mark,
- $config['fontpath'], $config['font_size'], false, 1, $config['homeurl'],
- 'white',
- 'black');
-}
-
-/**
- * Print a horizontal bar graph with modules data of agents
- *
- * @param integer height graph height
- * @param integer width graph width
- */
-function graph_db_agentes_modulos($width, $height) {
- global $config;
- global $graphic_type;
-
-
- $data = array ();
-
- switch ($config['dbtype']) {
- case "mysql":
- case "postgresql":
- $modules = db_get_all_rows_sql ('
- SELECT COUNT(id_agente_modulo), id_agente
- FROM tagente_modulo
- WHERE delete_pending = 0
- GROUP BY id_agente
- ORDER BY 1 DESC LIMIT 10');
- break;
- case "oracle":
- $modules = db_get_all_rows_sql ('
- SELECT COUNT(id_agente_modulo), id_agente
- FROM tagente_modulo
- WHERE rownum <= 10
- AND delete_pending = 0
- GROUP BY id_agente
- ORDER BY 1 DESC');
- break;
- }
- if ($modules === false)
- $modules = array ();
-
- $data = array();
- foreach ($modules as $module) {
- $agent_name = agents_get_name ($module['id_agente'], "none");
-
- if (empty($agent_name)) {
- continue;
- }
- switch ($config['dbtype']) {
- case "mysql":
- case "postgresql":
- $data[$agent_name]['g'] = $module['COUNT(id_agente_modulo)'];
- break;
- case "oracle":
- $data[$agent_name]['g'] = $module['count(id_agente_modulo)'];
- break;
- }
- }
-
- if($config["fixed_graph"] == false){
- $water_mark = array('file' =>
- $config['homedir'] . "/images/logo_vertical_water.png",
- 'url' => ui_get_full_url("images/logo_vertical_water.png", false, false, false));
- }
-
- return hbar_graph($config['flash_charts'],
- $data, $width, $height, array(),
- array(), "", "", true, "",
- $water_mark,
- $config['fontpath'], $config['font_size'], false, 1, $config['homeurl'],
- 'white',
- 'black');
-}
-
-/**
- * Print a pie graph with users activity in a period of time
- *
- * @param integer width pie graph width
- * @param integer height pie graph height
- * @param integer period time period
- */
-function graphic_user_activity ($width = 350, $height = 230) {
- global $config;
- global $graphic_type;
-
- $data = array ();
- $max_items = 5;
- switch ($config['dbtype']) {
- case "mysql":
- case "postgresql":
- $sql = sprintf ('SELECT COUNT(id_usuario) n_incidents, id_usuario
- FROM tsesion
- GROUP BY id_usuario
- ORDER BY 1 DESC LIMIT %d', $max_items);
- break;
- case "oracle":
- $sql = sprintf ('SELECT COUNT(id_usuario) n_incidents, id_usuario
- FROM tsesion
- WHERE rownum <= %d
- GROUP BY id_usuario
- ORDER BY 1 DESC', $max_items);
- break;
- }
- $logins = db_get_all_rows_sql ($sql);
-
- if ($logins == false) {
- $logins = array();
- }
- foreach ($logins as $login) {
- $data[$login['id_usuario']] = $login['n_incidents'];
- }
-
- if($config["fixed_graph"] == false){
- $water_mark = array('file' =>
- $config['homedir'] . "/images/logo_vertical_water.png",
- 'url' => ui_get_full_url("images/logo_vertical_water.png", false, false, false));
- }
-
- return pie3d_graph($config['flash_charts'], $data, $width, $height,
- __('Other'), '', $water_mark,
- $config['fontpath'], $config['font_size']);
-}
-
/**
* Print a pie graph with priodity incident
*/
@@ -3036,7 +2457,7 @@ function grafico_incidente_prioridad () {
}
return pie3d_graph($config['flash_charts'], $data, 320, 200,
- __('Other'), '', $water_mark,
+ __('Other'), '', '',
$config['fontpath'], $config['font_size']);
}
@@ -3077,7 +2498,7 @@ function graph_incidents_status () {
}
return pie3d_graph($config['flash_charts'], $data, 320, 200,
- __('Other'), '', $water_mark,
+ __('Other'), '', '',
$config['fontpath'], $config['font_size']);
}
@@ -3133,7 +2554,7 @@ function graphic_incident_group () {
}
return pie3d_graph($config['flash_charts'], $data, 320, 200,
- __('Other'), '', $water_mark,
+ __('Other'), '', '',
$config['fontpath'], $config['font_size']);
}
@@ -3188,7 +2609,7 @@ function graphic_incident_user () {
}
return pie3d_graph($config['flash_charts'], $data, 320, 200,
- __('Other'), '', $water_mark,
+ __('Other'), '', '',
$config['fontpath'], $config['font_size']);
}
@@ -3242,7 +2663,7 @@ function graphic_incident_source($width = 320, $height = 200) {
}
return pie3d_graph($config['flash_charts'], $data, $width, $height,
- __('Other'), '', $water_mark,
+ __('Other'), '', '',
$config['fontpath'], $config['font_size']);
}
@@ -3425,70 +2846,6 @@ function grafico_eventos_grupo ($width = 300, $height = 200, $url = "", $meta =
$config['fontpath'], $config['font_size'], 1, 'bottom');
}
-function grafico_eventos_agente ($width = 300, $height = 200, $result = false, $meta = false, $history = false) {
- global $config;
- global $graphic_type;
-
- //It was urlencoded, so we urldecode it
- //$url = html_entity_decode (rawurldecode ($url), ENT_QUOTES);
- $data = array ();
- $loop = 0;
-
- if ($result === false) {
- $result = array();
- }
-
- $system_events = 0;
- $other_events = 0;
- $total = array();
- $i = 0;
-
- foreach ($result as $row) {
- if ($meta) {
- $count[] = $row["agent_name"];
- }
- else {
- if ($row["id_agente"] == 0) {
- $count[] = __('SYSTEM');
- }
- else
- $count[] = agents_get_alias($row["id_agente"]) ;
- }
-
- }
-
- $total = array_count_values($count);
-
- foreach ($total as $key => $total) {
- if ($meta) {
- $name = $key." (".$total.")";
- }
- else {
- $name = $key." (".$total.")";
- }
- $data[$name] = $total;
- }
-
- /*
- if ($other_events > 0) {
- $name = __('Other')." (".$other_events.")";
- $data[$name] = $other_events;
- }
- */
-
- // Sort the data
- arsort($data);
- if($config["fixed_graph"] == false){
- $water_mark = array('file' =>
- $config['homedir'] . "/images/logo_vertical_water.png",
- 'url' => ui_get_full_url("images/logo_vertical_water.png", false, false, false));
- }
-
- return pie3d_graph($config['flash_charts'], $data, $width, $height,
- __('Others'), '', $water_mark,
- $config['fontpath'], $config['font_size'], 1, 'bottom');
-}
-
/**
* Print a pie graph with events data in 320x200 size
*
@@ -3514,8 +2871,11 @@ function grafico_eventos_total($filter = "", $width = 320, $height = 200, $noWat
}
$sql = sprintf("SELECT criticity, COUNT(id_evento) events
- FROM tevento %s
- GROUP BY criticity ORDER BY events DESC", $where);
+ FROM tevento
+ LEFT JOIN tagent_secondary_group tasg
+ ON tevento.id_agente = tasg.id_agent
+ %s %s
+ GROUP BY criticity ORDER BY events DESC", $where , $filter);
$criticities = db_get_all_rows_sql ($sql, false, false);
@@ -4824,12 +4184,11 @@ function graph_monitor_wheel ($width = 550, $height = 600, $filter = false) {
if (!empty($agents)) {
$agents_id = array();
$agents_aux = array();
- foreach ($agents as $key => $agent) {
+ foreach ($agents as $key => $agent) {
$agents_aux[$agent['id_agente']] = $agent;
}
$agents = $agents_aux;
$agents_aux = null;
- $fields = array('id_agente_modulo', 'id_agente', 'id_module_group', 'nombre');
$module_groups = modules_get_modulegroups();
$module_groups[0] = __('Not assigned');
diff --git a/pandora_console/include/functions_html.php b/pandora_console/include/functions_html.php
index 783f1a9cab..932e8a3457 100644
--- a/pandora_console/include/functions_html.php
+++ b/pandora_console/include/functions_html.php
@@ -47,13 +47,13 @@ else{
/**
* Prints the print_r with < pre > tags
*/
-function html_debug_print ($var, $file = '') {
+function html_debug_print ($var, $file = '', $oneline = false) {
$more_info = '';
if (is_string($var)) {
$more_info = 'size: ' . strlen($var);
}
elseif (is_bool($var)) {
- $more_info = 'val: ' .
+ $more_info = 'val: ' .
($var ? 'true' : 'false');
}
elseif (is_null($var)) {
@@ -62,10 +62,13 @@ function html_debug_print ($var, $file = '') {
elseif (is_array($var)) {
$more_info = count($var);
}
-
+
if ($file === true)
$file = '/tmp/logDebug';
-
+
+ if($oneline && is_string($var))
+ $var = preg_replace("/[\t|\n| ]+/", " ", $var);
+
if (strlen($file) > 0) {
$f = fopen($file, "a");
ob_start();
@@ -85,8 +88,13 @@ function html_debug_print ($var, $file = '') {
}
// Alias for "html_debug_print"
-function html_debug ($var, $file = '') {
- html_debug_print ($var, $file);
+function html_debug ($var, $file = '', $oneline = false) {
+ html_debug_print ($var, $file, $oneline);
+}
+
+// Alias for "html_debug_print"
+function hd ($var, $file = '', $oneline = false) {
+ html_debug_print ($var, $file, $oneline);
}
function html_f2str($function, $params) {
diff --git a/pandora_console/include/functions_modules.php b/pandora_console/include/functions_modules.php
index f8e632dad4..78cb1e8c96 100755
--- a/pandora_console/include/functions_modules.php
+++ b/pandora_console/include/functions_modules.php
@@ -142,14 +142,12 @@ function modules_copy_agent_module_to_agent ($id_agent_module, $id_destiny_agent
if ($forced_name !== false)
$module['nombre'] = $forced_name;
-
$modules = agents_get_modules ($id_destiny_agent, false,
array ('nombre' => $module['nombre'], 'disabled' => false));
// The module already exist in the target
if (! empty ($modules))
return array_pop (array_keys ($modules));
-
$modulesDisabled = agents_get_modules ($id_destiny_agent, false,
array ('nombre' => $module['nombre'], 'disabled' => true));
@@ -441,9 +439,9 @@ function modules_update_agent_module ($id, $values,
}
$result = @db_process_sql_update ('tagente_modulo', $values, $where);
-
+
if ($result == false) {
- if ($result_disable == ERR_GENERIC ){
+ if ($result_disable === ERR_GENERIC ){
return ERR_DB;
}
else{
@@ -2687,8 +2685,14 @@ function get_module_realtime_link_graph ($module) {
* with some user action through the console
* @param int New status
* @param int Agent module to force new status
+ * @param int Agent id to force state recalculations
*/
-function force_set_module_status ($status, $id_agent_module) {
+function force_set_module_status ($status, $id_agent_module, $id_agent) {
+ // Force recalculate counters
+ db_process_sql_update('tagente',
+ array('update_module_count' => 1),
+ array('id_agente' => $id_agent)
+ );
return db_process_sql_update( 'tagente_estado',
array(
'estado' => $status,
@@ -2776,33 +2780,38 @@ function modules_get_counter_by_states($state) {
return false;
}
-function modules_get_state_condition($state) {
+function modules_get_state_condition($state, $prefix = "tae") {
switch ($state) {
case AGENT_MODULE_STATUS_CRITICAL_ALERT:
case AGENT_MODULE_STATUS_CRITICAL_BAD:
return "(
- tae.estado = ".AGENT_MODULE_STATUS_CRITICAL_ALERT."
- OR tae.estado = ".AGENT_MODULE_STATUS_CRITICAL_BAD."
+ $prefix.estado = ".AGENT_MODULE_STATUS_CRITICAL_ALERT."
+ OR $prefix.estado = ".AGENT_MODULE_STATUS_CRITICAL_BAD."
)";
case AGENT_MODULE_STATUS_WARNING_ALERT:
case AGENT_MODULE_STATUS_WARNING:
return "(
- tae.estado = ".AGENT_MODULE_STATUS_WARNING_ALERT."
- OR tae.estado = ".AGENT_MODULE_STATUS_WARNING."
+ $prefix.estado = ".AGENT_MODULE_STATUS_WARNING_ALERT."
+ OR $prefix.estado = ".AGENT_MODULE_STATUS_WARNING."
)";
case AGENT_MODULE_STATUS_UNKNOWN:
- return "tae.estado = ".AGENT_MODULE_STATUS_UNKNOWN." ";
+ return "$prefix.estado = ".AGENT_MODULE_STATUS_UNKNOWN." ";
case AGENT_MODULE_STATUS_NO_DATA:
case AGENT_MODULE_STATUS_NOT_INIT:
return "(
- tae.estado = ".AGENT_MODULE_STATUS_NO_DATA."
- OR tae.estado = ".AGENT_MODULE_STATUS_NOT_INIT."
+ $prefix.estado = ".AGENT_MODULE_STATUS_NO_DATA."
+ OR $prefix.estado = ".AGENT_MODULE_STATUS_NOT_INIT."
)";
case AGENT_MODULE_STATUS_NORMAL_ALERT:
case AGENT_MODULE_STATUS_NORMAL:
return "(
- tae.estado = ".AGENT_MODULE_STATUS_NORMAL_ALERT."
- OR tae.estado = ".AGENT_MODULE_STATUS_NORMAL."
+ $prefix.estado = ".AGENT_MODULE_STATUS_NORMAL_ALERT."
+ OR $prefix.estado = ".AGENT_MODULE_STATUS_NORMAL."
+ )";
+ case AGENT_MODULE_STATUS_NOT_NORMAL:
+ return "(
+ $prefix.estado <> " . AGENT_MODULE_STATUS_NORMAL . "
+ AND $prefix.estado <> " . AGENT_MODULE_STATUS_NORMAL_ALERT . "
)";
}
// If the state is not an expected state, return no condition
diff --git a/pandora_console/include/functions_networkmap.php b/pandora_console/include/functions_networkmap.php
index 4e4ad37cee..35c0763c45 100644
--- a/pandora_console/include/functions_networkmap.php
+++ b/pandora_console/include/functions_networkmap.php
@@ -29,10 +29,6 @@ require_once($config['homedir'] . "/include/functions_modules.php");
require_once($config['homedir'] . "/include/functions_groups.php");
ui_require_css_file ('cluetip');
-/**
- * Definitions
- */
-define('DEFAULT_NETWORKMAP_CENTER_LOGO', 'images/networkmap/bola_pandora_network_maps.png');
// Check if a node descends from a given node
function networkmap_is_descendant ($node, $ascendant, $parents) {
@@ -260,7 +256,7 @@ function networkmap_generate_dot ($pandora_name, $group = 0,
$relative = false, $text_filter = '', $ip_mask = null,
$dont_show_subgroups = false, $strict_user = false, $size_canvas = null,
$old_mode = false, $map_filter = array()) {
-
+
global $config;
$nooverlap = 1;
@@ -271,17 +267,8 @@ function networkmap_generate_dot ($pandora_name, $group = 0,
$filter['disabled'] = 0;
if (!empty($text_filter)) {
- switch ($config['dbtype']) {
- case "mysql":
- case "postgresql":
- $filter[] =
- '(nombre COLLATE utf8_general_ci LIKE "%' . $text_filter . '%")';
- break;
- case "oracle":
- $filter[] =
- '(upper(nombre) LIKE upper(\'%' . $text_filter . '%\'))';
- break;
- }
+ $filter[] =
+ '(nombre COLLATE utf8_general_ci LIKE "%' . $text_filter . '%")';
}
if ($group >= 1) {
@@ -305,33 +292,11 @@ function networkmap_generate_dot ($pandora_name, $group = 0,
//foreach loop are without parent (id_parent = 0)
// Get agents data
- if ($strict_user) {
- if ($dont_show_subgroups)
- $filter['id_group'] = $group;
- else {
- if (!empty($childrens)) {
- foreach ($childrens as $children) {
- $filter_id_groups[$children] = $children;
- }
- }
- $filter_id_groups[$group] = $group;
- $filter['id_group'] = implode(',', $filter_id_groups);
- }
-
- $filter['group_by'] = 'tagente.id_agente';
- $fields = array ('tagente.id_grupo, tagente.nombre, tagente.id_os, tagente.id_parent, tagente.id_agente,
- tagente.normal_count, tagente.warning_count, tagente.critical_count,
- tagente.unknown_count, tagente.total_count, tagente.notinit_count');
- $acltags = tags_get_user_groups_and_tags ($config['id_user'],'AR', $strict_user);
- $agents = tags_get_all_user_agents (false, $config['id_user'], $acltags, $filter, $fields, false, $strict_user, true);
- }
- else {
- $agents = agents_get_agents ($filter,
- array ('id_grupo, nombre, id_os, id_parent, id_agente,
- normal_count, warning_count, critical_count,
- unknown_count, total_count, notinit_count'), 'AR',
- array('field' => 'id_parent', 'order' => 'ASC'));
- }
+ $agents = agents_get_agents ($filter,
+ array ('id_grupo, nombre, id_os, id_parent, id_agente,
+ normal_count, warning_count, critical_count,
+ unknown_count, total_count, notinit_count'), 'AR',
+ array('field' => 'id_parent', 'order' => 'ASC'));
}
else if ($group == -666) {
$agents = false;
@@ -343,21 +308,11 @@ function networkmap_generate_dot ($pandora_name, $group = 0,
unknown_count, total_count, notinit_count'), $strict_user);
}
else {
- if ($strict_user) {
- $filter['group_by'] = 'tagente.id_agente';
- $fields = array ('tagente.id_grupo, tagente.nombre, tagente.id_os, tagente.id_parent, tagente.id_agente,
- tagente.normal_count, tagente.warning_count, tagente.critical_count,
- tagente.unknown_count, tagente.total_count, tagente.notinit_count');
- $acltags = tags_get_user_groups_and_tags ($config['id_user'],'AR', $strict_user);
- $agents = tags_get_all_user_agents (false, $config['id_user'], $acltags, $filter, $fields, false, $strict_user, true);
- }
- else {
- $agents = agents_get_agents ($filter,
- array ('id_grupo, nombre, id_os, id_parent, id_agente,
- normal_count, warning_count, critical_count,
- unknown_count, total_count, notinit_count'), 'AR',
- array('field' => 'id_parent', 'order' => 'ASC'));
- }
+ $agents = agents_get_agents ($filter,
+ array ('id_grupo, nombre, id_os, id_parent, id_agente,
+ normal_count, warning_count, critical_count,
+ unknown_count, total_count, notinit_count'), 'AR',
+ array('field' => 'id_parent', 'order' => 'ASC'));
}
if ($agents === false)
@@ -390,15 +345,10 @@ function networkmap_generate_dot ($pandora_name, $group = 0,
$filter = array();
$filter['disabled'] = 0;
-
+
// Get agent modules data
- if ($strict_user) {
- $modules = tags_get_agent_modules ($agent['id_agente'], false, $acltags, false, $filter, false);
- }
- else {
- $modules = agents_get_modules($agent['id_agente'], '*', $filter, true, true);
- }
-
+ $modules = agents_get_modules($agent['id_agente'], '*', $filter, true, true);
+
if ($modules === false)
$modules = array();
@@ -619,264 +569,6 @@ function networkmap_generate_dot ($pandora_name, $group = 0,
return $graph;
}
-// Generate a dot graph definition for graphviz with groups
-function networkmap_generate_dot_groups ($pandora_name, $group = 0,
- $simple = 0, $font_size = 12, $layout = 'radial', $nooverlap = 0,
- $zoom = 1, $ranksep = 2.5, $center = 0, $regen = 1, $pure = 0,
- $modwithalerts = 0, $module_group = 0, $hidepolicymodules = 0,
- $depth = 'all', $id_networkmap = 0, $dont_show_subgroups = 0,
- $text_filter = '', $strict_user = false, $size_canvas = null) {
-
- global $config;
-
- if ($strict_user) {
- $acltags = tags_get_user_groups_and_tags ($config['id_user'],'AR', $strict_user);
- }
- $parents = array();
- $orphans = array();
-
- $filter = array ();
- $filter['disabled'] = 0;
-
- if (!empty($text_filter)) {
- switch ($config['dbtype']) {
- case "mysql":
- case "postgresql":
- $filter[] =
- '(nombre COLLATE utf8_general_ci LIKE "%' . $text_filter . '%")';
- break;
- case "oracle":
- $filter[] =
- '(upper(nombre) LIKE upper(\'%' . $text_filter . '%\'))';
- break;
- }
- }
-
- // Get groups data
- if ($group > 0) {
- $groups = array();
- $id_groups = groups_get_id_recursive($group, true);
-
- foreach($id_groups as $id_group) {
- $add = false;
- if (check_acl($config["id_user"], $id_group, 'AR')) {
- $add = true;
- }
-
- if ($add) {
- $groups[] = db_get_row ('tgrupo', 'id_grupo', $id_group);
- }
- }
-
- $filter['id_grupo'] = $id_groups;
- }
- else {
- if ($strict_user) {
- $groups = users_get_groups ($config['id_user'],"AR", false, true);
- }
- else {
- $groups = db_get_all_rows_in_table ('tgrupo');
- }
- if ($groups === false) {
- $groups = array();
- }
- }
-
- // Open Graph
- $graph = networkmap_open_graph ($layout, $nooverlap, $pure, $zoom,
- $ranksep, $font_size, $size_canvas);
-
- $node_count = 0;
-
- // Parse groups
- $nodes = array ();
- $nodes_groups = array();
- foreach ($groups as $group2) {
- $node_count ++;
- $group2['type'] = 'group';
- $group2['id_node'] = $node_count;
-
- // Add node
- $nodes_groups[$group2['id_grupo']] = $group2;
- }
-
- $node_count = 0;
-
- $groups_hiden = array();
- foreach ($nodes_groups as $node_group) {
-
- $node_count++;
-
- // Save node parent information to define edges later
- if ($node_group['parent'] != "0" && $node_group['id_grupo'] != $group) {
- if ((!$dont_show_subgroups) || ($group == 0)) {
- $parents[$node_count] = $nodes_groups[$node_group['parent']]['id_node'];
- }
- else {
- $groups_hiden[$node_group['id_grupo']] = 1;
- continue;
- }
- }
- else {
- $orphans[$node_count] = 1;
- }
-
- $nodes[$node_count] = $node_group;
- }
-
- if ($depth != 'group') {
- if ($strict_user) {
- $filter['group_by'] = 'tagente.nombre';
- $filter['id_group'] = $filter['id_grupo'];
- $fields = array ('tagente.id_grupo, tagente.nombre, tagente.id_os, tagente.id_agente,
- tagente.normal_count, tagente.warning_count, tagente.critical_count,
- tagente.unknown_count, tagente.total_count, tagente.notinit_count');
- $agents = tags_get_all_user_agents (false, $config['id_user'], $acltags, $filter, $fields, false, $strict_user, true);
- unset($filter['id_group']);
- }
- else {
- // Get agents data
- $agents = agents_get_agents ($filter,
- array ('id_grupo, nombre, id_os, id_agente,
- normal_count, warning_count, critical_count,
- unknown_count, total_count, notinit_count'));
- }
- if ($agents === false)
- $agents = array();
-
- // Parse agents
- $nodes_agents = array();
- foreach ($agents as $agent) {
- if ($dont_show_subgroups) {
- if (!empty($groups_hiden[$agent['id_grupo']])) {
- continue;
- }
- }
-
- // If only agents with alerts => agents without alerts discarded
- $alert_agent = agents_get_alerts($agent['id_agente']);
-
- if ($modwithalerts and empty($alert_agent['simple'])) {
- continue;
- }
-
- $node_count ++;
- // Save node parent information to define edges later
- $parents[$node_count] = $agent['parent'] = $nodes_groups[$agent['id_grupo']]['id_node'];
-
- $agent['id_node'] = $node_count;
- $agent['type'] = 'agent';
- // Add node
- $nodes[$node_count] = $nodes_agents[$agent['id_agente']] = $agent;
-
- if ($depth == 'agent') {
- continue;
- }
-
- // Get agent modules data
- if ($strict_user) {
- $filter['disabled'] = 0;
- $modules = tags_get_agent_modules ($agent['id_agente'], false, $acltags, false, $filter, false);
- } else {
- $modules = agents_get_modules ($agent['id_agente'], false, array('disabled' => 0), true, false);
- }
-
- // Parse modules
- foreach ($modules as $key => $module) {
- $node_count ++;
- $agent_module = modules_get_agentmodule($key);
- $alerts_module = db_get_sql('SELECT count(*) AS num
- FROM talert_template_modules
- WHERE id_agent_module = ' . $key);
-
- if ($alerts_module == 0 && $modwithalerts) {
- continue;
- }
-
- if ($agent_module['id_module_group'] != $module_group &&
- $module_group != 0) {
- continue;
- }
-
- if ($hidepolicymodules && $config['enterprise_installed']) {
- enterprise_include_once('include/functions_policies.php');
- if (policies_is_module_in_policy($key)) {
- continue;
- }
- }
-
- // Save node parent information to define edges later
- $parents[$node_count] = $agent_module['parent'] = $agent['id_node'];
-
- $agent_module['id_node'] = $node_count;
-
- $agent_module['type'] = 'module';
- // Add node
- $nodes[$node_count] = $agent_module;
- }
- }
- }
-
- if (empty ($nodes)) {
- return false;
- }
-
- // Create void statistics array
- $stats = array();
-
- // Create nodes
- foreach ($nodes as $node_id => $node) {
- if ($center > 0 && ! networkmap_is_descendant ($node_id, $center, $parents)) {
- unset ($parents[$node_id]);
- unset ($orphans[$node_id]);
- unset ($nodes[$node_id]);
- continue;
- }
- switch ($node['type']) {
- case 'group':
- $graph .= networkmap_create_group_node ($node , $simple, $font_size, $metaconsole = false, null, $strict_user) .
- "\n\t\t";
- $stats['groups'][] = $node['id_grupo'];
- break;
- case 'agent':
- $graph .= networkmap_create_agent_node ($node , $simple, $font_size, true, true) .
- "\n\t\t";
- $stats['agents'][] = $node['id_agente'];
- break;
- case 'module':
- $graph .= networkmap_create_module_node ($node , $simple, $font_size) .
- "\n\t\t";
- $stats['modules'][] = $node['id_agente_modulo'];
- break;
- }
- }
- // Define edges
- foreach ($parents as $node => $parent_id) {
- // Verify that the parent is in the graph
- if (isset ($nodes[$parent_id])) {
- $graph .= networkmap_create_edge ($node, $parent_id, $layout, $nooverlap, $pure, $zoom, $ranksep, $simple, $regen, $font_size, $group, 'operation/agentes/networkmap', 'groups', $id_networkmap);
- }
- else {
- $orphans[$node] = 1;
- }
- }
-
- // Create a central node if orphan nodes exist
- if (count ($orphans)) {
- $graph .= networkmap_create_pandora_node ($pandora_name, $font_size, $simple, $stats);
- }
-
- // Define edges for orphan nodes
- foreach (array_keys($orphans) as $node) {
- $graph .= networkmap_create_edge ('0', $node, $layout, $nooverlap, $pure, $zoom, $ranksep, $simple, $regen, $font_size, $group, 'operation/agentes/networkmap', 'groups', $id_networkmap);
- }
-
- // Close graph
- $graph .= networkmap_close_graph ();
-
- return $graph;
-}
-
// Returns an edge definition
function networkmap_create_edge ($head, $tail, $layout, $nooverlap, $pure, $zoom, $ranksep, $simple, $regen, $font_size, $group, $sec2 = 'operation/agentes/networkmap', $tab = 'topology', $id_networkmap = 0) {
if (defined("METACONSOLE")) {
diff --git a/pandora_console/include/functions_reporting.php b/pandora_console/include/functions_reporting.php
index d385b424be..668e576c64 100755
--- a/pandora_console/include/functions_reporting.php
+++ b/pandora_console/include/functions_reporting.php
@@ -1800,7 +1800,6 @@ function reporting_agent_module($report, $content) {
$row = array();
$row['agent_status'][$agent] = agents_get_status($agent);
$row['agent_name'] = agents_get_alias($agent);
-
$agent_modules = agents_get_modules($agent);
$row['modules'] = array();
@@ -3079,7 +3078,6 @@ function reporting_alert_report_agent($report, $content) {
$return["description"] = $content["description"];
$return["date"] = reporting_get_date_text($report, $content);
$return['label'] = (isset($content['style']['label'])) ? $content['style']['label'] : '';
-
$module_list = agents_get_modules($content['id_agent']);
$data = array();
@@ -3223,10 +3221,6 @@ function reporting_alert_report_module($report, $content) {
// Alerts over $id_agent_module
$alerts = alerts_get_effective_alert_actions($content['id_agent_module']);
- if ($alerts === false){
- return;
- }
-
$ntemplates = 0;
foreach ($alerts as $template => $actions) {
@@ -3673,7 +3667,6 @@ function reporting_agent_configuration($report, $content) {
$agent_configuration['description'] = $agent_data['comentarios'];
$agent_configuration['enabled'] = (int)!$agent_data['disabled'];
$agent_configuration['group'] = $report["group"];
-
$modules = agents_get_modules ($content['id_agent']);
$agent_configuration['modules'] = array();
@@ -6284,6 +6277,11 @@ function reporting_custom_graph($report, $content, $type = 'dinamic',
else {
$content['name'] = __('Simple graph');
}
+ } else {
+ if ($type_report == "custom_graph") {
+ $graphs = db_get_all_rows_field_filter ("tgraph", "id_graph", $content['id_gs']);
+ $id_graph = $content['id_gs'];
+ }
}
$return['title'] = $content['name'];
@@ -8292,11 +8290,10 @@ function reporting_get_agentmodule_ttr ($id_agent_module, $period = 0, $date = 0
* Get a detailed report of the modules of the agent
*
* @param int $id_agent Agent id to get the report for.
- * @param string $filter filter for get partial modules.
*
* @return array An array
*/
-function reporting_get_agent_module_info ($id_agent, $filter = false) {
+function reporting_get_agent_module_info ($id_agent) {
global $config;
$return = array ();
@@ -8312,12 +8309,7 @@ function reporting_get_agent_module_info ($id_agent, $filter = false) {
return $return;
}
- if ($filter != '') {
- $filter = 'AND ';
- }
-
- $filter = 'disabled = 0';
-
+ $filter = array('disabled' => 0);
$modules = agents_get_modules($id_agent, false, $filter, true, false);
if ($modules === false) {
@@ -8415,33 +8407,6 @@ function reporting_tiny_stats ($counts_info, $return = false, $type = 'agent', $
break;
}
- if ($strict_user && $type == 'agent') {
-
- $acltags = tags_get_user_groups_and_tags ($config['id_user'],'AR', $strict_user);
- $filter['disabled'] = 0;
- $id_agent = $counts_info['id_agente'];
-
- $counts_info = array();
- $counts_info['normal_count'] = count(tags_get_agent_modules ($id_agent, false, $acltags, false, $filter, false, AGENT_MODULE_STATUS_NORMAL));
- $counts_info['warning_count'] = count(tags_get_agent_modules ($id_agent, false, $acltags, false, $filter, false, AGENT_MODULE_STATUS_WARNING));
- $counts_info['critical_count'] = count(tags_get_agent_modules ($id_agent, false, $acltags, false, $filter, false, AGENT_MODULE_STATUS_CRITICAL_BAD));
- $counts_info['notinit_count'] = count(tags_get_agent_modules ($id_agent, false, $acltags, false, $filter, false, AGENT_MODULE_STATUS_NOT_INIT));
- $counts_info['unknown_count'] = count(tags_get_agent_modules ($id_agent, false, $acltags, false, $filter, false, AGENT_MODULE_STATUS_UNKNOWN));
- $counts_info['total_count'] = $counts_info['normal_count'] + $counts_info['warning_count'] + $counts_info['critical_count'] + $counts_info['unknown_count'] + $counts_info['notinit_count'];
-
- $all_agent_modules = tags_get_agent_modules ($id_agent, false, $acltags, false, $filter);
- if (!empty($all_agent_modules)) {
- $mod_clause = "(".implode(',', array_keys($all_agent_modules)).")";
-
- $counts_info['fired_count'] = (int) db_get_sql ("SELECT COUNT(times_fired)
- FROM talert_template_modules
- WHERE times_fired != 0 AND id_agent_module IN ".$mod_clause);
- }
- else {
- $counts_info['fired_count'] = 0;
- }
- }
-
// Store the counts in a data structure to print hidden divs with titles
$stats = array();
diff --git a/pandora_console/include/functions_tags.php b/pandora_console/include/functions_tags.php
index ba031c0cff..bd6aaebd63 100644
--- a/pandora_console/include/functions_tags.php
+++ b/pandora_console/include/functions_tags.php
@@ -192,11 +192,13 @@ function tags_get_modules_count ($id) {
* @return int Local module tag's count.
*/
function tags_get_local_modules_count ($id) {
- $field = 'COUNT(id_tag)';
+ $field = 'COUNT(DISTINCT(tagente_modulo.id_agente_modulo))';
$filter = array('id_tag' => $id);
-
- $num_modules = (int) db_get_value_filter($field, 'ttag_module', $filter);
-
+ $num_modules = (int) db_get_value_filter(
+ $field,
+ 'ttag_module INNER JOIN tagente_modulo ON ttag_module.id_agente_modulo = tagente_modulo.id_agente_modulo',
+ $filter
+ );
return $num_modules;
}
@@ -457,7 +459,7 @@ function tags_get_module_tags ($id, $policy = false) {
$tags = db_get_all_rows_filter('ttag_module',
array('id_agente_modulo' => $id), false);
}
-
+
if ($tags === false)
return array();
@@ -722,124 +724,37 @@ function tags_get_acl_tags_module_condition($acltags, $modules_table = '') {
$condition = '';
$group_conditions = array();
-
+
+ $without_tags = array();
+ $has_secondary = enterprise_hook('agents_is_using_secondary_groups');
// The acltags array contains the groups with the acl propagation applied
// after the changes done into the 'tags_get_user_groups_and_tags' function.
foreach ($acltags as $group_id => $group_tags) {
$tag_join = '';
if (!empty($group_tags)) {
- $tag_join = sprintf('INNER JOIN ttag_module ttmc
- ON tamc.id_agente_modulo = ttmc.id_agente_modulo
- AND ttmc.id_tag IN (%s)',
- is_array($group_tags) ? implode(',', $group_tags) : $group_tags);
+ $tag_join = sprintf('AND ttag_module.id_tag IN (%s)',is_array($group_tags) ? implode(',', $group_tags) : $group_tags);
+ if($has_secondary){
+ $agent_condition = sprintf('((tagente.id_grupo = %d OR tasg.id_group = %d) %s)',$group_id,$group_id,$tag_join);
+ } else {
+ $agent_condition = sprintf('((tagente.id_grupo = %d %s))',$group_id,$tag_join);
+ }
+ $group_conditions[] = $agent_condition;
+ } else {
+ $without_tags[] = $group_id;
}
- // FIXME: Not properly way to increse performance
- if(enterprise_hook('agents_is_using_secondary_groups')){
- $agent_condition = sprintf('SELECT tamc.id_agente_modulo
- FROM tagente_modulo tamc
- %s
- INNER JOIN tagente tac
- ON tamc.id_agente = tac.id_agente
- LEFT JOIN tagent_secondary_group tasg
- ON tasg.id_agent = tac.id_agente
- WHERE (tac.id_grupo = %d OR tasg.id_group = %d)',
- $tag_join, $group_id, $group_id);
- }
- else{
- $agent_condition = sprintf('SELECT tamc.id_agente_modulo
- FROM tagente_modulo tamc
- %s
- INNER JOIN tagente tac
- ON tamc.id_agente = tac.id_agente
- AND tac.id_grupo = %d',
- $tag_join, $group_id);
- }
-
- $sql_condition = sprintf('(%sid_agente_modulo IN (%s))', $modules_table, $agent_condition);
-
- $group_conditions[] = $sql_condition;
-
- $i++;
}
- if (!empty($group_conditions))
+ if (!empty($group_conditions)) {
$condition = implode(' OR ', $group_conditions);
- $condition = !empty($condition) ? "($condition)" : '';
-
- return $condition;
-}
-
-// The old function will be keeped to serve as reference of the changes done
-/**
- * Transform the acl_groups data into a SQL condition
- *
- * @param mixed acl_groups data calculated in tags_get_acl_tags function
- *
- * @return string SQL condition for tagente_module
- */
-function tags_get_acl_tags_module_condition_old($acltags, $modules_table = '') {
- if (!empty($modules_table)) {
- $modules_table .= '.';
}
-
- $condition = '';
-
- // Fix: Wrap SQL expression with "()" to avoid bad SQL sintax that makes Pandora retrieve all modules without taking care of id_agent => id_agent = X AND (sql_tag_expression)
- $i = 0;
- foreach ($acltags as $group_id => $group_tags) {
- if ($condition != '') {
+ if (!empty($without_tags)) {
+ if (!empty($condition)) {
$condition .= ' OR ';
}
-
- // Fix: Wrap SQL expression with "()" to avoid bad SQL sintax that makes Pandora retrieve all modules without taking care of id_agent => id_agent = X AND (sql_tag_expression)
- if ($i == 0)
- $condition .= ' ( ' . "\n";
-
- // Group condition (The module belongs to an agent of the group X)
- // Juanma (08/05/2014) Fix: Now group and tag is checked at the same time, before only tag was checked due to a bad condition
- if (!array_key_exists(0, $acltags)) {
- // Juanma (08/05/2014) Fix: get all groups recursively (Acl proc func!)
- $group_condition = sprintf('%sid_agente IN (SELECT id_agente FROM tagente WHERE id_grupo IN (%s))', $modules_table, implode(',', array_values(groups_get_id_recursive($group_id))));
- }
- else {
- //Avoid the user profiles with all group access.
- $group_condition = " 1 = 1 ";
- }
-
- //When the acl is only group without tags
- if (empty($group_tags)) {
- $condition .= "($group_condition)\n";
- }
- else {
- if (is_array($group_tags)) {
- $group_tags_query = implode(',',$group_tags);
- } else {
- $group_tags_query = $group_tags;
- }
- // Tags condition (The module has at least one of the restricted tags)
- $tags_condition = sprintf('%sid_agente_modulo IN (SELECT id_agente_modulo FROM ttag_module WHERE id_tag IN (%s))', $modules_table, $group_tags_query);
-
- $condition .=
- " ( \n" .
- " $group_condition \n" .
- " AND \n" .
- " $tags_condition \n" .
- " )\n";
- }
-
- $i++;
- }
-
- // Fix: Wrap SQL expression with "()" to avoid bad SQL sintax that makes Pandora retrieve all modules without taking care of id_agent => id_agent = X AND (sql_tag_expression)
- if (!empty($acltags))
- $condition .= ' ) ';
-
- //Avoid the user profiles with all group access.
- //if (!empty($condition)) {
- if (!empty($condition) &&
- !array_key_exists(0, array_keys($acltags))) {
- $condition = sprintf("\n((%s) OR %sid_agente NOT IN (SELECT id_agente FROM tagente WHERE id_grupo IN (%s)))", $condition, $modules_table, implode(',',array_keys($acltags)));
+ $in_group = implode(",",$without_tags);
+ $condition .= sprintf('(tagente.id_grupo IN (%s) OR tasg.id_group IN (%s))',$in_group,$in_group);
}
+ $condition = !empty($condition) ? "($condition)" : '';
return $condition;
}
@@ -859,102 +774,54 @@ function tags_get_acl_tags_event_condition($acltags, $meta = false, $force_group
// Get all tags of the system
$all_tags = tags_get_all_tags(false);
-
- // Juanma (08/05/2014) Fix : Will have all groups retrieved (also propagated ones)
- $_groups_not_in = '';
+ $without_tags = array();
foreach ($acltags as $group_id => $group_tags) {
- // Group condition (The module belongs to an agent of the group X)
- $group_condition = sprintf('id_grupo IN (%s)', implode(',', array_values(groups_get_id_recursive($group_id, true))));
- //$_groups_not_in .= implode(',', array_values(groups_get_id_recursive($group_id))) . ',';
-
- // Tags condition (The module has at least one of the restricted tags)
- $tags_condition = '';
+ // NO check if there is not tag associated with groups
if (empty($group_tags)) {
- // FIXME: Not properly way to increse performance
- if(enterprise_hook('agents_is_using_secondary_groups')){
- $tags_condition = "id_grupo = ".$group_id . " OR id_group = " . $group_id;
- }
- else{
- $tags_condition = "id_grupo = ".$group_id;
- }
- }
- else {
- if (!is_array($group_tags)) {
- $group_tags = explode(',', $group_tags);
- }
-
- foreach ($group_tags as $tag) {
- // If the tag ID doesnt exist, ignore
- if (!isset($all_tags[$tag])) {
- continue;
- }
-
- if ($tags_condition != '') {
- $tags_condition .= " OR \n";
- }
-
- //~ // Add as condition all the posibilities of the serialized tags
- //~ $tags_condition .= sprintf('tags LIKE "%s,%%"',io_safe_input($all_tags[$tag]));
- //~ $tags_condition .= sprintf(' OR tags LIKE "%%,%s,%%"',io_safe_input($all_tags[$tag]));
- //~ $tags_condition .= sprintf(' OR tags LIKE "%%,%s"',io_safe_input($all_tags[$tag]));
- //~ $tags_condition .= sprintf(' OR tags LIKE "%s %%"',io_safe_input($all_tags[$tag]));
- //~ $tags_condition .= sprintf(' OR tags LIKE "%%,%s %%"',io_safe_input($all_tags[$tag]));
-
- if ($force_group_and_tag) {
- if (!empty($all_tags[$tag])) {
- if ($force_equal) {
- $tags_condition .= sprintf('(tags = "%s"',io_safe_input($all_tags[$tag]));
- } else {
- $tags_condition .= "(tags LIKE '%".io_safe_input($all_tags[$tag])."%'";
- }
- $childrens = groups_get_childrens($group_id, null, true);
-
- if (empty($childrens)) {
- $tags_condition .= sprintf(' AND id_grupo = %d )', $group_id);
- } else {
- $childrens_ids[] = $group_id;
- foreach ($childrens as $child) {
- $childrens_ids[] = (int)$child['id_grupo'];
- }
- $ids_str = implode(',', $childrens_ids);
-
- $tags_condition .= sprintf(' AND id_grupo IN (%s) )', $ids_str);
- }
- } else {
- $tags_condition .= "id_grupo = ".$group_id;
- }
- } else {
- if ($force_equal) {
- $tags_condition .= sprintf('tags = "%s"',io_safe_input($all_tags[$tag]));
- } else {
- $tags_condition .= "tags LIKE '%".io_safe_input($all_tags[$tag])."%'";
- }
- }
- }
- }
-
- // If there is not tag condition ignore
- if (empty($tags_condition)) {
+ $without_tags []= $group_id;
continue;
}
-
- if ($condition != '') {
- $condition .= ' OR ';
+
+ // Group condition (The module belongs to an agent of the group X)
+ //$group_condition = sprintf('id_grupo IN (%s)', implode(',', array_values(groups_get_id_recursive($group_id, true))));
+ $group_condition = "(id_grupo = $group_id OR id_group = $group_id)";
+
+ // Tags condition (The module has at least one of the restricted tags)
+ $tags_condition = '';
+ $tags_condition_array = array();
+
+ foreach ($group_tags as $tag) {
+ // If the tag ID doesnt exist, ignore
+ if (!isset($all_tags[$tag])) continue;
+
+ $tags_condition_array[] = $force_equal
+ ? sprintf('tags = "%s"',io_safe_input($all_tags[$tag]))
+ : "tags LIKE '%".io_safe_input($all_tags[$tag])."%'";
}
- $condition .= "($tags_condition)\n";
+ // If there is not tag currently in Pandora, block the group info
+ if (empty($tags_condition_array)) {
+ $tags_condition_array[] = "1=0";
+ }
+
+ $tags_condition = $group_condition . " AND (" . implode(" OR ", $tags_condition_array) . ")";
+ $condition[] = "($tags_condition)\n";
}
-
- //Commented because ACLs propagation don't work
-/*
if (!empty($condition)) {
- // Juanma (08/05/2014) Fix : Also add events of other groups (taking care of propagate ACLs func!)
- if (!empty($_groups_not_in))
- $condition = sprintf("\n((%s) OR id_grupo NOT IN (%s))", $condition, rtrim($_groups_not_in, ','));
+ $condition = implode(' OR ', $condition);
}
-*/
-
+
+ if (!empty($without_tags)) {
+ if (!empty($condition)) {
+ $condition .= ' OR ';
+ }
+ $in_group = implode(",",$without_tags);
+ $condition .= sprintf('(id_grupo IN (%s) OR id_group IN (%s))',$in_group,$in_group);
+ }
+
+ $condition = !empty($condition) ? "($condition)" : '';
+
return $condition;
}
@@ -975,15 +842,14 @@ function tags_has_user_acl_tags($id_user = false) {
if(is_user_admin($id_user)) {
return false;
}
-
- $query = sprintf("SELECT count(*)
- FROM tusuario_perfil, tperfil
- WHERE tperfil.id_perfil = tusuario_perfil.id_perfil AND
- tusuario_perfil.id_usuario = '%s' AND tags != ''",
- $id_user);
-
+
+ $query = "SELECT count(*)
+ FROM tusuario_perfil
+ WHERE tusuario_perfil.id_usuario = '$id_user'
+ AND tags != '' AND tags !='0'";
+
$user_tags = db_get_value_sql($query);
-
+
return (bool)$user_tags;
}
@@ -1150,7 +1016,7 @@ function tags_get_tags_for_module_search($id_user = false, $access = 'AR') {
//--------------------------------------------------------------
return false;
}
- // Get the tags of the required access flag for each group
+ // Get the tags of the required access flag for each group
$tags = tags_get_acl_tags($id_user, 0, $access, 'data');
// If there are wrong parameters or fail ACL check, return false
if ($tags_user === ERR_WRONG_PARAMETERS || $tags_user === ERR_ACL) {
@@ -1186,252 +1052,27 @@ function tags_check_acl_by_module($id_module = 0, $id_user = false,
$access = 'AW') {
global $config;
- $return = false;
-
- if (!empty($id_module)) {
- $tags = tags_get_module_tags($id_module);
- $groups = modules_get_agent_groups($id_module);
-
- if ($id_user === false) {
- $id_user = $config["id_user"];
- }
-
- foreach ($groups as $group) {
- if (tags_check_acl($id_user, $group, $access, $tags, true)) {
- return true;
- }
- }
- }
-
- return $return;
-}
-
-/**
- * Check the ACLs with tags
- *
- * @param string ID of the user (with false the user will be taked from config)
- * @param string id of the group (0 means for at least one)
- * @param string access flag (AR,AW...)
- * @param mixed tags to be checked (array() means for at least one)
- *
- * @return bool true if the acl check has success, false otherwise
- */
-function tags_check_acl($id_user, $id_group, $access, $tags = array(), $flag_id_tag = false) {
- global $config;
-
+ if (empty($id_module)) return false;
if ($id_user === false) {
- $id_user = $config['id_user'];
+ $id_user = $config["id_user"];
}
-
- // Get parents to check in propagate ACL cases
- if (!is_array($id_group) && $id_group != 0) {
- $id_group = array($id_group);
- $group = db_get_row_filter('tgrupo',
- array('id_grupo' => $id_group));
- $parents = groups_get_parents($group['parent'], true);
-
- foreach ($parents as $parent) {
- $id_group[] = $parent['id_grupo'];
- }
- }
-
- $acls = tags_get_acl_tags($id_user, $id_group, $access, 'data');
-
- // If there are wrong parameters or fail ACL check, return false
- if ($acls === ERR_WRONG_PARAMETERS || $acls === ERR_ACL) {
- return false;
- }
-
- // If there are not tags restrictions or tags passed, check the group access
- if (empty($acls) || empty($tags)) {
- if (!is_array($id_group))
- $group_id_array = array($id_group);
-
- foreach ($id_group as $group) {
- if (check_acl($id_user, $group, $access))
- return true;
- }
- }
-
- # Fix: If user profile has more than one group, due to ACL propagation then id_group can be an array
- if (is_array($id_group)) {
-
- foreach ($id_group as $group) {
- if ($group > 0) {
- if (array_key_exists(0, $acls)) {
- //There is a All group
-
- foreach ($tags as $tag) {
- if (in_array($tag, $acls[0])) {
- return true;
- }
- else {
- return false;
- }
- }
- }
- else if (isset($acls[$group])) {
- foreach ($tags as $tag) {
- if (!$flag_id_tag)
- $tag = tags_get_id($tag);
-
- if (in_array($tag, $acls[$group])) {
- return true;
- } else if (empty($acls[$group])) {
- return true;
- }
- }
- }
- else {
- return false;
- }
- }
- else {
-
- foreach ($acls as $acl_tags) {
- foreach ($tags as $tag) {
- if (!$flag_id_tag)
- $tag = tags_get_id($tag);
-
- if (in_array($tag, $acl_tags)) {
- return true;
- }
- }
- }
- }
- }
- }
- else {
- if ($id_group > 0) {
- if (isset($acls[$id_group])) {
- foreach ($tags as $tag) {
- if (!$flag_id_tag)
- $tag = tags_get_id($tag);
-
- if (in_array($tag, $acls[$id_group])) {
- return true;
- }
- }
- }
- else {
- return false;
- }
- }
- else {
- foreach ($acls as $acl_tags) {
- foreach ($tags as $tag) {
- if (!$flag_id_tag)
- $tag = tags_get_id($tag);
-
- if (in_array($tag, $acl_tags)) {
- return true;
- }
- }
- }
- }
- }
-
- return false;
-}
-function tags_check_acl_event($id_user, $id_group, $access, $tags = array(),$p = false) {
- global $config;
-
- if($id_user === false) {
- $id_user = $config['id_user'];
- }
-
- $acls = tags_get_acl_tags($id_user, $id_group, $access, 'data');
-
- // If there are wrong parameters or fail ACL check, return false
- if($acls === ERR_WRONG_PARAMETERS || $acls === ERR_ACL) {
- return false;
- }
-
- // If there are not tags restrictions or tags passed, check the group access
- if (empty($acls) || empty($tags)) {
- if (!is_array($id_group))
- $group_id_array = array($id_group);
-
- foreach ($id_group as $group) {
- if (check_acl($id_user, $group, $access))
- return true;
- }
- }
-
- # Fix: If user profile has more than one group, due to ACL propagation then id_group can be an array
- if (is_array($id_group)) {
-
- foreach ($id_group as $group) {
- if ($group > 0) {
- if (isset($acls[$group])) {
- foreach ($tags as $tag) {
- $tag = tags_get_id($tag);
- if (in_array($tag, $acls[$group])) {
- return true;
- }
- }
- }
- else {
- //return false;
- $return = false;
- }
- }
- else {
- foreach ($acls as $acl_tags) {
- foreach ($tags as $tag) {
- $tag = tags_get_id($tag);
- if (in_array($tag, $acl_tags)) {
- return true;
- }
- }
- }
- }
-
- }
-
- }
- else {
- if ($id_group > 0) {
- if (isset($acls[$id_group])) {
- foreach ($tags as $tag) {
- $tag = tags_get_id($tag);
-
- if (in_array($tag, $acls[$id_group])) {
- return true;
- }
- }
- }
- else {
- //return false;
- $return = false;
- }
- }
- else {
- foreach ($acls as $acl_tags) {
- foreach ($tags as $tag) {
- $tag = tags_get_id($tag);
- if (in_array($tag, $acl_tags)) {
- return true;
- }
- }
- }
- }
- }
- //return false;
- $return = false;
-
- if ($return == false) {
- $parent = db_get_value('parent','tgrupo','id_grupo',$id_group);
-
- if ($parent !== 0) {
- $propagate = db_get_value('propagate','tgrupo','id_grupo',$parent);
- if ($propagate == 1) {
- $acl_parent = tags_check_acl_event($id_user, $parent, $access, $tags,$p);
- return $acl_parent;
- }
- }
+ $tags = tags_get_module_tags($id_module);
+ $groups = modules_get_agent_groups($id_module);
+ $user_groups = users_get_groups($id_user, $acces, false, true);
+
+ $acl_column = get_acl_column($access);
+ foreach ($groups as $group) {
+ // If user has not permission for this group,go to next group
+ if (!isset($user_groups[$group])) continue;
+ // No tags means user can see all tags for this group
+ if (empty($user_groups[$group]["tags"][$acl_column])) return true;
+ // Check acl
+ $intersection = array_intersect($tags, $user_groups[$group]["tags"][$acl_column]);
+ if(!empty($intersection)) return true;
}
+
+ return false;
}
/* This function checks event ACLs */
@@ -2446,7 +2087,9 @@ function tags_get_user_groups_and_tags ($id_user = false, $access = 'AR', $stric
$return = array();
foreach ($acls as $acl) {
- $return[$acl["id_grupo"]] = $acl["tags"];
+ $return[$acl["id_grupo"]] = isset($acl["tags"][get_acl_column($access)])
+ ? implode(",",$acl["tags"][get_acl_column($access)])
+ : "";
}
return $return;
@@ -2701,4 +2344,41 @@ function tags_get_module_policy_tags($id_tag, $id_module) {
return $id_module_policy;
}
+
+/**
+ * Get all tags configured to user associated to the agent.
+ *
+ * @param int $id_agent Agent to extract tags
+ * @param string $access Access to check
+ *
+ * @return mixed
+ * false if user has not permission on agent groups
+ * true if there is not any tag restriction
+ * array with all tags if there are tags configured
+ */
+function tags_get_user_applied_agent_tags ($id_agent, $access = "AR") {
+ global $config;
+
+ $agent_groups = agents_get_all_groups_agent($id_agent);
+ $user_groups = users_get_groups(false, 'AR', false, true);
+ // Check global agent permissions
+ if (!check_acl_one_of_groups($config['id_user'], $agent_groups, $access)) {
+ return false;
+ }
+
+ $acl_column = get_acl_column($access);
+ $tags = array();
+ foreach ($agent_groups as $group) {
+ // If user has not permission to a single group, continue
+ if (!isset($user_groups[$group])) continue;
+ $group_tags = $user_groups[$group]["tags"][$acl_column];
+ if (!empty($group_tags)) {
+ $tags = array_merge($tags, $group_tags);
+ } else {
+ // If an agent
+ return true;
+ }
+ }
+ return empty($tags) ? true : $tags;
+}
?>
diff --git a/pandora_console/include/functions_treeview.php b/pandora_console/include/functions_treeview.php
index 20d1f577bc..2f2e899143 100755
--- a/pandora_console/include/functions_treeview.php
+++ b/pandora_console/include/functions_treeview.php
@@ -745,16 +745,7 @@ function treeview_printTable($id_agente, $server_data = array(), $no_head = fals
foreach ($network_interfaces as $interface_name => $interface) {
if (!empty($interface['traffic'])) {
- $permission = false;
-
- if ($strict_user) {
- if (tags_check_acl_by_module($interface['traffic']['in'], $config['id_user'], 'RR') === true
- && tags_check_acl_by_module($interface['traffic']['out'], $config['id_user'], 'RR') === true)
- $permission = true;
- }
- else {
- $permission = check_acl($config['id_user'], $agent["id_grupo"], "RR");
- }
+ $permission = check_acl($config['id_user'], $agent["id_grupo"], "RR");
if ($permission) {
$params = array(
diff --git a/pandora_console/include/functions_ui.php b/pandora_console/include/functions_ui.php
index 54334e4ecf..9a21a9899c 100755
--- a/pandora_console/include/functions_ui.php
+++ b/pandora_console/include/functions_ui.php
@@ -823,10 +823,26 @@ function ui_format_alert_row ($alert, $agent = true, $url = '', $agent_style = f
else
return array ("", "", "", "", "", "", "");
}
-
- // Get agent id
- $id_agent = modules_get_agentmodule_agent ($alert['id_agent_module']);
- $agente = db_get_row ('tagente', 'id_agente', $id_agent);
+
+
+ if (defined('METACONSOLE')) {
+
+ $server = db_get_row ('tmetaconsole_setup', 'id', $alert['server_data']['id']);
+
+ if (metaconsole_connect($server) == NOERR) {
+
+ // Get agent data from node
+ $agente = db_get_row ('tagente', 'id_agente', $alert['id_agent']);
+
+ metaconsole_restore_db ();
+ }
+
+ } else {
+ // Get agent id
+ $id_agent = modules_get_agentmodule_agent ($alert['id_agent_module']);
+ $agente = db_get_row ('tagente', 'id_agente', $id_agent);
+ }
+
$template = alerts_get_alert_template ($alert['id_alert_template']);
$description = io_safe_output($template['name']);
@@ -934,7 +950,7 @@ function ui_format_alert_row ($alert, $agent = true, $url = '', $agent_style = f
ui_print_truncate_text (io_safe_output($description), 'description', false, true, true, '[…]', 'font-size: 7.1pt') .
$disabledHtmlEnd;
- $actions = alerts_get_alert_agent_module_actions ($alert['id'], false);
+ $actions = alerts_get_alert_agent_module_actions ($alert['id'], false, $alert['server_data']['id']);
if (!empty($actions)) {
$actionText = '
';
@@ -4052,7 +4068,7 @@ function ui_get_logo_to_center_networkmap () {
global $config;
if ((!enterprise_installed()) || empty($config['custom_network_center_logo'])) {
- return DEFAULT_NETWORKMAP_CENTER_LOGO;
+ return 'images/networkmap/bola_pandora_network_maps.png';
}
return 'enterprise/images/custom_general_logos/' . $config['custom_support_logo'];
diff --git a/pandora_console/include/functions_users.php b/pandora_console/include/functions_users.php
index c11fff79fd..e368a52b4a 100755
--- a/pandora_console/include/functions_users.php
+++ b/pandora_console/include/functions_users.php
@@ -208,23 +208,13 @@ function groups_combine_acl($acl_group_a, $acl_group_b){
"tags" => 1,
);
+ foreach ($acl_group_a['tags'] as $key => $value) {
+ $acl_group_b['tags'][$key] = array_merge($value, $acl_group_b['tags'][$key]);
+ }
+
foreach ($acl_list as $acl => $aux) {
- if($acl == "tags") {
- // Mix tags
-
- if (isset($acl_group_a[$acl]) && ($acl_group_a[$acl] != "")) {
- if (isset($acl_group_b[$acl]) && ($acl_group_b[$acl] != "")) {
- if ($acl_group_b[$acl] != ($acl_group_a[$acl])) {
- $acl_group_b[$acl] = $acl_group_a[$acl] . "," . $acl_group_b[$acl];
- }
- }
- else {
- $acl_group_b[$acl] = $acl_group_a[$acl];
- }
- }
- continue;
- }
+ if($acl == "tags") continue;
// propagate ACL
$acl_group_b[$acl] = $acl_group_a[$acl] || $acl_group_b[$acl];
}
@@ -286,6 +276,8 @@ function users_get_groups ($id_user = false, $privilege = "AR", $returnAllGroup
foreach ($raw_forest as $g) {
// XXX, following code must be remade (TAG)
+ users_get_explode_tags($g);
+
if (!isset($forest_acl[$g["id_grupo"]] )) {
$forest_acl[$g["id_grupo"]] = $g;
}
@@ -314,6 +306,7 @@ function users_get_groups ($id_user = false, $privilege = "AR", $returnAllGroup
}
else {
// add group to user ACL forest
+ users_get_explode_tags($group);
$tmp = groups_combine_acl($forest_acl[$parent], $group);
}
if ($tmp !== null) {
@@ -418,10 +411,13 @@ function users_get_first_group ($id_user = false, $privilege = "AR", $all_group
* @param int Agent id.
* @param string Access mode to be checked. Default AR (Agent reading)
* @param string User id. Current user by default
+ * @param bool True to use the metaconsole tables
*
* @return bool Access to that agent (false not, true yes)
*/
-function users_access_to_agent ($id_agent, $mode = "AR", $id_user = false) {
+function users_access_to_agent (
+ $id_agent, $mode = "AR", $id_user = false, $force_meta = false
+) {
if (empty ($id_agent))
return false;
@@ -432,7 +428,7 @@ function users_access_to_agent ($id_agent, $mode = "AR", $id_user = false) {
return (bool) check_acl_one_of_groups (
$id_user,
- agents_get_all_groups_agent((int)$id_agent),
+ agents_get_all_groups_agent((int)$id_agent, false, $force_meta),
$mode);
}
@@ -1066,4 +1062,27 @@ function users_get_strict_mode_groups($id_user, $return_group_all) {
return $return_user_groups;
}
+function users_get_explode_tags(&$group) {
+
+ if (empty($group['tags'])) {
+ $group['tags'] = array();
+ $group['tags']['agent_view'] = array();
+ $group['tags']['agent_edit'] = array();
+ $group['tags']['agent_disable'] = array();
+ $group['tags']['event_view'] = array();
+ $group['tags']['event_edit'] = array();
+ $group['tags']['event_management'] = array();
+ } else {
+ $aux = explode(',', $group['tags']);
+ $group['tags'] = array();
+ $group['tags']['agent_view'] = ($group['agent_view']) ? $aux : array();
+ $group['tags']['agent_edit'] = ($group['agent_edit']) ? $aux : array();
+ $group['tags']['agent_disable'] = ($group['agent_disable']) ? $aux : array();
+ $group['tags']['event_view'] = ($group['event_view']) ? $aux : array();
+ $group['tags']['event_edit'] = ($group['event_edit']) ? $aux : array();
+ $group['tags']['event_management'] = ($group['event_management']) ? $aux : array();
+ }
+
+}
+
?>
diff --git a/pandora_console/include/functions_visual_map.php b/pandora_console/include/functions_visual_map.php
index b92f17e230..d6112fb0bb 100755
--- a/pandora_console/include/functions_visual_map.php
+++ b/pandora_console/include/functions_visual_map.php
@@ -487,7 +487,7 @@ function visual_map_print_item($mode = "read", $layoutData,
else {
$url = ui_meta_get_url_console_child(
$layoutData['id_metaconsole'],
- "estado", "operation/agentes/ver_agente&id_agente=" . $layoutData['id_agent']);
+ "estado", "operation/agentes/ver_agente&id_agente=" . $layoutData['id_agent'], null, null, null, $isExternalLink);
}
}
else {
@@ -499,7 +499,7 @@ function visual_map_print_item($mode = "read", $layoutData,
else {
$url = ui_meta_get_url_console_child(
$layoutData['id_metaconsole'],
- "estado", "operation/agentes/ver_agente&id_agente=" . $layoutData['id_agent']);
+ "estado", "operation/agentes/ver_agente&id_agente=" . $layoutData['id_agent'], null, null, null, $isExternalLink);
}
}
}
@@ -662,7 +662,7 @@ function visual_map_print_item($mode = "read", $layoutData,
else {
$url = ui_meta_get_url_console_child(
$layoutData['id_metaconsole'],
- "estado", "operation/agentes/ver_agente&id_agente=" . $layoutData['id_agent']);
+ "estado", "operation/agentes/ver_agente&id_agente=" . $layoutData['id_agent'], null, null, null, $isExternalLink);
}
}
break;
@@ -724,7 +724,7 @@ function visual_map_print_item($mode = "read", $layoutData,
else {
$url = ui_meta_get_url_console_child(
$layoutData['id_metaconsole'],
- "estado", 'operation/agentes/ver_agente&id_agente='.$layoutData['id_agent']);
+ "estado", 'operation/agentes/ver_agente&id_agente='.$layoutData['id_agent'], null, null, null, $isExternalLink);
}
}
}
@@ -779,7 +779,7 @@ function visual_map_print_item($mode = "read", $layoutData,
else {
$url = ui_meta_get_url_console_child(
$layoutData['id_metaconsole'],
- "estado", 'operation/agentes/ver_agente&id_agente='.$layoutData["id_agent"].'&tab=data');
+ "estado", 'operation/agentes/ver_agente&id_agente='.$layoutData["id_agent"].'&tab=data', null, null, null, $isExternalLink);
}
}
}
@@ -1437,88 +1437,37 @@ function visual_map_print_item($mode = "read", $layoutData,
}
}
else{
- if ($layoutData['id_metaconsole'] != 0) {
-
- if($layoutData['clock_animation'] == 'analogic_1'){
- $img = '' .print_clock_analogic_1 ($layoutData['time_format'], $layoutData['timezone'],$layoutData['clock_animation'],$layoutData['width'],$layoutData['height'],$layoutData['id'],$layoutData['fill_color']).'
';
- }
- elseif ($layoutData['label_position']=='right') {
- $img = '' . print_clock_analogic_1 ($layoutData['time_format'], $layoutData['timezone'],$layoutData['clock_animation'],$layoutData['width'],$layoutData['height'],$layoutData['id'],$layoutData['fill_color']).'
';
- }
- else {
- $img = '' . print_clock_analogic_1 ($layoutData['time_format'], $layoutData['timezone'],$layoutData['clock_animation'],$layoutData['width'],$layoutData['height'],$layoutData['id'],$layoutData['fill_color']).'
';
- }
+ if ($layoutData['label_position']=='left') {
+ $img = '' . print_clock_analogic_1 ($layoutData['time_format'], $layoutData['timezone'],$layoutData['clock_animation'],$layoutData['width'],$layoutData['height'],$layoutData['id'],$layoutData['fill_color']).'
';
}
- else{
- if ($layoutData['label_position']=='left') {
- $img = '' . print_clock_analogic_1 ($layoutData['time_format'], $layoutData['timezone'],$layoutData['clock_animation'],$layoutData['width'],$layoutData['height'],$layoutData['id'],$layoutData['fill_color']).'
';
- }
- elseif ($layoutData['label_position']=='right') {
- $img = '' .print_clock_analogic_1 ($layoutData['time_format'], $layoutData['timezone'],$layoutData['clock_animation'],$layoutData['width'],$layoutData['height'],$layoutData['id'],$layoutData['fill_color']).'
';
- }
- else {
- $img ='' . print_clock_analogic_1 ($layoutData['time_format'], $layoutData['timezone'],$layoutData['clock_animation'],$layoutData['width'],$layoutData['height'],$layoutData['id'],$layoutData['fill_color']).'
';
- }
+ elseif ($layoutData['label_position']=='right') {
+ $img = '' . print_clock_analogic_1 ($layoutData['time_format'], $layoutData['timezone'],$layoutData['clock_animation'],$layoutData['width'],$layoutData['height'],$layoutData['id'],$layoutData['fill_color']).'
';
+ }
+ else {
+ $img = '' . print_clock_analogic_1 ($layoutData['time_format'], $layoutData['timezone'],$layoutData['clock_animation'],$layoutData['width'],$layoutData['height'],$layoutData['id'],$layoutData['fill_color']).'
';
}
-
}
elseif($layoutData['clock_animation'] == 'digital_1'){
-
- if ($width == 0) {
- if ($layoutData['label_position']=='left') {
- $img = '' .print_clock_digital_1 ($layoutData['time_format'], $layoutData['timezone'],$layoutData['clock_animation'],$layoutData['width'],$layoutData['height'],$layoutData['id'],$layoutData['fill_color']).'
';
- }
- elseif ($layoutData['label_position']=='right') {
- $img = '' . print_clock_digital_1 ($layoutData['time_format'], $layoutData['timezone'],$layoutData['clock_animation'],$layoutData['width'],$layoutData['height'],$layoutData['id'],$layoutData['fill_color']).'
';
- }
- else {
- $img = '' . print_clock_digital_1 ($layoutData['time_format'], $layoutData['timezone'],$layoutData['clock_animation'],$layoutData['width'],$layoutData['height'],$layoutData['id'],$layoutData['fill_color']).'
';
- }
+ if ($layoutData['label_position']=='left') {
+ $img = '' . print_clock_digital_1 ($layoutData['time_format'], $layoutData['timezone'],$layoutData['clock_animation'],$layoutData['width'],$layoutData['height'],$layoutData['id'],$layoutData['fill_color']).'
';
}
- else{
- if ($layoutData['label_position']=='left') {
- $img = '' . print_clock_digital_1 ($layoutData['time_format'], $layoutData['timezone'],$layoutData['clock_animation'],$layoutData['width'],$layoutData['height'],$layoutData['id'],$layoutData['fill_color']).'
';
- }
- elseif ($layoutData['label_position']=='right') {
- $img = '' .print_clock_digital_1 ($layoutData['time_format'], $layoutData['timezone'],$layoutData['clock_animation'],$layoutData['width'],$layoutData['height'],$layoutData['id'],$layoutData['fill_color']).'
';
- }
- else {
- $img ='' . print_clock_digital_1 ($layoutData['time_format'], $layoutData['timezone'],$layoutData['clock_animation'],$layoutData['width'],$layoutData['height'],$layoutData['id'],$layoutData['fill_color']).'
';
- }
+ elseif ($layoutData['label_position']=='right') {
+ $img = '' .print_clock_digital_1 ($layoutData['time_format'], $layoutData['timezone'],$layoutData['clock_animation'],$layoutData['width'],$layoutData['height'],$layoutData['id'],$layoutData['fill_color']).'
';
+ }
+ else {
+ $img ='' . print_clock_digital_1 ($layoutData['time_format'], $layoutData['timezone'],$layoutData['clock_animation'],$layoutData['width'],$layoutData['height'],$layoutData['id'],$layoutData['fill_color']).'
';
}
}
}
@@ -1775,16 +1724,25 @@ function visual_map_print_item($mode = "read", $layoutData,
$value = format_for_graph($value, 2);
}
- if (!empty($unit_text))
- $value .= " " . $unit_text;
-
// Hide value on boolean modules
- if (!modules_is_boolean($layoutData['id_agente_modulo'])) {
- $img_style_title .=
- " ' .
html_print_checkbox('show_on_top', 1, '', true) . ' ';
+ $show_last_value = array('0' => __('Hide last value on boolean modules'), '1' => __('Enabled'), '2' => __('Disabled'));
+ $form_items['show_last_value_row'] = array();
+ $form_items['show_last_value_row']['items'] = array('static_graph');
+ $form_items['show_last_value_row']['html'] =
+ '' . __('Show last value') . '
+ ' .
+ html_print_select($show_last_value, 'last_value', 0, '', '', '', true) .
+ ' ';
+
$form_items['module_graph_size_row'] = array();
$form_items['module_graph_size_row']['items'] = array('module_graph', 'datos');
$form_items['module_graph_size_row']['html'] = '' . __('Size') . '
diff --git a/pandora_console/include/graphs/flot/pandora.flot.js b/pandora_console/include/graphs/flot/pandora.flot.js
index a71cb5eb19..45208c12b8 100644
--- a/pandora_console/include/graphs/flot/pandora.flot.js
+++ b/pandora_console/include/graphs/flot/pandora.flot.js
@@ -2240,7 +2240,6 @@ function pandoraFlotArea( graph_id, values, legend,
}
function yFormatter(v, axis) {
- axis.datamin = 0;
if (short_data) {
var formatted = number_format(v, force_integer, "", short_data);
}
diff --git a/pandora_console/include/help/en/help_log_viewer.php b/pandora_console/include/help/en/help_log_viewer.php
new file mode 100644
index 0000000000..6e1708246c
--- /dev/null
+++ b/pandora_console/include/help/en/help_log_viewer.php
@@ -0,0 +1,56 @@
+
+Modelos de captura de datos
+
+Se pueden realizar graficas extrayendo información
+de los logs, clasificando la información en base a modelos de captura de datos.
+
+
+Estos modelos de captura de datos son básicamente expresiones regulares e
+identificadores, que nos permitirán analizar los orígenes de datos y mostrarlos como un gráfico.
+
+
+Podemos seleccionar el modelo de captura.
+El modelo por defecto, Apache log model, ofrece la posibilidad de parsear logs de Apache
+en formato estándar (access_log), pudiendo extraer gráficas comparativas de tiempo de respuesta,
+agrupando por página visitada y código de respuesta.
+
+
+Al pulsar en el botón de editar editaremos el modelo de captura seleccionado.
+Con el botón de crear agregaremos un nuevo modelo de captura.
+En el formulario que aparece, podremos elegir:
+
+
Título
+Un nombre para el modelo de captura
+
+
Expresión regular
+Cada campo a extraer se identifica con la subexpresión entre los paréntesis (expresión a capturar).
+
+
Los campos
+En el orden en que los hemos capturado con la expresión regular.
+Los resultados se agruparán por la concatenación de los campos clave, que son aquellos
+cuyo nombre no esté entre guiones bajos:
+
+clave, _valor_
+Observación: Si no especificamos un campo valor, será automáticamente el conteo de apariciones
+que coinciden con la expresión regular.
+
+Observación 2: Si especificamos una columna valor podremos elegir entre representar el valor acumulado
+(comportamiento por defecto) o marcar el checkbox para representar el promedio.
+
+Ejemplo
+Si quisiéramos extraer entradas de un log con el siguiente formato:
+Sep 19 12:05:01 nova systemd: Starting Session 6132 of user root.
+
+Para contar el número de veces que se ha iniciado sesión, agrupando por usuario, usaremos la expresion regular:
+
Starting Session \d+ of user (.*?)\.
+
+y de campo:
+username
+
+Este modelo de captura nos devolverá una grafica con el número de inicios de sesión por usuario
+en el intervalo de tiempo que seleccionemos.
+
diff --git a/pandora_console/include/help/es/help_log_viewer.php b/pandora_console/include/help/es/help_log_viewer.php
new file mode 100644
index 0000000000..dfdd818541
--- /dev/null
+++ b/pandora_console/include/help/es/help_log_viewer.php
@@ -0,0 +1,56 @@
+
+Visualización y búsqueda avanzadas
+
+Se pueden realizar graficas extrayendo información
+de los logs, clasificando la información en base a modelos de captura de datos.
+
+
+Estos modelos de captura de datos son básicamente expresiones regulares e
+identificadores, que nos permitirán analizar los orígenes de datos y mostrarlos como un gráfico.
+
+
+Podemos seleccionar el modelo de captura.
+El modelo por defecto, Apache log model, ofrece la posibilidad de parsear logs de Apache
+en formato estándar (access_log), pudiendo extraer gráficas comparativas de tiempo de respuesta,
+agrupando por página visitada y código de respuesta.
+
+
+Al pulsar en el botón de editar editaremos el modelo de captura seleccionado.
+Con el botón de crear agregaremos un nuevo modelo de captura.
+En el formulario que aparece, podremos elegir:
+
+
Título
+Un nombre para el modelo de captura
+
+
Expresión regular
+Cada campo a extraer se identifica con la subexpresión entre los paréntesis (expresión a capturar).
+
+
Los campos
+En el orden en que los hemos capturado con la expresión regular.
+Los resultados se agruparán por la concatenación de los campos clave, que son aquellos
+cuyo nombre no esté entre guiones bajos:
+
+clave, _valor_
+Observación: Si no especificamos un campo valor, será automáticamente el conteo de apariciones
+que coinciden con la expresión regular.
+
+Observación 2: Si especificamos una columna valor podremos elegir entre representar el valor acumulado
+(comportamiento por defecto) o marcar el checkbox para representar el promedio.
+
+Ejemplo
+Si quisiéramos extraer entradas de un log con el siguiente formato:
+Sep 19 12:05:01 nova systemd: Starting Session 6132 of user root.
+
+Para contar el número de veces que se ha iniciado sesión, agrupando por usuario, usaremos la expresion regular:
+
Starting Session \d+ of user (.*?)\.
+
+y de campo:
+username
+
+Este modelo de captura nos devolverá una grafica con el número de inicios de sesión por usuario
+en el intervalo de tiempo que seleccionemos.
+
diff --git a/pandora_console/include/help/ja/help_log_viewer.php b/pandora_console/include/help/ja/help_log_viewer.php
new file mode 100644
index 0000000000..65696bba38
--- /dev/null
+++ b/pandora_console/include/help/ja/help_log_viewer.php
@@ -0,0 +1,55 @@
+
+Visualización y búsqueda avanzadas
+
+Se pueden realizar graficas extrayendo información
+de los logs, clasificando la información en base a modelos de captura de datos.
+
+
+Estos modelos de captura de datos son básicamente expresiones regulares e
+identificadores, que nos permitirán analizar los orígenes de datos y mostrarlos como un gráfico.
+
+
+Podemos seleccionar el modelo de captura.
+El modelo por defecto, Apache log model, ofrece la posibilidad de parsear logs de Apache
+en formato estándar (access_log), pudiendo extraer gráficas comparativas de tiempo de respuesta,
+agrupando por página visitada y código de respuesta.
+
+
+Al pulsar en el botón de editar editaremos el modelo de captura seleccionado.
+Con el botón de crear agregaremos un nuevo modelo de captura.
+En el formulario que aparece, podremos elegir:
+
+
Título
+Un nombre para el modelo de captura
+
+
Expresión regular
+Cada campo a extraer se identifica con la subexpresión entre los paréntesis (expresión a capturar).
+
+
Los campos
+En el orden en que los hemos capturado con la expresión regular.
+Los resultados se agruparán por la concatenación de los campos clave, que son aquellos
+cuyo nombre no esté entre guiones bajos:
+
+clave, _valor_
+Observación: Si no especificamos un campo valor, será automáticamente el conteo de apariciones
+que coinciden con la expresión regular.
+
+Observación 2: Si especificamos una columna valor podremos elegir entre representar el valor acumulado
+(comportamiento por defecto) o marcar el checkbox para representar el promedio.
+
+Ejemplo
+Si quisiéramos extraer entradas de un log con el siguiente formato:
+Sep 19 12:05:01 nova systemd: Starting Session 6132 of user root.
+
+Para contar el número de veces que se ha iniciado sesión, agrupando por usuario, usaremos la expresion regular:
+
Starting Session \d+ of user (.*?)\.
+
+y de campo:
+username
+
+Este modelo de captura nos devolverá una grafica con el número de inicios de sesión por usuario
+en el intervalo de tiempo que seleccionemos.
\ No newline at end of file
diff --git a/pandora_console/include/javascript/functions_pandora_networkmap.js b/pandora_console/include/javascript/functions_pandora_networkmap.js
index 7edc029f68..83418f97c1 100644
--- a/pandora_console/include/javascript/functions_pandora_networkmap.js
+++ b/pandora_console/include/javascript/functions_pandora_networkmap.js
@@ -3958,26 +3958,6 @@ function get_status_module() {
});
}
-function check_changes_num_modules() {
- var params = [];
- params.push("check_changes_num_modules=1");
- params.push("id=" + id_agent);
- params.push("page=operation/agentes/pandora_networkmap.view");
- jQuery.ajax({
- data: params.join("&"),
- dataType: 'json',
- type: 'POST',
- url: action = "../../../ajax.php",
- success: function (data) {
- if (data['correct']) {
- if (module_count != data['count']) {
- //location.reload(true);
- }
- }
- }
- });
-}
-
function show_networkmap_node(id_agent_param, refresh_state) {
id_agent = id_agent_param;
diff --git a/pandora_console/include/javascript/pandora.js b/pandora_console/include/javascript/pandora.js
index 11157ed3ff..0788f43c70 100644
--- a/pandora_console/include/javascript/pandora.js
+++ b/pandora_console/include/javascript/pandora.js
@@ -65,58 +65,6 @@ Array.prototype.in_array = function () {
return false;
};
-/**
- * Fill up select box with id "module" with modules after agent has been selected
- *
- * @param event that has been triggered
- * @param id_agent Agent ID that has been selected
- * @param selected Which module(s) have to be selected
- */
-function agent_changed (event, id_agent, selected) {
- if (id_agent == undefined)
- id_agent = this.value;
- $('#module').attr ('disabled', 1);
- $('#module').empty ();
- $('#module').append ($(' 
';
- }
- else{
-
- if($layoutData['time_format'] == 'time'){
- $img = '
';
- }
- else{
- $img = '
';
}
else{
- if($layoutData['clock_animation'] == 'analogic_1'){
- $img = '
';
- }
- else{
- if($layoutData['time_format'] == 'time'){
- $img = '
';
- }
- else{
- $img = '
';
}
}
}
else{
if($layoutData['clock_animation'] == 'analogic_1'){
-
- if ($width == 0) {
- if ($layoutData['label_position']=='left') {
- $img = '