Ottomata has uploaded a new change for review.
https://gerrit.wikimedia.org/r/197413
Change subject: Make eventlogging forwarder define work with new forwarder
config file format
......................................................................
Make eventlogging forwarder define work with new forwarder config file format
Change-Id: Icade8cc51cb6222e80bdb2837694334db87ae654
---
M manifests/role/eventlogging.pp
M modules/eventlogging/manifests/package.pp
M modules/eventlogging/manifests/service/forwarder.pp
3 files changed, 7 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/13/197413/1
diff --git a/manifests/role/eventlogging.pp b/manifests/role/eventlogging.pp
index e487c0b..32713fb 100644
--- a/manifests/role/eventlogging.pp
+++ b/manifests/role/eventlogging.pp
@@ -143,10 +143,6 @@
$kafka_topic_version = 0
$kafka_topic = sprintf('%s-%02d', $kafka_topic_base_name,
$kafka_topic_version)
- package { 'python-kafka':
- ensure => present,
- }
-
eventlogging::service::consumer { 'kafka':
input => "tcp://${processor}:8600",
output =>
"kafka://${kafka_cluster}?brokers=${kafka_brokers}&topic=${kafka_topic}",
diff --git a/modules/eventlogging/manifests/package.pp
b/modules/eventlogging/manifests/package.pp
index 1ac1321..2806fac 100644
--- a/modules/eventlogging/manifests/package.pp
+++ b/modules/eventlogging/manifests/package.pp
@@ -9,6 +9,7 @@
package { [
'python-jsonschema',
+ 'python-kafka',
'python-mysqldb',
'python-pygments',
'python-pymongo',
diff --git a/modules/eventlogging/manifests/service/forwarder.pp
b/modules/eventlogging/manifests/service/forwarder.pp
index bb444e0..ad877da 100644
--- a/modules/eventlogging/manifests/service/forwarder.pp
+++ b/modules/eventlogging/manifests/service/forwarder.pp
@@ -6,8 +6,12 @@
#
# === Parameters
#
+# [*input*]
+# Input URI from which events should be forwarded.
+# Defaults to udp://0.0.0.0:$port
+#
# [*port*]
-# Port which should be forwarded. Defaults to the resource title.
+# Port which should be forwarded to. Defaults to the resource title.
#
# [*count*]
# If true, prepend an autoincrementing ID to each message that is
@@ -22,6 +26,7 @@
# eventlogging::service::forwarder { '8600': ]
#
define eventlogging::service::forwarder(
+ $input = "udp://0.0.0.0:${port}",
$port = $title,
$count = false,
$ensure = present,
--
To view, visit https://gerrit.wikimedia.org/r/197413
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Icade8cc51cb6222e80bdb2837694334db87ae654
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ottomata <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
