Merge 1809d51 into 0886184

.gitignore

@@ -12,3 +12,6 @@ dist
 htmlcov/
 __pychache__
 .vscode
+venv/
+.idea/
+*.iml

CHANGELOG

@@ -1,3 +1,7 @@
+0.15.0
+======
+- Enhanced --query argument to match against message payloads prepended with non-JSON data.
+
 0.14.0
 ======
 - New --aws-endpoint-url option to configure awslogs to use services such localstack, fakes3, etc...

awslogs/core.py

@@ -207,12 +207,22 @@ def consumer():
                         )
                     )
 
+                # Handle JSON payloads that might be prepended with logging info (level, timestamp, etc.)
                 message = event['message']
+                try:
+                    message = message[message.index('{'):]
+                except ValueError:  # Probably not JSON
+                    pass
+
                 if self.query is not None and message[0] == '{':
-                    parsed = json.loads(event['message'])
-                    message = self.query_expression.search(parsed)
-                    if not isinstance(message, str):
-                        message = json.dumps(message)
+                    try:
+                        parsed = json.loads(message)
+                    except json.decoder.JSONDecodeError:
+                        pass
+                    else:
+                        message = self.query_expression.search(parsed)
+                        if not isinstance(message, str):
+                            message = json.dumps(message)
                 output.append(message.rstrip())
 
                 print(' '.join(output))

setup.py

@@ -11,7 +11,7 @@
 
 setup(
     name='awslogs',
-    version='0.14.0',
+    version='0.15.0',
     url='https://github.com/jorgebastida/awslogs',
     license='BSD',
     author='Jorge Bastida',