Skip to content

Commit 2f5e1a1

Browse files
authored
Fix/just another rsyslogfix (#561)
- related to surfconext enviroments MR343 - parameterize ratelimit values these are only different from default for the docker hosts - use imjournal this always works - enable imsock on redhat family systems or some non-journalctl logging dissapears (like mark messages) - do not enable imsock on debian it generates double logging, this is probably because imsock on debian looks at /dev/log but this is a link to /run/systemd/journal/dev-log so it will get journalctl logs from this socket AND imjournal - on rhel based systems this is not the case, here /dev/log is not linked so only syslog logging is found there
1 parent 23ebc08 commit 2f5e1a1

5 files changed

Lines changed: 21 additions & 3 deletions

File tree

roles/rsyslog/defaults/main.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,3 +22,9 @@ rsyslog_dir_file_modes: 'dirCreateMode="0755" fileCreateMode="0640" FileGroup="s
2222
rsyslog_service_dropindir: "/etc/systemd/system/rsyslog.service.d"
2323
rsyslog_certifcate_dir: "/etc/pki/rsyslog"
2424
rsyslog_queue_dir: "/var/spool/rsyslog"
25+
26+
# these already have appropriate defaults in the template or rsyslog but you can
27+
# change them if necessary, for example on docker hosts they have to be a little higher
28+
# rsyslog_imjournal_ratelimitburst: 2000
29+
# rsyslog_imjournal_ratelimitinterval: 600
30+
# rsyslog_maxmessagesize: 8000

roles/rsyslog/tasks/main.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@
1818
block:
1919

2020
# journald forwards logs to rsyslog
21-
- name: Ensure journald forwards logs to rsyslog
21+
- name: When using imjournal no forwarding necessary
2222
ansible.builtin.lineinfile:
2323
path: /etc/systemd/journald.conf
2424
search_string: 'ForwardToSyslog='
25-
line: ForwardToSyslog=yes
25+
line: '#ForwardToSyslog=yes'
2626
notify:
2727
- "Restart journald"
2828

roles/rsyslog/templates/rsyslog_onlyforward.conf.j2

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,14 @@
33
module(load="imptcp")
44
input(type="imptcp" port="514")
55
{% endif %}
6-
module(load="imuxsock" SysSock.Use="on")
6+
{% if ansible_os_family == "RedHat" %}
7+
module(load="imuxsock")
8+
{% endif %}
9+
module(load="imjournal" # provides access to the systemd journal
10+
UsePid="system" # PID number is retrieved as the ID of the process the journal entry originates from
11+
StateFile="imjournal.state"
12+
ratelimit.interval="{{ rsyslog_imjournal_ratelimitinterval | default('600') }}"
13+
ratelimit.burst="{{ rsyslog_imjournal_ratelimitburst | default('20000') }}") # Reads journald logs
714
module(load="imklog") # provides kernel logging support
815
module(load="immark" interval="300" ) # provides --MARK-- message capability
916
module(load="omrelp")
@@ -14,6 +21,9 @@ template(name="CustomRelpFormat" type="string"
1421
$PreserveFQDN on
1522

1623
*.emerg :omusrmsg:*
24+
{% if rsyslog_maxmessagesize is defined %}
25+
$MaxMessageSize {{ rsyslog_maxmessagesize }}
26+
{% endif %}
1727

1828
{% if 'sysloghost' not in group_names %}
1929
{% for relp_host in relp_remote %}

roles/rsyslog/templates/sc_ruleset.conf.j2

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ if $programname == "profile" and $msg startswith " {" then { action(type="omfile
2626
:programname, isequal, "mariadbd" { action(type="omfile" DynaFile="galera-{{ item.name }}" {{ rsyslog_dir_file_modes }} ) stop }
2727
:programname, isequal, "garb-systemd" { action(type="omfile" DynaFile="haproxy-{{ item.name }}" {{ rsyslog_dir_file_modes }} ) stop }
2828
:programname, isequal, "Keepalived_vrrp" { action(type="omfile" DynaFile="keepalived-{{ item.name }}" {{ rsyslog_dir_file_modes }} ) stop }
29+
:programname, startswith, "mongo" { action(type="omfile" DynaFile="mongo-{{ item.name }}" {{ rsyslog_dir_file_modes }} ) stop }
2930
:programname, isequal, "Apache-STATIC" { action(type="omfile" DynaFile="apache-static-{{ item.name }}" {{ rsyslog_dir_file_modes }} ) stop }
3031
:programname, isequal, "Apache-METADATA" { action(type="omfile" DynaFile="apache-metadata-{{ item.name }}" {{ rsyslog_dir_file_modes }} ) stop }
3132
:programname, isequal, "oidcngserver" { action(type="omfile" DynaFile="oidcng-{{ item.name }}" {{ rsyslog_dir_file_modes }} ) stop }

roles/rsyslog/templates/sc_template.conf.j2

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ $template apache-voot-{{ item.name }}, "{{ rsyslog_dir }}/apps/{{ item.name }}/v
2121
$template galera-{{ item.name }}, "{{ rsyslog_dir }}/apps/{{ item.name }}/galera/galera.log"
2222
$template garb-{{ item.name }}, "{{ rsyslog_dir }}/apps/{{ item.name }}/galera/galera_garb.log"
2323
$template keepalived-{{ item.name }}, "{{ rsyslog_dir }}/apps/{{ item.name }}/keepalived/keepalived.log"
24+
$template mongo-{{ item.name }}, "{{ rsyslog_dir }}/apps/{{ item.name }}/mongo/mongo.log"
2425
$template apache-static-{{ item.name }}, "{{ rsyslog_dir }}/apps/{{ item.name }}/static/apache.log"
2526
$template apache-eb-{{ item.name }}, "{{ rsyslog_dir }}/apps/{{ item.name }}/eb/apache.log"
2627
$template eblog-{{ item.name }}, "{{ rsyslog_dir }}/apps/{{ item.name }}/eb/eb.log"

0 commit comments

Comments
 (0)