summaryrefslogtreecommitdiff
path: root/data/templates
diff options
context:
space:
mode:
authorsever-sever <v.gletenko@vyos.io>2020-10-16 12:50:36 +0000
committersever-sever <v.gletenko@vyos.io>2020-10-17 08:15:51 +0000
commit0eecfabd74f1f8dec96bf4bb64609eaa609edaef (patch)
tree3087fae0b50548045537c58464e30b9af09f5cb8 /data/templates
parenta5a77c47168b888bf008dab139d1e5d023568bfe (diff)
downloadvyos-1x-0eecfabd74f1f8dec96bf4bb64609eaa609edaef.tar.gz
vyos-1x-0eecfabd74f1f8dec96bf4bb64609eaa609edaef.zip
syslog: T2938: Add format octet-counted for syslog conf-mode
Diffstat (limited to 'data/templates')
-rw-r--r--data/templates/syslog/rsyslog.conf.tmpl22
1 files changed, 13 insertions, 9 deletions
diff --git a/data/templates/syslog/rsyslog.conf.tmpl b/data/templates/syslog/rsyslog.conf.tmpl
index bc3f7667b..a610d132f 100644
--- a/data/templates/syslog/rsyslog.conf.tmpl
+++ b/data/templates/syslog/rsyslog.conf.tmpl
@@ -22,19 +22,23 @@ $outchannel {{file}},{{files[file]['log-file']}},{{files[file]['max-size']}},{{f
{% if hosts %}
## remote logging
{% for host in hosts %}
-{% if hosts[host]['proto'] == 'tcp' %}
-{% if hosts[host]['port'] %}
+{% if hosts[host]['proto'] == 'tcp' %}
+{% if hosts[host]['port'] %}
+{% if hosts[host]['oct_count'] %}
+{{hosts[host]['selectors']}} @@(o){{host}}:{{hosts[host]['port']}};RSYSLOG_SyslogProtocol23Format
+{% else %}
{{hosts[host]['selectors']}} @@{{host}}:{{hosts[host]['port']}}
-{% else %}
+{% endif %}
+{% else %}
{{hosts[host]['selectors']}} @@{{host}}
-{% endif %}
-{% else %}
-{% if hosts[host]['port'] %}
+{% endif %}
+{% else %}
+{% if hosts[host]['port'] %}
{{hosts[host]['selectors']}} @{{host}}:{{hosts[host]['port']}}
-{% else %}
+{% else %}
{{hosts[host]['selectors']}} @{{host}}
-{% endif %}
-{% endif %}
+{% endif %}
+{% endif %}
{% endfor %}
{% endif %}
{% if user %}