engineering/unrhodecode
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
RhodeCode Admin 2022-10-28 13:08:19 +02:00
parent 8a95bb9eb4
commit 062734947d
3 changed files with 24 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

12
configs/development.ini
View file

@ -440,6 +440,8 @@ rc_cache.cache_perms.expiration_time = 300
; more Redis options: https://dogpilecache.sqlalchemy.org/en/latest/api.html#redis-backends
#rc_cache.cache_perms.arguments.distributed_lock = true
; auto-renew lock to prevent stale locks, slower but safer. Use only if problems happen
#rc_cache.cache_perms.arguments.lock_auto_renewal = true
; ***************************************************
; `cache_repo` cache for file tree, Readme, RSS FEEDS
@ -463,6 +465,8 @@ rc_cache.cache_repo.expiration_time = 2592000
; more Redis options: https://dogpilecache.sqlalchemy.org/en/latest/api.html#redis-backends
#rc_cache.cache_repo.arguments.distributed_lock = true
; auto-renew lock to prevent stale locks, slower but safer. Use only if problems happen
#rc_cache.cache_repo.arguments.lock_auto_renewal = true
; ##############
; BEAKER SESSION
@ -760,6 +764,7 @@ appenlight.log_namespace_blacklist =
#statsd.statsd_prefix =
#statsd.statsd_ipv6 = false
; Dummy marker to add new entries after.
; Add any custom entries below. Please don't remove this marker.
custom.conf = 1
@ -823,6 +828,9 @@ class = StreamHandler
args = (sys.stderr, )
level = DEBUG
formatter = color_formatter
; To enable JSON formatted logs replace generic with json
; This allows sending properly formatted logs to grafana loki or elasticsearch
#formatter = json
[handler_console_sql]
; "level = DEBUG" logs SQL queries and results.
@ -851,3 +859,7 @@ datefmt = %Y-%m-%d %H:%M:%S
class = rhodecode.lib.logging_formatter.ColorFormatterSql
format = %(asctime)s.%(msecs)03d [%(process)d] %(levelname)-5.5s [%(name)s] %(message)s
datefmt = %Y-%m-%d %H:%M:%S
[formatter_json]
format = %(message)s
class = rhodecode.lib._vendor.jsonlogger.JsonFormatter

4
configs/gunicorn_config.py
View file

@ -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()

8
configs/production.ini
View file

@ -715,6 +715,7 @@ appenlight.log_namespace_blacklist =
#statsd.statsd_prefix =
#statsd.statsd_ipv6 = false
; Dummy marker to add new entries after.
; Add any custom entries below. Please don't remove this marker.
custom.conf = 1
@ -778,6 +779,9 @@ 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
[handler_console_sql]
; "level = DEBUG" logs SQL queries and results.
@ -806,3 +810,7 @@ datefmt = %Y-%m-%d %H:%M:%S
class = rhodecode.lib.logging_formatter.ColorFormatterSql
format = %(asctime)s.%(msecs)03d [%(process)d] %(levelname)-5.5s [%(name)s] %(message)s
datefmt = %Y-%m-%d %H:%M:%S
[formatter_json]
format = %(message)s
class = rhodecode.lib._vendor.jsonlogger.JsonFormatter