浏览代码

rsyslog: Split logs on every node.

  Split the logs into unique (log one $thing only to one file) files on every
  node. Use the usual logfiles for anything not explicitly split away on std
  nodes, but move the log entries not matched into debug.log on the logserver.

Signed-off-by: Maximilian Wilhelm <max@rfc2324.org>
Maximilian Wilhelm 7 年之前
父节点
当前提交
9e1622c615
共有 2 个文件被更改,包括 16 次插入1 次删除
  1. 0 0
      rsyslog/99-debug.conf
  2. 16 1
      rsyslog/init.sls

+ 0 - 0
rsyslog/ffho/99-debug.conf → rsyslog/99-debug.conf


+ 16 - 1
rsyslog/init.sls

@@ -28,10 +28,18 @@ rsyslog:
     - source: salt://rsyslog/rsyslog.conf
 {% endif %}
 
-{% if 'logserver' in roles %}
+#
+# Install filter rules everywhere so we have the same log layout everywhere
+# and avoid logging stuff (kernel log, dhcpd, ...) multiple times (daemon.log,
+# message, syslog) on every node.
+#
 /etc/rsyslog.d/ffho.conf:
   file.managed:
     - source: salt://rsyslog/ffho.conf
+    - watch_in:
+      - service: rsyslog
+    - require:
+      - file: /etc/rsyslog.d/ffho
 
 /etc/rsyslog.d/ffho:
   file.recurse:
@@ -48,4 +56,11 @@ rsyslog:
   file.managed:
     - source: salt://rsyslog/ffho.logrotate
 
+
+{% if 'logserver' in roles %}
+/etc/rsyslog.d/99-debug.conf:
+  file.managed:
+    - source: salt://rsyslog/99-debug.conf
+    - watch_in:
+      - service: rsyslog
 {% endif %}