[tor-commits] [metrics-web/master] Add link to the Uncharted visualization.

Fri Aug 7 15:20:59 UTC 2015

commit c7381f861a52955502115763e0e78fd829114d17
Author: Karsten Loesing <karsten.loesing at gmx.net>
Date:   Fri Aug 7 17:20:15 2015 +0200

    Add link to the Uncharted visualization.
---
 website/etc/web.xml                                |    1 +
 .../org/torproject/metrics/web/IndexServlet.java   |    3 ++
 .../metrics/web/graphs/GraphsSubpagesServlet.java  |    2 ++
 website/web/WEB-INF/uncharted-data-flow.jsp        |   36 ++++++++++++++++++++
 website/web/images/uncharted-data-flow.png         |  Bin 0 -> 136205 bytes
 5 files changed, 42 insertions(+)

diff --git a/website/etc/web.xml b/website/etc/web.xml
index 1cb3381..70580e3 100644
--- a/website/etc/web.xml
+++ b/website/etc/web.xml
@@ -68,6 +68,7 @@
     <url-pattern>/hidserv-dir-onions-seen.html</url-pattern>
     <url-pattern>/hidserv-rend-relayed-cells.html</url-pattern>
     <url-pattern>/hidserv-frac-reporting.html</url-pattern>
+    <url-pattern>/uncharted-data-flow.html</url-pattern>
   </servlet-mapping>
 
   <servlet>
diff --git a/website/src/org/torproject/metrics/web/IndexServlet.java b/website/src/org/torproject/metrics/web/IndexServlet.java
index 4a3e47c..63b0da6 100644
--- a/website/src/org/torproject/metrics/web/IndexServlet.java
+++ b/website/src/org/torproject/metrics/web/IndexServlet.java
@@ -163,6 +163,9 @@ public class IndexServlet extends HttpServlet {
     availableMetrics.add(new Metric("hidserv-data.html",
         "Hidden-service statistics", new String[] { "Hidden services" },
         "Data", "Advanced"));
+    availableMetrics.add(new Metric("uncharted-data-flow.html",
+        "Data flow in the Tor network", new String[] { "Relays",
+        "Hidden services", "Bandwidth" }, "Link", "Basic"));
   }
 
   public void doGet(HttpServletRequest request,
diff --git a/website/src/org/torproject/metrics/web/graphs/GraphsSubpagesServlet.java b/website/src/org/torproject/metrics/web/graphs/GraphsSubpagesServlet.java
index c2033d5..0192836 100644
--- a/website/src/org/torproject/metrics/web/graphs/GraphsSubpagesServlet.java
+++ b/website/src/org/torproject/metrics/web/graphs/GraphsSubpagesServlet.java
@@ -98,6 +98,8 @@ public class GraphsSubpagesServlet extends HttpServlet {
         "WEB-INF/hidserv-rend-relayed-cells.jsp");
     this.availableGraphsSubpages.put("hidserv-frac-reporting.html",
         "WEB-INF/hidserv-frac-reporting.jsp");
+    this.availableGraphsSubpages.put("uncharted-data-flow.html",
+        "WEB-INF/uncharted-data-flow.jsp");
 
     this.availableGraphsSubpageTables = new HashMap<String, String>();
     this.availableGraphsSubpageTables.put("userstats-relay-table.html",
diff --git a/website/web/WEB-INF/uncharted-data-flow.jsp b/website/web/WEB-INF/uncharted-data-flow.jsp
new file mode 100644
index 0000000..4b9e9b0
--- /dev/null
+++ b/website/web/WEB-INF/uncharted-data-flow.jsp
@@ -0,0 +1,36 @@
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
+<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+<head>
+  <title>Tor Metrics — Data flow in the Tor network</title>
+  <meta http-equiv="content-type" content="text/html; charset=ISO-8859-1">
+  <link href="/css/stylesheet-ltr.css" type="text/css" rel="stylesheet">
+  <link href="/images/favicon.ico" type="image/x-icon" rel="shortcut icon">
+</head>
+<body>
+  <div class="center">
+    <%@ include file="banner.jsp"%>
+    <div class="main-column">
+
+<h2><a href="/">Tor Metrics</a> — Data flow in the Tor network</h2>
+<br>
+<p>Uncharted made a visualization of data flow in the Tor network where
+they place each <a href="about.html#relay">relay</a> on a world map and
+illustrate traffic exchanged between relays as animated dots. More details
+can be found on the <a
+href="https://torflow.uncharted.software/">Uncharted website</a>.</p>
+
+<a href="https://torflow.uncharted.software/">
+<img src="images/uncharted-data-flow.png"
+     alt="Data flow in the Tor network">
+</a>
+
+    </div>
+  </div>
+  <div class="bottom" id="bottom">
+    <%@ include file="footer.jsp"%>
+  </div>
+</body>
+</html>
diff --git a/website/web/images/uncharted-data-flow.png b/website/web/images/uncharted-data-flow.png
new file mode 100644
index 0000000..ba8be66
Binary files /dev/null and b/website/web/images/uncharted-data-flow.png differ

