Alex Monk has uploaded a new change for review.
https://gerrit.wikimedia.org/r/305660
Change subject: logging: remove reference to deployment-fluoride
......................................................................
logging: remove reference to deployment-fluoride
Hasn't existed for a while. not quite sure where it went, but I don't think
that we really need it.
Change-Id: I54eeebb5f2c2b29388e2b41d1be6c147cd9e027f
---
M manifests/role/logging.pp
M templates/udp2log/filters.mw.erb
2 files changed, 3 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/60/305660/1
diff --git a/manifests/role/logging.pp b/manifests/role/logging.pp
index e5a4491..17f12ad 100644
--- a/manifests/role/logging.pp
+++ b/manifests/role/logging.pp
@@ -49,11 +49,6 @@
source => 'puppet:///modules/udp2log/demux.py',
}
- $error_processor_host = $::realm ? {
- production => 'eventlog1001.eqiad.wmnet',
- labs => "deployment-fluoride.${::site}.wmflabs",
- }
-
$logstash_host = $::realm ? {
# TODO: Find a way to use multicast that doesn't cause duplicate
# messages to be stored in logstash. This is a SPOF.
@@ -70,7 +65,7 @@
monitor_packet_loss => false,
rotate => $rotate,
template_variables => {
- error_processor_host => $error_processor_host,
+ error_processor_host => 'eventlog1001.eqiad.wmnet',
error_processor_port => 8423,
# forwarding to logstash
diff --git a/templates/udp2log/filters.mw.erb b/templates/udp2log/filters.mw.erb
index d83516f..f0141ba 100644
--- a/templates/udp2log/filters.mw.erb
+++ b/templates/udp2log/filters.mw.erb
@@ -1,10 +1,12 @@
flush pipe 1 python /usr/local/bin/demux.py<% if
has_variable?("log_directory") then %> --basedir <%= @log_directory %><% end %>
+<% if @realm == "production" -%>
# Relay MediaWiki exceptions and fatals to eventlog1001 for generating reports.
# The trailing space in the egrep regex expression, make sure we only catch
# groups explicitly. We dont want to double count exceptions via exception and
# exception-json
pipe 1 egrep '^(fatal|exception) ' | /usr/bin/log2udp -h <%=
@template_variables['error_processor_host'] %> -p <%=
@template_variables['error_processor_port'] %>
+<% end -%>
# Forward some messages to Logstash's udp2log collector.
# Udp2log messages that originate from rsyslog and MediaWiki are already
--
To view, visit https://gerrit.wikimedia.org/r/305660
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I54eeebb5f2c2b29388e2b41d1be6c147cd9e027f
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alex Monk <a...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
