diff --git a/pandora_console/pandoradb.sql b/pandora_console/pandoradb.sql index 440199f901..cb5598f957 100644 --- a/pandora_console/pandoradb.sql +++ b/pandora_console/pandoradb.sql @@ -85,7 +85,6 @@ CREATE TABLE IF NOT EXISTS `tagente` ( `update_alert_count` TINYINT NOT NULL DEFAULT 0, `update_secondary_groups` TINYINT NOT NULL DEFAULT 0, `alias` VARCHAR(600) NOT NULL DEFAULT '', - `transactional_agent` TINYINT NOT NULL DEFAULT 0, `alias_as_name` TINYINT NOT NULL DEFAULT 0, `safe_mode_module` INT UNSIGNED NOT NULL DEFAULT 0, `cps` INT NOT NULL DEFAULT 0, @@ -3463,7 +3462,6 @@ CREATE TABLE IF NOT EXISTS `tmetaconsole_agent` ( `update_module_count` TINYINT NOT NULL DEFAULT 0, `update_alert_count` TINYINT NOT NULL DEFAULT 0, `update_secondary_groups` TINYINT NOT NULL DEFAULT 0, - `transactional_agent` TINYINT NOT NULL DEFAULT 0, `alias` VARCHAR(600) NOT NULL DEFAULT '', `alias_as_name` TINYINT NOT NULL DEFAULT 0, `safe_mode_module` INT UNSIGNED NOT NULL DEFAULT 0, diff --git a/pandora_server/lib/PandoraFMS/Core.pm b/pandora_server/lib/PandoraFMS/Core.pm index b90044db58..545d7a463c 100644 --- a/pandora_server/lib/PandoraFMS/Core.pm +++ b/pandora_server/lib/PandoraFMS/Core.pm @@ -257,7 +257,6 @@ our @EXPORT = qw( pandora_update_server pandora_update_table_from_hash pandora_update_template_module - pandora_mark_transactional_agent pandora_group_statistics pandora_server_statistics pandora_self_monitoring @@ -307,7 +306,6 @@ our @ServerTypes = qw ( icmpserver snmpserver satelliteserver - transactionalserver mfserver syncserver wuxserver @@ -3280,25 +3278,6 @@ sub pandora_update_agent ($$$$$$$;$$$) { db_do ($dbh, "UPDATE tagente SET $set WHERE id_agente = ?", @{$values}, $agent_id); } - -########################################################################## -=head2 C<< pandora_mark_transactional_agent (I<$id_agente>) >> - -Set an agent as transactional agent - -=cut -########################################################################## -sub pandora_mark_transactional_agent($$) { - my ($dbh, $id_agente) = @_; - - if ( (!(defined($id_agente))) || (!(defined($dbh))) ) { - return; - } - - db_do ($dbh, "UPDATE tagente SET transactional_agent=1 WHERE id_agente = ?", $id_agente); -} - - ########################################################################## =head2 C<< pandora_update_gis_data (I<$pa_config>, I<$dbh>, I<$agent_id>, I<$longitude>, I<$latitude>, I<$altitude>) >> diff --git a/pandora_server/lib/PandoraFMS/DataServer.pm b/pandora_server/lib/PandoraFMS/DataServer.pm index 896bbf935f..b3c32522c6 100644 --- a/pandora_server/lib/PandoraFMS/DataServer.pm +++ b/pandora_server/lib/PandoraFMS/DataServer.pm @@ -757,13 +757,8 @@ sub process_module_data ($$$$$$$$$$) { # Name XML tag and column name don't match $module_conf->{'nombre'} = safe_input($module_name); - # Check if module is 'Transactional subsystem status' - my $enable_transactional_subsystem = 0; - if ($module_conf->{'name'} eq "Transactional subsystem status") { - $enable_transactional_subsystem = 1; - } delete $module_conf->{'name'}; - + # Calculate the module interval in seconds if (defined($module_conf->{'cron_interval'})) { $module_conf->{'module_interval'} = $module_conf->{'cron_interval'}; @@ -824,11 +819,6 @@ sub process_module_data ($$$$$$$$$$) { delete $module_conf->{'module_group'}; } - if ($enable_transactional_subsystem == 1) { - # Defines current agent as transactional agent - pandora_mark_transactional_agent($dbh, $agent->{'id_agente'}); - } - $module_conf->{'id_modulo'} = 1; $module_conf->{'id_agente'} = $agent->{'id_agente'};