Ottomata has submitted this change and it was merged.
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
M modules/eventlogging/templates/forwarder.erb
4 files changed, 14 insertions(+), 6 deletions(-)
Approvals:
Ottomata: Looks good to me, approved
jenkins-bot: Verified
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..5176503 100644
--- a/modules/eventlogging/manifests/package.pp
+++ b/modules/eventlogging/manifests/package.pp
@@ -9,9 +9,11 @@
package { [
'python-jsonschema',
+ 'python-kafka',
'python-mysqldb',
'python-pygments',
'python-pymongo',
+ 'python-six',
'python-sqlalchemy',
'python-zmq',
]:
diff --git a/modules/eventlogging/manifests/service/forwarder.pp
b/modules/eventlogging/manifests/service/forwarder.pp
index bb444e0..d7f27da 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:$title (make sure $title is the port if you
don't set this.)
+#
# [*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
@@ -19,9 +23,14 @@
#
# === Examples
#
-# eventlogging::service::forwarder { '8600': ]
+# eventlogging::service::forwarder { '8600': }
+# eventlogging::service::forwarder { 'kafka-zmq_8601':
+# input => 'kafka://?brokers=localhost:9092&topic=eventlogging',
+# port => '8601',
+# }
#
define eventlogging::service::forwarder(
+ $input = "udp://0.0.0.0:${title}",
$port = $title,
$count = false,
$ensure = present,
diff --git a/modules/eventlogging/templates/forwarder.erb
b/modules/eventlogging/templates/forwarder.erb
index 4eb513e..bbb2231 100644
--- a/modules/eventlogging/templates/forwarder.erb
+++ b/modules/eventlogging/templates/forwarder.erb
@@ -1,2 +1,3 @@
+<%= @input %>
<%= @port %><% if @count %>
--count<% end %>
--
To view, visit https://gerrit.wikimedia.org/r/197413
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Icade8cc51cb6222e80bdb2837694334db87ae654
Gerrit-PatchSet: 5
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ottomata <[email protected]>
Gerrit-Reviewer: Nuria <[email protected]>
Gerrit-Reviewer: Ori.livneh <[email protected]>
Gerrit-Reviewer: Ottomata <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
