Ottomata has submitted this change and it was merged.
Change subject: Moving university filters to gadolinium. Moving 5xx filter to
gadolinium, attempting to use udp-filter instead of 5xx filter
......................................................................
Moving university filters to gadolinium.
Moving 5xx filter to gadolinium, attempting to use udp-filter instead of 5xx
filter
Change-Id: Ibd3037c1adfc8fe87a7e2c92ab00411a82359b4e
---
M templates/udp2log/filters.gadolinium.erb
M templates/udp2log/filters.locke.erb
2 files changed, 29 insertions(+), 18 deletions(-)
Approvals:
Ottomata: Verified; Looks good to me, approved
diff --git a/templates/udp2log/filters.gadolinium.erb
b/templates/udp2log/filters.gadolinium.erb
index 811ac0b..30a2289 100644
--- a/templates/udp2log/filters.gadolinium.erb
+++ b/templates/udp2log/filters.gadolinium.erb
@@ -26,27 +26,36 @@
+### All 5xx error responses -- domas (now using udp-filter instead of
5xx-filter).
+# pipe 1 <%= webrequest_filter_directory %>/5xx-filter | awk -W interactive
'$9 !~ "upload.wikimedia.org|query.php"' >> <%= webrequest_log_directory
%>/5xx.tsv.log
+pipe 1 /usr/bin/udp-filter -F '\t' -r -s '^5' | awk -W interactive '$9 !~
"upload.wikimedia.org|query.php"' >> <%= webrequest_log_directory %>/5xx.tsv.log
-#### These are still on locke:
### Vrije Universiteit
# Contact: <%=
scope.lookupvar('contacts::udp2log::vrije_universiteit_contact') %>
-# pipe 10 awk -f <%= webrequest_log_directory %>/bin/vu.awk | log2udp -h
130.37.198.252 -p 9999
+pipe 10 awk -f <%= webrequest_filter_directory %>/bin/vu.awk | log2udp -h
130.37.198.252 -p 9999
### University of Minnesota
# Contact: <%=
scope.lookupvar('contacts::udp2log::university_minnesota_contact') %>
# Former Contact: <%=
scope.lookupvar('contacts::udp2log::university_minnesota_contact_former') %>
# Former contact: <%=
scope.lookupvar('contacts::udp2log::university_minnesota_contact_former2') %>
-# pipe 10 awk -f <%= webrequest_log_directory %>/bin/minnesota.awk | log2udp
-h bento.cs.umn.edu -p 9999
+pipe 10 awk -f <%= webrequest_filter_directory %>/bin/minnesota.awk | log2udp
-h bento.cs.umn.edu -p 9999
+
+
+
+
+
+
+
+
+
+#### These are still on locke:
### domas' stuff.
# (This looks like a bunch of C to filter for mobile pages
# and output things by language.)
# pipe 1 /a/webstats/bin/filter | log2udp -h 127.0.0.1 -p 3815
-### All 5xx error responses -- domas
-# TODO: /usr/bin/udp-filter -F '\t' -r -s '^5' | awk -W interactive '$9 !~
"upload.wikimedia.org|query.php"' >> <%= webrequest_log_directory %>/5xx.tsv.log
-# pipe 1 <%= webrequest_log_directory %>/5xx-filter | awk -W interactive '$9
!~ "upload.wikimedia.org|query.php"' >> <%= webrequest_log_directory
%>/5xx.tsv.log
diff --git a/templates/udp2log/filters.locke.erb
b/templates/udp2log/filters.locke.erb
index 5317e56..45bd3b1 100644
--- a/templates/udp2log/filters.locke.erb
+++ b/templates/udp2log/filters.locke.erb
@@ -31,18 +31,6 @@
pipe 100 /usr/bin/udp-filter -F '\t' -p
Special:RecordImpression\?banner=,Special:RecordImpression\?result= >>
/a/squid/fundraising/logs/bannerImpressions-sampled100.tab.log
-# Vrije Universiteit
-# Contact: <%=
scope.lookupvar('contacts::udp2log::vrije_universiteit_contact') %>
-pipe 10 awk -f /a/squid/vu.awk | log2udp -h 130.37.198.252 -p 9999
-
-
-# University of Minnesota
-# Contact: <%=
scope.lookupvar('contacts::udp2log::university_minnesota_contact') %>
-# Former Contact: <%=
scope.lookupvar('contacts::udp2log::university_minnesota_contact_former') %>
-# Former contact: <%=
scope.lookupvar('contacts::udp2log::university_minnesota_contact_former2') %>
-pipe 10 awk -f /a/squid/minnesota.awk | log2udp -h bento.cs.umn.edu -p 9999
-
-
# All 5xx error responses -- domas
# TODO: /usr/bin/udp-filter -F '\t' -r -s '^5' | awk -W interactive '$9 !~
"upload.wikimedia.org|query.php"' >> /a/squid/5xx.log
@@ -53,6 +41,20 @@
+#### MOVED TO LOCKE:
+
+# Vrije Universiteit
+# Contact: <%=
scope.lookupvar('contacts::udp2log::vrije_universiteit_contact') %>
+# pipe 10 awk -f /a/squid/vu.awk | log2udp -h 130.37.198.252 -p 9999
+
+
+# University of Minnesota
+# Contact: <%=
scope.lookupvar('contacts::udp2log::university_minnesota_contact') %>
+# Former Contact: <%=
scope.lookupvar('contacts::udp2log::university_minnesota_contact_former') %>
+# Former contact: <%=
scope.lookupvar('contacts::udp2log::university_minnesota_contact_former2') %>
+# pipe 10 awk -f /a/squid/minnesota.awk | log2udp -h bento.cs.umn.edu -p 9999
+
+
--
To view, visit https://gerrit.wikimedia.org/r/55890
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ibd3037c1adfc8fe87a7e2c92ab00411a82359b4e
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ottomata <o...@wikimedia.org>
Gerrit-Reviewer: Ottomata <o...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
