From 8845e374471142eb7b9c92ae805701383ff89483 Mon Sep 17 00:00:00 2001
From: alejandro <alejandro.sanchez@pandorafms.com>
Date: Thu, 21 Apr 2022 10:31:20 +0200
Subject: [PATCH] Adding new option log_module

---
 .../Advanced Log Parser/pandora_logparser.pl  | 57 ++++++++++++-------
 1 file changed, 37 insertions(+), 20 deletions(-)

diff --git a/pandora_plugins/Advanced Log Parser/pandora_logparser.pl b/pandora_plugins/Advanced Log Parser/pandora_logparser.pl
index e22878e88a..b83ad3477f 100644
--- a/pandora_plugins/Advanced Log Parser/pandora_logparser.pl	
+++ b/pandora_plugins/Advanced Log Parser/pandora_logparser.pl	
@@ -469,15 +469,21 @@ sub parse_log ($$$$$$$$) {
     # Go to starting position
     seek(LOGFILE, $Idx_pos, 0);
 
-	$buffer .= "<module>\n";
-	$buffer .= "<name><![CDATA[" . $Module_name . "]]></name>\n";
-    $buffer .= "<description><![CDATA[" . $Description . "]]></description>\n";
-
-    if ($type eq "return_ocurrences"){
-    	$buffer .= "<type>generic_data</type>\n";        
+    if ($type eq "log_module"){
+    	$buffer = "<log_module>\n";
+        $buffer .= "<source><![CDATA[" . $Module_name . "]]></source>\n";  
+        $buffer .= "<data><![CDATA[";     
     } else {
-    	$buffer .= "<type><![CDATA[async_string]]></type>\n";
-    	$buffer .= "<datalist>\n";
+    	$buffer .= "<module>\n";
+        $buffer .= "<name><![CDATA[" . $Module_name . "]]></name>\n";
+        $buffer .= "<description><![CDATA[" . $Description . "]]></description>\n";
+
+        if ($type eq "return_ocurrences"){
+    	    $buffer .= "<type>generic_data</type>\n";        
+        } else {
+            $buffer .= "<type><![CDATA[async_string]]></type>\n";
+            $buffer .= "<datalist>\n";
+            }
     }
 
 	while ($line = <LOGFILE>) {
@@ -503,6 +509,11 @@ sub parse_log ($$$$$$$$) {
 	                $buffer .= "<data><value><![CDATA[".$line."]]></value></data>\n";
                 }
 
+                if ($type eq "log_module") {    
+                    $line =~ s/\]\]/]]]]><![CDATA[/g;         
+                    $buffer .= $line."\n";               
+                }
+
                 # Critical severity will prevail over other matches
                 if ($severity eq ""){
                     $severity = $value->{"severity"};
@@ -515,11 +526,12 @@ sub parse_log ($$$$$$$$) {
             }
         }
 	}
-
-    if ($type eq "return_ocurrences"){
-        $buffer .= "<data><![CDATA[".$count."]]></data>\n";
-    } else {
-    	$buffer .= "</datalist>\n";
+    if ($type ne "log_module"){
+        if ($type eq "return_ocurrences"){
+            $buffer .= "<data><![CDATA[".$count."]]></data>\n";
+        } else {
+            $buffer .= "</datalist>\n";
+        }
     }
 
     # Execute action if any match (always for last match) 
@@ -527,13 +539,18 @@ sub parse_log ($$$$$$$$) {
         `$action`;
     }        
 
-    # Write severity field in XML
-    if ($severity ne ""){
-        $buffer .= "<status>$severity</status>\n";
-    }
+    if ($type ne "log_module"){
+        # Write severity field in XML
+        if ($severity ne ""){
+            $buffer .= "<status>$severity</status>\n";
+        }
 
-    # End XML
-	$buffer .= "</module>\n";
+        # End XML
+        $buffer .= "</module>\n";
+    }else {
+        $buffer .= "]]></data>\n";
+        $buffer .= "</log_module>\n";
+        }
 
     # Update Index
 	$Idx_pos = tell(LOGFILE);
@@ -746,4 +763,4 @@ while (my ($key, $value) = each (@{$plugin_setup{"log"}})) {
 
     print "\n";
 
-}
\ No newline at end of file
+}