updated list of tests on the data page; change order of core services…

… to be alpha order (#551) approved out of band.
m-lab · Apr 1, 2020 · 8ef3817 · 8ef3817
1 parent c48bb06
commit 8ef3817
Show file tree

Hide file tree

Showing 2 changed files with 69 additions and 51 deletions.
diff --git a/_pages/04-data.md b/_pages/04-data.md
@@ -20,55 +20,39 @@ Measurement data from many experiments hosted on M-Lab are processed via the ETL
 
 Some M-Lab hosted tests do not use our ETL pipeline. Data for these tests are published independently by the test developers.
 
-There is typically at least a 24-hour delay between data collection and data publication. Below we provide links to data for our **Active tests** and archival data from **Inactive tests**.
-
-M-Lab also publishes public data sets about the M-Lab Platform, listed below.
+There is typically at least a 24-hour delay between data collection and data publication. Below we provide links to data for our **Current Tests** and archival data from **Inactive or Retired Tests**. Additionally, we list data from **Current M-Lab Core Services** as well as **Retired M-Lab Core Services**.
 
 ## Measurement Data (Active Tests)
 
-* [BISmark]({{site.baseurl}}/tests/bismark)
-  * BISmark measures Internet service provider (ISP) performance and traffic inside home networks.
-  * BISmark data is not processed by the M-Lab ETL Pipeline.
-  * More information is available on the [Project BISmark website](http://projectbismark.net/){:target="_blank"} and on the [Project BISmark Open Development Portal](http://projectbismark.github.io/){:target="_blank"}
-  * [BISmark Raw Data](http://uploads.projectbismark.net/){:target="_blank"}
-* [MobiPerf]({{site.baseurl}}/tests/mobiperf)
-  * MobiPerf is an open source application for measuring network performance on mobile platforms.
-  * MobiPerf data is not processed by the M-Lab ETL Pipeline.
-  * More information is available on the [MobiPerf website](http://www.mobiperf.com/){:target="_blank"}
-  * [MobiPerf Raw Data](https://console.cloud.google.com/storage/browser/openmobiledata_public){:target="_blank"}
 * [NDT]({{site.baseurl}}/tests/ndt)
   * Network Diagnostic Tool (NDT) measures characteristics of a TCP connection under heavy load.
   * NDT data is processed by the M-Lab ETL Pipeline.
   * More information is available at [Internet2](http://software.internet2.edu/ndt/){:target="_blank"} and [GitHub](https://github.com/ndt-project/ndt){:target="_blank"}.
   * [NDT Raw Data](https://console.developers.google.com/storage/browser/archive-measurement-lab/ndt/){:target="_blank"} - [NDT BigQuery Dataset](https://bigquery.cloud.google.com/dataset/measurement-lab:ndt)
-* [NPAD]({{site.baseurl}}/tests/npad)
-  * Network Path and Application Diagnosis (NPAD) diagnoses issues in a network path that can degrade network performance.
-  * NPAD data is processed by the M-Lab ETL Pipeline.
-  * More information is available from archived [UCAR](https://web.archive.org/web/20180714140225/https://www.ucar.edu/npad/){:target="_blank"} pages and [GitHub](https://github.com/npad/npad){:target="_blank"}.
-  * [NPAD Raw Data](https://console.developers.google.com/storage/browser/archive-measurement-lab/npad/){:target="_blank"}
-* [Paris Traceroute]({{site.baseurl}}/tests/paris_traceroute)
-  * Paris Traceroute maps network topology between two points on the Internet.
-  * Paris Traceroute data is processed by the M-Lab ETL Pipeline.
-  * More information is available at [Paris Traceroute](http://www.paris-traceroute.net/){:target="_blank"}
-  * [Paris Traceroute Raw Data](https://console.developers.google.com/storage/browser/archive-measurement-lab/paris-traceroute/){:target="_blank"} - [Paris Traceroute BigQuery Dataset](https://bigquery.cloud.google.com/table/measurement-lab:base_tables.traceroute){:target="_blank"}
-* [Reverse Traceroute]({{site.baseurl}}/tests/reverse_traceroute)
-  * Reverse traceroute measures the network path back to a user from selected network endpoints, and provides a rich source of information on network routing and topology.
-  * Reverse Traceroute data is not processed by the M-Lab ETL Pipeline.
-  * More information is available at [Reverse Traceroute](https://research.cs.washington.edu/networking/astronomy/reverse-traceroute.html){:target="_blank"}
-  * [Reverse Traceroute Raw Data](https://console.cloud.google.com/storage/browser/m-lab_revtr){:target="_blank"}
-* [SamKnows]({{site.baseurl}}/tests/samknows)
-  * The SamKnows performance testing platform is used by the USA's Federal Communications Commission (FCC), European Commission, UK government (Ofcom), Brazilian government (Anatel), Singapore's IDA and other government-backed studies worldwide.
-  * SamKnows infrastructure includes off-net test servers hosted by M-Lab, and the M-Lab and SamKnows teams coordinate regularly to support the various regulatory reporting periods of data collection conducted by SamKnows.
-  * SamKnows data is not processed by the M-Lab ETL Pipeline.
-  * More information is available at the [SamKnows website](https://www.samknows.com/){:target="_blank"}
-* [SideStream]({{site.baseurl}}/tests/sidestream)
-  * SideStream collects TCP state information about completed TCP connections on a system.
-  * Sidestream data is processed by the M-Lab ETL Pipeline.
-  * More information is available on [Github](https://github.com/npad/sidestream){:target="_blank"}.
-  * [Sidestream Raw Data](https://console.developers.google.com/storage/browser/archive-measurement-lab/sidestream/){:target="_blank"} - [Sidestream BigQuery Dataset](https://bigquery.cloud.google.com/dataset/measurement-lab:sidestream){:target="_blank"}
-
-## Measurement Data (Platform Data)
-
+* [Neubot DASH]({{site.baseurl}}/tests/neubot)
+  * Neubot measured the Internet in order to gather data useful to study broadband performance, network neutrality, and Internet censorship.
+  * More information is available at [Nexa Center](https://neubot.nexacenter.org/){:target="_blank"} and [GitHub](https://github.com/neubot){:target="_blank"}.
+  * [Neubot Raw Data](https://console.developers.google.com/storage/browser/archive-measurement-lab/neubot/){:target="_blank"}
+* [WeHe]({{site.baseurl}}/tests/wehe)
+  * Wehe uses your device to exchange Internet traffic recorded from real, popular apps like YouTube and Spotify, and attempts to tell you whether your ISP is giving different performance to an app's network traffic.
+  * More information is available from the [WeHe website](https://dd.meddle.mobi/){:target="_blank"} and [GitHub](https://dd.meddle.mobi/codeanddata.html){:target="_blank"}.
+  * [WeHe Raw Data](https://console.cloud.google.com/storage/browser/archive-measurement-lab/wehe/){:target="_blank"}
+
+## Current M-Lab Core Services and Platform Data
+
+* [Packet Headers]({{site.baseurl}}/tests/pcap)
+  * Collects packet headers for all incoming TCP flows and saves each stream of packet header captures into a per-stream .pcap file.
+  * More information is available on [Github](https://github.com/m-lab/packet-headers){:target="_blank"}.
+  * [Packet Headers Raw Data](){:target="_blank"}.
+* [TCP INFO]({{site.baseurl}}/tests/tcp-info)
+  * Collects statistics about the TCP connections running on the M-Lab platform using tcp-info.
+  * More information is available on [Github](https://github.com/m-lab/tcp-info){:target="_blank"}.
+  * [TCP INFO Raw Data]({{site.baseurl}}/tests/tcp-info/#tcp-info-data-in-raw-format).
+* [Traceroute]({{site.baseurl}}/tests/traceroute)
+  * M-Lab uses the Scamper traceroute tool from CAIDA to collect statistics about the TCP connections running on the M-Lab platform using tcp-info.
+  * More information is available from [CAIDA](https://www.caida.org/tools/measurement/scamper/){:target="_blank"}.
+  * [Traceroute Raw Data]({{site.baseurl}}/tests/traceroute/#traceroute-data-in-raw-format).
+  * [Traceroute Data in BigQuery]({{site.baseurl}}/tests/traceroute/#traceroute-data-in-bigquery)
 * [M-Lab Collectd](https://github.com/m-lab/collectd-mlab){:target="_blank"}
   * M-Lab Collectd is a monitoring tool for M-Lab slices, which collects resource utilization information about all M-Lab servers.
   * More information is available on [Github](https://github.com/m-lab/collectd-mlab){:target="_blank"}.
@@ -79,16 +63,27 @@ M-Lab also publishes public data sets about the M-Lab Platform, listed below.
   * [M-Lab DISCO Raw Data](https://console.developers.google.com/storage/browser/archive-measurement-lab/switch/){:target="_blank"}
   * [M-Lab DISCO Data in BigQuery](https://console.cloud.google.com/bigquery?project=measurement-lab&p=measurement-lab&d=utilization&t=switch&page=table){:target="_blank"}
 
-## Historical Data Sets (e.g. Retired Tests)
+## Historical Data Sets (Inactive/Retired Tests)
 
+* [BISmark]({{site.baseurl}}/tests/bismark)
+  * BISmark measures Internet service provider (ISP) performance and traffic inside home networks.
+  * BISmark data is not processed by the M-Lab ETL Pipeline.
+  * More information is available on the [Project BISmark website](http://projectbismark.net/){:target="_blank"} and on the [Project BISmark Open Development Portal](http://projectbismark.github.io/){:target="_blank"}
+  * [BISmark Raw Data](http://uploads.projectbismark.net/){:target="_blank"}
 * [Glasnost]({{site.baseurl}}/tests/glasnost)
   * Glasnost detected prioritization or censorship of network traffic.
   * More information is available at [MPI SWS](http://broadband.mpi-sws.org/transparency/bttest-mlab.php){:target="_blank"} and [GitHub](https://github.com/marcelscode/glasnost){:target="_blank"}.
   * [Glasnost Raw Data (archived)](https://console.developers.google.com/storage/browser/archive-measurement-lab/glasnost/){:target="_blank"}
-* [Neubot]({{site.baseurl}}/tests/neubot)
-  * Neubot measured the Internet in order to gather data useful to study broadband performance, network neutrality, and Internet censorship.
-  * More information is available at [Nexa Center](https://neubot.nexacenter.org/){:target="_blank"} and [GitHub](https://github.com/neubot){:target="_blank"}.
-  * [Neubot Raw Data](https://console.developers.google.com/storage/browser/archive-measurement-lab/neubot/){:target="_blank"}
+* [MobiPerf]({{site.baseurl}}/tests/mobiperf)
+  * MobiPerf is an open source application for measuring network performance on mobile platforms.
+  * MobiPerf data is not processed by the M-Lab ETL Pipeline.
+  * More information is available on the [MobiPerf website](http://www.mobiperf.com/){:target="_blank"}
+  * [MobiPerf Raw Data](https://console.cloud.google.com/storage/browser/openmobiledata_public){:target="_blank"}
+* [NPAD]({{site.baseurl}}/tests/npad)
+  * Network Path and Application Diagnosis (NPAD) diagnoses issues in a network path that can degrade network performance.
+  * NPAD data is processed by the M-Lab ETL Pipeline.
+  * More information is available from archived [UCAR](https://web.archive.org/web/20180714140225/https://www.ucar.edu/npad/){:target="_blank"} pages and [GitHub](https://github.com/npad/npad){:target="_blank"}.
+  * [NPAD Raw Data](https://console.developers.google.com/storage/browser/archive-measurement-lab/npad/){:target="_blank"}
 * [OONI]({{site.baseurl}}/tests/ooni)
   * OONI measures censorship, surveillance, and traffic manipulation on the Internet.
   * OONI data is not processed by the M-Lab ETL Pipeline.
@@ -98,12 +93,35 @@ M-Lab also publishes public data sets about the M-Lab Platform, listed below.
   * Pathload2 measured the available bandwidth of an Internet connection.
   * More information is available at [https://code.google.com/p/pathload2-gatech/](https://code.google.com/p/pathload2-gatech/){:target="_blank"}.
   * [Pathload2 Raw Data (archived)](https://console.developers.google.com/storage/browser/archive-measurement-lab/pathload2/){:target="_blank"}
+* [Reverse Traceroute]({{site.baseurl}}/tests/reverse_traceroute)
+  * Reverse traceroute measures the network path back to a user from selected network endpoints, and provides a rich source of information on network routing and topology.
+  * Reverse Traceroute data is not processed by the M-Lab ETL Pipeline.
+  * More information is available at [Reverse Traceroute](https://research.cs.washington.edu/networking/astronomy/reverse-traceroute.html){:target="_blank"}
+  * [Reverse Traceroute Raw Data](https://console.cloud.google.com/storage/browser/m-lab_revtr){:target="_blank"}
+* [SamKnows]({{site.baseurl}}/tests/samknows)
+  * The SamKnows performance testing platform is used by the USA's Federal Communications Commission (FCC), European Commission, UK government (Ofcom), Brazilian government (Anatel), Singapore's IDA and other government-backed studies worldwide.
+  * SamKnows infrastructure includes off-net test servers hosted by M-Lab, and the M-Lab and SamKnows teams coordinate regularly to support the various regulatory reporting periods of data collection conducted by SamKnows.
+  * SamKnows data is not processed by the M-Lab ETL Pipeline.
+  * More information is available at the [SamKnows website](https://www.samknows.com/){:target="_blank"}
 * [ShaperProbe]({{site.baseurl}}/tests/shaperprobe)
   * ShaperProbe detected prioritization of network traffic.
   * [Shaperprobe Raw Data (archived)](https://console.developers.google.com/storage/browser/archive-measurement-lab/shaperprobe/){:target="_blank"}
 * [Windrider]({{site.baseurl}}/tests/windrider)
   * WindRider attempted to detect whether your mobile provider was performing application- or service-specific differentiation.
 
+## Retired M-Lab Core Services
+
+* [Paris Traceroute]({{site.baseurl}}/tests/paris_traceroute)
+  * Paris Traceroute maps network topology between two points on the Internet.
+  * Paris Traceroute data is processed by the M-Lab ETL Pipeline.
+  * More information is available at [Paris Traceroute](http://www.paris-traceroute.net/){:target="_blank"}
+  * [Paris Traceroute Raw Data](https://console.developers.google.com/storage/browser/archive-measurement-lab/paris-traceroute/){:target="_blank"} - [Paris Traceroute BigQuery Dataset](https://bigquery.cloud.google.com/table/measurement-lab:base_tables.traceroute){:target="_blank"}
+* [SideStream]({{site.baseurl}}/tests/sidestream)
+  * SideStream collects TCP state information about completed TCP connections on a system.
+  * Sidestream data is processed by the M-Lab ETL Pipeline.
+  * More information is available on [Github](https://github.com/npad/sidestream){:target="_blank"}.
+  * [Sidestream Raw Data](https://console.developers.google.com/storage/browser/archive-measurement-lab/sidestream/){:target="_blank"} - [Sidestream BigQuery Dataset](https://bigquery.cloud.google.com/dataset/measurement-lab:sidestream){:target="_blank"}
+
 ## Data License and Citing M-Lab Data
 
 All data collected by M-Lab tests are available to the public without restriction under a [No Rights Reserved Creative Commons Zero Waiver](http://creativecommons.org/about/cc0){:target="_blank"}.

diff --git a/_pages/05-tests.md b/_pages/05-tests.md
@@ -29,16 +29,16 @@ grid-section:
     group-description: ""
     group-list-class: "l-grid l-3col"
     grid-items:
-      - link: "/tests/tcp-info/"
-        image: "tcpinfo.png"
-        img_attribution: "Created by Pravin Unagar from Noun Project"
-        heading: "TCP INFO"
-        desc: "Collects statistics about the TCP connections running on the M-Lab platform using tcp-info."
       - link: "/tests/pcap/"
         image: "pcap.png"
         img_attribution: "Created by Jo Santos from Noun Project"
         heading: "Packet Headers"
         desc: "Collects packet headers for all incoming TCP flows and saves each stream of packet captures into a per-stream .pcap file."
+      - link: "/tests/tcp-info/"
+        image: "tcpinfo.png"
+        img_attribution: "Created by Pravin Unagar from Noun Project"
+        heading: "TCP INFO"
+        desc: "Collects statistics about the TCP connections running on the M-Lab platform using tcp-info."
       - link: "/tests/traceroute/"
         image: "traceroute.png"
         img_attribution: "Created by Popular from Noun Project"