diff --git a/grafana.alloy b/grafana.alloy index ae0fa4dc..d62cc4cd 100644 --- a/grafana.alloy +++ b/grafana.alloy @@ -1,32 +1,3 @@ -logging { - level = "debug" - format = "logfmt" -} - -local.file_match "local_files" { - path_targets = [ - {"__path__" = "/var/log/sourcebot/*.log"}, - ] - sync_period = "5s" -} - -loki.source.file "log_scrape" { - targets = local.file_match.local_files.targets - forward_to = [loki.write.grafana_loki.receiver] - tail_from_end = true -} - -loki.write "grafana_loki" { - endpoint { - url = sys.env("GRAFANA_LOKI_ENDPOINT") - - basic_auth { - username = sys.env("GRAFANA_LOKI_USERNAME") - password = sys.env("GRAFANA_PASSWORD") - } - } -} - prometheus.scrape "local_app" { targets = [ { diff --git a/supervisord.conf b/supervisord.conf index 10a99285..6ec1fbba 100644 --- a/supervisord.conf +++ b/supervisord.conf @@ -1,7 +1,6 @@ [supervisord] nodaemon=true -logfile=supervisord.log -pidfile=/var/run/supervisord.pid +logfile=/dev/null logfile_maxbytes=0 [program:zoekt] @@ -9,7 +8,8 @@ command=./prefix-output.sh zoekt-webserver -index %(ENV_DATA_CACHE_DIR)s/index - autostart=true autorestart=true startretries=3 -stdout_logfile=/var/log/sourcebot/zoekt.log +stdout_logfile=/dev/fd/1 +stdout_logfile_maxbytes=0 redirect_stderr=true [program:web] @@ -17,11 +17,8 @@ command=./prefix-output.sh node packages/web/server.js autostart=true autorestart=true startretries=3 -stdout_logfile=/var/log/sourcebot/web.log +stdout_logfile=/dev/fd/1 stdout_logfile_maxbytes=0 -stderr_logfile_maxbytes=0 -stdout_logfile_backups=0 -stderr_logfile_backups=0 redirect_stderr=true [program:backend] @@ -29,11 +26,8 @@ command=./prefix-output.sh node packages/backend/dist/index.js --cacheDir %(ENV_ autostart=true autorestart=true startretries=3 -stdout_logfile=/var/log/sourcebot/backend.log +stdout_logfile=/dev/fd/1 stdout_logfile_maxbytes=0 -stderr_logfile_maxbytes=0 -stdout_logfile_backups=0 -stderr_logfile_backups=0 redirect_stderr=true [program:redis] @@ -41,11 +35,8 @@ command=redis-server autostart=true autorestart=true startretries=3 -stdout_logfile=/var/log/sourcebot/redis.log +stdout_logfile=/dev/fd/1 stdout_logfile_maxbytes=0 -stderr_logfile_maxbytes=0 -stdout_logfile_backups=0 -stderr_logfile_backups=0 redirect_stderr=true [program:alloy] @@ -53,9 +44,6 @@ command=alloy run grafana.alloy autostart=true autorestart=true startretries=3 -stdout_logfile=/var/log/sourcebot/alloy.log +stdout_logfile=/dev/fd/1 stdout_logfile_maxbytes=0 -stderr_logfile_maxbytes=0 -stdout_logfile_backups=0 -stderr_logfile_backups=0 redirect_stderr=true \ No newline at end of file