[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[tor-commits] [metrics-web/master] Remove fast-exit graphs.
commit c0a8102e08a9f3c1becb0f633f383a87c63ee166
Author: Karsten Loesing <karsten.loesing@xxxxxxx>
Date: Fri Jan 31 15:50:55 2014 +0100
Remove fast-exit graphs.
Keep stats/fast-exits.csv working for another month, just in case
somebody uses it. Unlikely, but let's be nice.
---
website/etc/web.xml | 6 --
website/rserve/graphs.R | 48 ----------------
.../metrics/web/graphs/RObjectGenerator.java | 2 -
website/web/WEB-INF/banner.jsp | 4 --
website/web/WEB-INF/fast-exits.jsp | 60 +++-----------------
website/web/WEB-INF/stats.jsp | 2 +
6 files changed, 10 insertions(+), 112 deletions(-)
diff --git a/website/etc/web.xml b/website/etc/web.xml
index 1a0e372..33ff390 100644
--- a/website/etc/web.xml
+++ b/website/etc/web.xml
@@ -210,12 +210,6 @@
<url-pattern>/connbidirect.png</url-pattern>
<url-pattern>/connbidirect.pdf</url-pattern>
<url-pattern>/connbidirect.svg</url-pattern>
- <url-pattern>/fast-exits.png</url-pattern>
- <url-pattern>/fast-exits.pdf</url-pattern>
- <url-pattern>/fast-exits.svg</url-pattern>
- <url-pattern>/almost-fast-exits.png</url-pattern>
- <url-pattern>/almost-fast-exits.pdf</url-pattern>
- <url-pattern>/almost-fast-exits.svg</url-pattern>
<url-pattern>/userstats-relay-country.png</url-pattern>
<url-pattern>/userstats-relay-country.pdf</url-pattern>
<url-pattern>/userstats-relay-country.svg</url-pattern>
diff --git a/website/rserve/graphs.R b/website/rserve/graphs.R
index bdeebe0..18d7734 100644
--- a/website/rserve/graphs.R
+++ b/website/rserve/graphs.R
@@ -716,54 +716,6 @@ plot_connbidirect <- function(start, end, path) {
ggsave(filename = path, width = 8, height = 5, dpi = 72)
}
-plot_fast_exits <- function(start, end, path) {
- f <- read.csv(paste("/srv/metrics.torproject.org/web/shared/stats/",
- "fast-exits.csv", sep = ""), stringsAsFactors = FALSE)
- f <- f[f$date >= start & f$date <= end, ]
- f <- data.frame(date = as.Date(f$date, "%Y-%m-%d"),
- relays = f$fastnum, P_exit = f$fastprob)
- r <- melt(f, id.vars = c("date"))
- r <- data.frame(r, type = ifelse(r$variable == "P_exit",
- "Total exit probability (in %)", "Number of relays"))
- ggplot(r, aes(x = date, y = value)) +
- geom_line(colour = "purple", size = 0.75) +
- facet_grid(type ~ ., scales = "free_y") +
- scale_x_date(name = "") +
- scale_y_continuous(name = "") +
- scale_colour_manual(values = c("purple", "orange")) +
- opts(title = paste("Fast exits (95+ Mbit/s configured bandwidth ",
- "rate,\n5000+ KB/s advertised bandwidth capacity,\n",
- "exit to ports 80, 443, 554, and 1755,\n",
- "at most 2 relays per /24 network)\n", sep = ""))
- ggsave(filename = path, width = 8, height = 6, dpi = 72)
-}
-
-plot_almost_fast_exits <- function(start, end, path) {
- f <- read.csv(paste("/srv/metrics.torproject.org/web/shared/stats/",
- "fast-exits.csv", sep = ""), stringsAsFactors = FALSE)
- f <- f[f$date >= start & f$date <= end, ]
- f <- melt(f, id.vars = c("date"))
- t <- data.frame(date = as.Date(f$date, "%Y-%m-%d"),
- var = ifelse(f$variable == 'fastnum' | f$variable == 'almostnum',
- "Number of relays", "Total exit probability (in %)"),
- variable = ifelse(f$variable == 'fastnum' |
- f$variable == 'fastprob', "fast", "almost fast"),
- value = floor(f$value))
- t <- data.frame(t, type = ifelse(t$variable == "fast",
- "fast exits (95+ Mbit/s, 5000+ KB/s, 80/443/554/1755, 2- per /24",
- paste("almost fast exits (80+ Mbit/s, 2000+ KB/s, 80/443,",
- "not in set of fast exits)")))
- ggplot(t, aes(x = date, y = value, colour = type)) +
- geom_line(size = 0.75) +
- facet_grid(var ~ ., scales = "free_y") +
- scale_x_date(name = "") +
- scale_y_continuous(name = "") +
- scale_colour_manual(name = "", values = c("orange", "purple")) +
- opts(title = "Relays almost meeting the fast-exit requirements",
- legend.position = "top")
- ggsave(filename = path, width = 8, height = 6, dpi = 72)
-}
-
plot_bandwidth_flags <- function(start, end, path) {
end <- min(end, as.character(Sys.Date() - 4))
b <- read.csv(paste("/srv/metrics.torproject.org/web/shared/stats/",
diff --git a/website/src/org/torproject/metrics/web/graphs/RObjectGenerator.java b/website/src/org/torproject/metrics/web/graphs/RObjectGenerator.java
index 314f38a..855c644 100644
--- a/website/src/org/torproject/metrics/web/graphs/RObjectGenerator.java
+++ b/website/src/org/torproject/metrics/web/graphs/RObjectGenerator.java
@@ -99,8 +99,6 @@ public class RObjectGenerator implements ServletContextListener {
this.availableGraphs.put("torperf-failures",
"start,end,source,filesize,filename");
this.availableGraphs.put("connbidirect", "start,end,filename");
- this.availableGraphs.put("fast-exits", "start,end,filename");
- this.availableGraphs.put("almost-fast-exits", "start,end,filename");
this.availableGraphs.put("userstats-relay-country",
"start,end,country,events,filename");
this.availableGraphs.put("userstats-bridge-country",
diff --git a/website/web/WEB-INF/banner.jsp b/website/web/WEB-INF/banner.jsp
index 6bff272..0633351 100644
--- a/website/web/WEB-INF/banner.jsp
+++ b/website/web/WEB-INF/banner.jsp
@@ -17,7 +17,6 @@
<%if (currentPage.endsWith("graphs.jsp") ||
currentPage.endsWith("network.jsp") ||
currentPage.endsWith("bubbles.jsp") ||
- currentPage.endsWith("fast-exits.jsp") ||
currentPage.endsWith("users.jsp") ||
currentPage.endsWith("performance.jsp")) {
%><br>
@@ -25,9 +24,6 @@
<a <%if (currentPage.endsWith("network.jsp")){
%>class="current"<%} else {%>href="/network.html"<%}
%>>Network</a>
- <a <%if (currentPage.endsWith("fast-exits.jsp")){
- %>class="current"<%} else {%>href="/fast-exits.html"<%}
- %>>Fast Exits</a>
<a <%if (currentPage.endsWith("bubbles.jsp")){
%>class="current"<%} else {%>href="/bubbles.html"<%}
%>>Bubbles</a>
diff --git a/website/web/WEB-INF/fast-exits.jsp b/website/web/WEB-INF/fast-exits.jsp
index 903c88c..a5310d0 100644
--- a/website/web/WEB-INF/fast-exits.jsp
+++ b/website/web/WEB-INF/fast-exits.jsp
@@ -15,63 +15,19 @@
<div class="main-column">
<h2>Tor Metrics Portal: Fast Exits</h2>
<br>
-<p>This page summarizes progress in operating 125 fast exits, which is a
+<p>This page summarized progress in operating 125 fast exits, which was a
deliverable for
<a href="https://trac.torproject.org/projects/tor/wiki/org/sponsors/SponsorJ";>SponsorJ</a>.</p>
-<br>
-<a name="fastexits"></a>
-<h3><a href="#fastexits" class="anchor">Relays meeting the fast-exit
-requirements</a></h3>
-<br>
-<img src="fast-exits.png${fast_exits_url}"
- width="576" height="432" alt="Fast exits graph">
-<form action="fast-exits.html#fastexits">
- <div class="formrow">
- <input type="hidden" name="graph" value="fast-exits">
- <p>
- <label>Start date (yyyy-mm-dd):</label>
- <input type="text" name="start" size="10"
- value="<c:choose><c:when test="${fn:length(fast_exits_start) == 0}">${default_start_date}</c:when><c:otherwise>${fast_exits_start[0]}</c:otherwise></c:choose>">
- <label>End date (yyyy-mm-dd):</label>
- <input type="text" name="end" size="10"
- value="<c:choose><c:when test="${fn:length(fast_exits_end) == 0}">${default_end_date}</c:when><c:otherwise>${fast_exits_end[0]}</c:otherwise></c:choose>">
- </p><p>
- <input class="submit" type="submit" value="Update graph">
- </p>
- </div>
-</form>
-<p>Download graph as
-<a href="fast-exits.pdf${fast_exits_url}">PDF</a> or
-<a href="fast-exits.svg${fast_exits_url}">SVG</a>.</p>
-<br>
+<p>This page is no longer maintained. You may be interested in the
+following similar graphs:</p>
-<a name="almostfastexits"></a>
-<h3><a href="#almostfastexits" class="anchor">Relays almost meeting the
-fast-exit requirements</a></h3>
-<br>
-<img src="almost-fast-exits.png${almost_fast_exits_url}"
- width="576" height="432" alt="Almost fast exits graph">
-<form action="fast-exits.html#almostfastexits">
- <div class="formrow">
- <input type="hidden" name="graph" value="almost-fast-exits">
- <p>
- <label>Start date (yyyy-mm-dd):</label>
- <input type="text" name="start" size="10"
- value="<c:choose><c:when test="${fn:length(almost_fast_exits_start) == 0}">${default_start_date}</c:when><c:otherwise>${almost_fast_exits_start[0]}</c:otherwise></c:choose>">
- <label>End date (yyyy-mm-dd):</label>
- <input type="text" name="end" size="10"
- value="<c:choose><c:when test="${fn:length(almost_fast_exits_end) == 0}">${default_end_date}</c:when><c:otherwise>${almost_fast_exits_end[0]}</c:otherwise></c:choose>">
- </p><p>
- <input class="submit" type="submit" value="Update graph">
- </p>
- </div>
-</form>
-<p>Download graph as
-<a href="almost-fast-exits.pdf${almost_fast_exits_url}">PDF</a> or
-<a href="almost-fast-exits.svg${almost_fast_exits_url}">SVG</a>.</p>
-<br>
+<ul>
+<li><a href="https://metrics.torproject.org/network.html#advbwdist-perc";>Advertised bandwidth distribution</a></li>
+<li><a href="https://metrics.torproject.org/network.html#advbwdist-relay";>Advertised bandwidth of n-th fastest relays</a></li>
+</ul>
+<p>This page may be removed in the future, so better not bookmark it.</p>
</div>
</div>
<div class="bottom" id="bottom">
diff --git a/website/web/WEB-INF/stats.jsp b/website/web/WEB-INF/stats.jsp
index bdbe4d9..0622e73 100644
--- a/website/web/WEB-INF/stats.jsp
+++ b/website/web/WEB-INF/stats.jsp
@@ -169,6 +169,8 @@ fastest relays.</li>
<h3><a href="#fast-exits" class="anchor">Relays meeting or almost meeting
fast-exit requirements</a></h3>
<br>
+<p><b><font color="red">This file has been deprecated on January 31, 2014
+and will not be available after March 1, 2014.</font></b></p>
<p>Statistics file <a href="stats/fast-exits.csv">fast-exits.csv</a>
contains the number of relays meeting or almost meeting fast-exit
requirements.
_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits