[or-cvs] [metrics-web/master] Update Tools page.

karsten at torproject.org karsten at torproject.org
Wed Sep 22 15:26:12 UTC 2010

Author: Karsten Loesing <karsten.loesing at gmx.net>
Date: Wed, 22 Sep 2010 17:21:00 +0200
Subject: Update Tools page.
Commit: 65b8d7d8e30a1505dc4629816f26ced8b5c27252

 war/WEB-INF/templates/research_tools.tpl.jsp |  110 +++++++++++++++++---------
 1 files changed, 73 insertions(+), 37 deletions(-)

diff --git a/war/WEB-INF/templates/research_tools.tpl.jsp b/war/WEB-INF/templates/research_tools.tpl.jsp
index 866d6ed..4f427fe 100644
--- a/war/WEB-INF/templates/research_tools.tpl.jsp
+++ b/war/WEB-INF/templates/research_tools.tpl.jsp
@@ -1,53 +1,68 @@
         <h2>Tor Metrics Portal: Tools</h2>
         <p>This page contains a collection of tools that can be used to
-        gather statistics as provided on the <a href="data.html">data</a>
+        gather statistics as provided on the <a href="data.html">Data</a>
         page and to process the resulting files to generate
         <a href="graphs.html">graphs</a>.</p>
-          <li><a href="#ernie">Metrics portal software</a></li>
+          <li><a href="#metrics-db">Metrics database</a></li>
+          <li><a href="#metrics-web">Metrics website</a></li>
           <li><a href="#dirarch">Directory-archive script</a></li>
           <li><a href="#bridgesan">Bridge descriptor sanitizer</a></li>
           <li><a href="#torperf">Torperf</a></li>
+          <li><a href="#exonerator">ExoneraTor</a></li>
+          <li><a href="#visitor">VisiTor</a></li>
-        <a id="ernie"/>
-        <h3>Metrics portal software</h3>
+        <a id="metrics-db"/>
+        <h3>Metrics database</h3>
-        <p>The <a href="graphs.html">graphs</a> on this website are
-        generated using ERNIE, the Enhanced R-based tor Network
-        Intelligence Engine (why ERNIE? because nobody liked BIRT; sorry
-        for misspelling Tor). ERNIE consists of Java code that parses
-        the various input data formats and writes CSV files and R code
-        that processes the CSV files to generate graphs. Of course, ERNIE
-        can be used to generate customized graphs without the need to put
-        them on a website. ERNIE can further import descriptors into a
-        database for further analysis and aggregate descriptors to make
-        tarballs.</p>
+        <p>The metrics database software is a Java application that parses
+        Tor's directory data and imports it into a PostgreSQL database.
+        This database can then be used to look up relays or perform
+        statistical analysis on the Tor network. The metrics database is
+        also used by this website.</p>
           <li>Browse the
-          <a href="http://gitweb.torproject.org//ernie.git">Git repository</a></li>
-          <li><tt>git clone git://git.torproject.org/git/ernie</tt></li>
+          <a href="https://gitweb.torproject.org/metrics-db.git/tree">Git
+          repository</a></li>
+          <li><tt>git clone git://git.torproject.org/metrics-db</tt></li>
+        <a id="metrics-web"/>
+        <h3>Metrics website</h3>
+        <br/>
+        <p>The metrics website software is a Tomcat application that
+        accesses the metrics database to generate this website. The
+        metrics website uses R to generate custom graphs on demand.</p>
+        <ul>
+          <li>Browse the
+          <a href="https://gitweb.torproject.org/metrics-web.git/tree">Git
+          repository</a></li>
+          <li><tt>git clone git://git.torproject.org/metrics-web</tt></li>
+        </ul>
+        <br/>
+        <a id="dirarch"/>
         <h3>Directory-archive script</h3>
         <p>The directory-archive script consists of a bunch of shell
         scripts that periodically download relay descriptors, sort them
         into a directory structure, and compile monthly tarballs. The
         tarballs are quite similar to the ones provided on the
-        <a href="data.html#relaydesc">data</a> page, with a few
+        <a href="data.html#relaydesc">Data</a> page, with a few
         exceptions: the provided tarballs are the result of combining two
         directory-archive script outputs, splitting v3 votes and v3
         consensuses into separate tarballs and replacing all colons in
-        filenames with dashes. The
-        <a href="#ernie">metrics portal software</a> contains similar
-        functionality.</p>
+        filenames with dashes. The <a href="#metrics-db">metrics database
+        software</a> contains similar functionality to the
+        directory-archive script.</p>
-          <li>Browse the <a href="http://gitweb.torproject.org//tor.git?a=tree;f=contrib/directory-archive;h=095a4216c06b5afc6274eddd39f0238067377fe4;hb=HEAD">contrib/directory-archive/</a> subdirectory in the Tor sources</a></li>
-          <li><tt>git clone git://git.torproject.org/git/tor</tt></li>
+          <li>Browse the <a href="https://gitweb.torproject.org/tor.git/tree/HEAD:/contrib/directory-archive">contrib/directory-archive/</a>
+          subdirectory in the Tor sources</a></li>
+          <li><tt>git clone git://git.torproject.org/tor</tt></li>
+        <a id="bridgesan"/>
         <h3>Bridge descriptor sanitizer</h3>
         <p>The bridge authority Tonga maintains a list of bridges in order
@@ -61,27 +76,48 @@
         information of bridges that must not be made public, or the
         purpose of bridges as non-public entry points into the Tor network
         would be obsolete. This script takes the half-hourly snapshots as
-        input, removesall possibly sensitive information from the
+        input, removes all possibly sensitive information from the
         descriptors, and puts out the sanitized bridge descriptors that
-        are safe to be published. The
-        <a href="#ernie">metrics portal software</a> contains similar
-        functionality and will soon make this bridge descriptor sanitizer
-        obsolete.</p>
+        are safe to be published. The <a href="#metrics-db">metrics
+        database software</a> contains similar functionality to the bridge
+        descriptor sanitizer.</p>
-          <li>Browse the
-          <a href="https://svn.torproject.org/svn/projects/archives/trunk/bridge-desc-sanitizer/">SVN repository</a></li>
-          <li><tt>svn co https://svn.torproject.org/svn/projects/archives/trunk/bridge-desc-sanitizer</tt></li>
+          <li>Browse the <a href="https://gitweb.torproject.org/metrics-utils.git/tree/HEAD:/bridge-desc-sanitizer">Git repository</a></li>
+          <li><tt>git clone git://git.torproject.org/metrics-utils</tt></li>
         <a id="torperf"/>
-        Torperf is a little tool that measures Tor's performance as users
-        experience it. Torperf uses a trivial SOCKS client to download
-        files of various sizes over the Tor network and notes how long
-        substeps take.</p>
+        <p>Torperf is a little tool that measures Tor's performance as
+        users experience it. Torperf uses a trivial SOCKS client to
+        download files of various sizes over the Tor network and notes how
+        long substeps take.</p>
-          <li>Browse the
-          <a href="https://svn.torproject.org/svn/torperf/trunk/">SVN repository</a></li>
-          <li><tt>svn co https://svn.torproject.org/svn/torperf/trunk torperf</tt></li>
+          <li>Browse the <a href="https://gitweb.torproject.org/torperf.git">Git repository</a></li>
+          <li><tt>git clone git://git.torproject.org/torperf</tt></li>
+        </ul>
+        <br/>
+        <a id="exonerator"/>
+        <h3>ExoneraTor</h3>
+        <br/>
+        <p>ExoneraTor parses the relay descriptor archives to answer the
+        question whether some IP address was a Tor relay. This script is
+        available as a Python and a Java version with equivalent
+        functionality. There is also a web version of
+        <a href="/exonerator.html">ExoneraTor</a> available.</p>
+        <ul>
+          <li>Browse the <a href="https://gitweb.torproject.org/metrics-utils.git/tree/HEAD:/exonerator">Git repository</a>
+          <li><tt>git clone git://git.torproject.org/metrics-utils</tt></li>
+        </ul>
+        <br/>
+        <a id="visitor"/>
+        <h3>VisiTor</h3>
+        <br/>
+        <p>VisiTor is a script that parses a web server log and the exit
+        list archives to tell how many of the requests come from Tor
+        users.</p>
+        <ul>
+          <li>Browse the <a href="https://gitweb.torproject.org/metrics-utils.git/tree/HEAD:/visitor">Git repository</a></li>
+          <li><tt>git clone git://git.torproject.org/metrics-utils</tt></li>

More information about the tor-commits mailing list