From 95e4d51e55f52fc35b21282a5f78db1ed323f2e5 Mon Sep 17 00:00:00 2001 From: Arturo Gonzalez Date: Wed, 19 Oct 2016 13:48:25 +0200 Subject: [PATCH 1/3] Added new functions and parameters to pandora cli --- pandora_server/util/pandora_manage.pl | 86 ++++++++++++++++++--------- 1 file changed, 58 insertions(+), 28 deletions(-) diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl index 46923d5657..ca9e1341d8 100644 --- a/pandora_server/util/pandora_manage.pl +++ b/pandora_server/util/pandora_manage.pl @@ -126,10 +126,11 @@ sub help_screen{ help_screen_line('--get_bad_conf_files', '', 'Get the files bad configured (without essential tokens)'); help_screen_line('--locate_agent', '', 'Search a agent into of nodes of metaconsole. Only Enterprise.'); print "\nMODULES:\n\n" unless $param ne ''; - help_screen_line('--create_data_module', " [ \n\t \n\t \n\t \n\t ]", 'Add data server module to agent'); - help_screen_line('--create_network_module', " \n\t [ \n\t \n\t \n\t ]", 'Add not snmp network module to agent'); - help_screen_line('--create_snmp_module', " \n\t [ \n\t \n\t \n\t \n\t \n\t ]", 'Add snmp network module to agent'); - help_screen_line('--create_plugin_module', " \n\t [ \n\t \n\t \n\t \n\t ]", 'Add plug-in module to agent'); + help_screen_line('--create_data_module', " [ \n\t \n\t \n\t \n\t \n\t ]", 'Add data server module to agent'); + help_screen_line('--create_network_module', " \n\t [ \n\t \n\t \n\t \n\t ]", 'Add not snmp network module to agent'); + help_screen_line('--create_snmp_module', " \n\t [ \n\t \n\t \n\t \n\t \n\t + \n\t ]", 'Add snmp network module to agent'); + help_screen_line('--create_plugin_module', " \n\t [ \n\t \n\t \n\t \n\t \n\t ]", 'Add plug-in module to agent'); help_screen_line('--create_module_group', ''); help_screen_line('--delete_module', 'Delete module from agent', ' '); help_screen_line('--data_module', " \n\t []", 'Insert data to module'); @@ -184,10 +185,11 @@ sub help_screen{ help_screen_line('--delete_not_policy_modules', '', 'Delete all modules without policy from configuration file'); help_screen_line('--disable_policy_alerts', '', 'Disable all the alerts of a policy'); help_screen_line('--create_policy', ' '); - help_screen_line('--create_policy_data_module', " [ \n\t \n\t \n\t \n\t \n\t ]", 'Add data server module to policy'); - help_screen_line('--create_policy_network_module', " [ \n\t \n\t \n\t \n\t ]", "Add not snmp network module to policy"); - help_screen_line('--create_policy_snmp_module', " \n\t [ \n\t \n\t \n\t \n\t \n\t ]", 'Add snmp network module to policy'); - help_screen_line('--create_policy_plugin_module', " \n\t [ \n\t \n\t \n\t \n\t ]", 'Add plug-in module to policy'); + help_screen_line('--create_policy_data_module', " [ \n\t \n\t \n\t \n\t \n\t ]", 'Add data server module to policy'); + help_screen_line('--create_policy_network_module', " [ \n\t \n\t \n\t \n\t \n\t ]", "Add not snmp network module to policy"); + help_screen_line('--create_policy_snmp_module', " \n\t [ \n\t \n\t \n\t \n\t \n\t \n\t + ]", 'Add snmp network module to policy'); + help_screen_line('--create_policy_plugin_module', " \n\t [ \n\t \n\t \n\t \n\t \n\t ]", 'Add plug-in module to policy'); help_screen_line('--create_policy_data_module_from_local_component', ' '); help_screen_line('--add_collection_to_policy', " "); help_screen_line('--validate_policy_alerts', '', 'Validate the alerts of a given policy'); @@ -1149,21 +1151,21 @@ sub cli_create_data_module($) { $min,$max,$post_process, $interval, $warning_min, $warning_max, $critical_min, $critical_max, $history_data, $definition_file, $configuration_data, $warning_str, $critical_str, $enable_unknown_events, $ff_threshold, $each_ff, $ff_threshold_normal, $ff_threshold_warning, $ff_threshold_critical, $ff_timeout, - $warning_inverse, $critical_inverse); + $warning_inverse, $critical_inverse, $critical_instructions, $warning_instructions, $unknown_instructions); if ($in_policy == 0) { ($module_name, $module_type, $agent_name, $description, $module_group, $min,$max,$post_process, $interval, $warning_min, $warning_max, $critical_min, $critical_max, $history_data, $definition_file, $warning_str, $critical_str, $enable_unknown_events, $ff_threshold, $each_ff, $ff_threshold_normal, $ff_threshold_warning, $ff_threshold_critical, $ff_timeout, - $warning_inverse, $critical_inverse) = @ARGV[2..27]; + $warning_inverse, $critical_inverse, $critical_instructions, $warning_instructions, $unknown_instructions) = @ARGV[2..30]; } else { ($policy_name, $module_name, $module_type, $description, $module_group, $min,$max,$post_process, $interval, $warning_min, $warning_max, $critical_min, $critical_max, $history_data, $configuration_data, $warning_str, $critical_str, $enable_unknown_events, $ff_threshold, $each_ff, $ff_threshold_normal, $ff_threshold_warning, $ff_threshold_critical, $ff_timeout, - $warning_inverse, $critical_inverse) = @ARGV[2..28]; + $warning_inverse, $critical_inverse, $critical_instructions, $warning_instructions, $unknown_instructions) = @ARGV[2..31]; } my $module_name_def; @@ -1307,6 +1309,9 @@ sub cli_create_data_module($) { $parameters{'ff_timeout'} = $ff_timeout unless !defined ($ff_timeout); $parameters{'critical_inverse'} = $critical_inverse unless !defined ($critical_inverse); $parameters{'warning_inverse'} = $warning_inverse unless !defined ($warning_inverse); + $parameters{'critical_instructions'} = $critical_instructions unless !defined ($critical_instructions); + $parameters{'warning_instructions'} = $warning_instructions unless !defined ($warning_instructions); + $parameters{'unknown_instructions'} = $unknown_instructions unless !defined ($unknown_instructions); if ($in_policy == 0) { pandora_create_module_from_hash ($conf, \%parameters, $dbh); @@ -1382,21 +1387,22 @@ sub cli_create_network_module($) { my ($policy_name, $module_name, $module_type, $agent_name, $module_address, $module_port, $description, $module_group, $min, $max, $post_process, $interval, $warning_min, $warning_max, $critical_min, $critical_max, $history_data, $ff_threshold, $warning_str, $critical_str, $enable_unknown_events, $each_ff, - $ff_threshold_normal, $ff_threshold_warning, $ff_threshold_critical, $timeout, $retries); + $ff_threshold_normal, $ff_threshold_warning, $ff_threshold_critical, $timeout, $retries, $critical_instructions, + $warning_instructions, $unknown_instructions); if ($in_policy == 0) { ($module_name, $module_type, $agent_name, $module_address, $module_port, $description, $module_group, $min, $max, $post_process, $interval, $warning_min, $warning_max, $critical_min, $critical_max, $history_data, $ff_threshold, $warning_str, $critical_str, $enable_unknown_events, $each_ff, $ff_threshold_normal, $ff_threshold_warning, - $ff_threshold_critical, $timeout, $retries) = @ARGV[2..27]; + $ff_threshold_critical, $timeout, $retries,$critical_instructions, $warning_instructions, $unknown_instructions) = @ARGV[2..30]; } else { ($policy_name, $module_name, $module_type, $module_port, $description, $module_group, $min, $max, $post_process, $interval, $warning_min, $warning_max, $critical_min, $critical_max, $history_data, $ff_threshold, $warning_str, $critical_str, $enable_unknown_events, $each_ff, $ff_threshold_normal, $ff_threshold_warning, - $ff_threshold_critical, $timeout, $retries) = @ARGV[2..26]; + $ff_threshold_critical, $timeout, $retries, $critical_instructions, $warning_instructions, $unknown_instructions) = @ARGV[2..29]; } my $module_name_def; @@ -1508,6 +1514,9 @@ sub cli_create_network_module($) { $parameters{'min_ff_event_critical'} = $ff_threshold_critical unless !defined ($ff_threshold_critical); $parameters{'max_timeout'} = $timeout unless !defined ($timeout); $parameters{'max_retries'} = $retries unless !defined ($retries); + $parameters{'critical_instructions'} = $critical_instructions unless !defined ($critical_instructions); + $parameters{'warning_instructions'} = $warning_instructions unless !defined ($warning_instructions); + $parameters{'unknown_instructions'} = $unknown_instructions unless !defined ($unknown_instructions); if ($in_policy == 0) { pandora_create_module_from_hash ($conf, \%parameters, $dbh); @@ -1528,21 +1537,24 @@ sub cli_create_snmp_module($) { $oid, $description, $module_group, $min, $max, $post_process, $interval, $warning_min, $warning_max, $critical_min, $critical_max, $history_data, $snmp3_priv_method, $snmp3_priv_pass, $snmp3_sec_level, $snmp3_auth_method, $snmp3_auth_user, $snmp3_auth_pass, $ff_threshold, $warning_str, $critical_str, $enable_unknown_events, - $each_ff, $ff_threshold_normal, $ff_threshold_warning, $ff_threshold_critical, $timeout, $retries); + $each_ff, $ff_threshold_normal, $ff_threshold_warning, $ff_threshold_critical, $timeout, $retries, + $critical_instructions, $warning_instructions, $unknown_instructions); if ($in_policy == 0) { ($module_name, $module_type, $agent_name, $module_address, $module_port, $version, $community, $oid, $description, $module_group, $min, $max, $post_process, $interval, $warning_min, $warning_max, $critical_min, $critical_max, $history_data, $snmp3_priv_method, $snmp3_priv_pass, $snmp3_sec_level, $snmp3_auth_method, $snmp3_auth_user, $snmp3_auth_pass, $ff_threshold, $warning_str, $critical_str, $enable_unknown_events, - $each_ff, $ff_threshold_normal, $ff_threshold_warning, $ff_threshold_critical, $timeout, $retries) = @ARGV[2..36]; + $each_ff, $ff_threshold_normal, $ff_threshold_warning, $ff_threshold_critical, $timeout, $retries, + $critical_instructions, $warning_instructions, $unknown_instructions) = @ARGV[2..39]; } else { ($policy_name, $module_name, $module_type, $module_port, $version, $community, $oid, $description, $module_group, $min, $max, $post_process, $interval, $warning_min, $warning_max, $critical_min, $critical_max, $history_data, $snmp3_priv_method, $snmp3_priv_pass, $snmp3_sec_level, $snmp3_auth_method, $snmp3_auth_user, $snmp3_auth_pass, $ff_threshold, $warning_str, $critical_str, $enable_unknown_events, - $each_ff, $ff_threshold_normal, $ff_threshold_warning, $ff_threshold_critical, $timeout, $retries) = @ARGV[2..35]; + $each_ff, $ff_threshold_normal, $ff_threshold_warning, $ff_threshold_critical, $timeout, $retries, + $critical_instructions, $warning_instructions, $unknown_instructions) = @ARGV[2..38]; } my $module_name_def; @@ -1659,6 +1671,9 @@ sub cli_create_snmp_module($) { $parameters{'min_ff_event_critical'} = $ff_threshold_critical unless !defined ($ff_threshold_critical); $parameters{'max_timeout'} = $timeout unless !defined ($timeout); $parameters{'max_retries'} = $retries unless !defined ($retries); + $parameters{'critical_instructions'} = $critical_instructions unless !defined ($critical_instructions); + $parameters{'warning_instructions'} = $warning_instructions unless !defined ($warning_instructions); + $parameters{'unknown_instructions'} = $unknown_instructions unless !defined ($unknown_instructions); if ($in_policy == 0) { pandora_create_module_from_hash ($conf, \%parameters, $dbh); @@ -1679,21 +1694,24 @@ sub cli_create_plugin_module($) { $user, $password, $params, $description, $module_group, $min, $max, $post_process, $interval, $warning_min, $warning_max, $critical_min, $critical_max, $history_data, $ff_threshold, $warning_str, $critical_str, $enable_unknown_events, - $each_ff, $ff_threshold_normal, $ff_threshold_warning, $ff_threshold_critical, $timeout); + $each_ff, $ff_threshold_normal, $ff_threshold_warning, $ff_threshold_critical, $timeout, + $critical_instructions, $warning_instructions, $unknown_instructions); if ($in_policy == 0) { ($module_name, $module_type, $agent_name, $module_address, $module_port, $plugin_name, $user, $password, $params, $description, $module_group, $min, $max, $post_process, $interval, $warning_min, $warning_max, $critical_min, $critical_max, $history_data, $ff_threshold, $warning_str, $critical_str, $enable_unknown_events, - $each_ff, $ff_threshold_normal, $ff_threshold_warning, $ff_threshold_critical, $timeout) = @ARGV[2..30]; + $each_ff, $ff_threshold_normal, $ff_threshold_warning, $ff_threshold_critical, $timeout, + $critical_instructions, $warning_instructions, $unknown_instructions) = @ARGV[2..33]; } else { ($policy_name, $module_name, $module_type, $module_port, $plugin_name, $user, $password, $params, $description, $module_group, $min, $max, $post_process, $interval, $warning_min, $warning_max, $critical_min, $critical_max, $history_data, $ff_threshold, $warning_str, $critical_str, $enable_unknown_events, - $each_ff, $ff_threshold_normal, $ff_threshold_warning, $ff_threshold_critical, $timeout) = @ARGV[2..29]; + $each_ff, $ff_threshold_normal, $ff_threshold_warning, $ff_threshold_critical, $timeout, + $critical_instructions, $warning_instructions, $unknown_instructions) = @ARGV[2..32]; } my $module_name_def; @@ -1825,6 +1843,9 @@ sub cli_create_plugin_module($) { $parameters{'min_ff_event_warning'} = $ff_threshold_warning unless !defined ($ff_threshold_warning); $parameters{'min_ff_event_critical'} = $ff_threshold_critical unless !defined ($ff_threshold_critical); $parameters{'max_timeout'} = $timeout unless !defined ($timeout); + $parameters{'critical_instructions'} = $critical_instructions unless !defined ($critical_instructions); + $parameters{'warning_instructions'} = $warning_instructions unless !defined ($warning_instructions); + $parameters{'unknown_instructions'} = $unknown_instructions unless !defined ($unknown_instructions); if ($in_policy == 0) { pandora_create_module_from_hash ($conf, \%parameters, $dbh); @@ -2524,6 +2545,15 @@ sub cli_module_update() { elsif ($field eq 'ff_threshold_critical') { $field = 'min_ff_event_critical'; } + elsif ($field eq 'critical_instructions') { + $field = 'critical_instructions'; + } + elsif ($field eq 'warning_instructions') { + $field = 'warning_instructions'; + } + elsif ($field eq 'unknown_instructions') { + $field = 'unknown_instructions'; + } else { # If is not a common value, check type and call type update funtion my $type = pandora_get_module_type($dbh,$id_agent_module); @@ -4520,7 +4550,7 @@ sub pandora_manage_main ($$$) { cli_delete_agent(); } elsif ($param eq '--create_data_module') { - param_check($ltotal, 27, 24); + param_check($ltotal, 30, 24); cli_create_data_module(0); } elsif ($param eq '--create_module_group') { @@ -4528,15 +4558,15 @@ sub pandora_manage_main ($$$) { cli_create_module_group(); } elsif ($param eq '--create_network_module') { - param_check($ltotal, 24, 20); + param_check($ltotal, 30, 20); cli_create_network_module(0); } elsif ($param eq '--create_snmp_module') { - param_check($ltotal, 35, 28); + param_check($ltotal, 38, 28); cli_create_snmp_module(0); } elsif ($param eq '--create_plugin_module') { - param_check($ltotal, 29, 19); + param_check($ltotal, 32, 19); cli_create_plugin_module(0); } elsif ($param eq '--delete_module') { @@ -4672,19 +4702,19 @@ sub pandora_manage_main ($$$) { cli_create_policy(); } elsif ($param eq '--create_policy_data_module') { - param_check($ltotal, 23, 20); + param_check($ltotal, 26, 20); cli_create_data_module(1); } elsif ($param eq '--create_policy_network_module') { - param_check($ltotal, 23, 20); + param_check($ltotal, 26, 20); cli_create_network_module(1); } elsif ($param eq '--create_policy_snmp_module') { - param_check($ltotal, 32, 27); + param_check($ltotal, 35, 27); cli_create_snmp_module(1); } elsif ($param eq '--create_policy_plugin_module') { - param_check($ltotal, 27, 19); + param_check($ltotal, 30, 19); cli_create_plugin_module(1); } elsif ($param eq '--create_alert_template') { From bab1a9f6f2f241cfad7f0a4d5b22514a551997e2 Mon Sep 17 00:00:00 2001 From: Arturo Gonzalez Date: Wed, 19 Oct 2016 15:34:15 +0200 Subject: [PATCH 2/3] Removed some traces --- .../godmode/agentes/module_manager_editor_common.php | 2 +- .../godmode/modules/manage_network_components_form_common.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pandora_console/godmode/agentes/module_manager_editor_common.php b/pandora_console/godmode/agentes/module_manager_editor_common.php index f7bf1800d5..99d5aeb3ef 100644 --- a/pandora_console/godmode/agentes/module_manager_editor_common.php +++ b/pandora_console/godmode/agentes/module_manager_editor_common.php @@ -229,7 +229,7 @@ if($disabledBecauseInPolicy){ $table_simple->data[1][3] .= html_print_input_hidden ('id_module_group', $id_module_group, true); } $table_simple->data[2][0] = __('Dynamic Interval') .' ' . ui_print_help_icon ('warning_status', true); -html_debug_print($dynamic_interval); + $table_simple->data[2][1] = html_print_extended_select_for_time ('dynamic_interval', $dynamic_interval, '', 'None', '0', 10, true, 'width:150px',false); $table_simple->data[2][2] = ''.__('Dynamic Min. ').''; $table_simple->data[2][2] .= html_print_input_text ('dynamic_min', $dynamic_min, '', 10, 255, true); diff --git a/pandora_console/godmode/modules/manage_network_components_form_common.php b/pandora_console/godmode/modules/manage_network_components_form_common.php index 71a35b18a8..7fa554a4b5 100644 --- a/pandora_console/godmode/modules/manage_network_components_form_common.php +++ b/pandora_console/godmode/modules/manage_network_components_form_common.php @@ -103,7 +103,7 @@ $table->data[2][2] = __('Interval'); $table->data[2][3] = html_print_extended_select_for_time ('module_interval' , $module_interval, '', '', '0', false, true); $table->data[3][0] = __('Dynamic Interval') .' ' . ui_print_help_icon ('warning_status', true); -html_debug_print($dynamic_interval); + $table->data[3][1] = html_print_extended_select_for_time ('dynamic_interval', $dynamic_interval, '', 'None', '0', 10, true, 'width:150px',false); $table->data[3][2] = ''.__('Dynamic Min. ').''; $table->data[3][2] .= html_print_input_text ('dynamic_min', $dynamic_min, '', 10, 255, true); From 449feab836bd35d11d8bf2b2089866ea6276d0ba Mon Sep 17 00:00:00 2001 From: artica Date: Thu, 20 Oct 2016 00:01:20 +0200 Subject: [PATCH 3/3] Auto-updated build strings. --- pandora_agents/unix/DEBIAN/control | 2 +- pandora_agents/unix/DEBIAN/make_deb_package.sh | 2 +- pandora_agents/unix/pandora_agent | 2 +- pandora_agents/unix/pandora_agent.redhat.spec | 2 +- pandora_agents/unix/pandora_agent.spec | 2 +- pandora_agents/unix/pandora_agent_installer | 2 +- pandora_agents/win32/installer/pandora.mpi | 2 +- pandora_agents/win32/pandora.cc | 2 +- pandora_agents/win32/versioninfo.rc | 2 +- pandora_console/DEBIAN/control | 2 +- pandora_console/DEBIAN/make_deb_package.sh | 2 +- pandora_console/include/config_process.php | 2 +- pandora_console/install.php | 2 +- pandora_console/pandora_console.redhat.spec | 2 +- pandora_console/pandora_console.spec | 2 +- pandora_console/pandoradb.data.oracle.sql | 2 +- pandora_server/DEBIAN/control | 2 +- pandora_server/DEBIAN/make_deb_package.sh | 2 +- pandora_server/lib/PandoraFMS/Config.pm | 2 +- pandora_server/pandora_server.redhat.spec | 2 +- pandora_server/pandora_server.spec | 2 +- pandora_server/pandora_server_installer | 2 +- pandora_server/util/pandora_db.pl | 2 +- pandora_server/util/pandora_manage.pl | 2 +- 24 files changed, 24 insertions(+), 24 deletions(-) diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control index a13e338493..a010da719e 100644 --- a/pandora_agents/unix/DEBIAN/control +++ b/pandora_agents/unix/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-agent-unix -Version: 6.1dev-161019 +Version: 6.1dev-161020 Architecture: all Priority: optional Section: admin diff --git a/pandora_agents/unix/DEBIAN/make_deb_package.sh b/pandora_agents/unix/DEBIAN/make_deb_package.sh index cd858915aa..287d46ba6b 100644 --- a/pandora_agents/unix/DEBIAN/make_deb_package.sh +++ b/pandora_agents/unix/DEBIAN/make_deb_package.sh @@ -14,7 +14,7 @@ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -pandora_version="6.1dev-161019" +pandora_version="6.1dev-161020" echo "Test if you has the tools for to make the packages." whereis dpkg-deb | cut -d":" -f2 | grep dpkg-deb > /dev/null diff --git a/pandora_agents/unix/pandora_agent b/pandora_agents/unix/pandora_agent index 222c432a99..30b0e20865 100644 --- a/pandora_agents/unix/pandora_agent +++ b/pandora_agents/unix/pandora_agent @@ -41,7 +41,7 @@ my $Sem = undef; my $ThreadSem = undef; use constant AGENT_VERSION => '6.1dev'; -use constant AGENT_BUILD => '161019'; +use constant AGENT_BUILD => '161020'; # Agent log default file size maximum and instances use constant DEFAULT_MAX_LOG_SIZE => 600000; diff --git a/pandora_agents/unix/pandora_agent.redhat.spec b/pandora_agents/unix/pandora_agent.redhat.spec index f6f3443725..31e6e0a704 100644 --- a/pandora_agents/unix/pandora_agent.redhat.spec +++ b/pandora_agents/unix/pandora_agent.redhat.spec @@ -3,7 +3,7 @@ # %define name pandorafms_agent_unix %define version 6.1dev -%define release 161019 +%define release 161020 Summary: Pandora FMS Linux agent, PERL version Name: %{name} diff --git a/pandora_agents/unix/pandora_agent.spec b/pandora_agents/unix/pandora_agent.spec index e52fcbc5b3..5bf384c64b 100644 --- a/pandora_agents/unix/pandora_agent.spec +++ b/pandora_agents/unix/pandora_agent.spec @@ -3,7 +3,7 @@ # %define name pandorafms_agent_unix %define version 6.1dev -%define release 161019 +%define release 161020 Summary: Pandora FMS Linux agent, PERL version Name: %{name} diff --git a/pandora_agents/unix/pandora_agent_installer b/pandora_agents/unix/pandora_agent_installer index fb62478482..18db0c3d32 100644 --- a/pandora_agents/unix/pandora_agent_installer +++ b/pandora_agents/unix/pandora_agent_installer @@ -10,7 +10,7 @@ # ********************************************************************** PI_VERSION="6.1dev" -PI_BUILD="161019" +PI_BUILD="161020" OS_NAME=`uname -s` FORCE=0 diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi index e69670b0f1..8899a69073 100644 --- a/pandora_agents/win32/installer/pandora.mpi +++ b/pandora_agents/win32/installer/pandora.mpi @@ -186,7 +186,7 @@ UpgradeApplicationID {} Version -{161019} +{161020} ViewReadme {Yes} diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc index b4e006028f..d332928dac 100644 --- a/pandora_agents/win32/pandora.cc +++ b/pandora_agents/win32/pandora.cc @@ -30,7 +30,7 @@ using namespace Pandora; using namespace Pandora_Strutils; #define PATH_SIZE _MAX_PATH+1 -#define PANDORA_VERSION ("6.1dev(Build 161019)") +#define PANDORA_VERSION ("6.1dev(Build 161020)") string pandora_path; string pandora_dir; diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc index 8e9f9db365..c2559721ca 100644 --- a/pandora_agents/win32/versioninfo.rc +++ b/pandora_agents/win32/versioninfo.rc @@ -11,7 +11,7 @@ BEGIN VALUE "LegalCopyright", "Artica ST" VALUE "OriginalFilename", "PandoraAgent.exe" VALUE "ProductName", "Pandora FMS Windows Agent" - VALUE "ProductVersion", "(6.1dev(Build 161019))" + VALUE "ProductVersion", "(6.1dev(Build 161020))" VALUE "FileVersion", "1.0.0.0" END END diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control index 52af982e4d..ebc59ea82b 100644 --- a/pandora_console/DEBIAN/control +++ b/pandora_console/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-console -Version: 6.1dev-161019 +Version: 6.1dev-161020 Architecture: all Priority: optional Section: admin diff --git a/pandora_console/DEBIAN/make_deb_package.sh b/pandora_console/DEBIAN/make_deb_package.sh index 05c398d451..a697d94da1 100644 --- a/pandora_console/DEBIAN/make_deb_package.sh +++ b/pandora_console/DEBIAN/make_deb_package.sh @@ -14,7 +14,7 @@ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -pandora_version="6.1dev-161019" +pandora_version="6.1dev-161020" package_pear=0 package_pandora=1 diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php index a33185058e..d7ef0b8537 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 = 'PC161019'; +$build_version = 'PC161020'; $pandora_version = 'v6.1dev'; // Do not overwrite default timezone set if defined. diff --git a/pandora_console/install.php b/pandora_console/install.php index 2148ca67ee..401c8a987b 100644 --- a/pandora_console/install.php +++ b/pandora_console/install.php @@ -71,7 +71,7 @@