Ottomata has submitted this change and it was merged.
Change subject: udp2log: puppet 3 compatibility fix: fully qualify variable
......................................................................
udp2log: puppet 3 compatibility fix: fully qualify variable
Change-Id: I33b0d76d8b599a1e80fd7ac8ec2bcd19e8aa42cf
---
M manifests/role/logging.pp
M templates/udp2log/filters.oxygen.erb
2 files changed, 4 insertions(+), 4 deletions(-)
Approvals:
Ottomata: Verified; Looks good to me, approved
diff --git a/manifests/role/logging.pp b/manifests/role/logging.pp
index 52873f7..6b01655 100644
--- a/manifests/role/logging.pp
+++ b/manifests/role/logging.pp
@@ -284,6 +284,7 @@
multicast => true,
packet_loss_log => '/var/log/udp2log/packet-loss.log',
log_directory => $webrequest_log_directory,
+ template_variables => { 'webrequest_filter_directory' =>
$webrequest_filter_directory },
}
}
@@ -298,7 +299,6 @@
monitor_packet_loss => false,
}
}
-
# == Class role::logging::udp2log::erbium
# Erbium udp2log instance:
# - Fundraising: This requires write permissions on the netapp mount.
diff --git a/templates/udp2log/filters.oxygen.erb
b/templates/udp2log/filters.oxygen.erb
index 66f5327..69f0eda 100644
--- a/templates/udp2log/filters.oxygen.erb
+++ b/templates/udp2log/filters.oxygen.erb
@@ -24,17 +24,17 @@
pipe 100 /bin/grep -P '<%= mobile_hosts_regex %>' >> <%= log_directory
%>/mobile-sampled-100.tsv.log
### 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"' >> <%= log_directory %>/5xx.tsv.log
+# pipe 1 <%= @template_variables['webrequest_filter_directory'] %>/5xx-filter
| awk -W interactive '$9 !~ "upload.wikimedia.org|query.php"' >> <%=
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"' >> <%= log_directory %>/5xx.tsv.log
### Vrije Universiteit
# Contact: <%=
scope.lookupvar('contacts::udp2log::vrije_universiteit_contact') %>
-pipe 10 awk -f <%= webrequest_filter_directory %>/vu.awk | log2udp -h
130.37.198.252 -p 9999
+pipe 10 awk -f <%= @template_variables['webrequest_filter_directory']
%>/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_filter_directory %>/minnesota.awk | log2udp -h
bento.cs.umn.edu -p 9999
+pipe 10 awk -f <%= @template_variables['webrequest_filter_directory']
%>/minnesota.awk | log2udp -h bento.cs.umn.edu -p 9999
--
To view, visit https://gerrit.wikimedia.org/r/107828
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I33b0d76d8b599a1e80fd7ac8ec2bcd19e8aa42cf
Gerrit-PatchSet: 13
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Matanya <[email protected]>
Gerrit-Reviewer: Alexandros Kosiaris <[email protected]>
Gerrit-Reviewer: Faidon Liambotis <[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
