# HG changeset patch
# User RhodeCode Admin <admin@rhodecode.com>
# Date 2022-10-28 11:07:37
# Node ID 345b06ac1303fd671d75011080b3749168b65f3e
# Parent  68a8ca72d2031a65597dc4fb5cd0de8b9cfa6cec

configs: added changed require to track logging with loki or logstash

diff --git a/configs/development.ini b/configs/development.ini
--- a/configs/development.ini
+++ b/configs/development.ini
@@ -237,6 +237,10 @@ class = StreamHandler
 args = (sys.stderr, )
 level = DEBUG
 formatter = generic
+; To enable JSON formatted logs replace generic with json
+; This allows sending properly formatted logs to grafana loki or elasticsearch
+#formatter = json
+
 
 ; ##########
 ; FORMATTERS
@@ -245,3 +249,8 @@ formatter = generic
 [formatter_generic]
 format = %(asctime)s.%(msecs)03d [%(process)d] %(levelname)-5.5s [%(name)s] %(message)s
 datefmt = %Y-%m-%d %H:%M:%S
+
+[formatter_json]
+format = %(timestamp)s %(levelname)s %(name)s %(message)s %(req_id)s
+class = vcsserver.lib._vendor.jsonlogger.JsonFormatter
+
diff --git a/configs/gunicorn_config.py b/configs/gunicorn_config.py
--- a/configs/gunicorn_config.py
+++ b/configs/gunicorn_config.py
@@ -33,6 +33,10 @@ tmp_upload_dir = None
 access_log_format = (
     '%(t)s %(p)s INFO  [GNCRN] %(h)-15s rqt:%(L)s %(s)s %(b)-6s "%(m)s:%(U)s %(q)s" usr:%(u)s "%(f)s" "%(a)s"')
 
+# loki format for easier parsing in grafana
+#access_log_format = (
+#        'time="%(t)s" pid=%(p)s level="INFO" type="[GNCRN]" ip="%(h)-15s" rqt="%(L)s" response_code="%(s)s" response_bytes="%(b)-6s" uri="%(m)s:%(U)s %(q)s" user=":%(u)s" user_agent="%(a)s"')
+
 # self adjust workers based on CPU count
 # workers = get_workers()
 
diff --git a/configs/production.ini b/configs/production.ini
--- a/configs/production.ini
+++ b/configs/production.ini
@@ -200,6 +200,10 @@ class = StreamHandler
 args = (sys.stderr, )
 level = INFO
 formatter = generic
+; To enable JSON formatted logs replace generic with json
+; This allows sending properly formatted logs to grafana loki or elasticsearch
+#formatter = json
+
 
 ; ##########
 ; FORMATTERS
@@ -208,3 +212,8 @@ formatter = generic
 [formatter_generic]
 format = %(asctime)s.%(msecs)03d [%(process)d] %(levelname)-5.5s [%(name)s] %(message)s
 datefmt = %Y-%m-%d %H:%M:%S
+
+[formatter_json]
+format = %(timestamp)s %(levelname)s %(name)s %(message)s %(req_id)s
+class = vcsserver.lib._vendor.jsonlogger.JsonFormatter
+