Log internal logs in syslog

references #1
Calvinverse · Feb 10, 2019 · dbba0f3 · dbba0f3
1 parent 3b53963
commit dbba0f3
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 55 deletions.
diff --git a/src/cookbooks/resource_logs_processor/recipes/logstash.rb b/src/cookbooks/resource_logs_processor/recipes/logstash.rb
@@ -441,33 +441,14 @@
 file "#{node['logstash']['path']['settings']}/log4j2.properties" do
   action :create
   content <<~YML
-    status = error
-    name = LogstashPropertiesConfig
-
-    appender.syslog.type = Syslog
-    appender.syslog.name = syslog
-    appender.syslog.facility = LOCAL0
-    appender.syslog.host = 127.0.0.1
-    appender.syslog.appName = logstash
-    appender.syslog.port = 514
-    appender.syslog.newLine = true
-    appender.syslog.protocol = UDP
-    appender.syslog.format = RFC5424
-    appender.syslog.messageId = Audit
-    appender.syslog.id = system1
-    appender.syslog.mdcId = mdc
-    appender.syslog.layout.type = loggerFields
-    appender.syslog.layout.pairs.type = KeyValuePair
-    appender.syslog.layout.pairs.key = category
-    appender.syslog.layout.pairs.value = %c
-    appender.syslog.layout.pairs2.type = KeyValuePair
-    appender.syslog.layout.pairs2.key = message
-    appender.syslog.layout.pairs2.value = %m
-    appender.syslog.layout.pairs3.type = KeyValuePair
-    appender.syslog.layout.pairs3.key = exception
-    appender.syslog.layout.pairs3.value = %ex
-
-    rootLogger.level = ${sys:ls.log.level}
+    log4j.rootLogger=INFO, SYSLOG
+
+    log4j.appender.SYSLOG=com.github.loggly.log4j.SyslogAppender64k
+    log4j.appender.SYSLOG.SyslogHost=localhost
+    log4j.appender.SYSLOG.Facility=Local0
+    log4j.appender.SYSLOG.Header=true
+    log4j.appender.SYSLOG.layout=org.apache.log4j.EnhancedPatternLayout
+    log4j.appender.SYSLOG.layout.ConversionPattern=java %d{ISO8601}{GMT} %p %t %c %M - %m%n
   YML
   group node['logstash']['service_group']
   mode '0550'

diff --git a/src/cookbooks/resource_logs_processor/spec/logstash_spec.rb b/src/cookbooks/resource_logs_processor/spec/logstash_spec.rb
@@ -63,7 +63,7 @@
         action: [:add],
         components: %w[main],
         distribution: 'stable',
-        key: 'https://artifacts.elastic.co/GPG-KEY-elasticsearch',
+        key: ['https://artifacts.elastic.co/GPG-KEY-elasticsearch'],
         uri: 'https://artifacts.elastic.co/packages/6.x/apt'
       )
     end
@@ -440,33 +440,14 @@
     end
 
     log4j2_properties_content = <<~CONF
-      status = error
-      name = LogstashPropertiesConfig
-
-      appender.syslog.type = Syslog
-      appender.syslog.name = syslog
-      appender.syslog.facility = LOCAL0
-      appender.syslog.host = 127.0.0.1
-      appender.syslog.appName = logstash
-      appender.syslog.port = 514
-      appender.syslog.newLine = true
-      appender.syslog.protocol = UDP
-      appender.syslog.format = RFC5424
-      appender.syslog.messageId = Audit
-      appender.syslog.id = system1
-      appender.syslog.mdcId = mdc
-      appender.syslog.layout.type = loggerFields
-      appender.syslog.layout.pairs.type = KeyValuePair
-      appender.syslog.layout.pairs.key = category
-      appender.syslog.layout.pairs.value = %c
-      appender.syslog.layout.pairs2.type = KeyValuePair
-      appender.syslog.layout.pairs2.key = message
-      appender.syslog.layout.pairs2.value = %m
-      appender.syslog.layout.pairs3.type = KeyValuePair
-      appender.syslog.layout.pairs3.key = exception
-      appender.syslog.layout.pairs3.value = %ex
-
-      rootLogger.level = ${sys:ls.log.level}
+      log4j.rootLogger=INFO, SYSLOG
+
+      log4j.appender.SYSLOG=com.github.loggly.log4j.SyslogAppender64k
+      log4j.appender.SYSLOG.SyslogHost=localhost
+      log4j.appender.SYSLOG.Facility=Local0
+      log4j.appender.SYSLOG.Header=true
+      log4j.appender.SYSLOG.layout=org.apache.log4j.EnhancedPatternLayout
+      log4j.appender.SYSLOG.layout.ConversionPattern=java %d{ISO8601}{GMT} %p %t %c %M - %m%n
     CONF
     it 'creates log4j2.properties in the configuration directory' do
       expect(chef_run).to create_file('/etc/logstash/log4j2.properties')