Ottomata has submitted this change and it was merged.
Change subject: Setting up misc udp2log instance on analytics1003 to test
moving sqstat there
......................................................................
Setting up misc udp2log instance on analytics1003 to test moving sqstat there
Removing sqstat from emery
Change-Id: I28c366112cb4e9a884731bdc7f467db446b8090f
---
M manifests/role/logging.pp
M manifests/site.pp
M templates/udp2log/filters.emery.erb
A templates/udp2log/filters.misc.erb
4 files changed, 24 insertions(+), 10 deletions(-)
Approvals:
Ottomata: Verified; Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/role/logging.pp b/manifests/role/logging.pp
index 31e7ee4..a966c8c 100644
--- a/manifests/role/logging.pp
+++ b/manifests/role/logging.pp
@@ -361,3 +361,11 @@
require => Misc::Udp2log::Instance['erbium'],
}
}
+
+# misc udp2log instance, mainly for a post-udp2log era...one day :)
+class role::logging::udp2log::misc {
+ misc::udp2log::instance { 'misc':
+ multicast => true,
+ packet_loss_log => '/var/log/udp2log/packet-loss.log',
+ }
+}
diff --git a/manifests/site.pp b/manifests/site.pp
index 3cf4fe5..67e9755 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -103,6 +103,9 @@
node 'analytics1003.eqiad.wmnet' {
include role::analytics
include role::analytics::kafkatee::webrequest::mobile
+
+ # run misc udp2log here for sqstat
+ include role::logging::udp2log::misc
}
node 'analytics1004.eqiad.wmnet' {
diff --git a/templates/udp2log/filters.emery.erb
b/templates/udp2log/filters.emery.erb
index 3d449a8..68dcf89 100644
--- a/templates/udp2log/filters.emery.erb
+++ b/templates/udp2log/filters.emery.erb
@@ -8,13 +8,3 @@
### 0.0001 of all udp2log messages
# This log file is also on gadolinium for redundancy
file 1000 <%= log_directory %>/sampled-1000.tsv.log
-
-
-### This feeds all http related graphs in graphite / gdash.wikimedia.org
-# We moved this to erbium on Jan 30, and recently have been noticing
-# erratic graphs. Moving sqstat back here to see if this move was the
-# cause of the problem. Also, since we want to replace udp2log with
-# kafkatee soon, hopefully we will be able to get rid of the lossy
-# multicast udp2log relay and just rely on Kafka, and then get rid
-# of emery altogether.
-pipe 2 /usr/local/bin/sqstat 2
diff --git a/templates/udp2log/filters.misc.erb
b/templates/udp2log/filters.misc.erb
new file mode 100644
index 0000000..e7cfd5a
--- /dev/null
+++ b/templates/udp2log/filters.misc.erb
@@ -0,0 +1,13 @@
+###
+#### This file managed by puppet.
+###
+
+### udp2log packet loss monitoring
+pipe 10 /usr/bin/packet-loss 10 '\t' >> <%= log_directory %>/packet-loss.log
+
+### This feeds all http related graphs in graphite / gdash.wikimedia.org
+# We moved this to erbium on Jan 30, and recently have been noticing
+# erratic graphs. Moving sqstat to this misc udp2log instance to
+# see if erratic graphs were caused by lossy multicast or just by
+# general business on erbium.
+pipe 2 /usr/local/bin/sqstat 2
--
To view, visit https://gerrit.wikimedia.org/r/124341
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I28c366112cb4e9a884731bdc7f467db446b8090f
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ottomata <[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
