Yurik has uploaded a new change for review.
https://gerrit.wikimedia.org/r/178745
Change subject: Zero: Temporary removal of several XCS IDs from analytics
......................................................................
Zero: Temporary removal of several XCS IDs from analytics
Debugging a complex analytics issue, and need to stop special
handling of the several questionable carrier IDs.
All traffic from those carriers will now be tagged with XCS
(just like it will be done after we remove Limn graphs)
Change-Id: I29264607acddaecceaf934a7f3059b6cb193ce4d
---
M templates/varnish/zero.inc.vcl.erb
1 file changed, 30 insertions(+), 29 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/45/178745/1
diff --git a/templates/varnish/zero.inc.vcl.erb
b/templates/varnish/zero.inc.vcl.erb
index c3586d3..a7203cc 100644
--- a/templates/varnish/zero.inc.vcl.erb
+++ b/templates/varnish/zero.inc.vcl.erb
@@ -143,24 +143,24 @@
set req.http.X-CS = req.http.X-CS2;
}
}
- } else if (req.http.X-CS2 == "470-03") {
- if (!req.http.X-Forwarded-Proto && !req.http.X-Forwarded-By) {
- if (req.http.host ~ "^((en|bn)\.)?(zero|m)\.") {
- set req.http.X-CS = req.http.X-CS2;
- }
- }
- } else if (req.http.X-CS2 == "624-02") {
- if (!req.http.X-Forwarded-Proto && !req.http.X-Forwarded-By) {
- if (req.http.host ~
"^((fr|ha|ln|yo|eo|ar|zh|en|es|de)\.)?m\.") {
- set req.http.X-CS = req.http.X-CS2;
- }
- }
- } else if (req.http.X-CS2 == "605-01") {
- if (!req.http.X-Forwarded-Proto && !req.http.X-Forwarded-By) {
- if (req.http.host ~ "^((fr|ru|ja|zh|it|de|en|es|ar)\.)?m\.") {
- set req.http.X-CS = req.http.X-CS2;
- }
- }
+ // } else if (req.http.X-CS2 == "470-03") {
+ // if (!req.http.X-Forwarded-Proto && !req.http.X-Forwarded-By) {
+ // if (req.http.host ~ "^((en|bn)\.)?(zero|m)\.") {
+ // set req.http.X-CS = req.http.X-CS2;
+ // }
+ // }
+ // } else if (req.http.X-CS2 == "624-02") {
+ // if (!req.http.X-Forwarded-Proto && !req.http.X-Forwarded-By) {
+ // if (req.http.host ~
"^((fr|ha|ln|yo|eo|ar|zh|en|es|de)\.)?m\.") {
+ // set req.http.X-CS = req.http.X-CS2;
+ // }
+ // }
+ // } else if (req.http.X-CS2 == "605-01") {
+ // if (!req.http.X-Forwarded-Proto && !req.http.X-Forwarded-By) {
+ // if (req.http.host ~
"^((fr|ru|ja|zh|it|de|en|es|ar)\.)?m\.") {
+ // set req.http.X-CS = req.http.X-CS2;
+ // }
+ // }
} else if (req.http.X-CS2 == "641-14") {
if (!req.http.X-Forwarded-Proto && !req.http.X-Forwarded-By) {
if (req.http.host ~
"^((en|zh|ar|hi|fr|sw|rw|de|es|ko)\.)?m\.") {
@@ -173,12 +173,12 @@
set req.http.X-CS = req.http.X-CS2;
}
}
- } else if (req.http.X-CS2 == "410-01") {
- if ((!req.http.X-Forwarded-Proto && !req.http.X-Forwarded-By) ||
req.http.X-Forwarded-By == "Opera") {
- if (req.http.host ~ "^((en|ur)\.)?(zero|m)\.") {
- set req.http.X-CS = req.http.X-CS2;
- }
- }
+ // } else if (req.http.X-CS2 == "410-01") {
+ // if ((!req.http.X-Forwarded-Proto && !req.http.X-Forwarded-By)
|| req.http.X-Forwarded-By == "Opera") {
+ // if (req.http.host ~ "^((en|ur)\.)?(zero|m)\.") {
+ // set req.http.X-CS = req.http.X-CS2;
+ // }
+ // }
} else if (req.http.X-CS2 == "510-11") {
if (!req.http.X-Forwarded-Proto && !req.http.X-Forwarded-By) {
if (req.http.host ~ "^((id|en|zh|ar|hi|ms|jv|su)\.)?zero\.") {
@@ -263,14 +263,15 @@
set req.http.X-CS = req.http.X-CS2;
}
}
- } else if (req.http.X-CS2 ~
"^(255-03|310-260|410-06|436-05|515-05|604-00|621-30|623-03|630-03|631-02|TEST.*)(\|.*)?$")
{
+// } else if (req.http.X-CS2 ~
"^(255-03|310-260|410-06|436-05|515-05|604-00|621-30|623-03|630-03|631-02|TEST.*)(\|.*)?$")
{
+ } else {
// Support HTTPS, allows all proxies
// Once analytics is fixed, this will be done for everything
set req.http.X-CS = req.http.X-CS2;
- } else if (!req.http.X-Forwarded-By || req.http.X-Forwarded-By ==
"Opera") {
- // Default: Support HTTPS for both DIRECT and OPERA, allows all
subnets
- // 401-01|414-06|416-03|429-02|437-01|514-02|515-03
- set req.http.X-CS = req.http.X-CS2;
+ // } else if (!req.http.X-Forwarded-By || req.http.X-Forwarded-By ==
"Opera") {
+ // // Default: Support HTTPS for both DIRECT and OPERA, allows all
subnets
+ // // 401-01|414-06|416-03|429-02|437-01|514-02|515-03
+ // set req.http.X-CS = req.http.X-CS2;
}
}
--
To view, visit https://gerrit.wikimedia.org/r/178745
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I29264607acddaecceaf934a7f3059b6cb193ce4d
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yurik <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
