Paladox has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/398660 )
Change subject: Add log4j to logstash plugin
......................................................................
Add log4j to logstash plugin
Change-Id: Ic891f936cfc60c1710a6a65f9f6272e4005bb500
---
A puppet/modules/logstash/manifests/input/log4j.pp
A puppet/modules/logstash/templates/input/log4j.erb
M puppet/modules/role/manifests/elk.pp
3 files changed, 42 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant
refs/changes/60/398660/1
diff --git a/puppet/modules/logstash/manifests/input/log4j.pp
b/puppet/modules/logstash/manifests/input/log4j.pp
new file mode 100644
index 0000000..dc06b12
--- /dev/null
+++ b/puppet/modules/logstash/manifests/input/log4j.pp
@@ -0,0 +1,31 @@
+# vim:sw=4 ts=4 sts=4 et:
+
+# = Define: logstash::input::log4j
+#
+# Configure logstash to collect input as a log4j listener
+#
+# == Parameters:
+# - $ensure: Whether the config should exist. Default present.
+# - $port: port to listen for json input on. Default 12202.
+# - $priority: Configuration loading priority. Default undef.
+#
+# == Sample usage:
+#
+# logstash::input::log4j {
+# port => 4560,
+# }
+#
+define logstash::input::log4j(
+ $ensure = present,
+ $port = 4560,
+ $priority = 10,
+ $mode = 'server',
+ $host = '0.0.0.0',
+) {
+ logstash::conf { "input_log4j_${title}":
+ ensure => $ensure,
+ content => template('logstash/input/log4j.erb'),
+ priority => $priority,
+ }
+}
+
diff --git a/puppet/modules/logstash/templates/input/log4j.erb
b/puppet/modules/logstash/templates/input/log4j.erb
new file mode 100644
index 0000000..65e8470
--- /dev/null
+++ b/puppet/modules/logstash/templates/input/log4j.erb
@@ -0,0 +1,9 @@
+input {
+ # Log4j socket-based logger
+ log4j {
+ type => "log4j"
+ port => "<%= @port %>"
+ mode => "<%= @mode %>"
+ host => "<%= @host %>"
+ }
+}
\ No newline at end of file
diff --git a/puppet/modules/role/manifests/elk.pp
b/puppet/modules/role/manifests/elk.pp
index 48825b3..7e7a7d4 100644
--- a/puppet/modules/role/manifests/elk.pp
+++ b/puppet/modules/role/manifests/elk.pp
@@ -34,6 +34,8 @@
port => 12202,
}
+ logstash::input::log4j { 'log4j': }
+
logstash::conf { 'filter_strip_ansi_color':
source => 'puppet:///modules/role/elk/filter-strip-ansi-color.conf',
priority => 40,
--
To view, visit https://gerrit.wikimedia.org/r/398660
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic891f936cfc60c1710a6a65f9f6272e4005bb500
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: stretch-migration
Gerrit-Owner: Paladox <thomasmulhall...@yahoo.com>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
