Erik Zachte has submitted this change and it was merged.

Change subject: [WIP] Link to the new browser-reports
......................................................................


[WIP] Link to the new browser-reports

This patch includes:
- Replace the links to SquidReportOperatingSystems and
  SquidReportClients in the index and search pages with
  the corresponding tab in browser-reports.wmflabs.org.
- Add the old links as a second option like: (see also
  the previous discontinued report)
- Add a link to the new reports in the perl generator
  that renders the SquidReport htmls.

Bug: T129101
Change-Id: I251ccc055dd3cd8c831739079d4c4e385baed8df
---
M portal/index.html
M portal/index_1_1.html
M portal/search.html
M squids/perl/SquidReportArchive.pl
4 files changed, 7 insertions(+), 7 deletions(-)

Approvals:
  Nuria: Looks good to me, but someone else must approve
  Erik Zachte: Checked; Looks good to me, approved
  jenkins-bot: Verified



diff --git a/portal/index.html b/portal/index.html
index 8bdc121..64e11b4 100644
--- a/portal/index.html
+++ b/portal/index.html
@@ -399,8 +399,8 @@
     <li><a 
href='http://stats.wikimedia.org/wikimedia/squids/SquidReportRequests.htm'>Which
 <b>kind of requests</b> are received, <b>for which wikis</b>?</a> Destination 
/ Mime type<br>
     <li><a 
href='http://stats.wikimedia.org/wikimedia/squids/SquidReportOrigins.htm'><b>Which
 sites</b> send most traffic, what kind of traffic ?</a> Referer (int/ext) / 
File category
     <li><a 
href='http://stats.wikimedia.org/wikimedia/squids/SquidReportCrawlers.htm'>Which
 <b>crawlers</b> access our servers?</a> Host / File types / Agent string<br>
-    <li><a 
href='http://stats.wikimedia.org/wikimedia/squids/SquidReportOperatingSystems.htm'>Which
 <b>operating systems</b> do our clients use?</a> Platform, mobile or not, 
release<br>
-    <li><a 
href='http://stats.wikimedia.org/wikimedia/squids/SquidReportClients.htm'>Which 
<b>browsers</b> are how popular?</a> Brand / Revision level / Mobile or not<br>
+    <li><a href='https://browser-reports.wmflabs.org/#all-sites-by-os'>Which 
<b>operating systems</b> do our clients use?</a> Platform, major version (see 
also the <a target='_blank' 
href='http://stats.wikimedia.org/wikimedia/squids/SquidReportOperatingSystems.htm'>previous
 discontinued report</a>)<br>
+    <li><a 
href='https://browser-reports.wmflabs.org/#all-sites-by-browser'>Which 
<b>browsers</b> are how popular?</a> Brand, major version (see also the <a 
target='_blank' 
href='http://stats.wikimedia.org/wikimedia/squids/SquidReportClients.htm'>previous
 discontinued report</a>)<br>
     <li><a 
href='http://stats.wikimedia.org/wikimedia/squids/SquidReportGoogle.htm'>Breakdown
 of all traffic that <b>Google</b> send us: directly (crawlers) and indirectly 
(search results)</a>
     <li><a 
href='http://stats.wikimedia.org/wikimedia/squids/SquidReportCountryData.htm'>Is
 our <b>mobile traffic</b> different in different parts of the world?</a> 
Region / Device type / OS<br>
 <!--<li><a 
href='http://stats.wikimedia.org/wikimedia/squids/SquidReportDevices.htm'>Which 
mobile <b>devices</b> are preferred by our readers?</a> Device class / OS<br> 
-->
diff --git a/portal/index_1_1.html b/portal/index_1_1.html
index 92dcf46..33208d2 100644
--- a/portal/index_1_1.html
+++ b/portal/index_1_1.html
@@ -418,8 +418,8 @@
     <a 
href='http://stats.wikimedia.org/wikimedia/squids/SquidReportScripts.htm'>Which 
scripts are invoked?</a> Breakdown by type (css, javascript, php), name and 
parameters<br>
     <a 
href='http://stats.wikimedia.org/wikimedia/squids/SquidReportSkins.htm'>Which 
skin files are downloaded and how often?</a><br>
     <a 
href='http://stats.wikimedia.org/wikimedia/squids/SquidReportCrawlers.htm'>Which
 crawlers access our servers?</a> Breakdown by host, file types requested, 
agent string<br>
-    <a 
href='http://stats.wikimedia.org/wikimedia/squids/SquidReportOperatingSystems.htm'>Which
 operating systems do our clients use?</a> Breakdown by platform, mobile or 
not, release<br>
-    <a 
href='http://stats.wikimedia.org/wikimedia/squids/SquidReportClients.htm'>Which 
browsers are how popular?</a> Breakdown by brand, revision level, mobile or 
not<br>
+    <a href='https://browser-reports.wmflabs.org/#all-sites-by-os'>Which 
operating systems do our clients use?</a> Breakdown by platform, major version 
(see also the <a target='_blank' 
href='http://stats.wikimedia.org/wikimedia/squids/SquidReportOperatingSystems.htm'>previous
 discontinued report</a>)<br>
+    <a href='https://browser-reports.wmflabs.org/#all-sites-by-browser'>Which 
browsers are how popular?</a> Breakdown by brand, major version (see also the 
<a target='_blank' 
href='http://stats.wikimedia.org/wikimedia/squids/SquidReportClients.htm'>previous
 discontinued report</a>)<br>
     <a 
href='http://stats.wikimedia.org/wikimedia/squids/SquidReportGoogle.htm'>Breakdown
 of all traffic that Google send us: directly (crawlers) and indirectly (search 
results)</a>
     <p>
     <a 
href="http://stats.wikimedia.org/wikimedia/squids/SquidReportRequests.htm";><img 
src="VisitorLogAnalysis.png" border="1"></a>
diff --git a/portal/search.html b/portal/search.html
index f71f297..d9ee3e5 100644
--- a/portal/search.html
+++ b/portal/search.html
@@ -222,8 +222,8 @@
     <a 
href='http://stats.wikimedia.org/wikimedia/squids/SquidReportScripts.htm'>Which 
scripts are invoked?</a> Breakdown by type (css, javascript, php), name and 
parameters<br>
     <a 
href='http://stats.wikimedia.org/wikimedia/squids/SquidReportSkins.htm'>Which 
skin files are downloaded and how often?</a><br>
     <a 
href='http://stats.wikimedia.org/wikimedia/squids/SquidReportCrawlers.htm'>Which
 crawlers access our servers?</a> Breakdown by host, file types requested, 
agent string<br>
-    <a 
href='http://stats.wikimedia.org/wikimedia/squids/SquidReportOperatingSystems.htm'>Which
 operating systems do our clients use?</a> Breakdown by platform, mobile or 
not, release<br>
-    <a 
href='http://stats.wikimedia.org/wikimedia/squids/SquidReportClients.htm'>Which 
browsers are how popular?</a> Breakdown by brand, revision level, mobile or 
not<br>
+    <a href='https://browser-reports.wmflabs.org/#all-sites-by-os'>Which 
operating systems do our clients use?</a> Breakdown by platform, major version 
(see also the <a target='_blank' 
href='http://stats.wikimedia.org/wikimedia/squids/SquidReportOperatingSystems.htm'>previous
 discontinued report</a>)<br>
+    <a href='https://browser-reports.wmflabs.org/#all-sites-by-browser'>Which 
browsers are how popular?</a> Breakdown by brand, major version (see also the 
<a target='_blank' 
href='http://stats.wikimedia.org/wikimedia/squids/SquidReportClients.htm'>previous
 discontinued report</a>)<br>
     <a 
href='http://stats.wikimedia.org/wikimedia/squids/SquidReportCountryData.htm'>Is
 our mobile traffic different in different parts of the world?</a> Breakdown by 
region and country, by device type and OS<br>
     <a 
href='http://stats.wikimedia.org/wikimedia/squids/SquidReportDevices.htm'>Which 
mobile devices are preferred by our readers?</a> Detailed breakdown by device 
class and OS<br>
     <a 
href='http://stats.wikimedia.org/wikimedia/squids/SquidReportUserAgents.htm'>How
 much mobile and app requests do we receive?</a> Breakdown by traffic 
category<br>
diff --git a/squids/perl/SquidReportArchive.pl 
b/squids/perl/SquidReportArchive.pl
index 1157fc6..fe339d4 100755
--- a/squids/perl/SquidReportArchive.pl
+++ b/squids/perl/SquidReportArchive.pl
@@ -9491,7 +9491,7 @@
 {
   my $report_id = shift ;
 
-  $html .= "<font color=#F00><b><big>Aug 2015: This report has been 
discontinued until further notice, due to lack of 
maintenance.</big></font><br><font color=#A00>Only some of the Wikistats 
traffic reports will be migrated to Wikimedia Foundation's new hadoop-based 
infrastructure.<br>If you want this particular report included in the migration 
<a 
href='https://www.mediawiki.org/w/index.php?title=Analytics/Wikistats/TrafficReports/Future_per_report_B2'>let
 us know</a> (id for this report is '$report_id').<br>Read more <a 
href='https://www.mediawiki.org/wiki/Analytics/Wikistats/TrafficReports/Future'>here</a>.</b></font><br>&nbsp;<br>"
 ;
+  $html .= "<font color=#F00><b><big>Aug 2015: This report has been 
discontinued until further notice, due to lack of 
maintenance.</big></font><br><font color=#A00>Only some of the Wikistats 
traffic reports will be migrated to Wikimedia Foundation's new hadoop-based 
infrastructure. See them <a target='_blank' 
href='https://browser-reports.wmflabs.org/'>here</a>.<br>If you want this 
particular report included in the migration <a 
href='https://www.mediawiki.org/w/index.php?title=Analytics/Wikistats/TrafficReports/Future_per_report_B2'>let
 us know</a> (id for this report is '$report_id').<br>Read more <a 
href='https://www.mediawiki.org/wiki/Analytics/Wikistats/TrafficReports/Future'>here</a>.</b></font><br>&nbsp;<br>"
 ;
 
 if ($report_id > 20)
 {

-- 
To view, visit https://gerrit.wikimedia.org/r/278917
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I251ccc055dd3cd8c831739079d4c4e385baed8df
Gerrit-PatchSet: 1
Gerrit-Project: analytics/wikistats
Gerrit-Branch: master
Gerrit-Owner: Mforns <[email protected]>
Gerrit-Reviewer: Erik Zachte <[email protected]>
Gerrit-Reviewer: Nuria <[email protected]>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to