| " . __('Legend') . " | |
| " . __("Orange cell when the module group and agent have at least one alarm fired.") . " | |
| " . __("Red cell when the module group and agent have at least one module in critical status and the others in any status") . " | |
| " . __("Yellow cell when the module group and agent have at least one in warning status and the others in grey or green status") . " | |
| " . __("Green cell when the module group and agent have all modules in OK status") . " | |
| " . __("Grey cell when the module group and agent have at least one in unknown status and the others in green status") . " | |
| " .__("Blue cell when the module group and agent have all modules in not init status.") . " | |
";
+ html_print_table($table);
echo "
";
+
+ ui_pagination($counter);
+
+ echo "";
+ echo "";
+ echo "
";
+ echo "
";
+
}
else {
- echo "| " . __('Legend') . " | |
| " . __("Orange cell when the module group and agent have at least one alarm fired.") . " | |
| " . __("Red cell when the module group and agent have at least one module in critical status and the others in any status") . " | |
| " . __("Yellow cell when the module group and agent have at least one in warning status and the others in grey or green status") . " | |
| " . __("Grey cell when the module group and agent have at least one in unknown status and the others in green status") . " | |
| " . __("Green cell when the module group and agent have all modules in OK status") . " | |
| " .__("Blue cell when the module group and agent have all modules in not init status.") . " | |
".__('There are no defined groups or module groups')."
";
+ ui_print_info_message ( array('no_close'=>true, 'message'=> __("This table shows in columns the modules group and in rows agents group. The cell shows all modules") ));
+ ui_print_info_message ( array('no_close'=>true, 'message'=> __('There are no defined groups or module groups') ));
}
-
+
ui_require_css_file('cluetip');
ui_require_jquery_file('cluetip');
?>
@@ -292,7 +270,8 @@ function mainModuleGroups() {
$("a.info_cell").cluetip ({
arrows: true,
attribute: 'rel',
- cluetipClass: 'default'
+ cluetipClass: 'default',
+ width: '200px'
});
});
diff --git a/pandora_console/extensions/realtime_graphs/realtime_graphs.js b/pandora_console/extensions/realtime_graphs/realtime_graphs.js
index 64960cc658..34da7b1704 100644
--- a/pandora_console/extensions/realtime_graphs/realtime_graphs.js
+++ b/pandora_console/extensions/realtime_graphs/realtime_graphs.js
@@ -28,6 +28,11 @@
return formattedTime;
}
},
+ yaxis: {
+ tickFormatter: function (value, axis) {
+ return shortNumber(value);
+ }
+ },
series: {
lines: {
lineWidth: 2,
@@ -158,6 +163,22 @@
});
}
+ function shortNumber (number) {
+ if (Math.round(number) != number) return number;
+ number = Number.parseInt(number);
+ if (Number.isNaN(number)) return number;
+
+ var shorts = ["", "K", "M", "G", "T", "P", "E", "Z", "Y"];
+ var pos = 0;
+
+ while (number >= 1000 || number <= -1000) {
+ pos++;
+ number = number / 1000;
+ }
+
+ return number + " " + shorts[pos];
+ }
+
$('#graph').change(function() {
$('form#realgraph').submit();
});
diff --git a/pandora_console/extras/mr/20.sql b/pandora_console/extras/mr/20.sql
index 58aa5bf708..a36a832839 100644
--- a/pandora_console/extras/mr/20.sql
+++ b/pandora_console/extras/mr/20.sql
@@ -24,4 +24,26 @@ ALTER TABLE `tlayout_template_data` ADD COLUMN `linked_layout_node_id` INT(10) N
ALTER TABLE `treport` ADD COLUMN `hidden` tinyint(1) NOT NULL DEFAULT 0;
+ALTER TABLE `trecon_task` ADD COLUMN `snmp_version` varchar(5) NOT NULL default '1';
+ALTER TABLE `trecon_task` ADD COLUMN `snmp_auth_user` varchar(255) NOT NULL default '';
+ALTER TABLE `trecon_task` ADD COLUMN `snmp_auth_pass` varchar(255) NOT NULL default '';
+ALTER TABLE `trecon_task` ADD COLUMN `snmp_auth_method` varchar(25) NOT NULL default '';
+ALTER TABLE `trecon_task` ADD COLUMN `snmp_privacy_method` varchar(25) NOT NULL default '';
+ALTER TABLE `trecon_task` ADD COLUMN `snmp_privacy_pass` varchar(255) NOT NULL default '';
+ALTER TABLE `trecon_task` ADD COLUMN `snmp_security_level` varchar(25) NOT NULL default '';
+ALTER TABLE `tpolicy_modules_inventory` ADD COLUMN `custom_fields` MEDIUMBLOB NOT NULL;
+
+CREATE TABLE IF NOT EXISTS `tlog_graph_models` (
+ `id` INTEGER UNSIGNED NOT NULL AUTO_INCREMENT,
+ `title` TEXT NOT NULL,
+ `regexp` TEXT NOT NULL,
+ `fields` TEXT NOT NULL,
+ `average` tinyint(1) NOT NULL default '0',
+ PRIMARY KEY(`id`)
+) ENGINE = InnoDB DEFAULT CHARSET=utf8;
+
+INSERT INTO tlog_graph_models VALUES (1, 'Apache log model',
+ '^.*?\s+.*".*?\s(\/.*?)\?.*1.1"\s+(.*?)\s+(.*?)\s+',
+ 'pagina, html_err_code, _tiempo_', 1);
+
COMMIT;
\ No newline at end of file
diff --git a/pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql b/pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
index dd39b6159f..29c5bb4f8b 100644
--- a/pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
+++ b/pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
@@ -1175,13 +1175,13 @@ ALTER TABLE titem MODIFY `source_data` int(10) unsigned;
INSERT INTO `tconfig` (`token`, `value`) VALUES ('big_operation_step_datos_purge', '100');
INSERT INTO `tconfig` (`token`, `value`) VALUES ('small_operation_step_datos_purge', '1000');
INSERT INTO `tconfig` (`token`, `value`) VALUES ('days_autodisable_deletion', '30');
-INSERT INTO `tconfig` (`token`, `value`) VALUES ('MR', 19);
+INSERT INTO `tconfig` (`token`, `value`) VALUES ('MR', 20);
INSERT INTO `tconfig` (`token`, `value`) VALUES ('custom_docs_logo', 'default_docs.png');
INSERT INTO `tconfig` (`token`, `value`) VALUES ('custom_support_logo', 'default_support.png');
INSERT INTO `tconfig` (`token`, `value`) VALUES ('custom_logo_white_bg_preview', 'pandora_logo_head_white_bg.png');
UPDATE tconfig SET value = 'https://licensing.artica.es/pandoraupdate7/server.php' WHERE token='url_update_manager';
DELETE FROM `tconfig` WHERE `token` = 'current_package_enterprise';
-INSERT INTO `tconfig` (`token`, `value`) VALUES ('current_package_enterprise', '726');
+INSERT INTO `tconfig` (`token`, `value`) VALUES ('current_package_enterprise', '727');
-- ---------------------------------------------------------------------
-- Table `tconfig_os`
@@ -1769,8 +1769,32 @@ CREATE TABLE IF NOT EXISTS `tlayout_template_data` (
FOREIGN KEY (`id_layout_template`) REFERENCES tlayout_template(`id`) ON DELETE CASCADE ON UPDATE CASCADE
) ENGINE = InnoDB DEFAULT CHARSET=utf8;
+-- ---------------------------------------------------------------------
+-- Table `tlog_graph_models`
+-- ---------------------------------------------------------------------
+CREATE TABLE IF NOT EXISTS `tlog_graph_models` (
+ `id` INTEGER UNSIGNED NOT NULL AUTO_INCREMENT,
+ `title` TEXT NOT NULL,
+ `regexp` TEXT NOT NULL,
+ `fields` TEXT NOT NULL,
+ `average` tinyint(1) NOT NULL default '0',
+ PRIMARY KEY(`id`)
+) ENGINE = InnoDB DEFAULT CHARSET=utf8;
+
+INSERT INTO tlog_graph_models VALUES (1, 'Apache log model',
+ '^.*?\s+.*".*?\s(\/.*?)\?.*1.1"\s+(.*?)\s+(.*?)\s+',
+ 'pagina, html_err_code, _tiempo_', 1);
+
-- -----------------------------------------------------
-- Add column in table `treport`
-- -----------------------------------------------------
ALTER TABLE `treport` ADD COLUMN `hidden` tinyint(1) NOT NULL DEFAULT 0;
+
+ALTER TABLE `trecon_task` ADD COLUMN `snmp_version` varchar(5) NOT NULL default '1';
+ALTER TABLE `trecon_task` ADD COLUMN `snmp_auth_user` varchar(255) NOT NULL default '';
+ALTER TABLE `trecon_task` ADD COLUMN `snmp_auth_pass` varchar(255) NOT NULL default '';
+ALTER TABLE `trecon_task` ADD COLUMN `snmp_auth_method` varchar(25) NOT NULL default '';
+ALTER TABLE `trecon_task` ADD COLUMN `snmp_privacy_method` varchar(25) NOT NULL default '';
+ALTER TABLE `trecon_task` ADD COLUMN `snmp_privacy_pass` varchar(255) NOT NULL default '';
+ALTER TABLE `trecon_task` ADD COLUMN `snmp_security_level` varchar(25) NOT NULL default '';
diff --git a/pandora_console/godmode/agentes/agent_manager.php b/pandora_console/godmode/agentes/agent_manager.php
index 0196fb9393..4e6be0e725 100644
--- a/pandora_console/godmode/agentes/agent_manager.php
+++ b/pandora_console/godmode/agentes/agent_manager.php
@@ -479,6 +479,7 @@ $table->data[3][1] .= __('Autodisable mode') . ' ' .
// Status (Disabled / Enabled)
$table->data[4][0] = __('Status');
$table->data[4][1] = __('Disabled') . ' ' .
+ ui_print_help_tip(__('If the remote configuration is enabled, it will also go into standby mode when disabling it.'), true) . ' ' .
html_print_radio_button_extended ("disabled", 1, '', $disabled, false, '', 'style="margin-right: 40px;"', true);
$table->data[4][1] .= __('Enabled') . ' ' .
html_print_radio_button_extended ("disabled", 0, '', $disabled, false, '', 'style="margin-right: 40px;"', true);
diff --git a/pandora_console/godmode/agentes/configurar_agente.php b/pandora_console/godmode/agentes/configurar_agente.php
index b0999eb638..3a208e1f7c 100644
--- a/pandora_console/godmode/agentes/configurar_agente.php
+++ b/pandora_console/godmode/agentes/configurar_agente.php
@@ -760,7 +760,7 @@ if ($update_agent) { // if modified some agent paramenter
$quiet = (int) get_parameter("quiet", 0);
$cps = (int) get_parameter("cps", 0);
- $old_interval = db_get_value('intervalo', 'tagente', 'id_agente', $id_agente);
+ $old_values = db_get_row('tagente', 'id_agente', $id_agente);
$fields = db_get_all_fields_in_table('tagent_custom_fields');
if ($fields === false) $fields = array();
@@ -860,11 +860,21 @@ if ($update_agent) { // if modified some agent paramenter
// Update the agent from the metaconsole cache
enterprise_include_once('include/functions_agents.php');
enterprise_hook ('agent_update_from_cache', array($id_agente, $values,$server_name));
-
- if ($old_interval != $intervalo) {
- enterprise_hook('config_agents_update_config_interval', array($id_agente, $intervalo));
+
+ # Update the configuration files
+ if ($old_values['intervalo'] != $intervalo) {
+ enterprise_hook(
+ 'config_agents_update_config_token',
+ array($id_agente, 'interval', $intervalo)
+ );
}
-
+ if ($old_values['disabled'] != $disabled) {
+ enterprise_hook(
+ 'config_agents_update_config_token',
+ array($id_agente, 'standby', $disabled ? "1" : "0")
+ );
+ }
+
if($tpolicy_group_old){
foreach ($tpolicy_group_old as $key => $value) {
$tpolicy_agents_old= db_get_sql("SELECT * FROM tpolicy_agents
@@ -1713,12 +1723,18 @@ if ($delete_module) { // DELETE agent module !
ui_print_error_message(__('There was a problem deleting the module'));
}
else {
- ui_print_success_message(__('Module deleted succesfully'));
+
+ echo '';
$agent = db_get_row ('tagente', 'id_agente', $id_agente);
db_pandora_audit("Agent management",
"Deleted module '".$module_data["nombre"]."' for agent ".$agent["alias"]);
}
+
+
}
// MODULE DUPLICATION
@@ -1936,11 +1952,11 @@ switch ($tab) {
resizable: true,
draggable: true,
modal: true,
- height: 220,
+ height: 240,
width: 600,
title: 'Changing the module name of a satellite agent',
open: function(){
- $('#dialog').html('
Warning
The names of the modules of a satellite should not be
altered manually. Unless you are absolutely certain of
the process, do not alter these names.
| Warning |
Warning
If you change the name of this module, various features
associated with this module, such as network maps,
interface graphs or other network modules, may no longer
work. If you are not completely sure of the process, please
do not change the name of the module.
| Warning |
' . $table->data[0][1] = ''; $table->data[0][2] = '' . __('Fields selected') . ''; $table->data[1][2] = html_print_select($result_selected, - 'fields_selected[]', true, '', '', '', true, true, false, '', false, 'width: 300px'); + 'fields_selected[]', true, '', '', 0, true, true, false, '', false, 'width: 300px'); echo '"; + $acl = "AND t.id_grupo IN ($groups_acl)"; + } -echo $form; + $form = ""; -$groups_sql = - "SELECT t.*, - p.nombre AS parent_name, - IF(t.parent=p.id_grupo, 1, 0) AS has_child - FROM tgrupo t - LEFT JOIN tgrupo p - ON t.parent=p.id_grupo - WHERE 1=1 - $acl - $search_name - ORDER BY nombre - LIMIT $offset, $block_size -"; + echo $form; -$groups = db_get_all_rows_sql($groups_sql); - -if (!empty($groups)) { - //Count all groups for pagination only saw user and filters - $groups_sql_count = "SELECT count(*) + $groups_sql = + "SELECT t.*, + p.nombre AS parent_name, + IF(t.parent=p.id_grupo, 1, 0) AS has_child FROM tgrupo t + LEFT JOIN tgrupo p + ON t.parent=p.id_grupo WHERE 1=1 $acl $search_name + ORDER BY nombre + LIMIT $offset, $block_size "; - $groups_count = db_get_value_sql($groups_sql_count); - $table = new StdClass(); - $table->width = '100%'; - $table->class = "databox data"; - $table->head = array (); - $table->head[0] = __('ID'); - $table->head[1] = __('Name'); - $table->head[2] = __('Icon'); - $table->head[3] = __('Alerts'); - $table->head[4] = __('Parent'); - $table->head[5] = __('Description'); - $table->head[6] = __('Actions'); - $table->align = array (); - $table->align[0] = 'right'; - $table->align[2] = 'left'; - $table->align[6] = 'left'; - $table->size[5] = '30%'; - $table->size[6] = '10%'; - $table->data = array (); + $groups = db_get_all_rows_sql($groups_sql); - foreach ($groups as $key => $group) { - $url = "index.php?sec=gagente&sec2=godmode/groups/configure_group&id_group=".$group['id_grupo']; - $url_delete = "index.php?sec=gagente&sec2=godmode/groups/group_list&delete_group=1&id_group=" . $group['id_grupo']; - $table->data[$key][0] = $group['id_grupo']; - $table->data[$key][1] = "" . $group['nombre'] . ""; - $table->data[$key][2] = html_print_image( - "images/groups_small/" . $group['icon'] . ".png", - true, - array( - "style" => '', - "class" => "bot", - "alt" => $group['nombre'], - "title" => $group['nombre'], - false, false, false, true - ) - ); + if (!empty($groups)) { + //Count all groups for pagination only saw user and filters + $groups_sql_count = "SELECT count(*) + FROM tgrupo t + WHERE 1=1 + $acl + $search_name + "; + $groups_count = db_get_value_sql($groups_sql_count); - //reporting_get_group_stats - $table->data[$key][3] = $group['disabled'] ? __('Disabled') : __('Enabled'); - $table->data[$key][4] = $group['parent_name']; - $table->data[$key][5] = $group['description']; - $table->data[$key][6] = "" . - html_print_image( - "images/config.png", + $table = new StdClass(); + $table->width = '100%'; + $table->class = "databox data"; + $table->head = array (); + $table->head[0] = __('ID'); + $table->head[1] = __('Name'); + $table->head[2] = __('Icon'); + $table->head[3] = __('Alerts'); + $table->head[4] = __('Parent'); + $table->head[5] = __('Description'); + $table->head[6] = __('Actions'); + $table->align = array (); + $table->align[0] = 'left'; + $table->align[2] = 'left'; + $table->align[6] = 'left'; + $table->size[0] = '3%'; + $table->size[5] = '30%'; + $table->size[6] = '5%'; + $table->data = array (); + + foreach ($groups as $key => $group) { + $url = "index.php?sec=gagente&sec2=godmode/groups/configure_group&id_group=".$group['id_grupo']; + $url_delete = "index.php?sec=gagente&sec2=godmode/groups/group_list&delete_group=1&id_group=" . $group['id_grupo']; + $table->data[$key][0] = $group['id_grupo']; + $table->data[$key][1] = "" . $group['nombre'] . ""; + $table->data[$key][2] = html_print_image( + "images/groups_small/" . $group['icon'] . ".png", true, array( - "alt" => __('Edit'), - "title" => __('Edit'), - "border" => '0' + "style" => '', + "class" => "bot", + "alt" => $group['nombre'], + "title" => $group['nombre'], + false, false, false, true ) - ) . - ""; + ); + + //reporting_get_group_stats + $table->data[$key][3] = $group['disabled'] ? __('Disabled') : __('Enabled'); + $table->data[$key][4] = $group['parent_name']; + $table->data[$key][5] = $group['description']; + $table->data[$key][6] = "" . + html_print_image( + "images/config.png", + true, + array( + "alt" => __('Edit'), + "title" => __('Edit'), + "border" => '0' + ) + ) . + ""; + + $confirm_message = __('Are you sure?'); + if ($group['has_child']) { + $confirm_message = __('The child groups will be updated to use the parent id of the deleted group') . ". " . $confirm_message; + } + + $table->data[$key][6] .= ' ' . + '' . + html_print_image( + "images/cross.png", + true, + array( + "alt" => __('Delete'), + "title" => __('Delete'), + "border" => '0' + ) + ) . + ""; - $confirm_message = __('Are you sure?'); - if ($group['has_child']) { - $confirm_message = __('The child groups will be updated to use the parent id of the deleted group') . ". " . $confirm_message; } - $table->data[$key][6] .= ' ' . - '' . - html_print_image( - "images/cross.png", - true, - array( - "alt" => __('Delete'), - "title" => __('Delete'), - "border" => '0' - ) - ) . - ""; - + echo ui_pagination( + $groups_count, false, + $offset, $block_size, + true, 'offset', false + ); + html_print_table ($table); + echo ui_pagination( + $groups_count, false, + $offset, $block_size, + true, 'offset', true + ); + } + else { + ui_print_info_message ( array('no_close'=>true, 'message'=> __('There are no defined groups') ) ); } - - echo ui_pagination( - $groups_count, false, - $offset, $block_size, - true, 'offset', false - ); - html_print_table ($table); - echo ui_pagination( - $groups_count, false, - $offset, $block_size, - true, 'offset', true - ); -} -else { - ui_print_info_message ( array('no_close'=>true, 'message'=> __('There are no defined groups') ) ); } if (check_acl($config['id_user'], 0, "PM")) { @@ -517,5 +564,101 @@ if (check_acl($config['id_user'], 0, "PM")) { echo ''; } +ui_require_javascript_file("TreeController", "include/javascript/tree/"); + enterprise_hook('close_meta_frame'); +$tab = "group_edition"; + ?> + + + + + + + + diff --git a/pandora_console/godmode/massive/massive_delete_modules.php b/pandora_console/godmode/massive/massive_delete_modules.php index d1dd485db2..4646dea1a8 100755 --- a/pandora_console/godmode/massive/massive_delete_modules.php +++ b/pandora_console/godmode/massive/massive_delete_modules.php @@ -52,6 +52,8 @@ function process_manage_delete ($module_name, $id_agents, $module_status = 'all' global $config; + $status_module = (int) get_parameter ('status_module'); + if (empty ($module_name)) { ui_print_error_message(__('No module selected')); return false; @@ -212,8 +214,10 @@ function process_manage_delete ($module_name, $id_agents, $module_status = 'all' } } else { - $modules = agents_get_modules ($id_agents, 'id_agente_modulo', - sprintf('nombre IN ("%s")', implode('","',$module_name)), true); + if ($status_module != -1) // If module status filter has been applied + $modules = agents_get_modules ($id_agents, 'id_agente_modulo', sprintf('nombre IN ("%s") AND id_agente_modulo IN (SELECT id_agente_modulo FROM tagente_estado where estado = %s OR utimestamp=0 )', implode('","',$module_name), $status_module), true); + else + $modules = agents_get_modules ($id_agents, 'id_agente_modulo', sprintf('nombre IN ("%s")', implode('","',$module_name)), true); } } diff --git a/pandora_console/godmode/massive/massive_edit_agents.php b/pandora_console/godmode/massive/massive_edit_agents.php index f543772648..3f78d8c88c 100755 --- a/pandora_console/godmode/massive/massive_edit_agents.php +++ b/pandora_console/godmode/massive/massive_edit_agents.php @@ -30,6 +30,7 @@ require_once ('include/functions_modules.php'); require_once ('include/functions_servers.php'); require_once ('include/functions_gis.php'); require_once ('include/functions_users.php'); +enterprise_include_once('include/functions_config_agents.php'); if (is_ajax ()) { $get_n_conf_files = (bool) get_parameter ('get_n_conf_files'); @@ -136,8 +137,11 @@ if ($update_agents) { foreach ($id_agents as $id_agent) { if (!empty($values)) { $group_old = false; - if($values['id_grupo']){ - $group_old = db_get_sql("SELECT id_grupo FROM tagente WHERE id_agente =" .$id_agent); + $disabled_old = false; + if($values['id_grupo'] || isset($values['disabled'])){ + $values_old = db_get_row_filter('tagente', array('id_agente' => $id_agent), array('id_grupo', 'disabled')); + if ($values_old['id_grupo']) $group_old = $values_old['id_grupo']; + if (isset($values['disabled'])) $disabled_old = $values_old['disabled']; } $result = db_process_sql_update ('tagente', @@ -149,7 +153,14 @@ if ($update_agents) { // Force an update of the agent cache. $result_metaconsole = agent_update_from_cache($id_agent,$values,$server_name); } - + + if ($disabled_old !== false && $disabled_old != $values['disabled']) { + enterprise_hook( + 'config_agents_update_config_token', + array($id_agent, 'standby', $values['disabled']) + ); + } + if($group_old || $result){ if ($group_old && $group_old != null) { $tpolicy_group_old = db_get_all_rows_sql("SELECT id_policy FROM tpolicy_groups @@ -421,7 +432,9 @@ $table->data[1][1] .= __('Autodisable mode').' '.html_print_radio_button_extende // Status (Disabled / Enabled) $table->data[2][0] = __('Status'); $table->data[2][1] = __('No change').' '.html_print_radio_button_extended ("disabled", -1, '', $disabled, false, '', 'style="margin-right: 40px;"', true); -$table->data[2][1] .= __('Disabled').' '.html_print_radio_button_extended ("disabled", 1, '', $disabled, false, '', 'style="margin-right: 40px;"', true); +$table->data[2][1] .= __('Disabled') . ' ' . + ui_print_help_tip(__('If the remote configuration is enabled, it will also go into standby mode when disabling it.'), true) . ' ' . + html_print_radio_button_extended ("disabled", 1, '', $disabled, false, '', 'style="margin-right: 40px;"', true); $table->data[2][1] .= __('Active').' '.html_print_radio_button_extended ("disabled", 0, '', $disabled, false, '', 'style="margin-right: 40px;"', true); // Remote configuration diff --git a/pandora_console/godmode/massive/massive_edit_modules.php b/pandora_console/godmode/massive/massive_edit_modules.php index e7f92d4594..2367ad05d9 100755 --- a/pandora_console/godmode/massive/massive_edit_modules.php +++ b/pandora_console/godmode/massive/massive_edit_modules.php @@ -47,17 +47,21 @@ $update = (bool) get_parameter_post ('update'); if ($update) { $agents_ = ''; if ($selection_mode == 'modules') { + + $agents_ = array(); + $force = get_parameter('force_type', false); if ($agents_select == false) { $agents_select = array(); - $agents_ = array(); } foreach ($agents_select as $agent_name) { $agents_[] = agents_get_agent_id($agent_name); } + $modules_ = $module_name; + } else if ($selection_mode == 'agents') { $force = get_parameter('force_group', false); @@ -75,6 +79,7 @@ if ($update) { // If the option to select all of one group or module type is checked if ($force) { if ($force == 'type') { + $type_condition = ''; if ($module_type != 0) $type_condition = "AND tam.id_tipo_modulo = $module_type"; @@ -141,12 +146,11 @@ if ($update) { else { // Standard procedure foreach ($agents_ as $agent_) { - + if ($modules_ == false) $modules_ = array(); foreach ($modules_ as $module_) { - $result = process_manage_edit ($module_, $agent_, $modules_selection_mode); $count++; $success += (int)$result; @@ -331,6 +335,7 @@ $table->data['form_modules_2'][2] .= html_print_select ( 'all' => __('Show all agents')), 'agents_selection_mode', 'common', false, '', '', true); + $table->data['form_modules_2'][3] = html_print_select (array(), 'agents[]', $agents_select, false, __('None'), 0, true, true, false); @@ -1540,12 +1545,14 @@ function process_manage_edit ($module_name, $agents_select = null, $module_statu $update_tags = get_parameter('id_tag', false); if (array_search(0, $agents_select) !== false) { + //Apply at All agents. $modules = db_get_all_rows_filter ('tagente_modulo', $filter_modules, array ('id_agente_modulo')); } else { + if ($module_name == "0") { //Any module $modules = db_get_all_rows_filter ('tagente_modulo', @@ -1559,7 +1566,8 @@ function process_manage_edit ($module_name, $agents_select = null, $module_statu array ('id_agente_modulo')); } } - + + if ($modules === false) return false; @@ -1575,16 +1583,16 @@ function process_manage_edit ($module_name, $agents_select = null, $module_statu } $modules = $modules_to_delete; } - + foreach ($modules as $module) { $result = modules_update_agent_module( $module['id_agente_modulo'], $values, true, $update_tags); - if (is_error($result)) { - + + if (is_error($result)) return false; - } + } return true; diff --git a/pandora_console/godmode/reporting/reporting_builder.php b/pandora_console/godmode/reporting/reporting_builder.php index 067b756908..144f3be45d 100755 --- a/pandora_console/godmode/reporting/reporting_builder.php +++ b/pandora_console/godmode/reporting/reporting_builder.php @@ -2075,9 +2075,9 @@ else { $buttons = null; $buttons = array( 'main' => array('active' => true, - 'text' => '' . - html_print_image("images/op_reporting.png", true, array ("title" => __('Main data'))) .'')); - $textReportName = ''; + 'text' => '' . + html_print_image("images/report_list.png", true, array ("title" => __('Reports list'))) .'')); + $textReportName = __('Create Custom Report'); } // Page header for metaconsole diff --git a/pandora_console/godmode/reporting/visual_console_builder.editor.js b/pandora_console/godmode/reporting/visual_console_builder.editor.js index 7d3021bfd2..d32b15e1aa 100755 --- a/pandora_console/godmode/reporting/visual_console_builder.editor.js +++ b/pandora_console/godmode/reporting/visual_console_builder.editor.js @@ -1543,8 +1543,16 @@ function loadFieldsFromDB(item) { $("select[name=parent]").val(val); if (key == 'linked_layout_status_type') $("select[name=linked_map_status_calculation_type]").val(val).change(); - if (key == 'id_layout_linked') - $("select[name=map_linked]").val(val).change(); + if (key == 'id_layout_linked') { + if (data['linked_layout_node_id'] == null) { + $("select[name=map_linked]").val(val).change(); + } + else { + var $option = $("select[name=map_linked] > option[data-node-id=" + data['linked_layout_node_id'] + "][value=" + val + "]"); + if ($option.length === 0) $option = $("select[name=map_linked] > option[value=" + val + "]"); + $option.prop("selected", true).parent().change(); + } + } if (key == 'linked_layout_node_id') $("input[name=linked_map_node_id]").val(val); if (key == 'id_layout_linked_weight') diff --git a/pandora_console/godmode/servers/manage_recontask.php b/pandora_console/godmode/servers/manage_recontask.php index 2b9527704d..1d5dc69c89 100644 --- a/pandora_console/godmode/servers/manage_recontask.php +++ b/pandora_console/godmode/servers/manage_recontask.php @@ -97,7 +97,15 @@ if ((isset ($_GET["update"])) OR ((isset ($_GET["create"])))) { $field2 = get_parameter ("_field2_", ""); $field3 = get_parameter ("_field3_", ""); $field4 = get_parameter ("_field4_", ""); - + $snmp_version = get_parameter_post ("snmp_version"); + $snmp3_auth_user = get_parameter_post ("snmp_auth_user"); + $snmp3_auth_pass = get_parameter_post ("snmp_auth_pass"); + $snmp3_privacy_method = get_parameter_post ("snmp_privacy_method"); + $snmp3_privacy_pass = get_parameter_post ("snmp_privacy_pass"); + $snmp3_auth_method = get_parameter_post ("snmp_auth_method"); + $snmp3_security_level = get_parameter_post ("snmp_security_level"); + + if ($mode == "network_sweep") $id_recon_script = 0; else @@ -154,8 +162,30 @@ if (isset($_GET["update"])) { 'macros' => $macros, 'alias_as_name' => $alias_as_name, 'snmp_enabled' => $snmp_enabled, - 'vlan_enabled' => $vlan_enabled + 'vlan_enabled' => $vlan_enabled, + 'snmp_version' => $snmp_version ); + + $values_v3 = array( + 'snmp_auth_user' => $snmp3_auth_user, + 'snmp_auth_pass' => $snmp3_auth_pass, + 'snmp_privacy_method' => $snmp3_privacy_method, + 'snmp_privacy_pass' => $snmp3_privacy_pass, + 'snmp_auth_method' => $snmp3_auth_method, + 'snmp_security_level' => $snmp3_security_level + ); + if($values['snmp_version'] == '1' || $values['snmp_version'] == '2' || $values['snmp_version'] == '2c'){ + $values_v3 = array( + 'snmp_auth_user' => '', + 'snmp_auth_pass' => '', + 'snmp_privacy_method' => '', + 'snmp_privacy_pass' => '', + 'snmp_auth_method' => '', + 'snmp_security_level' => '' + ); + } + + $values = array_merge($values, $values_v3); $where = array('id_rt' => $id); @@ -217,13 +247,37 @@ if (isset($_GET["create"])) { 'macros' => $macros, 'alias_as_name' => $alias_as_name, 'snmp_enabled' => $snmp_enabled, - 'vlan_enabled' => $vlan_enabled + 'vlan_enabled' => $vlan_enabled, + 'snmp_version' => $snmp_version ); + $values_v3 = array( + 'snmp_auth_user' => $snmp3_auth_user, + 'snmp_auth_pass' => $snmp3_auth_pass, + 'snmp_privacy_method' => $snmp3_privacy_method, + 'snmp_privacy_pass' => $snmp3_privacy_pass, + 'snmp_auth_method' => $snmp3_auth_method, + 'snmp_security_level' => $snmp3_security_level + ); + if($values['snmp_version'] == '1' || $values['snmp_version'] == '2' || $values['snmp_version'] == '2c'){ + $values_v3 = array( + 'snmp_auth_user' => '', + 'snmp_auth_pass' => '', + 'snmp_privacy_method' => '', + 'snmp_privacy_pass' => '', + 'snmp_auth_method' => '', + 'snmp_security_level' => '' + ); + } + if ($values['snmp_version'] == '3'){ + $values['vlan_enabled'] = 0; + } + + $values = array_merge($values, $values_v3); + $name = io_safe_output($name); $name = trim($name, ' '); $name = io_safe_input($name); - $reason = ""; if ($name != "") { @@ -293,7 +347,7 @@ else { $color=1; if ($result !== false) { $table = new StdClass(); - $table->head = array (__('Name'), __('Network'), __('Mode'), __('Group'), __('Incident'), __('OS'), __('Interval'), __('Ports'), __('Action')); + $table->head = array (__('Name'), __('Network'), __('Mode'), __('Group'), __('SNMP Version'), __('Incident'), __('OS'), __('Interval'), __('Ports'), __('Action')); $table->align = array ("left","left","left","left","left","left","left","left"); $table->width = "100%"; $table->cellpadding = 4; @@ -336,48 +390,64 @@ if ($result !== false) { $data[3] = "-"; } + //SNMP VERSION + if ($row["snmp_version"] == '1'){ + $data[4] = "v. 1"; + } + elseif($row["snmp_version"] == '2'){ + $data[4] = "v. 2"; + } + elseif($row["snmp_version"] == '2c'){ + $data[4] = "v. 2c"; + } + elseif($row["snmp_version"] == '3'){ + $data[4] = "v. 3"; + } + + + // INCIDENT - $data[4] = (($row["create_incident"] == 1) ? __('Yes') : __('No')); + $data[5] = (($row["create_incident"] == 1) ? __('Yes') : __('No')); // OS if ($row["id_recon_script"] == 0) { - $data[5] =(($row["id_os"] > 0) ? ui_print_os_icon ($row["id_os"], false, true) : __('Any')); + $data[6] =(($row["id_os"] > 0) ? ui_print_os_icon ($row["id_os"], false, true) : __('Any')); } else { - $data[5] = "-"; + $data[6] = "-"; } // INTERVAL if ($row["interval_sweep"]==0) - $data[6] = __("Manual"); + $data[7] = __("Manual"); else - $data[6] =human_time_description_raw($row["interval_sweep"]); + $data[7] =human_time_description_raw($row["interval_sweep"]); // PORTS if ($row["id_recon_script"] == 0) { - $data[7] = substr($row["recon_ports"],0,15); + $data[8] = substr($row["recon_ports"],0,15); } else { - $data[7] = "-"; + $data[8] = "-"; } // ACTION $task_group = $row["id_group"]; if (in_array($task_group, $user_groups_w)){ - $data[8] = '' . html_print_image("images/eye.png", true) . ''; - $data[8] .= '' . html_print_image("images/cross.png", true, array("border" => '0')) . ''; + $data[9] = '' . html_print_image("images/eye.png", true) . ''; + $data[9] .= '' . html_print_image("images/cross.png", true, array("border" => '0')) . ''; if($mode_name != 'IPAM Recon'){ - $data[8] .= '' .html_print_image("images/config.png", true) . ''; + $data[9] .= '' .html_print_image("images/config.png", true) . ''; } else { $sql_ipam = 'select id from tipam_network where id_recon_task =' . $row["id_rt"]; $id_recon_ipam = db_get_sql($sql_ipam); - $data[8] .= '' . html_print_image("images/config.png", true) . ''; + $data[9] .= '' . html_print_image("images/config.png", true) . ''; } if($row["disabled"] == 0) { - $data[8] .= '' .html_print_image("images/lightbulb.png", true) . ''; + $data[9] .= '' .html_print_image("images/lightbulb.png", true) . ''; } else { - $data[8] .= '' .html_print_image("images/lightbulb_off.png", true) . ''; + $data[9] .= '' .html_print_image("images/lightbulb_off.png", true) . ''; } } diff --git a/pandora_console/godmode/servers/manage_recontask_form.php b/pandora_console/godmode/servers/manage_recontask_form.php index d33e0ee19c..f5865d1470 100644 --- a/pandora_console/godmode/servers/manage_recontask_form.php +++ b/pandora_console/godmode/servers/manage_recontask_form.php @@ -108,6 +108,13 @@ if (isset($_GET["update"]) || (isset($_GET["upd"]))) { $id_os = $row["id_os"]; $recon_ports = $row["recon_ports"]; $snmp_community = $row["snmp_community"]; + $snmp_version = $row["snmp_version"]; + $snmp3_auth_user = $row["snmp_auth_user"]; + $snmp3_auth_pass = $row["snmp_auth_pass"]; + $snmp3_privacy_method = $row["snmp_privacy_method"]; + $snmp3_privacy_pass = $row["snmp_privacy_pass"]; + $snmp3_auth_method = $row["snmp_auth_method"]; + $snmp3_security_level = $row["snmp_security_level"]; $id_recon_script = $row["id_recon_script"]; $field1 = $row["field1"]; $field2 = $row["field2"]; @@ -156,6 +163,13 @@ elseif (isset($_GET["create"]) || isset($_GET["crt"])) { $id_group = 0; $create_incident = 1; $snmp_community = "public"; + $snmp3_auth_user = ''; + $snmp3_auth_pass = ''; + $snmp_version = 1; + $snmp3_privacy_method = ''; + $snmp3_privacy_pass = ''; + $snmp3_auth_method = ''; + $snmp3_security_level = ''; $id_network_profile = 0; $id_os = -1; // Any $recon_ports = ""; // Any @@ -212,6 +226,13 @@ $table->rowclass[20] = "network_sweep"; $table->rowclass[21] = "network_sweep"; $table->rowclass[22] = "network_sweep"; $table->rowclass[23] = "network_sweep"; +$table->rowclass[24] = "network_sweep"; +$table->rowclass[25] = "network_sweep recon_v3"; +$table->rowclass[26] = "network_sweep recon_v3"; +$table->rowclass[27] = "network_sweep recon_v3"; +$table->rowclass[28] = "network_sweep recon_v3"; +$table->rowclass[29] = "network_sweep recon_v3"; +$table->rowclass[30] = "network_sweep recon_v3"; $table->rowclass[6] = "recon_script"; $table->rowclass[13] = "recon_script"; @@ -327,6 +348,34 @@ $table->data[12][0] = "".__('SNMP Default community'); $table->data[12][0] .= ui_print_help_tip (__('You can specify several values, separated by commas, for example: public,mysecret,1234'), true); $table->data[12][1] = html_print_input_text ('snmp_community', $snmp_community, '', 35, 0, true); +//SNMP version + +$snmp_versions['1'] = 'v. 1'; +$snmp_versions['2'] = 'v. 2'; +$snmp_versions['2c'] = 'v. 2c'; +$snmp_versions['3'] = 'v. 3'; +$table->data[24][0] ="". _('SNMP version'); +$table->data[24][1] = html_print_select ($snmp_versions, 'snmp_version', $snmp_version, '', '', 0, true); + +$table->data[25][0] ="".__('Auth user'); +$table->data[25][1] = html_print_input_text ('snmp_auth_user', $snmp3_auth_user, '', 15, 60, true, '', + false, '', ''); +$table->data[26][0] ="". __('Auth password') . ui_print_help_tip(__("The pass length must be eight character minimum."), true); +$table->data[26][1] = html_print_input_password ('snmp_auth_pass', $snmp3_auth_pass, '', 15, 60, true, '', + false, ''); +$table->data[26][1] .= html_print_input_hidden_extended('active_snmp_v3', 0, 'active_snmp_v3_mmen', true); + +$table->data[27][0] ="". __('Privacy method'); +$table->data[27][1] = html_print_select(array('DES' => __('DES'), 'AES' => __('AES')), 'snmp_privacy_method', $snmp3_privacy_method, '', '', '', true, false, false, '', ''); +$table->data[28][0] ="". __('Privacy pass') . ui_print_help_tip(__("The pass length must be eight character minimum."), true); +$table->data[28][1] = html_print_input_password ('snmp_privacy_pass', $snmp3_privacy_pass, '', 15, 60, true, '', + false, ''); +$table->data[29][0] ="". __('Auth method'); +$table->data[29][1] = html_print_select(array('MD5' => __('MD5'), 'SHA' => __('SHA')), 'snmp_auth_method', $snmp3_auth_method, '', '', '', true, false, false, '', ''); +$table->data[30][0] ="". __('Security level'); +$table->data[30][1] = html_print_select(array('noAuthNoPriv' => __('Not auth and not privacy method'), + 'authNoPriv' => __('Auth and not privacy method'), 'authPriv' => __('Auth and privacy method')), 'snmp_security_level', $snmp3_security_level, '', '', '', true, false, false, '', ''); + // Explanation $explanation = db_get_value('description', 'trecon_script', 'id_recon_script', $id_recon_script); @@ -461,9 +510,24 @@ $('select#id_recon_script').change(function() { get_explanation_recon_script($(this).val()); }); +$('select#snmp_version').change(function () { + if (this.value == "3") { + $(".recon_v3").show(); + $("input[name=active_snmp_v3]").val(1); + $("input[name=snmp_community]").attr("disabled", true); + $("input[name=vlan_enabled]").removeAttr("checked"); + $("input[name=vlan_enabled]").attr("disabled", true); + } + else { + $(".recon_v3").hide(); + $("input[name=active_snmp_v3]").val(0); + $("input[name=snmp_community]").removeAttr('disabled'); + $("input[name=vlan_enabled]").removeAttr('disabled'); + } +}); + $('select#mode').change(function() { var type = $(this).val(); - if (type == 'recon_script') { $(".recon_script").show(); $(".network_sweep").hide(); @@ -474,6 +538,7 @@ $('select#mode').change(function() { $(".recon_script").hide(); $(".network_sweep").show(); $('.macro_field').remove(); + $('select#snmp_version').trigger('change'); } }).change(); @@ -543,5 +608,5 @@ function get_explanation_recon_script (id) { }); taskManager.addTask(xhr); } -/* ]]> */ + diff --git a/pandora_console/godmode/users/configure_user.php b/pandora_console/godmode/users/configure_user.php index f5b7fdc5bc..cd8c981c8e 100644 --- a/pandora_console/godmode/users/configure_user.php +++ b/pandora_console/godmode/users/configure_user.php @@ -253,7 +253,7 @@ if ($create_user) { db_pandora_audit("User management", - "Created user ".io_safe_input($id), false, false, $info); + "Created user ".io_safe_output($id), false, false, $info); ui_print_result_message ($result, __('Successfully created'), diff --git a/pandora_console/include/ajax/tree.ajax.php b/pandora_console/include/ajax/tree.ajax.php index c2e051c3f4..07435d9109 100644 --- a/pandora_console/include/ajax/tree.ajax.php +++ b/pandora_console/include/ajax/tree.ajax.php @@ -43,6 +43,7 @@ if (is_ajax ()) { require_once($config['homedir'] . "/include/class/TreeModule.class.php"); require_once($config['homedir'] . "/include/class/TreeTag.class.php"); require_once($config['homedir'] . "/include/class/TreeGroup.class.php"); + require_once($config['homedir'] . "/include/class/TreeGroupEdition.class.php"); enterprise_include_once("include/class/TreePolicies.class.php"); enterprise_include_once("include/class/TreeGroupMeta.class.php"); require_once($config['homedir'] . "/include/functions_reporting.php"); @@ -104,6 +105,9 @@ if (is_ajax ()) { if (!class_exists('TreePolicies')) break; $tree = new TreePolicies($type, $rootType, $id, $rootID, $serverID, $childrenMethod, $access); break; + case 'group_edition': + $tree = new TreeGroupEdition($type, $rootType, $id, $rootID, $serverID, $childrenMethod, $access); + break; default: // FIXME. No error handler return; diff --git a/pandora_console/include/ajax/visual_console_builder.ajax.php b/pandora_console/include/ajax/visual_console_builder.ajax.php index d472542390..98be4f174b 100755 --- a/pandora_console/include/ajax/visual_console_builder.ajax.php +++ b/pandora_console/include/ajax/visual_console_builder.ajax.php @@ -101,7 +101,7 @@ $height = get_parameter('height', null); $parent = get_parameter('parent', null); $map_linked = get_parameter('map_linked', null); $linked_map_node_id = get_parameter('linked_map_node_id', null); -$linked_map_status_calculation_type = get_parameter('linked_map_status_calculation_type', 'default'); +$linked_map_status_calculation_type = get_parameter('linked_map_status_calculation_type', null); $map_linked_weight = get_parameter('map_linked_weight', null); if ($map_linked_weight !== null) { @@ -615,8 +615,8 @@ switch ($action) { $values['id_agent'] = $id_agent; } - if ($linked_map_node_id) { - $values['linked_layout_node_id'] = $linked_map_node_id; + if ($linked_map_node_id !== null) { + $values['linked_layout_node_id'] = (int) $linked_map_node_id; } } else if ($id_agent == 0) { 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..b72e3ec216 100644 --- a/pandora_console/include/class/Tree.class.php +++ b/pandora_console/include/class/Tree.class.php @@ -93,12 +93,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']."%%')"; } @@ -268,7 +268,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) { 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/TreeGroupEdition.class.php b/pandora_console/include/class/TreeGroupEdition.class.php new file mode 100644 index 0000000000..dea62da238 --- /dev/null +++ b/pandora_console/include/class/TreeGroupEdition.class.php @@ -0,0 +1,108 @@ +id == -1) { + $this->getFirstLevel(); + } + } + + protected function getProcessedGroups () { + $processed_groups = array(); + // Index and process the groups + $groups = $this->getGroupCounters(); + + // If user have not permissions in parent, set parent node to 0 (all) + // Avoid to do foreach for admins + if (!users_can_manage_group_all("AR")) { + foreach ($groups as $id => $group) { + if (!isset($this->userGroups[$groups[$id]['parent']])) { + $groups[$id]['parent'] = 0; + } + } + } + // Build the group hierarchy + foreach ($groups as $id => $group) { + if (isset($groups[$id]['parent']) && ($groups[$id]['parent'] != 0)) { + $parent = $groups[$id]['parent']; + // Parent exists + if (!isset($groups[$parent]['children'])) { + $groups[$parent]['children'] = array(); + } + // Store a reference to the group into the parent + $groups[$parent]['children'][] = &$groups[$id]; + // This group was introduced into a parent + $groups[$id]['have_parent'] = true; + } + } + + // Sort the children groups + foreach ($groups as $id => $group) { + if (isset($groups[$id]['children'])) { + usort($groups[$id]['children'], array("Tree", "cmpSortNames")); + } + } + //Filter groups and eliminates the reference to children groups out of her parent + $groups = array_filter($groups, function ($group) { + return !$group['have_parent']; + }); + + usort($groups, array("Tree", "cmpSortNames")); + return $groups; + } + + + protected function getGroupCounters() { + $messages = array( + 'confirm' => __('Confirm'), + 'cancel' => __('Cancel'), + 'messg' => __('Are you sure?') + ); + $sql = "SELECT id_grupo AS gid, + nombre as name, parent, icon + FROM tgrupo + "; + + $stats = db_get_all_rows_sql($sql); + $group_stats = array(); + foreach ($stats as $group) { + $group_stats[$group['gid']]['name'] = $group['name']; + $group_stats[$group['gid']]['parent'] = $group['parent']; + $group_stats[$group['gid']]['icon'] = $group['icon']; + $group_stats[$group['gid']]['id'] = $group['gid']; + $group_stats[$group['gid']]['type'] = 'group'; + + $group_stats[$group['gid']] = $this->getProcessedItem($group_stats[$group['gid']]); + $group_stats[$group['gid']]['delete']['messages'] = $messages; + $group_stats[$group['gid']]['edit'] = 1; + $group_stats[$group['gid']]['alerts'] = ''; + } + + return $group_stats; + } +} + +?> + diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php index dcad6d4aab..100c12c8fd 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 = 'PC180913'; +$build_version = 'PC181001'; $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..426a5c2e6b 100644 --- a/pandora_console/include/functions_agents.php +++ b/pandora_console/include/functions_agents.php @@ -915,7 +915,7 @@ function agents_get_group_agents ( if (isset($search['status'])) { switch ($search['status']) { case AGENT_STATUS_NORMAL: - $filter[] = "normal_count = total_count"; + $filter[] = "(normal_count = total_count AND notinit_count <> total_count)"; break; case AGENT_STATUS_WARNING: $filter[] = "(critical_count = 0 AND warning_count > 0)"; @@ -2025,11 +2025,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 + ); } /** @@ -2680,20 +2686,21 @@ 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)); + $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); diff --git a/pandora_console/include/functions_alerts.php b/pandora_console/include/functions_alerts.php index 322b3a7602..52c0338eb4 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 (); @@ -1638,23 +1652,13 @@ function get_agent_alert_fired ($id_agent, $id_alert, $period, $date = 0) { * * @return array An array with all the events happened. */ -function get_module_alert_fired ($id_agent_module, $id_alert, $period, $date = 0) { +function get_module_alert_fired ($id_agent_module, $id_alert) { - if (!is_numeric ($date)) { - $date = time_w_fixed_tz($date); - } - if (empty ($date)) { - $date = get_system_time(); - } - - $datelimit = $date - $period; - - $sql = sprintf ('SELECT timestamp + $sql = sprintf ('SELECT * FROM tevento - WHERE id_agentmodule = %d AND utimestamp > %d - AND utimestamp <= %d + WHERE id_agentmodule = %d AND id_alert_am = %d - ORDER BY timestamp DESC', $id_agent_module, $datelimit, $date, $id_alert); + ORDER BY timestamp DESC', $id_agent_module, $id_alert); return db_get_all_rows_sql ($sql); } diff --git a/pandora_console/include/functions_api.php b/pandora_console/include/functions_api.php index 189cc4203b..e66fb3dcaf 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 @@ -7007,10 +7080,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_graph.php b/pandora_console/include/functions_graph.php index 33118d39c2..ff15c53525 100644 --- a/pandora_console/include/functions_graph.php +++ b/pandora_console/include/functions_graph.php @@ -513,6 +513,8 @@ function grafico_modulo_sparse_data( } $period_time_interval = $period_time_interval - $params['time_interval']; } + //drag the last value to paint the graph correctly + $acum_array_data[]= array( 0 => $start_period, 1 => $acum_array_data[$i-1][1]); $array_data['sum1']['data'] = $acum_array_data; } @@ -3034,7 +3036,7 @@ function grafico_incidente_prioridad () { } return pie3d_graph($config['flash_charts'], $data, 320, 200, - __('Other'), '', $water_mark, + __('Other'), '', '', $config['fontpath'], $config['font_size']); } @@ -3075,7 +3077,7 @@ function graph_incidents_status () { } return pie3d_graph($config['flash_charts'], $data, 320, 200, - __('Other'), '', $water_mark, + __('Other'), '', '', $config['fontpath'], $config['font_size']); } @@ -3131,7 +3133,7 @@ function graphic_incident_group () { } return pie3d_graph($config['flash_charts'], $data, 320, 200, - __('Other'), '', $water_mark, + __('Other'), '', '', $config['fontpath'], $config['font_size']); } @@ -3186,7 +3188,7 @@ function graphic_incident_user () { } return pie3d_graph($config['flash_charts'], $data, 320, 200, - __('Other'), '', $water_mark, + __('Other'), '', '', $config['fontpath'], $config['font_size']); } @@ -3240,7 +3242,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']); } 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..1349b6dadd 100755 --- a/pandora_console/include/functions_modules.php +++ b/pandora_console/include/functions_modules.php @@ -441,9 +441,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 +2687,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, diff --git a/pandora_console/include/functions_networkmap.php b/pandora_console/include/functions_networkmap.php index 4e4ad37cee..eff9444824 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) { diff --git a/pandora_console/include/functions_reporting.php b/pandora_console/include/functions_reporting.php index 4cc8315b0b..1f019934e9 100755 --- a/pandora_console/include/functions_reporting.php +++ b/pandora_console/include/functions_reporting.php @@ -1552,7 +1552,7 @@ function reporting_event_report_group($report, $content, function reporting_event_report_module($report, $content, $type = 'dinamic', $force_width_chart = null, $force_height_chart = null, $pdf=0) { - + global $config; if($pdf){ @@ -1563,20 +1563,29 @@ function reporting_event_report_module($report, $content, } $return['type'] = 'event_report_module'; - + if (empty($content['name'])) { $content['name'] = __('Event Report Module'); } - + + $id_server = false; + if(is_metaconsole()){ + $id_server = metaconsole_get_id_server($content["server_name"]); + metaconsole_connect(null, $id_server); + } + $return['title'] = $content['name']; - $return['subtitle'] = agents_get_alias($content['id_agent']) . - " - " . - io_safe_output( - modules_get_agentmodule_name($content['id_agent_module'])); + $return['subtitle'] = agents_get_alias($content['id_agent']) . " - " . + io_safe_output(modules_get_agentmodule_name($content['id_agent_module'])); + + if(is_metaconsole()){ + metaconsole_restore_db(); + } + $return["description"] = $content["description"]; $return["date"] = reporting_get_date_text($report, $content); $return['label'] = (isset($content['style']['label'])) ? $content['style']['label'] : ''; - + $event_filter = $content['style']; $return['show_summary_group'] = $event_filter['show_summary_group']; //filter @@ -1585,22 +1594,18 @@ function reporting_event_report_module($report, $content, $filter_event_type = json_decode($event_filter['filter_event_type'],true); $filter_event_status = json_decode($event_filter['filter_event_status'],true); $filter_event_filter_search = $event_filter['event_filter_search']; - + //graphs $event_graph_by_user_validator = $event_filter['event_graph_by_user_validator']; $event_graph_by_criticity = $event_filter['event_graph_by_criticity']; $event_graph_validated_vs_unvalidated = $event_filter['event_graph_validated_vs_unvalidated']; - - $id_server = false; - if(is_metaconsole()){ - $id_server = metaconsole_get_id_server($content["server_name"]); - } + //data events $data = reporting_get_module_detailed_event ( - $content['id_agent_module'], $content['period'], $report["datetime"], - $show_summary_group, $filter_event_severity, $filter_event_type, + $content['id_agent_module'], $content['period'], $report["datetime"], + $show_summary_group, $filter_event_severity, $filter_event_type, $filter_event_status, $filter_event_filter_search, $force_width_chart, - $event_graph_by_user_validator, $event_graph_by_criticity, + $event_graph_by_user_validator, $event_graph_by_criticity, $event_graph_validated_vs_unvalidated, $ttl, $id_server); if (empty($data)) { @@ -1608,7 +1613,7 @@ function reporting_event_report_module($report, $content, } else { $return['data'] = array_reverse($data); - } + } if ($config['metaconsole']) { metaconsole_restore_db(); @@ -1621,7 +1626,7 @@ function reporting_event_report_module($report, $content, else{ $return['total_events'] = 0; } - + return reporting_check_structure_content($return); } @@ -2865,14 +2870,27 @@ function reporting_alert_get_fired($id_agent_module, $id_alert_template_module, $id_alert_template_module, $period, $datetime); + + if (!is_numeric ($datetime)) { + $datetime = time_w_fixed_tz($datetime); + } + if (empty ($datetime)) { + $datetime = get_system_time(); + } + + $datelimit = $datetime - $period; + $empty = '----------------------------'; if (empty($firedTimes)) { $firedTimes = array(); - $firedTimes[0]['timestamp'] = null; + $firedTimes[0]['timestamp'] = $empty; } foreach ($firedTimes as $fireTime) { + if($fireTime['utimestamp'] > $datelimit && $fireTime['utimestamp'] <= $datetime) $fired[] = $fireTime['timestamp']; + else + $fired[] = $empty; } return $fired; @@ -2955,6 +2973,16 @@ function reporting_alert_report_group($report, $content) { foreach ($alerts as $template => $actions) { + $datetime = (int) $report["datetime"]; + if (!is_numeric ($datetime)) { + $datetime = time_w_fixed_tz($datetime); + } + if (empty ($datetime)) { + $datetime = get_system_time(); + } + $period = (int) $content["period"]; + $datelimit = $datetime - $period; + $data_action = array(); $data_action['actions'] = array(); @@ -2963,7 +2991,7 @@ function reporting_alert_report_group($report, $content) { foreach ($actions["custom"] as $action) { $data_action[$naction]["name"] = $action["name"]; $fired = $action["fired"]; - if ($fired == 0){ + if ($fired == 0 || ($fired <= $datelimit || $fired > $datetime)){ $data_action[$naction]['fired'] = '----------------------------'; } else { @@ -2976,7 +3004,7 @@ function reporting_alert_report_group($report, $content) { foreach ($actions["default"] as $action) { $data_action[$naction]["name"] = $action["name"]; $fired = $action["fired"]; - if ($fired == 0){ + if ($fired == 0 || ($fired <= $datelimit || $fired > $datetime)){ $data_action[$naction]['fired'] = '----------------------------'; } else { @@ -2989,7 +3017,7 @@ function reporting_alert_report_group($report, $content) { foreach ($actions["unavailable"] as $action) { $data_action[$naction]["name"] = $action["name"]; $fired = $action["fired"]; - if ($fired == 0){ + if ($fired == 0 || ($fired <= $datelimit || $fired > $datetime)){ $data_action[$naction]['fired'] = '----------------------------'; } else { @@ -3009,10 +3037,7 @@ function reporting_alert_report_group($report, $content) { (int) $report["datetime"]); $module_actions["actions"] = $data_action; - if ($module_actions["template_fired"][0] !== null) $data_row['alerts'][$ntemplates] = $module_actions; - else - $data_row = null; $ntemplates++; } @@ -3075,6 +3100,16 @@ function reporting_alert_report_agent($report, $content) { foreach ($alerts as $template => $actions) { + $datetime = (int) $report["datetime"]; + if (!is_numeric ($datetime)) { + $datetime = time_w_fixed_tz($datetime); + } + if (empty ($datetime)) { + $datetime = get_system_time(); + } + $period = (int) $content["period"]; + $datelimit = $datetime - $period; + $data_action = array(); $data_action['actions'] = array(); @@ -3083,7 +3118,7 @@ function reporting_alert_report_agent($report, $content) { foreach ($actions["custom"] as $action) { $data_action[$naction]["name"] = $action["name"]; $fired = $action["fired"]; - if ($fired == 0){ + if ($fired == 0 || ($fired <= $datelimit || $fired > $datetime)){ $data_action[$naction]['fired'] = '----------------------------'; } else { @@ -3096,7 +3131,7 @@ function reporting_alert_report_agent($report, $content) { foreach ($actions["default"] as $action) { $data_action[$naction]["name"] = $action["name"]; $fired = $action["fired"]; - if ($fired == 0){ + if ($fired == 0 || ($fired <= $datelimit || $fired > $datetime)){ $data_action[$naction]['fired'] = '----------------------------'; } else { @@ -3109,7 +3144,7 @@ function reporting_alert_report_agent($report, $content) { foreach ($actions["unavailable"] as $action) { $data_action[$naction]["name"] = $action["name"]; $fired = $action["fired"]; - if ($fired == 0){ + if ($fired == 0 || ($fired <= $datelimit || $fired > $datetime)){ $data_action[$naction]['fired'] = '----------------------------'; } else { @@ -3129,10 +3164,7 @@ function reporting_alert_report_agent($report, $content) { (int) $report["datetime"]); $module_actions["actions"] = $data_action; - if ($module_actions["template_fired"][0] !== null) $data_row['alerts'][$ntemplates] = $module_actions; - else - $data_row = null; $ntemplates++; } @@ -3191,13 +3223,18 @@ 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) { + $datetime = (int) $report["datetime"]; + if (!is_numeric ($datetime)) { + $datetime = time_w_fixed_tz($datetime); + } + if (empty ($datetime)) { + $datetime = get_system_time(); + } + $period = (int) $content["period"]; + $datelimit = $datetime - $period; $data_action = array(); $data_action['actions'] = array(); @@ -3207,7 +3244,7 @@ function reporting_alert_report_module($report, $content) { foreach ($actions["custom"] as $action) { $data_action[$naction]["name"] = $action["name"]; $fired = $action["fired"]; - if ($fired == 0){ + if ($fired == 0 || ($fired <= $datelimit || $fired > $datetime)){ $data_action[$naction]['fired'] = '----------------------------'; } else { @@ -3220,7 +3257,7 @@ function reporting_alert_report_module($report, $content) { foreach ($actions["default"] as $action) { $data_action[$naction]["name"] = $action["name"]; $fired = $action["fired"]; - if ($fired == 0){ + if ($fired == 0 || ($fired <= $datelimit || $fired > $datetime)){ $data_action[$naction]['fired'] = '----------------------------'; } else { @@ -3233,7 +3270,7 @@ function reporting_alert_report_module($report, $content) { foreach ($actions["unavailable"] as $action) { $data_action[$naction]["name"] = $action["name"]; $fired = $action["fired"]; - if ($fired == 0){ + if ($fired == 0 || ($fired <= $datelimit || $fired > $datetime)){ $data_action[$naction]['fired'] = '----------------------------'; } else { @@ -3253,10 +3290,7 @@ function reporting_alert_report_module($report, $content) { (int) $report["datetime"]); $module_actions["actions"] = $data_action; - if ($module_actions["template_fired"][0] !== null) $data_row['alerts'][$ntemplates] = $module_actions; - else - $data_row = null; $ntemplates++; } @@ -3816,114 +3850,114 @@ function reporting_value($report, $content, $type,$pdf) { 'type_graph' => $config['type_module_charts'], 'time_interval' => $content['lapse'], 'server_id' => $id_meta, - 'height' => $config['graph_image_height'] + 'height' => $config['graph_image_height'], + 'fullscale' => true ); switch ($type) { case 'max': - if($content['lapse_calc'] == 0){ - $value = reporting_get_agentmodule_data_max( - $content['id_agent_module'], $content['period'], $report["datetime"]); - if (!$config['simple_module_value']) { - $formated_value = $value; + if($content['lapse_calc'] == 0){ + $value = reporting_get_agentmodule_data_max( + $content['id_agent_module'], $content['period'], $report["datetime"]); + if (!$config['simple_module_value']) { + $formated_value = $value; + } + else { + $formated_value = format_for_graph($value, $config['graph_precision']) . " " . $unit; + } } - else { - $formated_value = format_for_graph($value, $config['graph_precision']) . " " . $unit; - } - } - else{ - $value = ' -
';
- if($content['visual_format'] == 1 || $content['visual_format'] == 2 || $content['visual_format'] == 3){
+ else{
+ $value = '
+
|
- - | -'; + $formated_value = $value; + } - if($content['visual_format'] == 2 || $content['visual_format'] == 3){ - $params['force_interval'] = 'max_only'; - $value .= grafico_modulo_sparse($params); - } - - $value .= ' - - | -||||||||||||||||||
';
-
- if($content['visual_format'] == 1 || $content['visual_format'] == 3){
-
- $value .= '
-
|
-
';
+ else{
+ $value = '
+
|
- ||||||||||||||||||||
';
-
- if($content['visual_format'] == 1 || $content['visual_format'] == 3){
-
- $value .= '
-
|
-
- ';
@@ -4052,7 +4048,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..43603663a1 100755
--- a/pandora_console/include/functions_users.php
+++ b/pandora_console/include/functions_users.php
@@ -418,10 +418,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 +435,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);
}
diff --git a/pandora_console/include/functions_visual_map.php b/pandora_console/include/functions_visual_map.php
index b92f17e230..71cf0e6047 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);
}
}
}
diff --git a/pandora_console/include/functions_visual_map_editor.php b/pandora_console/include/functions_visual_map_editor.php
index abbc179c61..a20a8c5e42 100755
--- a/pandora_console/include/functions_visual_map_editor.php
+++ b/pandora_console/include/functions_visual_map_editor.php
@@ -700,7 +700,7 @@ function visual_map_editor_print_item_palette($visualConsole_id, $background) {
$visual_maps = db_get_all_rows_filter("tlayout", "id != " . (int) $visualConsole_id, array("id", "name"));
$form_items_advance['map_linked_row']['html'] = '
- 1 critical, 1 warning y 3 normal -> Status normal. +
- 2 critical, 2 warning y 1 normal -> Status normal. +
- 1 critical, 3 warning y 1 normal -> Status warning. +
- 3 critical, 1 warning y 1 normal -> Status critical. +
- 1 critical, 1 warning y 3 unknown -> Status unknown. +
- 1 critical, 1 warning y 3 normal -> Estado normal. +
- 2 critical, 2 warning y 1 normal -> Estado normal. +
- 1 critical, 3 warning y 1 normal -> Estado warning. +
- 3 critical, 1 warning y 1 normal -> Estado critical. +
- 1 critical, 1 warning y 3 unknown -> Estado unknown. +
Ways to calculate the status of the linked visual console
+ +By Default
++ It calculates the status based on the status of all elements, as an agent would do. +
+ +By weight
++ It calculates the status of the elements that have a visual console, a module or an agent assigned in relation to a percentage of elements configured by the user. This percentage is the one that has to exceed the number of elements of a non-normal status with respect to the number of elements taken into account in the calculation for that status to change. +
+ ++ For example, given an element with a percentage of 50% and a visual console linked with 5 elements: +
+-
+
+ If several statuses exceed the weight, the priority is the same as in the rest of the status calculation (critical > warning > unknown). If there are no elements to perform the calculation, the status becomes unknown. +
+ +By critical elements
++ It calculates the status using the elements in critical status and the percentages of the thresholds defined by the user. If the number of elements in critical status with respect to the number of elements taken into account in the calculation exceeds the percentage assigned as warning, the status becomes warning. The same applies to the percentage assigned as critical, which also has preference. +
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_linked_map_status_calc.php b/pandora_console/include/help/es/help_linked_map_status_calc.php new file mode 100644 index 0000000000..40c5682d7a --- /dev/null +++ b/pandora_console/include/help/es/help_linked_map_status_calc.php @@ -0,0 +1,36 @@ + +Formas de calcular el estado de la consola visual enlazada
+ +Por defecto
++ Calcula el estado a partir del estado de todos los elementos, como lo harÃa un agente. +
+ +Por peso
++ Calcula el estado de los elementos que tienen asignados una consola visual, un módulo o un agente en relación a un porcentaje de elementos configurado por el usuario. Este porcentaje es el que tiene que superar el número de elementos de un estado no normal respecto al número de elementos tenidos en cuenta en el cálculo para que el ese estado cambie. +
+ ++ Por ejemplo, dado un elemento con un porcentaje del 50% y una consola visual enlazada con 5 elementos: +
+-
+
+ Si varios estados superan el peso, la prioridad es igual que en el resto de cálculo de estados (critical > warning > unknown). Si no hay elementos para realizar el cálculo, el estado pasa a ser unknown. +
+ +Por elementos crÃticos
++ Calcula el estado usando los elementos en estado critical y los porcentajes de los umbrales definidos por el usuario. Si el número de los elementos en estado critical respecto al número de elementos tenidos en cuenta en el cálculo supera el porcentaje asignado como warning, el estado pasa a ser warning. Lo mismo para el porcentaje asignado como critical, que además tiene preferencia. +
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/pandora.js b/pandora_console/include/javascript/pandora.js index bc8432ae48..7a23b2a36c 100644 --- a/pandora_console/include/javascript/pandora.js +++ b/pandora_console/include/javascript/pandora.js @@ -529,7 +529,7 @@ function module_changed_by_multiple_modules (event, id_module, selected) { jQuery.each (data, function (i, val) { s = js_html_entity_decode(val); $('#agents') - .append ($('').html (s).attr ("value", val)); + .append ($('').html (s).attr ("value", i)); $('#agents').fadeIn ('normal'); }); @@ -1585,6 +1585,10 @@ function display_confirm_dialog (message, ok_text, cancel_text, ok_function) { clean_function(); } + var buttons_obj = {}; + buttons_obj[cancel_text] = clean_function; + buttons_obj[ok_text] = ok_function_clean; + // Display the dialog $("body").append('' + message + '
+ 'images/config.png)
')
+ var $updatebtn = $('')
+ .append($updateicon);
+ $content.append($updatebtn);
+ }
+
+ if(typeof element.delete != 'undefined'){
+ var url_delete = controller.baseURL + "index.php?sec=gagente&sec2=godmode/groups/group_list&tab=tree&delete_group=1&id_group=" + element.id;
+ var $deleteBtn = $(' +'images/cross.png)
');
+ $deleteBtn.click(function (event){
+ var ok_function = function(){
+ window.location.replace(url_delete);
+ };
+ display_confirm_dialog(
+ element.delete.messages.messg,
+ element.delete.messages.confirm,
+ element.delete.messages.cancel,
+ ok_function
+ )
+ });
+ $content.append($deleteBtn);
+ }
+
+ if(typeof element.alerts != 'undefined'){
+ $content.append(element.alerts);
+ }
+
break;
case 'agent':
// Is quiet
@@ -583,95 +612,99 @@ var TreeController = {
if (typeof(public_user) === 'undefined') public_user = 0;
if (typeof element.searchChildren != 'undefined' && element.searchChildren) {
- $node
- .removeClass("leaf-empty")
- .addClass("leaf-closed");
+ if(element.rootType == "group_edition"
+ && typeof element.children == 'undefined'){
+ $node.addClass("leaf-empty");
+ }
+ else{
+ $node
+ .removeClass("leaf-empty")
+ .addClass("leaf-closed");
+ $leafIcon.click(function (e) {
+ e.preventDefault();
- $leafIcon.click(function (e) {
- e.preventDefault();
-
- if (!$node.hasClass("leaf-loading") && !$node.hasClass("children-loaded") && !$node.hasClass("leaf-empty")) {
- $node
- .removeClass("leaf-closed")
- .removeClass("leaf-error")
- .addClass("leaf-loading");
-
- $.ajax({
- url: controller.ajaxURL,
- type: 'POST',
- dataType: 'json',
- data: {
- page: controller.ajaxPage,
- getChildren: 1,
- id: element.id,
- type: element.type,
- rootID: element.rootID,
- serverID: element.serverID,
- rootType: element.rootType,
- filter: controller.filter,
- hash: public_hash,
- id_user: public_user
- },
- complete: function(xhr, textStatus) {
- $node.removeClass("leaf-loading");
- $node.addClass("children-loaded");
- },
- success: function(data, textStatus, xhr) {
- if (data.success) {
- var $group = $node.children("ul.tree-group");
-
- if ((typeof data.tree != 'undefined' && data.tree.length > 0) || $group.length > 0) {
- $node.addClass("leaf-open");
-
- if ($group.length <= 0) {
- $group = $("