Ori.livneh has uploaded a new change for review.
https://gerrit.wikimedia.org/r/59854
Change subject: Parametrize mwerror port
......................................................................
Parametrize mwerror port
Change-Id: Ie69c4e5194b10cf19c9f2b0980e6c8f3c7925762
---
D modules/eventlogging/files/mwerrors.conf
M modules/eventlogging/manifests/mediawiki_errors.pp
A modules/eventlogging/templates/mwerrors.conf.erb
R modules/eventlogging/templates/mwerrors.pyconf.erb
4 files changed, 24 insertions(+), 16 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/54/59854/1
diff --git a/modules/eventlogging/files/mwerrors.conf
b/modules/eventlogging/files/mwerrors.conf
deleted file mode 100644
index 2982121..0000000
--- a/modules/eventlogging/files/mwerrors.conf
+++ /dev/null
@@ -1,10 +0,0 @@
-; Supervisord configuration for 'mwerrors' Ganglia module.
-; Managed by Puppet: puppet:///files/eventlogging/mwerrors.conf
-; Forward MediaWiki fatals / exceptions to ZeroMQ
-
-[group:mwerrors]
-programs = udp2zmq_8423
-
-[program:udp2zmq_8423]
-command = udp2zmq 8423
-user = eventlogging
diff --git a/modules/eventlogging/manifests/mediawiki_errors.pp
b/modules/eventlogging/manifests/mediawiki_errors.pp
index 2870b84..80fb77e 100644
--- a/modules/eventlogging/manifests/mediawiki_errors.pp
+++ b/modules/eventlogging/manifests/mediawiki_errors.pp
@@ -1,5 +1,13 @@
-# Monitor MediaWiki errors using Ganglia
-class eventlogging::mediawiki_errors {
+# == Class: eventlogging::mediawiki_errors
+#
+# Monitors MediaWiki exceptions and fatals using Ganglia.
+#
+# === Parameters
+#
+# [*port*]
+# UDP port to listen on.
+#
+class eventlogging::mediawiki_errors($port = 8423) {
file { '/usr/lib/ganglia/python_modules/mwerrors.py':
ensure => present,
@@ -11,7 +19,7 @@
}
file { '/etc/supervisor/conf.d/mwerrors.conf':
- source => 'puppet:///modules/eventlogging/mwerrors.conf',
+ content => template('eventlogging/mwerrors.conf.erb'),
require => [ Package['supervisor'], Systemuser['eventlogging']
],
notify => Service['supervisor'],
mode => '0444',
@@ -19,7 +27,7 @@
file { '/etc/ganglia/conf.d/mwerrors.pyconf':
ensure => present,
- source => 'puppet:///modules/eventlogging/mwerrors.pyconf',
+ content => template('eventlogging/mwerrors.pyconf.erb'),
require => [
File['/etc/ganglia/conf.d'],
File['/usr/lib/ganglia/python_modules/mwerrors.py'],
diff --git a/modules/eventlogging/templates/mwerrors.conf.erb
b/modules/eventlogging/templates/mwerrors.conf.erb
new file mode 100644
index 0000000..d9814a8
--- /dev/null
+++ b/modules/eventlogging/templates/mwerrors.conf.erb
@@ -0,0 +1,10 @@
+; Supervisord configuration for 'mwerrors' Ganglia module.
+; File managed by Puppet
+; Forward MediaWiki fatals / exceptions to ZeroMQ
+
+[group:mwerrors]
+programs = udp2zmq_<%= @port %>
+
+[program:udp2zmq_<%= @port %>]
+command = udp2zmq <%= @port %>
+user = eventlogging
diff --git a/modules/eventlogging/files/mwerrors.pyconf
b/modules/eventlogging/templates/mwerrors.pyconf.erb
similarity index 87%
rename from modules/eventlogging/files/mwerrors.pyconf
rename to modules/eventlogging/templates/mwerrors.pyconf.erb
index 6087741..82aa999 100644
--- a/modules/eventlogging/files/mwerrors.pyconf
+++ b/modules/eventlogging/templates/mwerrors.pyconf.erb
@@ -1,6 +1,6 @@
/**
* MediaWiki exceptions & fatals monitoring
- * File managed by Puppet: puppet:///files/eventlogging/mwerrors.pyconf
+ * File managed by Puppet
*/
modules {
@@ -8,7 +8,7 @@
name = "mwerrors"
language = "python"
param endpoint {
- value = "tcp://127.0.0.1:8423"
+ value = "tcp://127.0.0.1:<%= @port %>"
}
}
}
--
To view, visit https://gerrit.wikimedia.org/r/59854
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie69c4e5194b10cf19c9f2b0980e6c8f3c7925762
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ori.livneh <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
