From 8233264d2af682c6fbe5876497fe0ffcef6f6bab Mon Sep 17 00:00:00 2001
From: Jeremy Lecour <jlecour@evolix.fr>
Date: Tue, 21 Sep 2021 14:41:07 +0200
Subject: [PATCH] logstash: logging to syslog is configurable (default: True)

---
 CHANGELOG.md               |  1 +
 logstash/defaults/main.yml |  2 ++
 logstash/handlers/main.yml | 10 ++++++++++
 logstash/tasks/logs.yml    | 23 +++++++++++++++++++++++
 logstash/tasks/main.yml    |  2 +-
 5 files changed, 37 insertions(+), 1 deletion(-)
 create mode 100644 logstash/handlers/main.yml

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ac78e059..652f5250 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -19,6 +19,7 @@ The **patch** part changes incrementally at each release.
 * generate-ldif: detect hardware raid card
 * generate-ldif: detect mdadm
 * listupgrade: crontab is configurable
+* logstash: logging to syslog is configurable (default: True)
 * mongodb: create munin plugins directory if missing
 * mysql: script "mysql_connections" to display a compact list of connections
 * mysql: script "mysql-queries-killer.sh" to kill MySQL queries
diff --git a/logstash/defaults/main.yml b/logstash/defaults/main.yml
index 06bf376d..7cc40e49 100644
--- a/logstash/defaults/main.yml
+++ b/logstash/defaults/main.yml
@@ -6,3 +6,5 @@ logstash_jvm_xmx: 512g
 logstash_log_rotate_days: 365
 logstash_custom_tmpdir: Null
 logstash_default_tmpdir: /var/lib/logstash/tmp
+logstash_log_syslog_enabled: True
+logstash_config_force: True
\ No newline at end of file
diff --git a/logstash/handlers/main.yml b/logstash/handlers/main.yml
new file mode 100644
index 00000000..d21d4de3
--- /dev/null
+++ b/logstash/handlers/main.yml
@@ -0,0 +1,10 @@
+---
+
+- name: restart logstash
+  systemd:
+    name: logstash
+    state: restarted
+    daemon_reload: yes
+
+- name: reload systemd
+  command: systemctl daemon-reload
\ No newline at end of file
diff --git a/logstash/tasks/logs.yml b/logstash/tasks/logs.yml
index 975cd8bc..b09ebaf2 100644
--- a/logstash/tasks/logs.yml
+++ b/logstash/tasks/logs.yml
@@ -16,3 +16,26 @@
     group: root
     mode: "0750"
   when: is_cron_installed.rc == 0
+
+- name: "Create a system config directory for systemd overrides"
+  file:
+    path: /etc/systemd/system/logstash.service.d
+    state: directory
+
+- name: "disable syslog"
+  ini_file:
+    path: /etc/systemd/system/logstash.service.d/override.conf
+    section: Service
+    option: "{{ item.option }}"
+    value: "{{ item.value }}"
+    owner: root
+    group: root
+    mode: "0644"
+    create: yes
+    no_extra_spaces: yes
+    state: "{{ logstash_log_syslog_enabled | bool | ternary('absent','present') }}"
+  loop:
+    - { option: "StandardOutput", value: "null" }
+    - { option: "StandardError",  value: "null" }
+  notify:
+    - restart logstash
\ No newline at end of file
diff --git a/logstash/tasks/main.yml b/logstash/tasks/main.yml
index 73bdab1d..856ceba1 100644
--- a/logstash/tasks/main.yml
+++ b/logstash/tasks/main.yml
@@ -88,7 +88,7 @@
     owner: logstash
     group: logstash
     mode: "0640"
-    force: yes
+    force: "{{ logstash_config_force | bool }}"
   loop: "{{ query('first_found', templates) }}"
   vars:
     templates: