commit 50518618efc414695dfe5d6adc7db9c54145a79b Author: Karsten Loesing karsten.loesing@gmx.net Date: Thu Mar 12 16:19:23 2015 +0100
Make new /stats/hidserv.csv available. --- website/etc/web.xml | 1 + .../metrics/web/graphs/GraphsSubpagesServlet.java | 2 + .../metrics/web/research/ResearchStatsServlet.java | 1 + website/web/WEB-INF/hidserv-data.jsp | 64 ++++++++++++++++++++ website/web/WEB-INF/index.jsp | 8 +++ 5 files changed, 76 insertions(+)
diff --git a/website/etc/web.xml b/website/etc/web.xml index 25f4e7d..b9049ac 100644 --- a/website/etc/web.xml +++ b/website/etc/web.xml @@ -64,6 +64,7 @@ <url-pattern>/clients-data.html</url-pattern> <url-pattern>/torperf-data.html</url-pattern> <url-pattern>/connbidirect-data.html</url-pattern> + <url-pattern>/hidserv-data.html</url-pattern> </servlet-mapping>
<servlet> diff --git a/website/src/org/torproject/metrics/web/graphs/GraphsSubpagesServlet.java b/website/src/org/torproject/metrics/web/graphs/GraphsSubpagesServlet.java index 803969d..beb3e69 100644 --- a/website/src/org/torproject/metrics/web/graphs/GraphsSubpagesServlet.java +++ b/website/src/org/torproject/metrics/web/graphs/GraphsSubpagesServlet.java @@ -90,6 +90,8 @@ public class GraphsSubpagesServlet extends HttpServlet { "WEB-INF/torperf-data.jsp"); this.availableGraphsSubpages.put("connbidirect-data.html", "WEB-INF/connbidirect-data.jsp"); + this.availableGraphsSubpages.put("hidserv-data.html", + "WEB-INF/hidserv-data.jsp");
this.availableGraphsSubpageTables = new HashMap<String, String>(); this.availableGraphsSubpageTables.put("userstats-relay-table.html", diff --git a/website/src/org/torproject/metrics/web/research/ResearchStatsServlet.java b/website/src/org/torproject/metrics/web/research/ResearchStatsServlet.java index ef566f5..ea30c60 100644 --- a/website/src/org/torproject/metrics/web/research/ResearchStatsServlet.java +++ b/website/src/org/torproject/metrics/web/research/ResearchStatsServlet.java @@ -34,6 +34,7 @@ public class ResearchStatsServlet extends HttpServlet { this.availableStatisticsFiles.add("torperf"); this.availableStatisticsFiles.add("connbidirect"); this.availableStatisticsFiles.add("advbwdist"); + this.availableStatisticsFiles.add("hidserv"); }
public long getLastModified(HttpServletRequest request) { diff --git a/website/web/WEB-INF/hidserv-data.jsp b/website/web/WEB-INF/hidserv-data.jsp new file mode 100644 index 0000000..2d9bb31 --- /dev/null +++ b/website/web/WEB-INF/hidserv-data.jsp @@ -0,0 +1,64 @@ +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> +<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %> +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> +<html> +<head> + <title>Tor Metrics — Hidden-service statistics</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> — Hidden-service statistics</h2> +<br> +<p> +The following data file contains +<a href="about.html#hidden-service">hidden-service</a> statistics +gathered by a small subset of <a href="about.html#relay">relays</a> and +extrapolated to network totals. +Statistics include the amount of hidden-service traffic and the number +of hidden-service addresses in the network per day. +For more details on the extrapolation algorithm, see <a +href="https://blog.torproject.org/blog/some-statistics-about-onions%22%3Ethis +blog post</a> and <a +href="https://research.torproject.org/techreports/extrapolating-hidserv-stats-2015... +technical report</a>.</p> + +<p><b>Download as <a href="stats/hidserv.csv">CSV file</a>.</b></p> + +<p>The statistics file contains the following columns:</p> +<ul> +<li><b>date:</b> UTC date (YYYY-MM-DD) when relays or bridges have been +listed as running.</li> +<li><b>type:</b> Type of hidden-service statistic reported by relays and +extrapolated to network totals. +Examples include <b>"rend-relayed-cells"</b> for the number of cells on +rendezvous circuits observed by rendezvous points and +<b>"dir-onions-seen"</b> for the number of unique .onion addresses +observed by hidden-service directories.</li> +<li><b>wmean:</b> Weighted mean of extrapolated network totals.</li> +<li><b>wmedian:</b> Weighted median of extrapolated network totals.</li> +<li><b>wiqm:</b> Weighted interquartile mean of extrapolated network +totals.</li> +<li><b>frac:</b> Total network fraction of reported statistics.</li> +<li><b>stats:</b> Number of reported statistics with non-zero computed +network fraction.</li> +</ul> + +<h4>Related metrics</h4> +<ul> +<li><a href="relayflags.html">Graph: Relays with Exit, Fast, Guard, Stable, and HSDir flags</a></li> +</ul> + + </div> + </div> + <div class="bottom" id="bottom"> + <%@ include file="footer.jsp"%> + </div> +</body> +</html> + diff --git a/website/web/WEB-INF/index.jsp b/website/web/WEB-INF/index.jsp index 7aec371..29141e4 100644 --- a/website/web/WEB-INF/index.jsp +++ b/website/web/WEB-INF/index.jsp @@ -84,6 +84,14 @@ <li><a href="connbidirect-data.html">Data: Fraction of connections used uni-/bidirectionally</a></li> </ul>
+ <h3>Hidden services</h3> + <p>How many hidden services are there in the network, and how much + traffic do they handle?</p> + +<ul> +<li><a href="hidserv-data.html">Data: Hidden-service statistics</a></li> +</ul> + </div> </div> <div class="bottom" id="bottom">