From e540d96eb2ba37443cadcdb3fd72f309831b6e74 Mon Sep 17 00:00:00 2001
From: fermin831 <fermin.hernandez@artica.es>
Date: Mon, 21 Jan 2019 18:43:47 +0100
Subject: [PATCH] Revert "Added events in DataServer processed XML"

This reverts commit cbe518dc53855766ce440babe6d021791987789e [formerly e3166d9fb2bcbf1b6aa574ae1a96e796a26a70a6].


Former-commit-id: 759a3da8b31fef88d2d7b22daeae09062f3bd80c
---
 pandora_server/lib/PandoraFMS/DataServer.pm | 49 +--------------------
 1 file changed, 1 insertion(+), 48 deletions(-)

diff --git a/pandora_server/lib/PandoraFMS/DataServer.pm b/pandora_server/lib/PandoraFMS/DataServer.pm
index 3db55cc8f0..6ff42d34ed 100644
--- a/pandora_server/lib/PandoraFMS/DataServer.pm
+++ b/pandora_server/lib/PandoraFMS/DataServer.pm
@@ -29,8 +29,6 @@ use XML::Parser::Expat;
 use XML::Simple;
 use POSIX qw(setsid strftime);
 use IO::Uncompress::Unzip;
-use JSON qw(decode_json);
-use MIME::Base64;
 
 # For Reverse Geocoding
 use LWP::Simple;
@@ -323,7 +321,6 @@ sub process_xml_data ($$$$$) {
 	
 	# Get agent id
 	my $agent_id = get_agent_id ($dbh, $agent_name);
-	my $group_id = 0;
 	if ($agent_id < 1) {
 		if ($pa_config->{'autocreate'} == 0) {
 			logger($pa_config, "ERROR: There is no agent defined with name $agent_name", 3);
@@ -332,7 +329,7 @@ sub process_xml_data ($$$$$) {
 		
 		# Get OS, group and description
 		my $os = pandora_get_os ($dbh, $data->{'os_name'});
-		$group_id = $pa_config->{'autocreate_group'};
+		my $group_id = $pa_config->{'autocreate_group'};
 		if (! defined (get_group_name ($dbh, $group_id))) {
 			if (defined ($data->{'group_id'}) && $data->{'group_id'} ne '') {
 				$group_id = $data->{'group_id'};
@@ -597,9 +594,6 @@ sub process_xml_data ($$$$$) {
 
 	# Process snmptrapd modules
 	enterprise_hook('process_snmptrap_data', [$pa_config, $data, $server_id, $dbh]);
-
-	# Process events
-	process_events_dataserver($pa_config, $data, $agent_id, $group_id, $dbh);
 }
 
 ##########################################################################
@@ -968,46 +962,5 @@ sub unlink_modules {
 	db_do($dbh, "UPDATE tagente_modulo SET parent_module_id = 0 WHERE id_agente_modulo = ?", $child_id);
 }
 
-##########################################################################
-# Process events in the XML.
-##########################################################################
-sub process_events_dataserver {
-	my ($pa_config, $data, $agent_id, $group_id, $dbh) = @_;
-
-	return unless defined($data->{'events'});
-
-	foreach my $event (@{$data->{'events'}}) {
-		next unless defined($event->{'event'}) && defined($event->{'event'}->[0]);
-		my $event_info_encoded = $event->{'event'}->[0];
-
-		# Try to decode the base64 inside
-		my $event_info;
-		eval {
-			$event_info = decode_json(decode_base64($event_info_encoded));
-		};
-
-		if ($@) {
-			logger($pa_config, "Error processing base64 event data '$event_info_encoded'.", 5);
-			next;
-		}
-		next unless defined($event_info->{'data'});
-
-		pandora_event(
-			$pa_config,
-			$event_info->{'data'},
-			$group_id,
-			$agent_id,
-			defined($event_info->{'severity'}) ? $event_info->{'severity'} : 0,
-			0,
-			0,
-			'system',
-			0,
-			$dbh
-		);
-	}
-
-	return;
-}
-
 1;
 __END__