commit 784296292460ab46e7984699f3b9fee44bca216d Author: Karsten Loesing <karsten.loesing@gmx.net> Date: Sun Jun 12 17:42:25 2016 +0200 Remove the "Tor Cloud bridges" graph. The Tor Cloud project was discontinued in May 2015, so there's no real point in keeping a graph that shows how the number of Tor Cloud bridges slowly goes down to zero. Implements #18769. --- website/etc/metrics.json | 27 ++------------------------- website/etc/web.xml | 4 ---- website/rserve/graphs.R | 30 ------------------------------ 3 files changed, 2 insertions(+), 59 deletions(-) diff --git a/website/etc/metrics.json b/website/etc/metrics.json index 03e8b85..1aac409 100644 --- a/website/etc/metrics.json +++ b/website/etc/metrics.json @@ -20,8 +20,7 @@ "related": [ "relayflags", "versions", - "platforms", - "cloudbridges" + "platforms" ] }, { @@ -97,27 +96,6 @@ ] }, { - "id": "cloudbridges", - "title": "Tor Cloud bridges", - "tags": [ - "Bridges" - ], - "type": "Graph", - "level": "Basic", - "description": "<p>The following graph shows the number of running <a href=\"about.html#bridge\">bridges</a> that are deployed in <a href=\"http://aws.amazon.com/ec2/\">Amazon's EC2 cloud</a> using images provided by <a href=\"https://cloud.torproject.org/\">Tor Cloud</a>. These bridges have, by default, a nickname that starts with \"ec2bridger\" which bridge operators usually leave unchanged.</p>", - "function": "plot_cloudbridges", - "parameters": [ - "start", - "end" - ], - "data": [ - "servers-data" - ], - "related": [ - "networksize" - ] - }, - { "id": "servers-data", "title": "Number of relays and bridges", "tags": [ @@ -143,8 +121,7 @@ "networksize", "relayflags", "versions", - "platforms", - "cloudbridges" + "platforms" ] }, { diff --git a/website/etc/web.xml b/website/etc/web.xml index 8587947..809cc41 100644 --- a/website/etc/web.xml +++ b/website/etc/web.xml @@ -29,7 +29,6 @@ <url-pattern>/relayflags.html</url-pattern> <url-pattern>/versions.html</url-pattern> <url-pattern>/platforms.html</url-pattern> - <url-pattern>/cloudbridges.html</url-pattern> <url-pattern>/bandwidth.html</url-pattern> <url-pattern>/bwhist-flags.html</url-pattern> <url-pattern>/bandwidth-flags.html</url-pattern> @@ -131,9 +130,6 @@ <url-pattern>/networksize.png</url-pattern> <url-pattern>/networksize.pdf</url-pattern> <url-pattern>/networksize.svg</url-pattern> - <url-pattern>/cloudbridges.png</url-pattern> - <url-pattern>/cloudbridges.pdf</url-pattern> - <url-pattern>/cloudbridges.svg</url-pattern> <url-pattern>/relaycountries.png</url-pattern> <url-pattern>/relaycountries.pdf</url-pattern> <url-pattern>/relaycountries.svg</url-pattern> diff --git a/website/rserve/graphs.R b/website/rserve/graphs.R index cfae47c..d304395 100644 --- a/website/rserve/graphs.R +++ b/website/rserve/graphs.R @@ -303,36 +303,6 @@ plot_networksize <- function(start, end, path) { ggsave(filename = path, width = 8, height = 5, dpi = 72) } -plot_cloudbridges <- function(start, end, path) { - end <- min(end, as.character(Sys.Date() - 2)) - s <- read.csv(paste("/srv/metrics.torproject.org/metrics/shared/stats/", - "servers.csv", sep = ""), stringsAsFactors = FALSE) - s <- s[s$date >= start & s$date <= end & s$flag == '' & - s$country == '' & s$version == '' & s$platform == '' & - s$ec2bridge == 't', ] - s <- data.frame(date = as.Date(s$date, "%Y-%m-%d"), bridges = s$bridges) - dates <- seq(from = as.Date(start, "%Y-%m-%d"), - to = as.Date(end, "%Y-%m-%d"), by="1 day") - missing <- setdiff(dates, s$date) - if (length(missing) > 0) - s <- rbind(s, - data.frame(date = as.Date(missing, origin = "1970-01-01"), - bridges = NA)) - date_breaks <- date_breaks( - as.numeric(max(as.Date(s$date, "%Y-%m-%d")) - - min(as.Date(s$date, "%Y-%m-%d")))) - ggplot(s, aes(x = as.Date(date, "%Y-%m-%d"), y = bridges)) + - geom_line(size = 1, colour = "green3") + - scale_x_date(name = paste("\nThe Tor Project - ", - "https://metrics.torproject.org/", sep = ""), - format = date_breaks$format, major = date_breaks$major, - minor = date_breaks$minor) + - scale_y_continuous(name = "", limits = c(0, - max(s$bridges, na.rm = TRUE))) + - opts(title = "Number of Tor Cloud bridges\n") - ggsave(filename = path, width = 8, height = 5, dpi = 72) -} - plot_relaycountries <- function(start, end, country, path) { end <- min(end, as.character(Sys.Date() - 2)) s <- read.csv(paste("/srv/metrics.torproject.org/metrics/shared/stats/",