BryanDavis has uploaded a new change for review.
https://gerrit.wikimedia.org/r/306299
Change subject: Revert "logstash: new input for msgpack over UDP"
......................................................................
Revert "logstash: new input for msgpack over UDP"
This reverts commit 6403f20041b9c4f6353b41d0d581549d9fcbb5fe.
The uwsgi package for Debian Jessie doesn't support msgpack encoding, so we
don't have a use for this right now.
Change-Id: If173ba728c327d0222c22e490aefcb3ad6e49158
---
M manifests/role/logstash.pp
M modules/logstash/manifests/input/udp.pp
M modules/logstash/templates/input/udp.erb
3 files changed, 0 insertions(+), 18 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/99/306299/1
diff --git a/manifests/role/logstash.pp b/manifests/role/logstash.pp
index 51084e7..e7d7abf 100644
--- a/manifests/role/logstash.pp
+++ b/manifests/role/logstash.pp
@@ -85,19 +85,6 @@
srange => '$DOMAIN_NETWORKS',
}
- logstash::input::udp { 'msgpack':
- port => 1717,
- codec => 'msgpack',
- tags => ['es'],
- }
-
- ferm::service { 'logstash_msgpack':
- proto => 'udp',
- port => '1717',
- notrack => true,
- srange => '$DOMAIN_NETWORKS',
- }
-
## Global pre-processing (15)
# move files into module?
diff --git a/modules/logstash/manifests/input/udp.pp
b/modules/logstash/manifests/input/udp.pp
index c7da302..917961c 100644
--- a/modules/logstash/manifests/input/udp.pp
+++ b/modules/logstash/manifests/input/udp.pp
@@ -10,7 +10,6 @@
# - $port: Port to listen for udp2log input on. Default '11514'.
# - $codec: Codec to decode tcp stream input. Default 'plain'.
# - $priority: Configuration loading priority. Default '10'.
-# - $tags: Array of tags to add to events. Default undef.
#
# == Sample usage:
#
@@ -25,7 +24,6 @@
$port = 11514,
$codec = 'plain',
$priority = 10,
- $tags = undef,
) {
logstash::conf { "input-udp-${title}":
ensure => $ensure,
diff --git a/modules/logstash/templates/input/udp.erb
b/modules/logstash/templates/input/udp.erb
index 3f4f32e..d0cd97b 100644
--- a/modules/logstash/templates/input/udp.erb
+++ b/modules/logstash/templates/input/udp.erb
@@ -3,8 +3,5 @@
type => "<%= @type %>"
port => <%= @port %>
codec => "<%= @codec %>"
-<% if @tags -%>
- tags => <%= scope.function_ordered_json(@tags) %>
-<% end -%>
}
}
--
To view, visit https://gerrit.wikimedia.org/r/306299
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If173ba728c327d0222c22e490aefcb3ad6e49158
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BryanDavis <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
