Ottomata has submitted this change and it was merged.
Change subject: Qualify erb template variables
......................................................................
Qualify erb template variables
Bug: T97251
Change-Id: I1e9655024162966a93082ee9f96bfbb8f259f715
---
M manifests/role/analytics/kafka.pp
M modules/zookeeper
M templates/udp2log/filters.erbium.erb
M templates/udp2log/filters.misc.erb
M templates/udp2log/filters.mw.erb
5 files changed, 6 insertions(+), 6 deletions(-)
Approvals:
Ottomata: Verified; Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/role/analytics/kafka.pp
b/manifests/role/analytics/kafka.pp
index 52aa19a..b77e7d8 100644
--- a/manifests/role/analytics/kafka.pp
+++ b/manifests/role/analytics/kafka.pp
@@ -108,7 +108,7 @@
}
$zookeeper_hosts = keys(hiera('zookeeper_hosts'))
$zookeeper_chroot = "/kafka/${kafka_cluster_name}"
- $zookeeper_url = inline_template("<%= @zookeeper_hosts.sort.join(',')
%><%= zookeeper_chroot %>")
+ $zookeeper_url = inline_template("<%= @zookeeper_hosts.sort.join(',')
%><%= @zookeeper_chroot %>")
}
# == Class role::analytics::kafka::client
diff --git a/modules/zookeeper b/modules/zookeeper
index 3272c7c..6e3a24b 160000
--- a/modules/zookeeper
+++ b/modules/zookeeper
-Subproject commit 3272c7cc8dbe5ca5746c20ab8598229c69ad6d2d
+Subproject commit 6e3a24b08327f61bb09a9924e76e51c09180b3d9
diff --git a/templates/udp2log/filters.erbium.erb
b/templates/udp2log/filters.erbium.erb
index 7707dc1..6a4eaef 100644
--- a/templates/udp2log/filters.erbium.erb
+++ b/templates/udp2log/filters.erbium.erb
@@ -3,7 +3,7 @@
###
### udp2log packet loss monitoring
-pipe 10 /usr/bin/packet-loss 10 '\t' >> <%= packet_loss_log %>
+pipe 10 /usr/bin/packet-loss 10 '\t' >> <%= @packet_loss_log %>
### Fundraising
## Landing pages
@@ -16,9 +16,9 @@
### 0.0001 of all udp2log messages
# This filter has been migrated to Hive. It's output is available on
# stat1002 at /a/log/webrequest/archive/sampled
-file 1000 <%= log_directory %>/sampled-1000.tsv.log
+file 1000 <%= @log_directory %>/sampled-1000.tsv.log
### All 5xx error responses.
# This filter has been migrated to Hive. It's output is available on
# stat1002 at /a/log/webrequest/archive/5xx
-pipe 1 /usr/bin/udp-filter -F '\t' -r -s '^5' | awk -W interactive '$9 !~
"upload.wikimedia.org"' >> <%= log_directory %>/5xx.tsv.log
+pipe 1 /usr/bin/udp-filter -F '\t' -r -s '^5' | awk -W interactive '$9 !~
"upload.wikimedia.org"' >> <%= @log_directory %>/5xx.tsv.log
diff --git a/templates/udp2log/filters.misc.erb
b/templates/udp2log/filters.misc.erb
index ac9febb..d3f4de4 100644
--- a/templates/udp2log/filters.misc.erb
+++ b/templates/udp2log/filters.misc.erb
@@ -3,7 +3,7 @@
###
### udp2log packet loss monitoring
-pipe 10 /usr/bin/packet-loss 10 '\t' >> <%= log_directory %>/packet-loss.log
+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
diff --git a/templates/udp2log/filters.mw.erb b/templates/udp2log/filters.mw.erb
index 1878327..d83516f 100644
--- a/templates/udp2log/filters.mw.erb
+++ b/templates/udp2log/filters.mw.erb
@@ -1,4 +1,4 @@
-flush pipe 1 python /usr/local/bin/demux.py<% if
has_variable?("log_directory") then %> --basedir <%= log_directory %><% end %>
+flush pipe 1 python /usr/local/bin/demux.py<% if
has_variable?("log_directory") then %> --basedir <%= @log_directory %><% end %>
# Relay MediaWiki exceptions and fatals to eventlog1001 for generating reports.
# The trailing space in the egrep regex expression, make sure we only catch
--
To view, visit https://gerrit.wikimedia.org/r/219202
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I1e9655024162966a93082ee9f96bfbb8f259f715
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ottomata <o...@wikimedia.org>
Gerrit-Reviewer: Ottomata <o...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
