Merge pull request #64 from SumoLogic/hpal_lambda_fixes

Fixes for Github issues

Author: duchatran

cloudwatchevents/cloudwatchevents.js

@@ -89,7 +89,7 @@ exports.handler = function (event, context) {
 
     // Used to hold chunks of messages to post to SumoLogic
     var messageList = {};
-
+    var final_event;
     // Validate URL has been set
     var urlObject = url.parse(SumoURL);
     if (urlObject.protocol != 'https:' || urlObject.host === null || urlObject.path === null) {

cloudwatchlogs/cloudwatchlogs_lambda.js

@@ -74,7 +74,7 @@ function sumoMetaKey(awslogsData, message) {
 
 }
 
-function postToSumo(context, messages) {
+function postToSumo(callback, messages) {
     var messagesTotal = Object.keys(messages).length;
     var messagesSent = 0;
     var messageErrors = [];
@@ -91,9 +91,9 @@ function postToSumo(context, messages) {
         if (total == messagesTotal) {
             console.log('messagesSent: ' + messagesSent + ' messagesErrors: ' + messageErrors.length);
             if (messageErrors.length > 0) {
-                context.fail('errors: ' + messageErrors);
+                callback('errors: ' + messageErrors);
             } else {
-                context.succeed();
+                callback(null, "Success");
             }
         }
     };
@@ -135,29 +135,29 @@ function postToSumo(context, messages) {
 }
 
 
-exports.handler = function (event, context) {
-    
+exports.handler = function (event, context, callback) {
+
     // Used to hold chunks of messages to post to SumoLogic
     var messageList = {};
 
     // Validate URL has been set
     var urlObject = url.parse(SumoURL);
     if (urlObject.protocol != 'https:' || urlObject.host === null || urlObject.path === null) {
-        context.fail('Invalid SUMO_ENDPOINT environment variable: ' + SumoURL);
+        callback('Invalid SUMO_ENDPOINT environment variable: ' + SumoURL);
     }
 
     var zippedInput = new Buffer(event.awslogs.data, 'base64');
 
     zlib.gunzip(zippedInput, function (e, buffer) {
         if (e) {
-            context.fail(e);
+            callback(e);
         }
 
         var awslogsData = JSON.parse(buffer.toString(encoding));
 
         if (awslogsData.messageType === 'CONTROL_MESSAGE') {
             console.log('Control message');
-            context.succeed('Success');
+            callback(null, 'Success');
         }
 
         var lastRequestID = null;
@@ -213,7 +213,7 @@ exports.handler = function (event, context) {
         });
 
         // Push messages to Sumo
-        postToSumo(context, messageList);
-        
+        postToSumo(callback, messageList);
+
     });
 };

dlq_processor/cloudwatchlogs_lambda.js

@@ -12,7 +12,7 @@ var includeLogInfo = true;  // default is true
 // Regex used to detect logs coming from lambda functions.
 // The regex will parse out the requestID and strip the timestamp
 // Example: 2016-11-10T23:11:54.523Z	108af3bb-a79b-11e6-8bd7-91c363cc05d9    some message
-var consoleFormatRegex = /^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}.\d{3}Z\t(\w+?-\w+?-\w+?-\w+?-\w+)\t/;
+var consoleFormatRegex = /^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}.\d{3}Z\s(\w+?-\w+?-\w+?-\w+?-\w+)\s/;
 
 // Used to extract RequestID
 var requestIdRegex = /(?:RequestId:|Z)\s+([\w\d\-]+)/;
@@ -102,7 +102,7 @@ exports.processLogs = function (env, eventAwslogsData, errorHandler) {
                 log.message = JSON.parse(log.message);
             } catch (err) {
                 // Do nothing, leave as text
-                log.message.trim();
+                log.message = log.message.trim();
             }
 
             // delete id as it's not very useful