[MediaWiki-commits] [Gerrit] mediawiki/vagrant[master]: Add log4j to logstash plugin

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/391638 )

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(-)

Approvals:
  BryanDavis: Looks good to me, approved
  jenkins-bot: Verified
  Gehel: Looks good to me, but someone else must approve



diff --git a/puppet/modules/logstash/manifests/input/log4j.pp 
b/puppet/modules/logstash/manifests/input/log4j.pp
new file mode 100644
index 000..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 000..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/391638
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic891f936cfc60c1710a6a65f9f6272e4005bb500
Gerrit-PatchSet: 7
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Paladox 
Gerrit-Reviewer: BryanDavis 
Gerrit-Reviewer: Chad 
Gerrit-Reviewer: Dduvall 
Gerrit-Reviewer: EBernhardson 
Gerrit-Reviewer: Gehel 
Gerrit-Reviewer: Paladox 
Gerrit-Reviewer: Reedy 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki/vagrant[master]: Add log4j to logstash plugin

[Paladox (Code Review)]

Paladox has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/391638 )

Change subject: Add log4j to logstash plugin
..

Add log4j to logstash plugin

Change-Id: Ic891f936cfc60c1710a6a65f9f6272e4005bb500
---
0 files changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant 
refs/changes/38/391638/1


-- 
To view, visit https://gerrit.wikimedia.org/r/391638
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: master
Gerrit-Owner: Paladox 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits