From a6e93797527edc4d2f4e554a44d683f6edeea8f8 Mon Sep 17 00:00:00 2001
From: Vasiliy Faronov <vfaronov@gmail.com>
Date: Sun, 7 Aug 2022 21:48:57 +0300
Subject: [PATCH] Feat: JSON output

---
 bonfire/cli.py     | 5 ++++-
 bonfire/formats.py | 4 ++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/bonfire/cli.py b/bonfire/cli.py
index 3b43844..986e86d 100644
--- a/bonfire/cli.py
+++ b/bonfire/cli.py
@@ -21,7 +21,7 @@
 from .graylog_api import SearchRange, SearchQuery
 from .utils import cli_error, api_from_config, api_from_host
 from .output import run_logprint
-from .formats import tail_format, dump_format
+from .formats import tail_format, dump_format, json_format
 
 
 @click.command()
@@ -37,6 +37,7 @@
 @click.option("-#", "--search-to", default=None, help="Query range to (default: now)")
 @click.option('-t', '--tail', 'mode', flag_value='tail', default=True, help="Show the last n lines for the query (default)")
 @click.option('-d', '--dump', 'mode', flag_value='dump', help="Print the query result as a csv")
+@click.option('-j', '--json', 'mode', flag_value='json', help="Print the raw JSON log objects, one per line")
 @click.option("-f", "--follow", default=False, is_flag=True, help="Poll the logging server for new logs matching the query (sets search from to now, limit to None)")
 @click.option("-l", "--interval", default=1000, help="Polling interval in ms (default: 1000)")
 @click.option("-n", "--limit", default=10, help="Limit the number of results (default: 10)")
@@ -200,6 +201,8 @@ def run(host,
         formatter = tail_format(fields, color)
     elif mode == "dump":
         formatter = dump_format(fields, color)
+    elif mode == "json":
+        formatter = json_format
 
     run_logprint(gl_api, q, formatter, follow, interval, latency)
 
diff --git a/bonfire/formats.py b/bonfire/formats.py
index f345592..8c04a2b 100644
--- a/bonfire/formats.py
+++ b/bonfire/formats.py
@@ -6,6 +6,7 @@
 
 from termcolor import colored
 import syslog
+import json
 
 def get_log_color_and_background(level):
     log_color = 'green'
@@ -43,3 +44,6 @@ def format(entry):
             return colored(msg, log_color, log_background)
         return msg
     return format
+
+def json_format(entry):
+    return json.dumps(entry.message_dict)