ArielGlenn has uploaded a new change for review.
https://gerrit.wikimedia.org/r/79328
Change subject: fix up torrus aggregation for varnish/squid caches
......................................................................
fix up torrus aggregation for varnish/squid caches
Change-Id: I2583729ceb02fb0651d1837a21c08f38a6983fbf
---
M templates/torrus/cdn-aggregates.xml.erb
1 file changed, 3 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/28/79328/1
diff --git a/templates/torrus/cdn-aggregates.xml.erb
b/templates/torrus/cdn-aggregates.xml.erb
index 88b787d..b94593e 100644
--- a/templates/torrus/cdn-aggregates.xml.erb
+++ b/templates/torrus/cdn-aggregates.xml.erb
@@ -8,7 +8,7 @@
def squid_rpn(role, site, list=nil)
result = ""
- list = node_list(role, site) if list == nil
+ list = node_list(role, site+'-squid') if list == nil
list.each do |node|
result <<
"{/Squids/#{site}/#{role}/#{node}/%layer%/%squidmetric%},"
end
@@ -39,7 +39,7 @@
</param>
<param name="expr-Squid_api_pmtpa">
-<%= squid_rpn('text', 'pmtpa', node_list('api', 'pmtpa')) %>
+<%= squid_rpn('text', 'pmtpa', node_list('api', 'pmtpa'+'-squid')) %>
</param>
<param name="expr-Squid_upload_pmtpa">
@@ -51,7 +51,7 @@
</param>
<param name="expr-Squid_api_eqiad">
-<%= squid_rpn('text', 'eqiad', node_list('api', 'eqiad')) %>
+<%= squid_rpn('text', 'eqiad', node_list('api', 'eqiad'+'-squid')) %>
</param>
<param name="expr-Squid_text_esams">
--
To view, visit https://gerrit.wikimedia.org/r/79328
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2583729ceb02fb0651d1837a21c08f38a6983fbf
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: ArielGlenn <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
