Fix the ordering of rsyslog.d files
Some checks failed
continuous-integration/drone/push Build is failing

A call to sendLogsToRemote for logs received through RELP/UDP has
been added (to send them to Logstash/Redis/…), so common.conf's prefix
must be lower than collector.conf's.

Note: future "third-party" config files will also call sendLogsToRemote
and thus will also have to use a prefix higher than 10.
This commit is contained in:
jeltz 2021-03-01 02:11:29 +01:00
parent 02a8cb84df
commit ba8b4e8c29
4 changed files with 6 additions and 4 deletions

View file

@ -15,8 +15,8 @@
- name: Deploy rsyslog input configuration file - name: Deploy rsyslog input configuration file
become: true become: true
template: template:
src: 10-collector.conf.j2 src: 20-collector.conf.j2
dest: /etc/rsyslog.d/10-collector.conf dest: /etc/rsyslog.d/20-collector.conf
owner: root owner: root
group: root group: root
mode: u=rw,g=r,o=r mode: u=rw,g=r,o=r

View file

@ -49,5 +49,7 @@ input(
{% endif %} {% endif %}
port="{{ input.port }}" port="{{ input.port }}"
ruleset="handleIncomingLogs" ruleset="handleIncomingLogs"
call sendLogsToRemote
) )
{% endfor %} {% endfor %}

View file

@ -28,8 +28,8 @@
loop: loop:
- src: rsyslog.conf.j2 - src: rsyslog.conf.j2
dest: /etc/rsyslog.conf dest: /etc/rsyslog.conf
- src: 99-common.conf.j2 - src: 10-common.conf.j2
dest: /etc/rsyslog.d/99-common.conf dest: /etc/rsyslog.d/10-common.conf
notify: Restart rsyslog notify: Restart rsyslog
- name: Create journald.conf.d directory - name: Create journald.conf.d directory