summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniil Baturin <daniil@vyos.io>2024-01-11 15:18:52 +0000
committerGitHub <noreply@github.com>2024-01-11 15:18:52 +0000
commit3a0ca18360391a7fac6f19f7cb97000842b40637 (patch)
tree0797f0090e11750a4e7ec10087f32e10cb808ea9
parent1ef41db63ea4e0a048d342f9a80c21cecebb8a36 (diff)
parent61817dbb3f2667bcb0fbd734d70daeb2c4672720 (diff)
downloadvyos-1x-3a0ca18360391a7fac6f19f7cb97000842b40637.tar.gz
vyos-1x-3a0ca18360391a7fac6f19f7cb97000842b40637.zip
Merge pull request #2803 from vyos/mergify/bp/sagitta/pr-2797
syslog: T1487: store all journald log files also in syslog (backport #2797)
-rw-r--r--data/templates/rsyslog/rsyslog.conf.j24
1 files changed, 4 insertions, 0 deletions
diff --git a/data/templates/rsyslog/rsyslog.conf.j2 b/data/templates/rsyslog/rsyslog.conf.j2
index 97e0ee0b7..96f91def1 100644
--- a/data/templates/rsyslog/rsyslog.conf.j2
+++ b/data/templates/rsyslog/rsyslog.conf.j2
@@ -1,5 +1,9 @@
### Autogenerated by system_syslog.py ###
+# Load journald logs to rsyslog
+module(load="imjournal")
+module(load="mmjsonparse")
+
{% if global.marker is vyos_defined %}
$ModLoad immark
{% if global.marker.interval is vyos_defined %}