diff --git a/group_vars/all/rsyslog_client.yml b/group_vars/all/rsyslog_client.yml new file mode 100644 index 00000000..b59ddd84 --- /dev/null +++ b/group_vars/all/rsyslog_client.yml @@ -0,0 +1,3 @@ +--- +glob_rsyslog_client: + server: "{{ query('ldap', 'ip', 'tealc', 'adm') | ipv4 | first }}" diff --git a/host_vars/airbus.cachan-adm.crans.org.yml b/host_vars/airbus.cachan-adm.crans.org.yml index c8d0ef2e..15c0f1d8 100644 --- a/host_vars/airbus.cachan-adm.crans.org.yml +++ b/host_vars/airbus.cachan-adm.crans.org.yml @@ -21,3 +21,6 @@ loc_borg: glob_prometheus_node_exporter: listen_addr: "{{ query('ldap', 'ip', ansible_hostname, 'cachan-adm') | ipv4 | first }}" + +loc_rsyslog_client: + server: "{{ query('ldap', 'ip', 'gulp', 'cachan-adm') | ipv4 | first }}" diff --git a/host_vars/fyre.cachan-adm.crans.org.yml b/host_vars/fyre.cachan-adm.crans.org.yml index 2f6cfaee..fe8ba22f 100644 --- a/host_vars/fyre.cachan-adm.crans.org.yml +++ b/host_vars/fyre.cachan-adm.crans.org.yml @@ -33,6 +33,9 @@ glob_snmp_exporter: procurve_password: "{{ vault.snmp_procurve_password }}" unifi_password: "{{ vault.snmp_unifi_password }}" +loc_rsyslog_client: + server: "{{ query('ldap', 'ip', 'gulp', 'cachan-adm') | ipv4 | first }}" + loc_ninjabot: config: nick: fyre diff --git a/host_vars/omnomnom.cachan-adm.crans.org.yml b/host_vars/omnomnom.cachan-adm.crans.org.yml index 3685560f..82e771bb 100644 --- a/host_vars/omnomnom.cachan-adm.crans.org.yml +++ b/host_vars/omnomnom.cachan-adm.crans.org.yml @@ -28,3 +28,6 @@ loc_borg: glob_prometheus_node_exporter: listen_addr: "{{ query('ldap', 'ip', ansible_hostname, 'cachan-adm') | ipv4 | first }}" + +loc_rsyslog_client: + server: "{{ query('ldap', 'ip', 'gulp', 'cachan-adm') | ipv4 | first }}" diff --git a/host_vars/re2o-ldap.cachan-adm.crans.org.yml b/host_vars/re2o-ldap.cachan-adm.crans.org.yml index c8d0ef2e..15c0f1d8 100644 --- a/host_vars/re2o-ldap.cachan-adm.crans.org.yml +++ b/host_vars/re2o-ldap.cachan-adm.crans.org.yml @@ -21,3 +21,6 @@ loc_borg: glob_prometheus_node_exporter: listen_addr: "{{ query('ldap', 'ip', ansible_hostname, 'cachan-adm') | ipv4 | first }}" + +loc_rsyslog_client: + server: "{{ query('ldap', 'ip', 'gulp', 'cachan-adm') | ipv4 | first }}" diff --git a/host_vars/re2o.cachan-adm.crans.org.yml b/host_vars/re2o.cachan-adm.crans.org.yml index c872b865..98020456 100644 --- a/host_vars/re2o.cachan-adm.crans.org.yml +++ b/host_vars/re2o.cachan-adm.crans.org.yml @@ -22,6 +22,9 @@ loc_borg: - borg@zephir.cachan-adm.crans.org:/backup/borg/{{ ansible_hostname }} ssh_options: "" +loc_rsyslog_client: + server: "{{ query('ldap', 'ip', 'gulp', 'cachan-adm') | ipv4 | first }}" + loc_re2o: owner: root group: _nounou diff --git a/host_vars/rodauh.cachan-adm.crans.org.yml b/host_vars/rodauh.cachan-adm.crans.org.yml index 75e6a304..3989c95d 100644 --- a/host_vars/rodauh.cachan-adm.crans.org.yml +++ b/host_vars/rodauh.cachan-adm.crans.org.yml @@ -43,3 +43,6 @@ glob_prometheus_node_exporter: glob_prometheus_nginx_exporter: listen_addr: "{{ query('ldap', 'ip', ansible_hostname, 'cachan-adm') | ipv4 | first }}" + +loc_rsyslog_client: + server: "{{ query('ldap', 'ip', 'gulp', 'cachan-adm') | ipv4 | first }}" diff --git a/host_vars/routeur-gulp.cachan-adm.crans.org/cachan.yml b/host_vars/routeur-gulp.cachan-adm.crans.org/cachan.yml index 2cabe406..06f194e2 100644 --- a/host_vars/routeur-gulp.cachan-adm.crans.org/cachan.yml +++ b/host_vars/routeur-gulp.cachan-adm.crans.org/cachan.yml @@ -25,3 +25,6 @@ loc_borg: glob_prometheus_node_exporter: listen_addr: "{{ query('ldap', 'ip', ansible_hostname, 'cachan-adm') | ipv4 | first }}" + +loc_rsyslog_client: + server: "{{ query('ldap', 'ip', 'gulp', 'cachan-adm') | ipv4 | first }}" diff --git a/host_vars/terenez.cachan-adm.crans.org.yml b/host_vars/terenez.cachan-adm.crans.org.yml index 46732a20..aba1824f 100644 --- a/host_vars/terenez.cachan-adm.crans.org.yml +++ b/host_vars/terenez.cachan-adm.crans.org.yml @@ -24,3 +24,6 @@ glob_prometheus_node_exporter: glob_prometheus_nginx_exporter: listen_addr: "{{ query('ldap', 'ip', ansible_hostname, 'cachan-adm') | ipv4 | first }}" + +loc_rsyslog_client: + server: "{{ query('ldap', 'ip', 'gulp', 'cachan-adm') | ipv4 | first }}" diff --git a/host_vars/unifi.cachan-adm.crans.org.yml b/host_vars/unifi.cachan-adm.crans.org.yml index 75dc7ea5..2d7cd4bc 100644 --- a/host_vars/unifi.cachan-adm.crans.org.yml +++ b/host_vars/unifi.cachan-adm.crans.org.yml @@ -26,3 +26,6 @@ loc_borg: glob_prometheus_node_exporter: listen_addr: "{{ query('ldap', 'ip', ansible_hostname, 'cachan-adm') | ipv4 | first }}" + +loc_rsyslog_client: + server: "{{ query('ldap', 'ip', 'gulp', 'cachan-adm') | ipv4 | first }}" diff --git a/host_vars/zephir.cachan-adm.crans.org.yml b/host_vars/zephir.cachan-adm.crans.org.yml index f30a1b16..5f5cf00e 100644 --- a/host_vars/zephir.cachan-adm.crans.org.yml +++ b/host_vars/zephir.cachan-adm.crans.org.yml @@ -30,3 +30,6 @@ loc_borg: glob_prometheus_node_exporter: listen_addr: "{{ query('ldap', 'ip', ansible_hostname, 'cachan-adm') | ipv4 | first }}" + +loc_rsyslog_client: + server: "{{ query('ldap', 'ip', 'gulp', 'cachan-adm') | ipv4 | first }}" diff --git a/plays/root.yml b/plays/root.yml index 0df02eee..e5e30e7c 100755 --- a/plays/root.yml +++ b/plays/root.yml @@ -44,6 +44,12 @@ roles: - home-nounou +- hosts: all, !rsyslog-server + vars: + rsyslog_client: "{{ glob_rsyslog_client | default({}) | combine(loc_rsyslog_client | default({})) }}" + roles: + - rsyslog-client + - import_playbook: scripts.yml - import_playbook: vm_setup.yml - import_playbook: borgbackup_client.yml diff --git a/roles/rsyslog-client/templates/rsyslog.d/50-send_relp.conf.j2 b/roles/rsyslog-client/templates/rsyslog.d/50-send_relp.conf.j2 index 6a1bc009..32ddde8a 100644 --- a/roles/rsyslog-client/templates/rsyslog.d/50-send_relp.conf.j2 +++ b/roles/rsyslog-client/templates/rsyslog.d/50-send_relp.conf.j2 @@ -6,4 +6,4 @@ $ActionQueueType LinkedList # use asynchronous processing $ActionQueueFileName syslogfwd # set file name, also enables disk mode $ActionResumeRetryCount -1 # infinite retries on insert failure $ActionQueueSaveOnShutdown on # save in-memory data if rsyslog shuts down -*.* :omrelp:{{ rsyslog.server }}:20514;RSYSLOG_ForwardFormat +*.* :omrelp:{{ rsyslog_client.server }}:20514;RSYSLOG_ForwardFormat