diff --git a/abra.sh b/abra.sh index 992df8e..c52f7ca 100644 --- a/abra.sh +++ b/abra.sh @@ -11,7 +11,7 @@ export MATRIX_ALERTMANAGER_CONFIG_VERSION=v2 export MATRIX_ALERTMANAGER_ENTRYPOINT_VERSION=v1 export GF_ALERTS_NODE_VERSION=v5 export GF_ALERTS_LOKI_VERSION=v5 -export CONFIG_ALLOY_VERSION=v3 +export CONFIG_ALLOY_VERSION=v4 export GF_ALERTS_TRAEFIK_VERSION=v1 # migrates secrets from old names to new names by reading values from the diff --git a/config.alloy.tmpl b/config.alloy.tmpl index aeb055f..f534ea7 100644 --- a/config.alloy.tmpl +++ b/config.alloy.tmpl @@ -306,7 +306,7 @@ loki.source.docker "docker" { host = "unix:///var/run/docker.sock" targets = discovery.relabel.docker.output labels = {"app" = "docker"} - forward_to = [loki.write.loki.receiver] + forward_to = [loki.process.drop_old.receiver] } // JOURNALD: reads the systemd journal binary log directly. @@ -338,7 +338,7 @@ loki.relabel "journal" { // drop network db stats (15-20% of kernel logs) loki.process "journal" { - forward_to = [loki.write.loki.receiver] + forward_to = [loki.process.drop_old.receiver] stage.drop { expression = ".*NetworkDB stats.*" @@ -363,7 +363,7 @@ loki.process "syslog_files" { stage.static_labels { values = { job = "syslog" } } - forward_to = [loki.write.loki.receiver] + forward_to = [loki.process.drop_old.receiver] } {{ end }} @@ -390,10 +390,18 @@ loki.source.syslog "syslog" { } relabel_rules = loki.relabel.syslog.rules - forward_to = [loki.write.loki.receiver] + forward_to = [loki.process.drop_old.receiver] } {{ end }} +loki.process "drop_old" { + forward_to = [loki.write.loki.receiver] + + stage.drop { + older_than = "160h" + } +} + loki.write "loki" { endpoint { url = "{{ env "LOKI_PUSH_URL" }}"