From ee51114fe88e171a980c195500dd62dbec39446a Mon Sep 17 00:00:00 2001 From: fermin831 Date: Mon, 24 Sep 2018 11:20:47 +0200 Subject: [PATCH 1/8] Added standby mode on unix agent --- pandora_agents/unix/AIX/pandora_agent.conf | 3 + pandora_agents/unix/Darwin/pandora_agent.conf | 3 + .../unix/FreeBSD/pandora_agent.conf | 3 + pandora_agents/unix/HP-UX/pandora_agent.conf | 3 + pandora_agents/unix/Linux/pandora_agent.conf | 3 + pandora_agents/unix/NT4/pandora_agent.conf | 9 ++- pandora_agents/unix/NetBSD/pandora_agent.conf | 3 + pandora_agents/unix/SunOS/pandora_agent.conf | 3 + pandora_agents/unix/pandora_agent | 69 ++++++++++++------- 9 files changed, 71 insertions(+), 28 deletions(-) diff --git a/pandora_agents/unix/AIX/pandora_agent.conf b/pandora_agents/unix/AIX/pandora_agent.conf index 5f755ae4af..0d640badaa 100644 --- a/pandora_agents/unix/AIX/pandora_agent.conf +++ b/pandora_agents/unix/AIX/pandora_agent.conf @@ -87,6 +87,9 @@ transfer_mode tentacle # If set to 1 allows the agent to be configured via the web console (Only Enterprise version) # remote_config 1 +# Default 0, set to 1 to avoid module executions and report to server +# standby 1 + # If set to 1 start Drone Agent's Proxy Mode # proxy_mode 1 diff --git a/pandora_agents/unix/Darwin/pandora_agent.conf b/pandora_agents/unix/Darwin/pandora_agent.conf index bfe673cf6c..53dd20cf4f 100644 --- a/pandora_agents/unix/Darwin/pandora_agent.conf +++ b/pandora_agents/unix/Darwin/pandora_agent.conf @@ -117,6 +117,9 @@ transfer_mode tentacle # If set to 1 allows the agent to be configured via the web console (Only Enterprise version) #remote_config 1 +# Default 0, set to 1 to avoid module executions and report to server +# standby 1 + # If set to 1 start Drone Agent's Proxy Mode # proxy_mode 1 diff --git a/pandora_agents/unix/FreeBSD/pandora_agent.conf b/pandora_agents/unix/FreeBSD/pandora_agent.conf index d829dfe933..3590ee6551 100644 --- a/pandora_agents/unix/FreeBSD/pandora_agent.conf +++ b/pandora_agents/unix/FreeBSD/pandora_agent.conf @@ -130,6 +130,9 @@ transfer_mode tentacle # If set to 1 allows the agent to be configured via the web console (Only Enterprise version) remote_config 0 +# Default 0, set to 1 to avoid module executions and report to server +# standby 1 + # If set to 1 start Drone Agent's Proxy Mode #proxy_mode 1 diff --git a/pandora_agents/unix/HP-UX/pandora_agent.conf b/pandora_agents/unix/HP-UX/pandora_agent.conf index 29dc961d62..aa1dcb1592 100644 --- a/pandora_agents/unix/HP-UX/pandora_agent.conf +++ b/pandora_agents/unix/HP-UX/pandora_agent.conf @@ -89,6 +89,9 @@ transfer_mode tentacle # If set to 1 allows the agent to be configured via the web console (Only Enterprise version) # remote_config 1 +# Default 0, set to 1 to avoid module executions and report to server +# standby 1 + # If set to 1 start Drone Agent's Proxy Mode # proxy_mode 1 diff --git a/pandora_agents/unix/Linux/pandora_agent.conf b/pandora_agents/unix/Linux/pandora_agent.conf index c97d6b489f..fc55d1d872 100644 --- a/pandora_agents/unix/Linux/pandora_agent.conf +++ b/pandora_agents/unix/Linux/pandora_agent.conf @@ -136,6 +136,9 @@ transfer_mode tentacle # If set to 1 allows the agent to be configured via the web console (Only Enterprise version) remote_config 0 +# Default 0, set to 1 to avoid module executions and report to server +# standby 1 + # If set to 1 start Drone Agent's Proxy Mode # proxy_mode 1 diff --git a/pandora_agents/unix/NT4/pandora_agent.conf b/pandora_agents/unix/NT4/pandora_agent.conf index e493e71850..7a47602abc 100644 --- a/pandora_agents/unix/NT4/pandora_agent.conf +++ b/pandora_agents/unix/NT4/pandora_agent.conf @@ -41,9 +41,9 @@ udp_server_auth_address 0.0.0.0 # Group assigned for this agent (descriptive, p.e: Servers) #group Servers - -# Group password (if defined). -#group_password + +# Group password (if defined). +#group_password # Autotime: Enforce to server to ignore timestamp coming from this # agent, used when agents has no timer or it's inestable. 1 to enable @@ -102,6 +102,9 @@ transfer_mode tentacle # If set to 1 allows the agent to be configured via the web console (Only Enterprise version) remote_config 0 +# Default 0, set to 1 to avoid module executions and report to server +# standby 1 + # Number of threads to execute modules in parallel #agent_threads 1 diff --git a/pandora_agents/unix/NetBSD/pandora_agent.conf b/pandora_agents/unix/NetBSD/pandora_agent.conf index 6954f557e0..42d8c19a25 100644 --- a/pandora_agents/unix/NetBSD/pandora_agent.conf +++ b/pandora_agents/unix/NetBSD/pandora_agent.conf @@ -98,6 +98,9 @@ transfer_mode tentacle # If set to 1 allows the agent to be configured via the web console (Only Enterprise version) #remote_config 1 +# Default 0, set to 1 to avoid module executions and report to server +# standby 1 + # If set to 1 start Drone Agent's Proxy Mode #proxy_mode 1 diff --git a/pandora_agents/unix/SunOS/pandora_agent.conf b/pandora_agents/unix/SunOS/pandora_agent.conf index 8fe67c12d0..625bc89848 100644 --- a/pandora_agents/unix/SunOS/pandora_agent.conf +++ b/pandora_agents/unix/SunOS/pandora_agent.conf @@ -92,6 +92,9 @@ transfer_mode tentacle # If set to 1 allows the agent to be configured via the web console (Only Enterprise version) #remote_config 1 +# Default 0, set to 1 to avoid module executions and report to server +# standby 1 + # If set to 1 start Drone Agent's Proxy Mode #proxy_mode 1 diff --git a/pandora_agents/unix/pandora_agent b/pandora_agents/unix/pandora_agent index 1974d5fe75..30944cbec8 100755 --- a/pandora_agents/unix/pandora_agent +++ b/pandora_agents/unix/pandora_agent @@ -186,6 +186,7 @@ my %DefaultConf = ( 'xml_buffer' => 0, 'custom_id' => '', 'url_address' => '', + 'standby' => 0, ); my %Conf = %DefaultConf; @@ -1333,6 +1334,41 @@ sub check_collections () { } } +################################################################################ +# Sleep function +################################################################################ +sub sleep_agent { + my ($main_agent, $iter_base_time) = @_; + + # Sleep if main agent + if ($main_agent != 0) { + foreach my $broker_pid (@BrokerPid) { + waitpid ($broker_pid, 0); + } + + # Cron mode + exit (0) if ($Conf{'cron_mode'} == 1); + + $iter_base_time += $Conf{'intensive_interval'}; + my $now = time(); + + my $interval_remain = $iter_base_time - $now; + + if ($interval_remain >= 0) { + sleep ($interval_remain); + } else { + # don't sleep if iteraion took more than "intensive_interval" seconds + $iter_base_time = $now; # use current time as base time + } + } + # Finish if broker agent + else { + exit (0); + } + + return $iter_base_time; +} + ############################################################################### # Return the MD5 checksum of the given string as a hex string. # Pseudocode from: http://en.wikipedia.org/wiki/MD5#Pseudocode @@ -2959,6 +2995,12 @@ while (1) { } } + # Do not report to server if standby mode is enabled + if ($Conf{'standby'} eq '1' && $Conf{'debug'} ne '1') { + $iter_base_time = sleep_agent($main_agent, $iter_base_time); + next; + } + my $address; if(defined($Conf{'address'})) { @@ -3161,31 +3203,8 @@ while (1) { $SIG{'INT'} = \&udp_server_signal; } - # Sleep if main agent - if ($main_agent != 0) { - foreach my $broker_pid (@BrokerPid) { - waitpid ($broker_pid, 0); - } - - # Cron mode - last if ($Conf{'cron_mode'} == 1); - - $iter_base_time += $Conf{'intensive_interval'}; - my $now = time(); - - my $interval_remain = $iter_base_time - $now; - - if ($interval_remain >= 0) { - sleep ($interval_remain); - } else { - # don't sleep if iteraion took more than "intensive_interval" seconds - $iter_base_time = $now; # use current time as base time - } - } - # Finish if broker agent - else { - exit (0); - } + # Sleep agent function + $iter_base_time = sleep_agent($main_agent, $iter_base_time); } __END__ From a0da08e1aae98b5541b54264232d5c247b50771c Mon Sep 17 00:00:00 2001 From: fermin831 Date: Mon, 24 Sep 2018 13:13:12 +0200 Subject: [PATCH 2/8] Added standby mode on windows agent --- pandora_agents/win32/bin/pandora_agent.conf | 5 ++++- pandora_agents/win32/pandora_windows_service.cc | 8 ++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/pandora_agents/win32/bin/pandora_agent.conf b/pandora_agents/win32/bin/pandora_agent.conf index e8caadc9c3..8cbd66dc0c 100644 --- a/pandora_agents/win32/bin/pandora_agent.conf +++ b/pandora_agents/win32/bin/pandora_agent.conf @@ -1,6 +1,6 @@ # Base config file for Pandora FMS Windows Agent # (c) 2006-2017 Artica Soluciones Tecnologicas -# Version 7.0NG.727 +# Version 7.0NG.727 # This program is Free Software, you can redistribute it and/or modify it # under the terms of the GNU General Public Licence as published by the Free Software @@ -82,6 +82,9 @@ server_port 41121 # Debug mode renames XML in the temp folder and continues running # debug 1 +# Default 0, set to 1 to avoid module executions and report to server +# standby 1 + # XML encoding (ISO-8859-1 by default). Most windows servers experience problems when you set to UTF-8. Other special codepages may be specified here. #encoding ISO-8859-1 diff --git a/pandora_agents/win32/pandora_windows_service.cc b/pandora_agents/win32/pandora_windows_service.cc index e843cdbc05..275ee60724 100644 --- a/pandora_agents/win32/pandora_windows_service.cc +++ b/pandora_agents/win32/pandora_windows_service.cc @@ -1869,7 +1869,7 @@ Pandora_Windows_Service::pandora_run_broker (string config) { server_addr = conf->getValue ("server_ip"); - if (this->broker_modules != NULL) { + if (this->broker_modules != NULL && !(conf->getValue ("standby") == "1" && !getPandoraDebug())) { this->broker_modules->goFirst (); while (! this->broker_modules->isLast ()) { @@ -1937,7 +1937,7 @@ Pandora_Windows_Service::pandora_run_broker (string config) { } } - if (data_flag == 1 || this->timestamp + this->interval_sec <= this->run_time) { + if ((data_flag == 1 || this->timestamp + this->interval_sec <= this->run_time) && !(conf->getValue ("standby") == "1" && !getPandoraDebug())) { // Send the XML if (!server_addr.empty ()) { @@ -1997,7 +1997,7 @@ Pandora_Windows_Service::pandora_run (int forced_run) { execution_number++; - if (this->modules != NULL) { + if (this->modules != NULL && !(conf->getValue ("standby") == "1" && !getPandoraDebug())) { this->modules->goFirst (); while (! this->modules->isLast ()) { @@ -2057,7 +2057,7 @@ Pandora_Windows_Service::pandora_run (int forced_run) { } } - if (forced_run == 1 || data_flag == 1 || this->timestamp + this->interval_sec <= this->run_time) { + if ((forced_run == 1 || data_flag == 1 || this->timestamp + this->interval_sec <= this->run_time) && !(conf->getValue ("standby") == "1" && !getPandoraDebug())) { // Send the XML if (!server_addr.empty ()) { From 9cf578e1f60cdd8e00197aeb0eee44e090822eeb Mon Sep 17 00:00:00 2001 From: fermin831 Date: Mon, 24 Sep 2018 16:54:53 +0200 Subject: [PATCH 3/8] Update configuration files when disabled is modified on agents editing --- .../godmode/agentes/configurar_agente.php | 20 ++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/pandora_console/godmode/agentes/configurar_agente.php b/pandora_console/godmode/agentes/configurar_agente.php index b0999eb638..5094f83d5c 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 From 823b32ac636fc5090f52e74850aa577864c2ceeb Mon Sep 17 00:00:00 2001 From: fermin831 Date: Mon, 24 Sep 2018 17:32:58 +0200 Subject: [PATCH 4/8] Added update standby token in massive operations --- .../godmode/massive/massive_edit_agents.php | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/pandora_console/godmode/massive/massive_edit_agents.php b/pandora_console/godmode/massive/massive_edit_agents.php index f543772648..981857783e 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 From 87fa7a7125088741f6cab43c46a6385611e26c5f Mon Sep 17 00:00:00 2001 From: fermin831 Date: Tue, 25 Sep 2018 13:42:29 +0200 Subject: [PATCH 5/8] Added --set_disabled_and_standby to CLI --- pandora_server/lib/PandoraFMS/Tools.pm | 1 + pandora_server/util/pandora_manage.pl | 24 ++++++++++++++++++++++++ 2 files changed, 25 insertions(+) diff --git a/pandora_server/lib/PandoraFMS/Tools.pm b/pandora_server/lib/PandoraFMS/Tools.pm index 1758d79459..5e5f58c4a8 100755 --- a/pandora_server/lib/PandoraFMS/Tools.pm +++ b/pandora_server/lib/PandoraFMS/Tools.pm @@ -28,6 +28,7 @@ use Socket qw(inet_ntoa inet_aton); use Sys::Syslog; use Scalar::Util qw(looks_like_number); use LWP::UserAgent; +use threads; # New in 3.2. Used to sendmail internally, without external scripts # use Module::Loaded; diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl index 8314db7273..ccf9294af2 100644 --- a/pandora_server/util/pandora_manage.pl +++ b/pandora_server/util/pandora_manage.pl @@ -136,6 +136,7 @@ sub help_screen{ help_screen_line('--delete_cluster_agent', ' ', 'Deleting cluster agent'); help_screen_line('--delete_cluster_item', '', 'Deleting cluster item'); help_screen_line('--get_cluster_status', '', 'Getting cluster status'); + help_screen_line('--set_disabled_and_standby', ' ', 'Overwrite and disable and standby status'); print "\nMODULES:\n\n" unless $param ne ''; 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_web_module', " [ \n\t \n\t \n\t \n\t \n\t \n\t ].\n\t The valid data types are web_data, web_proc, web_content_data or web_content_string", 'Add web server module to agent'); @@ -6125,6 +6126,10 @@ sub pandora_manage_main ($$$) { param_check($ltotal, 1, 0); cli_migration_agent(); } + elsif ($param eq '--set_disabled_and_standby') { + param_check($ltotal, 3, 1); + cli_set_disabled_and_standby(); + } else { print_log "[ERROR] Invalid option '$param'.\n\n"; $param = ''; @@ -6709,4 +6714,23 @@ sub cli_get_cluster_status() { else{ print "\n0\n"; } +} + +############################################################################## +# Set an agent disabled and with standby. +# Related option: --set_disabled_and_standby +############################################################################## + +sub cli_set_disabled_and_standby() { + my ($id, $id_node, $value) = @ARGV[2..4]; + $id_node = 0 unless defined($id_node); + $value = 1 unless defined($value); #Set to disabled by default + + # Call the API. + my $result = api_call( + $conf, 'set', 'disabled_and_standby', $id, $id_node, $value + ); + + my $exit_code = (defined($result) && "$result" eq "1") ? "1" : "0"; + print "\n$exit_code\n"; } \ No newline at end of file From 22b46e41f1ad02872aa95df4e54ca187c54dc851 Mon Sep 17 00:00:00 2001 From: fermin831 Date: Tue, 25 Sep 2018 15:59:33 +0200 Subject: [PATCH 6/8] Added standby mode on disabled token of API function set update_agent --- pandora_console/include/functions_api.php | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/pandora_console/include/functions_api.php b/pandora_console/include/functions_api.php index 189cc4203b..350a3089ab 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 From 90bbd31b66640054a2d7f319e80c51ca5ed5a861 Mon Sep 17 00:00:00 2001 From: fermin831 Date: Tue, 25 Sep 2018 16:00:37 +0200 Subject: [PATCH 7/8] Added tip to disabled radiobutton in agent edition and massive operations --- pandora_console/godmode/agentes/agent_manager.php | 1 + pandora_console/godmode/massive/massive_edit_agents.php | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/pandora_console/godmode/agentes/agent_manager.php b/pandora_console/godmode/agentes/agent_manager.php index 0196fb9393..418fe850c0 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 agent has remote configuration activated, it will put it on standby mode too.'), 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/massive/massive_edit_agents.php b/pandora_console/godmode/massive/massive_edit_agents.php index 981857783e..c5d33c4f67 100755 --- a/pandora_console/godmode/massive/massive_edit_agents.php +++ b/pandora_console/godmode/massive/massive_edit_agents.php @@ -432,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 agent has remote configuration activated, it will put it on standby mode too.'), 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 From 8fe3e1606fa10a49cc8c4133ab2e377be1973e09 Mon Sep 17 00:00:00 2001 From: fermin831 Date: Wed, 26 Sep 2018 10:50:16 +0200 Subject: [PATCH 8/8] Fixed string (avoiding macaronic English) --- pandora_console/godmode/agentes/agent_manager.php | 2 +- pandora_console/godmode/massive/massive_edit_agents.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pandora_console/godmode/agentes/agent_manager.php b/pandora_console/godmode/agentes/agent_manager.php index 418fe850c0..4e6be0e725 100644 --- a/pandora_console/godmode/agentes/agent_manager.php +++ b/pandora_console/godmode/agentes/agent_manager.php @@ -479,7 +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 agent has remote configuration activated, it will put it on standby mode too.'), true) . ' ' . + 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/massive/massive_edit_agents.php b/pandora_console/godmode/massive/massive_edit_agents.php index c5d33c4f67..3f78d8c88c 100755 --- a/pandora_console/godmode/massive/massive_edit_agents.php +++ b/pandora_console/godmode/massive/massive_edit_agents.php @@ -433,7 +433,7 @@ $table->data[1][1] .= __('Autodisable mode').' '.html_print_radio_button_extende $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') . ' ' . - ui_print_help_tip(__('If the agent has remote configuration activated, it will put it on standby mode too.'), true) . ' ' . + 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);