From 4378dc48ad3258fbb5f4df5deb0ea3fc1c5264e1 Mon Sep 17 00:00:00 2001
From: enriquecd <enrique.camargo@artica.com>
Date: Wed, 28 Mar 2018 18:37:59 +0200
Subject: [PATCH 1/4] Fix cluster ACL - #1878
---
pandora_console/general/firts_task/cluster_builder.php | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/pandora_console/general/firts_task/cluster_builder.php b/pandora_console/general/firts_task/cluster_builder.php
index eb2e8d0e71..dc1e1a3ea3 100644
--- a/pandora_console/general/firts_task/cluster_builder.php
+++ b/pandora_console/general/firts_task/cluster_builder.php
@@ -49,8 +49,17 @@ ui_print_info_message ( array('no_close'=>true, 'message'=> __('There are no cl
echo __('<b>Clusters to guarantee service</b>: these are active - passive (A/P) mode clusters. It means that one of the nodes (or machines that make up the cluster) will be running (primary) and another won\'t (secondary). When the primary goes down, the secondary must take over and give the service instead. Although many of the elements of this cluster are active-passive, it will also have active elements in both of them that indicate that the passive node is "online", so that in the case of a service failure in the master, the active node collects this information.');
?></p>
+
+ <?php
+ if(check_acl ($config['id_user'], 0, "AW")) {
+ ?>
+
<form action="index.php?sec=reporting&sec2=enterprise/godmode/reporting/cluster_builder&step=1" method="post">
<input style="margin-bottom:20px;" type="submit" class="button_task" value="<?php echo __('Create Cluster'); ?>" />
</form>
+
+ <?php
+ }
+ ?>
</div>
</div>
\ No newline at end of file
From 4f57461b71b98b6b4ef84da1b60cc2f66b8af50d Mon Sep 17 00:00:00 2001
From: enriquecd <enrique.camargo@artica.com>
Date: Mon, 2 Apr 2018 15:29:59 +0200
Subject: [PATCH 2/4] Add help to CLI - #983
---
pandora_server/util/pandora_manage.pl | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index 0a5248c5c8..ebac0eb369 100644
--- a/pandora_server/util/pandora_manage.pl
+++ b/pandora_server/util/pandora_manage.pl
@@ -126,8 +126,9 @@ sub help_screen{
help_screen_line('--clean_conf_file', '<agent_name>', "Clean a local conf of a given agent deleting all modules, \n\t policies, file collections and comments");
help_screen_line('--get_bad_conf_files', '', 'Get the files bad configured (without essential tokens)');
help_screen_line('--locate_agent', '<agent_name>', 'Search a agent into of nodes of metaconsole. Only Enterprise.');
- help_screen_line('--migration_agent_queue', '<id_agent> <source_node_name> <target_node_name> [<db_only>]', 'Migrate agent only metaconsole');
- help_screen_line('--migration_agent', '<id_agent> ', 'Is migrating the agent only metaconsole');
+ help_screen_line('--migration_agent_queue', '<id_node> <source_node_name> <target_node_name> [<db_only>]', 'Migrate agent only metaconsole');
+ help_screen_line('--migration_agent', '<id_node> ', 'Is migrating the agent only metaconsole');
+ help_screen_line('--apply_module_template', '<id_template> <id_agent>', 'Apply module template to agent');
print "\nMODULES:\n\n" unless $param ne '';
help_screen_line('--create_data_module', "<module_name> <module_type> <agent_name> [<description> <module_group> \n\t <min> <max> <post_process> <interval> <warning_min> <warning_max> <critical_min> <critical_max> \n\t <history_data> <definition_file> <warning_str> <critical_str>\n\t <unknown_events> <ff_threshold> <each_ff> <ff_threshold_normal>\n\t <ff_threshold_warning> <ff_threshold_critical> <ff_timeout> <warning_inverse> <critical_inverse>\n\t <critical_instructions> <warning_instructions> <unknown_instructions>]", 'Add data server module to agent');
help_screen_line('--create_web_module', "<module_name> <module_type> <agent_name> [<description> <module_group> \n\t <min> <max> <post_process> <interval> <warning_min> <warning_max> <critical_min> <critical_max> \n\t <history_data> <definition_file> <warning_str> <critical_str>\n\t <unknown_events> <ff_threshold> <each_ff> <ff_threshold_normal>\n\t <ff_threshold_warning> <ff_threshold_critical> <ff_timeout> <warning_inverse> <critical_inverse>\n\t <critical_instructions> <warning_instructions> <unknown_instructions>].\n\t The valid data types are web_data, web_proc, web_content_data or web_content_string", 'Add web server module to agent');
From 73279989858836ac0835095e1883c587c0211e48 Mon Sep 17 00:00:00 2001
From: danielmaya <daniel.maya@artica.es>
Date: Tue, 3 Apr 2018 12:25:51 +0200
Subject: [PATCH 3/4] Fixed raw_text undefined in networkmap
---
.../include/javascript/functions_pandora_networkmap.js | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/pandora_console/include/javascript/functions_pandora_networkmap.js b/pandora_console/include/javascript/functions_pandora_networkmap.js
index 8fc943835c..491f927cc8 100644
--- a/pandora_console/include/javascript/functions_pandora_networkmap.js
+++ b/pandora_console/include/javascript/functions_pandora_networkmap.js
@@ -943,11 +943,11 @@ function load_interfaces(selected_links) {
}
}
});
-
+
$("#relations_table-template_row-node_source", template_relation_row)
- .html(link_each.source['raw_text']);
+ .html(link_each.source['raw_text'] != 'undefined' ? link_each.source['text'] : link_each.source['raw_text']);
$("#relations_table-template_row-node_target", template_relation_row)
- .html(link_each.target['raw_text']);
+ .html(link_each.target['raw_text'] != 'undefined' ? link_each.target['text'] : link_each.target['raw_text']);
$("#relations_table-template_row-edit", template_relation_row)
.attr("align", "center");
$("#relations_table-template_row-edit .delete_icon", template_relation_row)
From cac55053e3df0ad007672f9374a4c6a8875a7af4 Mon Sep 17 00:00:00 2001
From: daniel <daniel.barbero@artica.es>
Date: Tue, 3 Apr 2018 12:42:54 +0200
Subject: [PATCH 4/4] fixed minor error fullscale in report interfaces
metaconsole
---
pandora_console/include/functions_reporting.php | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/pandora_console/include/functions_reporting.php b/pandora_console/include/functions_reporting.php
index 52aa90b1f5..5df97acf9d 100755
--- a/pandora_console/include/functions_reporting.php
+++ b/pandora_console/include/functions_reporting.php
@@ -2736,7 +2736,7 @@ function reporting_network_interfaces_report($report, $content, $type = 'dinamic
}
else{
$network_interfaces_by_agents = agents_get_network_interfaces(false, $filter);
- $return = agents_get_network_interfaces_array($network_interfaces_by_agents, $return, $type, $content, $report);
+ $return = agents_get_network_interfaces_array($network_interfaces_by_agents, $return, $type, $content, $report, $fullscale);
metaconsole_restore_db();
}
}
@@ -2744,13 +2744,13 @@ function reporting_network_interfaces_report($report, $content, $type = 'dinamic
}
else{
$network_interfaces_by_agents = agents_get_network_interfaces(false, $filter);
- $return = agents_get_network_interfaces_array($network_interfaces_by_agents, $return, $type, $content, $report);
+ $return = agents_get_network_interfaces_array($network_interfaces_by_agents, $return, $type, $content, $report, $fullscale);
}
return reporting_check_structure_content($return);
}
-function agents_get_network_interfaces_array($network_interfaces_by_agents, $return, $type, $content, $report){
+function agents_get_network_interfaces_array($network_interfaces_by_agents, $return, $type, $content, $report, $fullscale){
if (empty($network_interfaces_by_agents)) {
$return['failed'] =
__('The group has no agents or none of the agents has any network interface');