May 2018 - tor-commits - lists.torproject.org

[metrics-web/release] Fix path.
by karsten＠torproject.org 30 May '18

30 May '18

commit c78da5d11c7c055e6a7264190fca06a3dbb6231a Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Jan 31 20:29:56 2018 +0100 Fix path. Related to renaming packages/modules in #24294. --- build.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.xml b/build.xml index c9005d1..28a6a62 100644 --- a/build.xml +++ b/build.xml @@ -420,7 +420,7 @@ <fileset dir="${modulebase}/onionperf/stats" includes="*.csv" /> <fileset dir="${modulebase}/connbidirect/stats" includes="connbidirect2.csv" /> <fileset dir="${modulebase}/advbwdist/stats" includes="advbwdist.csv" /> - <fileset dir="${modulebase}/legacy/stats" includes="*.csv" /> + <fileset dir="${modulebase}/servers/stats" includes="*.csv" /> <fileset dir="${modulebase}/hidserv/stats" includes="hidserv.csv" /> <fileset dir="${modulebase}/clients/stats" includes="clients*.csv userstats-combined.csv" />

1 0

[metrics-web/release] Point out that OnionPerf measures v2 onion services.
by karsten＠torproject.org 30 May '18

30 May '18

commit a3dd5b4eba62f875dac934575ef671c63c4f5b10 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Thu Feb 8 17:06:41 2018 +0100 Point out that OnionPerf measures v2 onion services. --- src/main/resources/web/json/metrics.json | 4 ++-- src/main/resources/web/jsps/stats.jsp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/resources/web/json/metrics.json b/src/main/resources/web/json/metrics.json index 61d51b9..0b8aca7 100644 --- a/src/main/resources/web/json/metrics.json +++ b/src/main/resources/web/json/metrics.json @@ -348,7 +348,7 @@ "id": "torperf", "title": "Time to download files over Tor", "type": "Graph", - "description": "This graph shows overall performance when downloading static files of different sizes over Tor. The graph shows the range of measurements from first to third quartile, and highlights the median. The slowest and fastest quarter of measurements are omitted from the graph.", + "description": "This graph shows overall performance when downloading static files of different sizes over Tor, either from a server on the public internet or from a version 2 onion server. The graph shows the range of measurements from first to third quartile, and highlights the median. The slowest and fastest quarter of measurements are omitted from the graph.", "function": "plot_torperf", "parameters": [ "start", @@ -365,7 +365,7 @@ "id": "torperf-failures", "title": "Timeouts and failures of downloading files over Tor", "type": "Graph", - "description": "This graph shows the fraction of timeouts and failures when downloading static files of different sizes over Tor. A timeout occurs when a download does not complete within the scheduled time, in which case it is aborted in order not to overlap with the next scheduled download. A failure occurs when the download completes, but the response is smaller than expected.", + "description": "This graph shows the fraction of timeouts and failures when downloading static files of different sizes over Tor, either from a server on the public internet or from a version 2 onion server. A timeout occurs when a download does not complete within the scheduled time, in which case it is aborted in order not to overlap with the next scheduled download. A failure occurs when the download completes, but the response is smaller than expected.", "function": "plot_torperf_failures", "parameters": [ "start", diff --git a/src/main/resources/web/jsps/stats.jsp b/src/main/resources/web/jsps/stats.jsp index c8fef15..c224a06 100644 --- a/src/main/resources/web/jsps/stats.jsp +++ b/src/main/resources/web/jsps/stats.jsp @@ -401,8 +401,8 @@ measurements. If this column contains the empty string, all measurements are included, regardless of which service performed them.</li> <li>server: Either "public" if the request was made to a server on -the public internet, or "onion" if the request was made to an onion -server.</li> +the public internet, or "onion" if the request was made to a version 2 +onion server.</li> <li>q1: First quartile of time until receiving the last byte in milliseconds.</li>

1 0

[metrics-web/release] Update news.json to version 219 of doc/MetricsTimeline.
by karsten＠torproject.org 30 May '18

30 May '18

commit 544a9585af52ca4503bc95d4d15c5f4bedd2cc74 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Thu Feb 8 10:46:47 2018 +0100 Update news.json to version 219 of doc/MetricsTimeline. --- src/main/resources/web/json/news.json | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/resources/web/json/news.json b/src/main/resources/web/json/news.json index 8da74f9..6b8565a 100644 --- a/src/main/resources/web/json/news.json +++ b/src/main/resources/web/json/news.json @@ -2886,11 +2886,12 @@ "<OR>", "relay" ], - "description": "Huge increase in relay users (400k+).", + "description": "Huge increase in relay users (400k+). An anonymous contributor suggests that it may be a botnet, based on the large number of hosts with an open SMB port in the UAE.", "links": [ "<a href=\"https://metrics.torproject.org/userstats-relay-country.html?start=2017-01-0…">graph</a>", "<a href=\"https://lists.torproject.org/pipermail/metrics-team/2017-January/000284.htm…">metrics-team thread</a>", - "<a href=\"https://www.reddit.com/r/TOR/comments/5pbukk/united_arab_emirates_went_from…">reddit thread</a>" + "<a href=\"https://www.reddit.com/r/TOR/comments/5pbukk/united_arab_emirates_went_from…">reddit thread</a>", + "<a href=\"https://trac.torproject.org/projects/tor/ticket/25137#comment:10\">comment about botnet</a>" ], "unknown": true },

1 0

[metrics-web/release] Preserve UTF-8 encoding of table data.
by karsten＠torproject.org 30 May '18

30 May '18

commit 50ae3c4579709fca8e95bfcab136a21de5acfe70 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Feb 7 17:35:02 2018 +0100 Preserve UTF-8 encoding of table data. Fixes #25167. --- src/main/java/org/torproject/metrics/web/RObjectGenerator.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/torproject/metrics/web/RObjectGenerator.java b/src/main/java/org/torproject/metrics/web/RObjectGenerator.java index 06177bf..c7d0041 100644 --- a/src/main/java/org/torproject/metrics/web/RObjectGenerator.java +++ b/src/main/java/org/torproject/metrics/web/RObjectGenerator.java @@ -14,6 +14,7 @@ import java.io.File; import java.io.FileInputStream; import java.io.IOException; import java.io.InputStreamReader; +import java.nio.charset.StandardCharsets; import java.util.ArrayList; import java.util.Arrays; import java.util.HashMap; @@ -222,7 +223,7 @@ public class RObjectGenerator implements ServletContextListener { /* Write the table content to a map. */ List<Map<String, String>> result = new ArrayList<>(); try (BufferedReader br = new BufferedReader(new InputStreamReader( - new ByteArrayInputStream(tableBytes)))) { + new ByteArrayInputStream(tableBytes), StandardCharsets.UTF_8))) { String line = br.readLine(); if (line != null) { List<String> headers = new ArrayList<>(Arrays.asList(line.split(",")));

1 0

[metrics-web/release] Sleep rather than wait.
by karsten＠torproject.org 30 May '18

30 May '18

commit fd132b88376476b2cc844aa4b6ee4aecfbf616ac Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Jan 8 11:29:14 2018 +0100 Sleep rather than wait. Fixes #24824. --- .../java/org/torproject/metrics/web/CollectorDirectoryProvider.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/torproject/metrics/web/CollectorDirectoryProvider.java b/src/main/java/org/torproject/metrics/web/CollectorDirectoryProvider.java index ecf716c..2960599 100644 --- a/src/main/java/org/torproject/metrics/web/CollectorDirectoryProvider.java +++ b/src/main/java/org/torproject/metrics/web/CollectorDirectoryProvider.java @@ -40,11 +40,11 @@ public class CollectorDirectoryProvider implements Runnable { long waitingSinceMillis = System.currentTimeMillis(); do { try { - this.wait(200L); + Thread.sleep(200L); } catch (InterruptedException e) { /* Ignore. */ } - } while (null == index.get() + } while (null == this.index.get() && System.currentTimeMillis() < waitingSinceMillis + 10000L); } return this.index.get();

1 0

[metrics-web/release] Stop using \n to create whitespace around text.
by karsten＠torproject.org 30 May '18

30 May '18

commit ba6c9e2efdb238df0cdb2363d00de78322cfa4de Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri Feb 9 21:09:16 2018 +0100 Stop using \n to create whitespace around text. --- src/main/R/rserver/graphs.R | 74 +++++++++++++++++++++++++-------------------- 1 file changed, 42 insertions(+), 32 deletions(-) diff --git a/src/main/R/rserver/graphs.R b/src/main/R/rserver/graphs.R index b238713..440a691 100644 --- a/src/main/R/rserver/graphs.R +++ b/src/main/R/rserver/graphs.R @@ -273,13 +273,25 @@ formatter <- function(x, ...) { format(x, ..., scientific = FALSE, big.mark = ' ') } -theme_update(plot.title = element_text(hjust = 0.5), - plot.margin = margin(5.5, 11, 5.5, 5.5)) +theme_update( + # Make plot title centered, and leave some room to the plot. + plot.title = element_text(hjust = 0.5, margin = margin(b = 11)), + + # Leave a little more room to the right for long x axis labels. + plot.margin = margin(5.5, 11, 5.5, 5.5), + + # Leave some room between plot and x axis label, which we use for the + # copyright notice. + axis.title.x = element_text(margin = margin(t = 11)), + + # Leave some room between plot and y axis label. + axis.title.y = element_text(margin = margin(r = 11)) +) # Set the default line size of geom_line() to 1. update_geom_defaults("line", list(size = 1)) -copyright_notice = "\nThe Tor Project - https://metrics.torproject.org/" +copyright_notice = "The Tor Project - https://metrics.torproject.org/" plot_networksize <- function(start, end, path) { end <- min(end, as.character(Sys.Date() - 2)) @@ -310,7 +322,7 @@ plot_networksize <- function(start, end, path) { scale_y_continuous(name = "", limits = c(0, NA)) + scale_colour_hue("", breaks = c("relays", "bridges"), labels = c("Relays", "Bridges")) + - ggtitle("Number of relays\n") + ggtitle("Number of relays") ggsave(filename = path, width = 8, height = 5, dpi = 150) } @@ -347,7 +359,7 @@ plot_versions <- function(start, end, path) { scale_colour_manual(name = "Tor version", values = colours[colours$breaks %in% visible_versions, 2], breaks = visible_versions) + - ggtitle("Relay versions\n") + ggtitle("Relay versions") ggsave(filename = path, width = 8, height = 5, dpi = 150) } @@ -375,7 +387,7 @@ plot_platforms <- function(start, end, path) { breaks = c("Linux", "Darwin", "BSD", "Windows", "Other"), labels = c("Linux", "macOS", "BSD", "Windows", "Other"), values = c("#E69F00", "#56B4E9", "#009E73", "#0072B2", "#333333")) + - ggtitle("Relay platforms\n") + ggtitle("Relay platforms") ggsave(filename = path, width = 8, height = 5, dpi = 150) } @@ -515,7 +527,7 @@ plot_relayflags <- function(start, end, flags, path) { scale_colour_manual(name = "Relay flags", values = c("#E69F00", "#56B4E9", "#009E73", "#EE6A50", "#000000", "#0072B2"), breaks = flags, labels = flags) + - ggtitle("Number of relays with relay flags assigned\n") + ggtitle("Number of relays with relay flags assigned") ggsave(filename = path, width = 8, height = 5, dpi = 150) } @@ -651,7 +663,7 @@ plot_connbidirect <- function(start, end, path) { breaks = c("both", "write", "read"), labels = c("Both reading and writing", "Mostly writing", "Mostly reading")) + - ggtitle("Fraction of connections used uni-/bidirectionally\n") + + ggtitle("Fraction of connections used uni-/bidirectionally") + theme(legend.position = "top") ggsave(filename = path, width = 8, height = 5, dpi = 150) } @@ -734,11 +746,10 @@ plot_userstats <- function(start, end, node, variable, value, events, if (node == 'relay') { if (value != 'all') { u <- u[u$country == value, ] - title <- paste("Directly connecting users from ", - countryname(value), "\n", sep = "") + title <- paste("Directly connecting users from", countryname(value)) } else { u <- u[u$country == '', ] - title <- "Directly connecting users\n" + title <- "Directly connecting users" } u <- aggregate(list(lower = u$lower, upper = u$upper, users = u$clients), @@ -764,7 +775,7 @@ plot_userstats <- function(start, end, node, variable, value, events, by = list(date = as.Date(u$date, "%Y-%m-%d"), value = u$transport), FUN = sum) - title <- paste("Bridge users by transport\n") + title <- paste("Bridge users by transport") } else { u <- u[u$transport == value, ] u <- aggregate(list(lower = u$lower, upper = u$upper, @@ -772,17 +783,17 @@ plot_userstats <- function(start, end, node, variable, value, events, by = list(date = as.Date(u$date, "%Y-%m-%d"), value = u$transport), FUN = sum) - title <- paste("Bridge users using ", + title <- paste("Bridge users using", ifelse(value == '<??>', 'unknown pluggable transport(s)', ifelse(value == '<OR>', 'default OR protocol', ifelse(value == '!<OR>', 'any pluggable transport', ifelse(value == 'fte', 'FTE', ifelse(value == 'websocket', 'Flash proxy/websocket', - paste('transport', value)))))), "\n", sep = "") + paste('transport', value))))))) } } else if (variable == 'version') { u <- u[u$version == value, ] - title <- paste("Bridge users using IP", value, "\n", sep = "") + title <- paste("Bridge users using IP", value, sep = "") u <- aggregate(list(lower = u$lower, upper = u$upper, users = u$clients), by = list(date = as.Date(u$date, "%Y-%m-%d"), @@ -791,11 +802,10 @@ plot_userstats <- function(start, end, node, variable, value, events, } else { if (value != 'all') { u <- u[u$country == value, ] - title <- paste("Bridge users from ", countryname(value), - "\n", sep = "") + title <- paste("Bridge users from", countryname(value)) } else { u <- u[u$country == '' & u$transport == '' & u$version == '', ] - title <- "Bridge users\n" + title <- "Bridge users" } u <- aggregate(list(lower = u$lower, upper = u$upper, users = u$clients), @@ -928,11 +938,11 @@ plot_advbwdist_perc <- function(start, end, p, path) { labels = date_format(date_breaks$format), date_breaks = date_breaks$major, date_minor_breaks = date_breaks$minor) + - scale_y_continuous(name = "Advertised bandwidth in Gbit/s\n", + scale_y_continuous(name = "Advertised bandwidth in Gbit/s", limits = c(0, NA)) + scale_colour_hue(name = "Percentile", breaks = rev(levels(t$percentile))) + - ggtitle("Advertised bandwidth distribution\n") + ggtitle("Advertised bandwidth distribution") ggsave(filename = path, width = 8, height = 5, dpi = 150) } @@ -955,10 +965,10 @@ plot_advbwdist_relay <- function(start, end, n, path) { labels = date_format(date_breaks$format), date_breaks = date_breaks$major, date_minor_breaks = date_breaks$minor) + - scale_y_continuous(name = "Advertised bandwidth in Gbit/s\n", + scale_y_continuous(name = "Advertised bandwidth in Gbit/s", limits = c(0, NA)) + scale_colour_hue(name = "n", breaks = levels(t$relay)) + - ggtitle("Advertised bandwidth of n-th fastest relays\n") + ggtitle("Advertised bandwidth of n-th fastest relays") ggsave(filename = path, width = 8, height = 5, dpi = 150) } @@ -979,7 +989,7 @@ plot_hidserv_dir_onions_seen <- function(start, end, path) { date_breaks = date_breaks$major, date_minor_breaks = date_breaks$minor) + scale_y_continuous(name = "") + - ggtitle("Unique .onion addresses\n") + ggtitle("Unique .onion addresses") ggsave(filename = path, width = 8, height = 5, dpi = 150) } @@ -1002,7 +1012,7 @@ plot_hidserv_rend_relayed_cells <- function(start, end, path) { date_breaks = date_breaks$major, date_minor_breaks = date_breaks$minor) + scale_y_continuous(name = "") + - ggtitle("Onion-service traffic in Mbit/s\n") + ggtitle("Onion-service traffic in Mbit/s") ggsave(filename = path, width = 8, height = 5, dpi = 150) } @@ -1057,11 +1067,11 @@ plot_webstats_tb <- function(start, end, path) { labels = date_format(date_breaks$format), date_breaks = date_breaks$major, date_minor_breaks = date_breaks$minor) + - scale_y_continuous(name = 'Requests per day\n', labels = formatter, + scale_y_continuous(name = 'Requests per day', labels = formatter, limits = c(0, NA)) + theme(strip.text.y = element_text(angle = 0, hjust = 0, size = rel(1.5)), strip.background = element_rect(fill = NA)) + - ggtitle("Tor Browser downloads and updates\n") + ggtitle("Tor Browser downloads and updates") ggsave(filename = path, width = 8, height = 5, dpi = 150) } @@ -1080,14 +1090,14 @@ plot_webstats_tb_platform <- function(start, end, path) { labels = date_format(date_breaks$format), date_breaks = date_breaks$major, date_minor_breaks = date_breaks$minor) + - scale_y_continuous(name = 'Requests per day\n', labels = formatter, + scale_y_continuous(name = 'Requests per day', labels = formatter, limits = c(0, NA)) + scale_colour_hue(name = "Platform", breaks = c("w", "m", "l", "o", ""), labels = c("Windows", "macOS", "Linux", "Other", "Unknown")) + theme(strip.text.y = element_text(angle = 0, hjust = 0, size = rel(1.5)), strip.background = element_rect(fill = NA)) + - ggtitle("Tor Browser downloads by platform\n") + ggtitle("Tor Browser downloads by platform") ggsave(filename = path, width = 8, height = 5, dpi = 150) } @@ -1110,14 +1120,14 @@ plot_webstats_tb_locale <- function(start, end, path) { labels = date_format(date_breaks$format), date_breaks = date_breaks$major, date_minor_breaks = date_breaks$minor) + - scale_y_continuous(name = 'Requests per day\n', labels = formatter, + scale_y_continuous(name = 'Requests per day', labels = formatter, limits = c(0, NA)) + scale_colour_hue(name = "Locale", breaks = c(e$locale, "(other)"), labels = c(e$locale, "Other")) + theme(strip.text.y = element_text(angle = 0, hjust = 0, size = rel(1.5)), strip.background = element_rect(fill = NA)) + - ggtitle("Tor Browser downloads by locale\n") + ggtitle("Tor Browser downloads by locale") ggsave(filename = path, width = 8, height = 5, dpi = 150) } @@ -1139,11 +1149,11 @@ plot_webstats_tm <- function(start, end, path) { labels = date_format(date_breaks$format), date_breaks = date_breaks$major, date_minor_breaks = date_breaks$minor) + - scale_y_continuous(name = 'Requests per day\n', labels = formatter, + scale_y_continuous(name = 'Requests per day', labels = formatter, limits = c(0, NA)) + theme(strip.text.y = element_text(angle = 0, hjust = 0, size = rel(1.5)), strip.background = element_rect(fill = NA)) + - ggtitle("Tor Messenger downloads and updates\n") + ggtitle("Tor Messenger downloads and updates") ggsave(filename = path, width = 8, height = 5, dpi = 150) }

1 0

[metrics-web/release] Simplify setting the lower y axis limit to 0.
by karsten＠torproject.org 30 May '18

30 May '18

commit 73dd9973a5a8f65aec79764042e1ca587829d00f Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri Feb 9 20:38:43 2018 +0100 Simplify setting the lower y axis limit to 0. --- src/main/R/rserver/graphs.R | 64 +++++++++++++++++---------------------------- 1 file changed, 24 insertions(+), 40 deletions(-) diff --git a/src/main/R/rserver/graphs.R b/src/main/R/rserver/graphs.R index 2a055c2..c7f7d90 100644 --- a/src/main/R/rserver/graphs.R +++ b/src/main/R/rserver/graphs.R @@ -303,8 +303,7 @@ plot_networksize <- function(start, end, path) { labels = date_format(date_breaks$format), date_breaks = date_breaks$major, date_minor_breaks = date_breaks$minor) + - scale_y_continuous(name = "", limits = c(0, max(networksize$value, - na.rm = TRUE))) + + scale_y_continuous(name = "", limits = c(0, NA)) + scale_colour_hue("", breaks = c("relays", "bridges"), labels = c("Relays", "Bridges")) + ggtitle("Number of relays\n") @@ -341,8 +340,7 @@ plot_versions <- function(start, end, path) { labels = date_format(date_breaks$format), date_breaks = date_breaks$major, date_minor_breaks = date_breaks$minor) + - scale_y_continuous(name = "", - limits = c(0, max(versions$relays, na.rm = TRUE))) + + scale_y_continuous(name = "", limits = c(0, NA)) + scale_colour_manual(name = "Tor version", values = colours[colours$breaks %in% visible_versions, 2], breaks = visible_versions) + @@ -370,8 +368,7 @@ plot_platforms <- function(start, end, path) { labels = date_format(date_breaks$format), date_breaks = date_breaks$major, date_minor_breaks = date_breaks$minor) + - scale_y_continuous(name = "", - limits = c(0, max(platforms$value, na.rm = TRUE))) + + scale_y_continuous(name = "", limits = c(0, NA)) + scale_colour_manual(name = "Platform", breaks = c("Linux", "Darwin", "BSD", "Windows", "Other"), labels = c("Linux", "macOS", "BSD", "Windows", "Other"), @@ -401,8 +398,7 @@ plot_bandwidth <- function(start, end, path) { labels = date_format(date_breaks$format), date_breaks = date_breaks$major, date_minor_breaks = date_breaks$minor) + - scale_y_continuous(name = "Bandwidth (Gbit/s)", - limits = c(0, max(bandwidth$value, na.rm = TRUE) * 8 / 1e9)) + + scale_y_continuous(name = "Bandwidth (Gbit/s)", limits = c(0, NA)) + scale_colour_hue(name = "", h.start = 90, breaks = c("bwadv", "bwhist"), labels = c("Advertised bandwidth", "Bandwidth history")) + @@ -448,8 +444,7 @@ plot_bwhist_flags <- function(start, end, path) { labels = date_format(date_breaks$format), date_breaks = date_breaks$major, date_minor_breaks = date_breaks$minor) + - scale_y_continuous(name="Bandwidth (Gbit/s)", - limits = c(0, max(bw$value, na.rm = TRUE) * 8 / 1e9)) + + scale_y_continuous(name="Bandwidth (Gbit/s)", limits = c(0, NA)) + scale_colour_manual(name = "", values = c("#E69F00", "#56B4E9", "#009E73", "#0072B2")) + ggtitle("Bandwidth history by relay flags") + @@ -477,8 +472,7 @@ plot_dirbytes <- function(start, end, path) { labels = date_format(date_breaks$format), date_breaks = date_breaks$major, date_minor_breaks = date_breaks$minor) + - scale_y_continuous(name="Bandwidth (Gbit/s)", - limits = c(0, max(dir$value, na.rm = TRUE) * 8 / 1e9)) + + scale_y_continuous(name="Bandwidth (Gbit/s)", limits = c(0, NA)) + scale_colour_hue(name = "", breaks = c("dirwrite", "dirread"), labels = c("Written dir bytes", "Read dir bytes")) + @@ -519,8 +513,7 @@ plot_relayflags <- function(start, end, flags, path) { labels = date_format(date_breaks$format), date_breaks = date_breaks$major, date_minor_breaks = date_breaks$minor, limits = as.Date(c(start, end))) + - scale_y_continuous(name = "", limits = c(0, max(networksize$value, - na.rm = TRUE))) + + scale_y_continuous(name = "", limits = c(0, NA)) + scale_colour_manual(name = "Relay flags", values = c("#E69F00", "#56B4E9", "#009E73", "#EE6A50", "#000000", "#0072B2"), breaks = flags, labels = flags) + @@ -567,8 +560,7 @@ plot_torperf <- function(start, end, source, server, filesize, path) { labels = date_format(date_breaks$format), date_breaks = date_breaks$major, date_minor_breaks = date_breaks$minor) + - scale_y_continuous(name = "") + - expand_limits(y = 0) + + scale_y_continuous(name = "", limits = c(0, NA)) + scale_fill_manual(name = paste("Measured times on", ifelse(source == "all", "all sources", source), "per day"), breaks = c("line", "ribbon"), @@ -724,8 +716,7 @@ plot_bandwidth_flags <- function(start, end, path) { labels = date_format(date_breaks$format), date_breaks = date_breaks$major, date_minor_breaks = date_breaks$minor) + - scale_y_continuous(name="Bandwidth (Gbit/s)", - limits = c(0, max(bandwidth$value, na.rm = TRUE) * 8 / 1e9)) + + scale_y_continuous(name="Bandwidth (Gbit/s)", limits = c(0, NA)) + scale_colour_manual(name = "", values = c("#E69F00", "#D6C827", "#009E73", "#00C34F")) + ggtitle(paste("Advertised bandwidth and bandwidth history by", @@ -854,8 +845,7 @@ plot_userstats <- function(start, end, node, variable, value, events, labels = date_format(date_breaks$format), date_breaks = date_breaks$major, date_minor_breaks = date_breaks$minor) + - scale_y_continuous(name = "", labels = formatter) + - expand_limits(y = 0) + + scale_y_continuous(name = "", labels = formatter, limits = c(0, NA)) + ggtitle(title) if (length(value) > 1) { plot <- plot + @@ -904,8 +894,6 @@ plot_userstats_bridge_combined <- function(start, end, country, path) { by = list(transport = u$transport), FUN = sum) a <- a[order(a$mid, decreasing = TRUE)[1:top], ] u <- u[u$transport %in% a$transport, ] - max_y <- ifelse(length(na.omit(u$high)) == 0, 0, - max(u$high, na.rm = TRUE)) title <- paste("Bridge users by transport from ", countryname(country), sep = "") date_breaks <- date_breaks( @@ -919,8 +907,7 @@ plot_userstats_bridge_combined <- function(start, end, country, path) { labels = date_format(date_breaks$format), date_breaks = date_breaks$major, date_minor_breaks = date_breaks$minor) + - scale_y_continuous(name = "", limits = c(0, max_y), - labels = formatter) + + scale_y_continuous(name = "", limits = c(0, NA), labels = formatter) + scale_colour_hue(paste("Top-", top, " transports", sep = "")) + scale_fill_hue(paste("Top-", top, " transports", sep = "")) + ggtitle(title) + @@ -951,7 +938,7 @@ plot_advbwdist_perc <- function(start, end, p, path) { date_breaks = date_breaks$major, date_minor_breaks = date_breaks$minor) + scale_y_continuous(name = "Advertised bandwidth in Gbit/s\n", - limits = c(0, max(t$advbw, na.rm = TRUE))) + + limits = c(0, NA)) + scale_colour_hue(name = "Percentile", breaks = rev(levels(t$percentile))) + ggtitle("Advertised bandwidth distribution\n") @@ -979,7 +966,7 @@ plot_advbwdist_relay <- function(start, end, n, path) { date_breaks = date_breaks$major, date_minor_breaks = date_breaks$minor) + scale_y_continuous(name = "Advertised bandwidth in Gbit/s\n", - limits = c(0, max(t$advbw, na.rm = TRUE))) + + limits = c(0, NA)) + scale_colour_hue(name = "n", breaks = levels(t$relay)) + ggtitle("Advertised bandwidth of n-th fastest relays\n") ggsave(filename = path, width = 8, height = 5, dpi = 150) @@ -1078,14 +1065,14 @@ plot_webstats_tb <- function(start, end, path) { ggplot(d, aes(x = log_date, y = count)) + geom_point() + geom_line() + - expand_limits(y = 0) + facet_grid(request_type ~ ., scales = "free_y") + scale_x_date(name = paste("\nThe Tor Project - ", "https://metrics.torproject.org/", sep = ""), labels = date_format(date_breaks$format), date_breaks = date_breaks$major, date_minor_breaks = date_breaks$minor) + - scale_y_continuous(name = 'Requests per day\n', labels = formatter) + + scale_y_continuous(name = 'Requests per day\n', labels = formatter, + limits = c(0, NA)) + theme(strip.text.y = element_text(angle = 0, hjust = 0, size = rel(1.5)), strip.background = element_rect(fill = NA)) + ggtitle("Tor Browser downloads and updates\n") @@ -1103,13 +1090,13 @@ plot_webstats_tb_platform <- function(start, end, path) { ggplot(d, aes(x = log_date, y = count, colour = platform)) + geom_point() + geom_line() + - expand_limits(y = 0) + scale_x_date(name = paste("\nThe Tor Project - ", "https://metrics.torproject.org/", sep = ""), labels = date_format(date_breaks$format), date_breaks = date_breaks$major, date_minor_breaks = date_breaks$minor) + - scale_y_continuous(name = 'Requests per day\n', labels = formatter) + + scale_y_continuous(name = 'Requests per day\n', labels = formatter, + limits = c(0, NA)) + scale_colour_hue(name = "Platform", breaks = c("w", "m", "l", "o", ""), labels = c("Windows", "macOS", "Linux", "Other", "Unknown")) + @@ -1134,13 +1121,13 @@ plot_webstats_tb_locale <- function(start, end, path) { ggplot(d, aes(x = log_date, y = count, colour = locale)) + geom_point() + geom_line() + - expand_limits(y = 0) + scale_x_date(name = paste("\nThe Tor Project - ", "https://metrics.torproject.org/", sep = ""), labels = date_format(date_breaks$format), date_breaks = date_breaks$major, date_minor_breaks = date_breaks$minor) + - scale_y_continuous(name = 'Requests per day\n', labels = formatter) + + scale_y_continuous(name = 'Requests per day\n', labels = formatter, + limits = c(0, NA)) + scale_colour_hue(name = "Locale", breaks = c(e$locale, "(other)"), labels = c(e$locale, "Other")) + @@ -1163,14 +1150,14 @@ plot_webstats_tm <- function(start, end, path) { ggplot(d, aes(x = log_date, y = count)) + geom_point() + geom_line() + - expand_limits(y = 0) + facet_grid(request_type ~ ., scales = "free_y") + scale_x_date(name = paste("\nThe Tor Project - ", "https://metrics.torproject.org/", sep = ""), labels = date_format(date_breaks$format), date_breaks = date_breaks$major, date_minor_breaks = date_breaks$minor) + - scale_y_continuous(name = 'Requests per day\n', labels = formatter) + + scale_y_continuous(name = 'Requests per day\n', labels = formatter, + limits = c(0, NA)) + theme(strip.text.y = element_text(angle = 0, hjust = 0, size = rel(1.5)), strip.background = element_rect(fill = NA)) + ggtitle("Tor Messenger downloads and updates\n") @@ -1204,12 +1191,11 @@ plot_relays_ipv6 <- function(start, end, path) { labels = date_format(date_breaks$format), date_breaks = date_breaks$major, date_minor_breaks = date_breaks$minor) + - scale_y_continuous(name = "") + + scale_y_continuous(name = "", limits = c(0, NA)) + scale_colour_hue(name = "", h.start = 90, breaks = c("total", "announced", "reachable", "exiting"), labels = c("Total (IPv4) OR", "IPv6 announced OR", "IPv6 reachable OR", "IPv6 exiting")) + - expand_limits(y = 0) + ggtitle("Relays by IP version") + theme(legend.position = "top") ggsave(filename = path, width = 8, height = 5, dpi = 150) @@ -1239,11 +1225,10 @@ plot_bridges_ipv6 <- function(start, end, path) { labels = date_format(date_breaks$format), date_breaks = date_breaks$major, date_minor_breaks = date_breaks$minor) + - scale_y_continuous(name = "") + + scale_y_continuous(name = "", limits = c(0, NA)) + scale_colour_hue(name = "", h.start = 90, breaks = c("total", "announced"), labels = c("Total (IPv4) OR", "IPv6 announced OR")) + - expand_limits(y = 0) + ggtitle("Bridges by IP version") + theme(legend.position = "top") ggsave(filename = path, width = 8, height = 5, dpi = 150) @@ -1282,13 +1267,12 @@ plot_advbw_ipv6 <- function(start, end, path) { labels = date_format(date_breaks$format), date_breaks = date_breaks$major, date_minor_breaks = date_breaks$minor) + - scale_y_continuous(name = "Bandwidth (Gbit/s)") + + scale_y_continuous(name = "Bandwidth (Gbit/s)", limits = c(0, NA)) + scale_colour_hue(name = "", h.start = 90, breaks = c("total", "total_guard", "total_exit", "reachable_guard", "reachable_exit", "exiting"), labels = c("Total (IPv4) OR", "Guard total (IPv4)", "Exit total (IPv4)", "Reachable guard IPv6 OR", "Reachable exit IPv6 OR", "IPv6 exiting")) + - expand_limits(y = 0) + ggtitle("Advertised bandwidth by IP version") + theme(legend.position = "top") + guides(colour = guide_legend(nrow = 2, byrow = TRUE))

1 0

[metrics-web/release] Set the default line size of geom_line() to 1.
by karsten＠torproject.org 30 May '18

30 May '18

commit 43822357ea1ae16016565f422b97d96b2a9f5c6c Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri Feb 9 20:55:51 2018 +0100 Set the default line size of geom_line() to 1. Also change some line sizes from 0.75 to 1 for extra consistency. --- src/main/R/rserver/graphs.R | 37 ++++++++++++++++++++----------------- 1 file changed, 20 insertions(+), 17 deletions(-) diff --git a/src/main/R/rserver/graphs.R b/src/main/R/rserver/graphs.R index 10f89ce..b238713 100644 --- a/src/main/R/rserver/graphs.R +++ b/src/main/R/rserver/graphs.R @@ -276,6 +276,9 @@ formatter <- function(x, ...) { theme_update(plot.title = element_text(hjust = 0.5), plot.margin = margin(5.5, 11, 5.5, 5.5)) +# Set the default line size of geom_line() to 1. +update_geom_defaults("line", list(size = 1)) + copyright_notice = "\nThe Tor Project - https://metrics.torproject.org/" plot_networksize <- function(start, end, path) { @@ -299,7 +302,7 @@ plot_networksize <- function(start, end, path) { as.numeric(max(as.Date(networksize$date, "%Y-%m-%d")) - min(as.Date(networksize$date, "%Y-%m-%d")))) ggplot(networksize, aes(x = as.Date(date, "%Y-%m-%d"), y = value, - colour = variable)) + geom_line(size = 1) + + colour = variable)) + geom_line() + scale_x_date(name = copyright_notice, labels = date_format(date_breaks$format), date_breaks = date_breaks$major, @@ -335,7 +338,7 @@ plot_versions <- function(start, end, path) { min(as.Date(versions$date, "%Y-%m-%d")))) ggplot(versions, aes(x = as.Date(date, "%Y-%m-%d"), y = relays, colour = version)) + - geom_line(size = 1) + + geom_line() + scale_x_date(name = copyright_notice, labels = date_format(date_breaks$format), date_breaks = date_breaks$major, @@ -362,7 +365,7 @@ plot_platforms <- function(start, end, path) { min(as.Date(platforms$date, "%Y-%m-%d")))) ggplot(platforms, aes(x = as.Date(date, "%Y-%m-%d"), y = value, colour = variable)) + - geom_line(size = 1) + + geom_line() + scale_x_date(name = copyright_notice, labels = date_format(date_breaks$format), date_breaks = date_breaks$major, @@ -391,7 +394,7 @@ plot_bandwidth <- function(start, end, path) { min(as.Date(bandwidth$date, "%Y-%m-%d")))) ggplot(bandwidth, aes(x = as.Date(date, "%Y-%m-%d"), y = value * 8 / 1e9, colour = variable)) + - geom_line(size = 1) + + geom_line() + scale_x_date(name = copyright_notice, labels = date_format(date_breaks$format), date_breaks = date_breaks$major, @@ -436,7 +439,7 @@ plot_bwhist_flags <- function(start, end, path) { min(as.Date(bw$date, "%Y-%m-%d")))) ggplot(bw, aes(x = as.Date(date, "%Y-%m-%d"), y = value * 8 / 1e9, colour = variable)) + - geom_line(size = 1) + + geom_line() + scale_x_date(name = copyright_notice, labels = date_format(date_breaks$format), date_breaks = date_breaks$major, @@ -463,7 +466,7 @@ plot_dirbytes <- function(start, end, path) { min(as.Date(dir$date, "%Y-%m-%d")))) ggplot(dir, aes(x = as.Date(date, "%Y-%m-%d"), y = value * 8 / 1e9, colour = variable)) + - geom_line(size = 1) + + geom_line() + scale_x_date(name = copyright_notice, labels = date_format(date_breaks$format), date_breaks = date_breaks$major, @@ -503,7 +506,7 @@ plot_relayflags <- function(start, end, flags, path) { as.numeric(max(as.Date(end, "%Y-%m-%d")) - min(as.Date(networksize$date, "%Y-%m-%d")))) ggplot(networksize, aes(x = as.Date(date, "%Y-%m-%d"), y = value, - colour = as.factor(variable))) + geom_line(size = 1) + + colour = as.factor(variable))) + geom_line() + scale_x_date(name = copyright_notice, labels = date_format(date_breaks$format), date_breaks = date_breaks$major, @@ -702,7 +705,7 @@ plot_bandwidth_flags <- function(start, end, path) { levels = levels(bandwidth$variable)[c(3, 4, 1, 2)]) ggplot(bandwidth, aes(x = as.Date(date, "%Y-%m-%d"), y = value * 8 / 1e9, colour = variable)) + - geom_line(size = 1) + + geom_line() + scale_x_date(name = copyright_notice, labels = date_format(date_breaks$format), date_breaks = date_breaks$major, @@ -830,7 +833,7 @@ plot_userstats <- function(start, end, node, variable, value, events, colour = "firebrick2") } plot <- plot + - geom_line(size = 1) + + geom_line() + scale_x_date(name = copyright_notice, labels = date_format(date_breaks$format), date_breaks = date_breaks$major, @@ -920,7 +923,7 @@ plot_advbwdist_perc <- function(start, end, p, path) { min(as.Date(t$date, "%Y-%m-%d")))) ggplot(t, aes(x = as.Date(date), y = advbw, colour = percentile)) + facet_grid(variable ~ .) + - geom_line(size = 0.75) + + geom_line() + scale_x_date(name = copyright_notice, labels = date_format(date_breaks$format), date_breaks = date_breaks$major, @@ -947,7 +950,7 @@ plot_advbwdist_relay <- function(start, end, n, path) { min(as.Date(t$date, "%Y-%m-%d")))) ggplot(t, aes(x = as.Date(date), y = advbw, colour = relay)) + facet_grid(variable ~ .) + - geom_line(size = 0.75) + + geom_line() + scale_x_date(name = copyright_notice, labels = date_format(date_breaks$format), date_breaks = date_breaks$major, @@ -970,7 +973,7 @@ plot_hidserv_dir_onions_seen <- function(start, end, path) { date_breaks <- date_breaks(as.numeric(max(h$date, na.rm = TRUE) - min(h$date, na.rm = TRUE))) ggplot(h, aes(x = as.Date(date, origin = "1970-01-01"), y = wiqm)) + - geom_line(size = 0.75) + + geom_line() + scale_x_date(name = copyright_notice, labels = date_format(date_breaks$format), date_breaks = date_breaks$major, @@ -993,7 +996,7 @@ plot_hidserv_rend_relayed_cells <- function(start, end, path) { - min(h$date, na.rm = TRUE))) ggplot(h, aes(x = as.Date(date, origin = "1970-01-01"), y = wiqm * 8 * 512 / (86400 * 1e6))) + - geom_line(size = 0.75) + + geom_line() + scale_x_date(name = copyright_notice, labels = date_format(date_breaks$format), date_breaks = date_breaks$major, @@ -1017,7 +1020,7 @@ plot_hidserv_frac_reporting <- function(start, end, path) { - min(h$date, na.rm = TRUE))) ggplot(h, aes(x = as.Date(date, origin = "1970-01-01"), y = frac, colour = type)) + - geom_line(size = 0.75) + + geom_line() + geom_hline(yintercept = 0.01, linetype = 2) + scale_x_date(name = copyright_notice, labels = date_format(date_breaks$format), @@ -1165,7 +1168,7 @@ plot_relays_ipv6 <- function(start, end, path) { gather(total, announced, reachable, exiting, key = "category", value = "count") %>% ggplot(aes(x = valid_after_date, y = count, colour = category)) + - geom_line(size = 1) + + geom_line() + scale_x_date(name = copyright_notice, labels = date_format(date_breaks$format), date_breaks = date_breaks$major, @@ -1198,7 +1201,7 @@ plot_bridges_ipv6 <- function(start, end, path) { by = "1 day")), all = TRUE) %>% gather(total, announced, key = "category", value = "count") %>% ggplot(aes(x = valid_after_date, y = count, colour = category)) + - geom_line(size = 1) + + geom_line() + scale_x_date(name = copyright_notice, labels = date_format(date_breaks$format), date_breaks = date_breaks$major, @@ -1239,7 +1242,7 @@ plot_advbw_ipv6 <- function(start, end, path) { exiting, key = "category", value = "count") %>% ggplot(aes(x = valid_after_date, y = (count * 8) / 1e9, colour = category)) + - geom_line(size = 1) + + geom_line() + scale_x_date(name = copyright_notice, labels = date_format(date_breaks$format), date_breaks = date_breaks$major,

1 0

[metrics-web/release] Use a variable for the copyright notice.
by karsten＠torproject.org 30 May '18

30 May '18

commit cfd676fe60b4ab717bfa2303d55620b04bb0141f Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri Feb 9 20:51:40 2018 +0100 Use a variable for the copyright notice. --- src/main/R/rserver/graphs.R | 77 ++++++++++++++++----------------------------- 1 file changed, 27 insertions(+), 50 deletions(-) diff --git a/src/main/R/rserver/graphs.R b/src/main/R/rserver/graphs.R index c7f7d90..10f89ce 100644 --- a/src/main/R/rserver/graphs.R +++ b/src/main/R/rserver/graphs.R @@ -276,6 +276,8 @@ formatter <- function(x, ...) { theme_update(plot.title = element_text(hjust = 0.5), plot.margin = margin(5.5, 11, 5.5, 5.5)) +copyright_notice = "\nThe Tor Project - https://metrics.torproject.org/" + plot_networksize <- function(start, end, path) { end <- min(end, as.character(Sys.Date() - 2)) s <- read.csv(paste("/srv/metrics.torproject.org/metrics/shared/stats/", @@ -298,8 +300,7 @@ plot_networksize <- function(start, end, path) { min(as.Date(networksize$date, "%Y-%m-%d")))) ggplot(networksize, aes(x = as.Date(date, "%Y-%m-%d"), y = value, colour = variable)) + geom_line(size = 1) + - scale_x_date(name = paste("\nThe Tor Project - ", - "https://metrics.torproject.org/", sep = ""), + scale_x_date(name = copyright_notice, labels = date_format(date_breaks$format), date_breaks = date_breaks$major, date_minor_breaks = date_breaks$minor) + @@ -335,8 +336,7 @@ plot_versions <- function(start, end, path) { ggplot(versions, aes(x = as.Date(date, "%Y-%m-%d"), y = relays, colour = version)) + geom_line(size = 1) + - scale_x_date(name = paste("\nThe Tor Project - ", - "https://metrics.torproject.org/", sep = ""), + scale_x_date(name = copyright_notice, labels = date_format(date_breaks$format), date_breaks = date_breaks$major, date_minor_breaks = date_breaks$minor) + @@ -363,8 +363,7 @@ plot_platforms <- function(start, end, path) { ggplot(platforms, aes(x = as.Date(date, "%Y-%m-%d"), y = value, colour = variable)) + geom_line(size = 1) + - scale_x_date(name = paste("\nThe Tor Project - ", - "https://metrics.torproject.org/", sep = ""), + scale_x_date(name = copyright_notice, labels = date_format(date_breaks$format), date_breaks = date_breaks$major, date_minor_breaks = date_breaks$minor) + @@ -393,8 +392,7 @@ plot_bandwidth <- function(start, end, path) { ggplot(bandwidth, aes(x = as.Date(date, "%Y-%m-%d"), y = value * 8 / 1e9, colour = variable)) + geom_line(size = 1) + - scale_x_date(name = paste("\nThe Tor Project - ", - "https://metrics.torproject.org/", sep = ""), + scale_x_date(name = copyright_notice, labels = date_format(date_breaks$format), date_breaks = date_breaks$major, date_minor_breaks = date_breaks$minor) + @@ -439,8 +437,7 @@ plot_bwhist_flags <- function(start, end, path) { ggplot(bw, aes(x = as.Date(date, "%Y-%m-%d"), y = value * 8 / 1e9, colour = variable)) + geom_line(size = 1) + - scale_x_date(name = paste("\nThe Tor Project - ", - "https://metrics.torproject.org/", sep = ""), + scale_x_date(name = copyright_notice, labels = date_format(date_breaks$format), date_breaks = date_breaks$major, date_minor_breaks = date_breaks$minor) + @@ -467,8 +464,7 @@ plot_dirbytes <- function(start, end, path) { ggplot(dir, aes(x = as.Date(date, "%Y-%m-%d"), y = value * 8 / 1e9, colour = variable)) + geom_line(size = 1) + - scale_x_date(name = paste("\nThe Tor Project - ", - "https://metrics.torproject.org/", sep = ""), + scale_x_date(name = copyright_notice, labels = date_format(date_breaks$format), date_breaks = date_breaks$major, date_minor_breaks = date_breaks$minor) + @@ -508,8 +504,7 @@ plot_relayflags <- function(start, end, flags, path) { min(as.Date(networksize$date, "%Y-%m-%d")))) ggplot(networksize, aes(x = as.Date(date, "%Y-%m-%d"), y = value, colour = as.factor(variable))) + geom_line(size = 1) + - scale_x_date(name = paste("\nThe Tor Project - ", - "https://metrics.torproject.org/", sep = ""), + scale_x_date(name = copyright_notice, labels = date_format(date_breaks$format), date_breaks = date_breaks$major, date_minor_breaks = date_breaks$minor, limits = as.Date(c(start, end))) + @@ -555,8 +550,7 @@ plot_torperf <- function(start, end, source, server, filesize, path) { geom_line(colour = colour, size = 0.75) + geom_ribbon(data = torperf, aes(x = date, ymin = q1/1e3, ymax = q3/1e3, fill = "ribbon")) + - scale_x_date(name = paste("\nThe Tor Project - ", - "https://metrics.torproject.org/", sep = ""), + scale_x_date(name = copyright_notice, labels = date_format(date_breaks$format), date_breaks = date_breaks$major, date_minor_breaks = date_breaks$minor) + @@ -608,8 +602,7 @@ plot_torperf_failures <- function(start, end, source, server, filesize, path) { ggplot(torperf, aes(x = as.Date(date, "%Y-%m-%d"), y = value, colour = variable)) + geom_point(size = 2) + - scale_x_date(name = paste("\nThe Tor Project - ", - "https://metrics.torproject.org/", sep = ""), + scale_x_date(name = copyright_notice, labels = date_format(date_breaks$format), date_breaks = date_breaks$major, date_minor_breaks = date_breaks$minor) + @@ -642,8 +635,7 @@ plot_connbidirect <- function(start, end, path) { geom_line(size = 0.75) + geom_ribbon(aes(x = date, ymin = X0.25, ymax = X0.75, fill = direction), alpha = 0.5, show_guide = FALSE) + - scale_x_date(name = paste("\nThe Tor Project - ", - "https://metrics.torproject.org/", sep = ""), + scale_x_date(name = copyright_notice, labels = date_format(date_breaks$format), date_breaks = date_breaks$major, date_minor_breaks = date_breaks$minor) + @@ -711,8 +703,7 @@ plot_bandwidth_flags <- function(start, end, path) { ggplot(bandwidth, aes(x = as.Date(date, "%Y-%m-%d"), y = value * 8 / 1e9, colour = variable)) + geom_line(size = 1) + - scale_x_date(name = paste("\nThe Tor Project - ", - "https://metrics.torproject.org/", sep = ""), + scale_x_date(name = copyright_notice, labels = date_format(date_breaks$format), date_breaks = date_breaks$major, date_minor_breaks = date_breaks$minor) + @@ -840,8 +831,7 @@ plot_userstats <- function(start, end, node, variable, value, events, } plot <- plot + geom_line(size = 1) + - scale_x_date(name = paste("\nThe Tor Project - ", - "https://metrics.torproject.org/", sep = ""), + scale_x_date(name = copyright_notice, labels = date_format(date_breaks$format), date_breaks = date_breaks$major, date_minor_breaks = date_breaks$minor) + @@ -902,8 +892,7 @@ plot_userstats_bridge_combined <- function(start, end, country, path) { ggplot(u, aes(x = as.Date(date), ymin = low, ymax = high, colour = transport, fill = transport)) + geom_ribbon(alpha = 0.5, size = 0.5) + - scale_x_date(name = paste("\nThe Tor Project - ", - "https://metrics.torproject.org/", sep = ""), + scale_x_date(name = copyright_notice, labels = date_format(date_breaks$format), date_breaks = date_breaks$major, date_minor_breaks = date_breaks$minor) + @@ -932,8 +921,7 @@ plot_advbwdist_perc <- function(start, end, p, path) { ggplot(t, aes(x = as.Date(date), y = advbw, colour = percentile)) + facet_grid(variable ~ .) + geom_line(size = 0.75) + - scale_x_date(name = paste("\nThe Tor Project - ", - "https://metrics.torproject.org/", sep = ""), + scale_x_date(name = copyright_notice, labels = date_format(date_breaks$format), date_breaks = date_breaks$major, date_minor_breaks = date_breaks$minor) + @@ -960,8 +948,7 @@ plot_advbwdist_relay <- function(start, end, n, path) { ggplot(t, aes(x = as.Date(date), y = advbw, colour = relay)) + facet_grid(variable ~ .) + geom_line(size = 0.75) + - scale_x_date(name = paste("\nThe Tor Project - ", - "https://metrics.torproject.org/", sep = ""), + scale_x_date(name = copyright_notice, labels = date_format(date_breaks$format), date_breaks = date_breaks$major, date_minor_breaks = date_breaks$minor) + @@ -984,8 +971,7 @@ plot_hidserv_dir_onions_seen <- function(start, end, path) { - min(h$date, na.rm = TRUE))) ggplot(h, aes(x = as.Date(date, origin = "1970-01-01"), y = wiqm)) + geom_line(size = 0.75) + - scale_x_date(name = paste("\nThe Tor Project - ", - "https://metrics.torproject.org/", sep = ""), + scale_x_date(name = copyright_notice, labels = date_format(date_breaks$format), date_breaks = date_breaks$major, date_minor_breaks = date_breaks$minor) + @@ -1008,8 +994,7 @@ plot_hidserv_rend_relayed_cells <- function(start, end, path) { ggplot(h, aes(x = as.Date(date, origin = "1970-01-01"), y = wiqm * 8 * 512 / (86400 * 1e6))) + geom_line(size = 0.75) + - scale_x_date(name = paste("\nThe Tor Project - ", - "https://metrics.torproject.org/", sep = ""), + scale_x_date(name = copyright_notice, labels = date_format(date_breaks$format), date_breaks = date_breaks$major, date_minor_breaks = date_breaks$minor) + @@ -1034,8 +1019,7 @@ plot_hidserv_frac_reporting <- function(start, end, path) { colour = type)) + geom_line(size = 0.75) + geom_hline(yintercept = 0.01, linetype = 2) + - scale_x_date(name = paste("\nThe Tor Project - ", - "https://metrics.torproject.org/", sep = ""), + scale_x_date(name = copyright_notice, labels = date_format(date_breaks$format), date_breaks = date_breaks$major, date_minor_breaks = date_breaks$minor) + @@ -1066,8 +1050,7 @@ plot_webstats_tb <- function(start, end, path) { geom_point() + geom_line() + facet_grid(request_type ~ ., scales = "free_y") + - scale_x_date(name = paste("\nThe Tor Project - ", - "https://metrics.torproject.org/", sep = ""), + scale_x_date(name = copyright_notice, labels = date_format(date_breaks$format), date_breaks = date_breaks$major, date_minor_breaks = date_breaks$minor) + @@ -1090,8 +1073,7 @@ plot_webstats_tb_platform <- function(start, end, path) { ggplot(d, aes(x = log_date, y = count, colour = platform)) + geom_point() + geom_line() + - scale_x_date(name = paste("\nThe Tor Project - ", - "https://metrics.torproject.org/", sep = ""), + scale_x_date(name = copyright_notice, labels = date_format(date_breaks$format), date_breaks = date_breaks$major, date_minor_breaks = date_breaks$minor) + @@ -1121,8 +1103,7 @@ plot_webstats_tb_locale <- function(start, end, path) { ggplot(d, aes(x = log_date, y = count, colour = locale)) + geom_point() + geom_line() + - scale_x_date(name = paste("\nThe Tor Project - ", - "https://metrics.torproject.org/", sep = ""), + scale_x_date(name = copyright_notice, labels = date_format(date_breaks$format), date_breaks = date_breaks$major, date_minor_breaks = date_breaks$minor) + @@ -1151,8 +1132,7 @@ plot_webstats_tm <- function(start, end, path) { geom_point() + geom_line() + facet_grid(request_type ~ ., scales = "free_y") + - scale_x_date(name = paste("\nThe Tor Project - ", - "https://metrics.torproject.org/", sep = ""), + scale_x_date(name = copyright_notice, labels = date_format(date_breaks$format), date_breaks = date_breaks$major, date_minor_breaks = date_breaks$minor) + @@ -1186,8 +1166,7 @@ plot_relays_ipv6 <- function(start, end, path) { value = "count") %>% ggplot(aes(x = valid_after_date, y = count, colour = category)) + geom_line(size = 1) + - scale_x_date(name = paste("\nThe Tor Project - ", - "https://metrics.torproject.org/", sep = ""), + scale_x_date(name = copyright_notice, labels = date_format(date_breaks$format), date_breaks = date_breaks$major, date_minor_breaks = date_breaks$minor) + @@ -1220,8 +1199,7 @@ plot_bridges_ipv6 <- function(start, end, path) { gather(total, announced, key = "category", value = "count") %>% ggplot(aes(x = valid_after_date, y = count, colour = category)) + geom_line(size = 1) + - scale_x_date(name = paste("\nThe Tor Project - ", - "https://metrics.torproject.org/", sep = ""), + scale_x_date(name = copyright_notice, labels = date_format(date_breaks$format), date_breaks = date_breaks$major, date_minor_breaks = date_breaks$minor) + @@ -1262,8 +1240,7 @@ plot_advbw_ipv6 <- function(start, end, path) { ggplot(aes(x = valid_after_date, y = (count * 8) / 1e9, colour = category)) + geom_line(size = 1) + - scale_x_date(name = paste("\nThe Tor Project - ", - "https://metrics.torproject.org/", sep = ""), + scale_x_date(name = copyright_notice, labels = date_format(date_breaks$format), date_breaks = date_breaks$major, date_minor_breaks = date_breaks$minor) +

1 0

[metrics-web/release] Use variables for paths.
by karsten＠torproject.org 30 May '18

30 May '18

commit ee0218d8e3dfc5163ef74e443ecfbcfac293977f Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri Feb 9 22:00:59 2018 +0100 Use variables for paths. --- src/main/R/rserver/graphs.R | 93 ++++++++++++++++++++++----------------------- 1 file changed, 46 insertions(+), 47 deletions(-) diff --git a/src/main/R/rserver/graphs.R b/src/main/R/rserver/graphs.R index 768b776..9a37d88 100644 --- a/src/main/R/rserver/graphs.R +++ b/src/main/R/rserver/graphs.R @@ -293,9 +293,13 @@ update_geom_defaults("line", list(size = 1)) copyright_notice = "The Tor Project - https://metrics.torproject.org/" +stats_dir = "/srv/metrics.torproject.org/metrics/shared/stats/" + +rdata_dir = "/srv/metrics.torproject.org/metrics/shared/RData/" + plot_networksize <- function(start, end, path) { - s <- read.csv(paste("/srv/metrics.torproject.org/metrics/shared/stats/", - "servers.csv", sep = ""), stringsAsFactors = FALSE) + s <- read.csv(paste(stats_dir, "servers.csv", sep = ""), + stringsAsFactors = FALSE) s <- s[s$date >= start & s$date <= end & s$flag == '' & s$country == '' & s$version == '' & s$platform == '' & s$ec2bridge == '', ] @@ -326,8 +330,8 @@ plot_networksize <- function(start, end, path) { } plot_versions <- function(start, end, path) { - s <- read.csv(paste("/srv/metrics.torproject.org/metrics/shared/stats/", - "servers.csv", sep = ""), stringsAsFactors = FALSE) + s <- read.csv(paste(stats_dir, "servers.csv", sep = ""), + stringsAsFactors = FALSE) s <- s[s$date >= start & s$date <= end & s$flag == '' & s$country == '' & s$version != '' & s$platform == '' & s$ec2bridge == '', ] @@ -362,8 +366,8 @@ plot_versions <- function(start, end, path) { } plot_platforms <- function(start, end, path) { - s <- read.csv(paste("/srv/metrics.torproject.org/metrics/shared/stats/", - "servers.csv", sep = ""), stringsAsFactors = FALSE) + s <- read.csv(paste(stats_dir, "servers.csv", sep = ""), + stringsAsFactors = FALSE) s <- s[s$date >= start & s$date <= end & s$flag == '' & s$country == '' & s$version == '' & s$platform != '' & s$ec2bridge == '', ] @@ -389,8 +393,8 @@ plot_platforms <- function(start, end, path) { } plot_bandwidth <- function(start, end, path) { - b <- read.csv(paste("/srv/metrics.torproject.org/metrics/shared/stats/", - "bandwidth.csv", sep = ""), stringsAsFactors = FALSE) + b <- read.csv(paste(stats_dir, "bandwidth.csv", sep = ""), + stringsAsFactors = FALSE) b <- b[b$date >= start & b$date <= end & b$isexit == '' & b$isguard == '', ] b <- data.frame(date = as.Date(b$date, "%Y-%m-%d"), @@ -417,8 +421,8 @@ plot_bandwidth <- function(start, end, path) { } plot_bwhist_flags <- function(start, end, path) { - b <- read.csv(paste("/srv/metrics.torproject.org/metrics/shared/stats/", - "bandwidth.csv", sep = ""), stringsAsFactors = FALSE) + b <- read.csv(paste(stats_dir, "bandwidth.csv", sep = ""), + stringsAsFactors = FALSE) b <- b[b$date >= start & b$date <= end & b$isexit != '' & b$isguard != '', ] bw <- data.frame(date = as.Date(b$date, "%Y-%m-%d"), @@ -460,8 +464,8 @@ plot_bwhist_flags <- function(start, end, path) { } plot_dirbytes <- function(start, end, path) { - b <- read.csv(paste("/srv/metrics.torproject.org/metrics/shared/stats/", - "bandwidth.csv", sep = ""), stringsAsFactors = FALSE) + b <- read.csv(paste(stats_dir, "bandwidth.csv", sep = ""), + stringsAsFactors = FALSE) b <- b[b$date >= start & b$date <= end & b$isexit == '' & b$isguard == '', ] b <- data.frame(date = as.Date(b$date, "%Y-%m-%d"), @@ -487,8 +491,8 @@ plot_dirbytes <- function(start, end, path) { } plot_relayflags <- function(start, end, flags, path) { - s <- read.csv(paste("/srv/metrics.torproject.org/metrics/shared/stats/", - "servers.csv", sep = ""), stringsAsFactors = FALSE) + s <- read.csv(paste(stats_dir, "servers.csv", sep = ""), + stringsAsFactors = FALSE) s <- s[s$date >= start & s$date <= end & s$country == '' & s$version == '' & s$platform == '' & s$ec2bridge == '', ] s <- data.frame(date = as.Date(s$date, "%Y-%m-%d"), @@ -527,8 +531,8 @@ plot_relayflags <- function(start, end, flags, path) { plot_torperf <- function(start, end, source, server, filesize, path) { filesizeVal <- ifelse(filesize == '50kb', 50 * 1024, ifelse(filesize == '1mb', 1024 * 1024, 5 * 1024 * 1024)) - t <- read.csv(paste("/srv/metrics.torproject.org/metrics/shared/stats/", - "torperf-1.1.csv", sep = ""), stringsAsFactors = FALSE) + t <- read.csv(paste(stats_dir, "torperf-1.1.csv", sep = ""), + stringsAsFactors = FALSE) known_sources <- c("all", unique(t[t$source != "", "source"])) colours <- data.frame(source = known_sources, colour = brewer.pal(length(known_sources), "Paired"), @@ -576,8 +580,8 @@ plot_torperf <- function(start, end, source, server, filesize, path) { plot_torperf_failures <- function(start, end, source, server, filesize, path) { filesizeVal <- ifelse(filesize == '50kb', 50 * 1024, ifelse(filesize == '1mb', 1024 * 1024, 5 * 1024 * 1024)) - t <- read.csv(paste("/srv/metrics.torproject.org/metrics/shared/stats/", - "torperf-1.1.csv", sep = ""), stringsAsFactors = FALSE) + t <- read.csv(paste(stats_dir, "torperf-1.1.csv", sep = ""), + stringsAsFactors = FALSE) t <- t[t$date >= start & t$date <= end & t$filesize == filesizeVal & t$source == ifelse(source == 'all', '', source) & t$server == server, ] @@ -624,8 +628,8 @@ plot_torperf_failures <- function(start, end, source, server, filesize, path) { } plot_connbidirect <- function(start, end, path) { - c <- read.csv(paste("/srv/metrics.torproject.org/metrics/shared/stats/", - "connbidirect2.csv", sep = ""), stringsAsFactors = FALSE) + c <- read.csv(paste(stats_dir, "connbidirect2.csv", sep = ""), + stringsAsFactors = FALSE) c <- c[c$date >= start & c$date <= end, ] c <- data.frame(date = as.Date(c$date), direction = factor(c$direction, @@ -659,8 +663,8 @@ plot_connbidirect <- function(start, end, path) { } plot_bandwidth_flags <- function(start, end, path) { - b <- read.csv(paste("/srv/metrics.torproject.org/metrics/shared/stats/", - "bandwidth.csv", sep = ""), stringsAsFactors = FALSE) + b <- read.csv(paste(stats_dir, "bandwidth.csv", sep = ""), + stringsAsFactors = FALSE) b <- b[b$date >= start & b$date <= end & b$isexit != '' & b$isguard != '', ] b <- data.frame(date = as.Date(b$date, "%Y-%m-%d"), @@ -722,8 +726,7 @@ plot_bandwidth_flags <- function(start, end, path) { plot_userstats <- function(start, end, node, variable, value, events, path) { - load(paste("/srv/metrics.torproject.org/metrics/shared/RData/clients-", - node, ".RData", sep = "")) + load(paste(rdata_dir, "clients-", node, ".RData", sep = "")) c <- data u <- c[c$date >= start & c$date <= end, ] u <- rbind(u, data.frame(date = start, @@ -875,8 +878,7 @@ plot_userstats_bridge_combined <- function(start, end, country, path) { } else { top <- 3 country <- ifelse(country == "all", NA, country) - load(paste("/srv/metrics.torproject.org/metrics/shared/RData/", - "userstats-bridge-combined.RData", sep = "")) + load(paste(rdata_dir, "userstats-bridge-combined.RData", sep = "")) u <- data u <- u[u$date >= start & u$date <= end & (is.na(country) | u$country == country), ] @@ -906,7 +908,7 @@ plot_userstats_bridge_combined <- function(start, end, country, path) { } plot_advbwdist_perc <- function(start, end, p, path) { - t <- read.csv(paste("/srv/metrics.torproject.org/metrics/shared/stats/", + t <- read.csv(paste(stats_dir, "advbwdist.csv", sep = ""), stringsAsFactors = FALSE) t <- t[t$date >= start & t$date <= end & t$percentile %in% as.numeric(p), ] @@ -933,8 +935,8 @@ plot_advbwdist_perc <- function(start, end, p, path) { } plot_advbwdist_relay <- function(start, end, n, path) { - t <- read.csv(paste("/srv/metrics.torproject.org/metrics/shared/stats/", - "advbwdist.csv", sep = ""), stringsAsFactors = FALSE) + t <- read.csv(paste(stats_dir, "advbwdist.csv", sep = ""), + stringsAsFactors = FALSE) t <- t[t$date >= start & t$date <= end & t$relay %in% as.numeric(n), ] t <- data.frame(date = t$date, advbw = t$advbw * 8 / 1e9, variable = ifelse(t$isexit != "t", "All relays", @@ -958,8 +960,8 @@ plot_advbwdist_relay <- function(start, end, n, path) { } plot_hidserv_dir_onions_seen <- function(start, end, path) { - h <- read.csv(paste("/srv/metrics.torproject.org/metrics/shared/stats/", - "hidserv.csv", sep = ""), stringsAsFactors = FALSE) + h <- read.csv(paste(stats_dir, "hidserv.csv", sep = ""), + stringsAsFactors = FALSE) h <- h[h$date >= start & h$date <= end & h$type == "dir-onions-seen", ] h <- rbind(data.frame(date = NA, wiqm = 0), data.frame(date = as.Date(h$date, "%Y-%m-%d"), @@ -978,8 +980,8 @@ plot_hidserv_dir_onions_seen <- function(start, end, path) { } plot_hidserv_rend_relayed_cells <- function(start, end, path) { - h <- read.csv(paste("/srv/metrics.torproject.org/metrics/shared/stats/", - "hidserv.csv", sep = ""), stringsAsFactors = FALSE) + h <- read.csv(paste(stats_dir, "hidserv.csv", sep = ""), + stringsAsFactors = FALSE) h <- h[h$date >= start & h$date <= end & h$type == "rend-relayed-cells", ] h <- rbind(data.frame(date = NA, wiqm = 0), @@ -1000,8 +1002,8 @@ plot_hidserv_rend_relayed_cells <- function(start, end, path) { } plot_hidserv_frac_reporting <- function(start, end, path) { - h <- read.csv(paste("/srv/metrics.torproject.org/metrics/shared/stats/", - "hidserv.csv", sep = ""), stringsAsFactors = FALSE) + h <- read.csv(paste(stats_dir, "hidserv.csv", sep = ""), + stringsAsFactors = FALSE) h <- h[h$date >= start & h$date <= end, ] h <- rbind(data.frame(date = NA, frac = 0, type = c("rend-relayed-cells", @@ -1030,7 +1032,7 @@ plot_hidserv_frac_reporting <- function(start, end, path) { } plot_webstats_tb <- function(start, end, path) { - load("/srv/metrics.torproject.org/metrics/shared/RData/webstats-tb.RData") + load(paste(rdata_dir, "webstats-tb.RData", sep = "")) d <- data d <- d[d$log_date >= start & d$log_date <= end, ] date_breaks <- date_breaks(as.numeric(max(d$log_date) - min(d$log_date))) @@ -1057,8 +1059,8 @@ plot_webstats_tb <- function(start, end, path) { } plot_webstats_tb_platform <- function(start, end, path) { - d <- read.csv(paste("/srv/metrics.torproject.org/metrics/shared/stats/", - "webstats.csv", sep = ""), stringsAsFactors = FALSE) + d <- read.csv(paste(stats_dir, "webstats.csv", sep = ""), + stringsAsFactors = FALSE) d <- d[d$log_date >= start & d$log_date <= end & d$request_type == 'tbid', ] d <- aggregate(list(count = d$count), by = list(log_date = as.Date(d$log_date), platform = d$platform), FUN = sum) @@ -1082,8 +1084,8 @@ plot_webstats_tb_platform <- function(start, end, path) { } plot_webstats_tb_locale <- function(start, end, path) { - d <- read.csv(paste("/srv/metrics.torproject.org/metrics/shared/stats/", - "webstats.csv", sep = ""), stringsAsFactors = FALSE) + d <- read.csv(paste(stats_dir, "webstats.csv", sep = ""), + stringsAsFactors = FALSE) d <- d[d$log_date >= start & d$log_date <= end & d$request_type == 'tbid', ] e <- d e <- aggregate(list(count = e$count), by = list(locale = e$locale), FUN = sum) @@ -1111,7 +1113,7 @@ plot_webstats_tb_locale <- function(start, end, path) { } plot_webstats_tm <- function(start, end, path) { - load("/srv/metrics.torproject.org/metrics/shared/RData/webstats-tm.RData") + load(paste(rdata_dir, "webstats-tm.RData", sep = "")) d <- data d <- d[d$log_date >= start & d$log_date <= end, ] date_breaks <- date_breaks(as.numeric(max(d$log_date) - min(d$log_date))) @@ -1136,8 +1138,7 @@ plot_webstats_tm <- function(start, end, path) { } plot_relays_ipv6 <- function(start, end, path) { - all_relay_data <- read.csv( - "/srv/metrics.torproject.org/metrics/shared/stats/ipv6servers.csv", + all_relay_data <- read.csv(paste(stats_dir, "ipv6servers.csv", sep = ""), colClasses = c("valid_after_date" = "Date")) %>% filter(server == "relay") start_date <- max(as.Date(start), min(all_relay_data$valid_after_date)) @@ -1171,8 +1172,7 @@ plot_relays_ipv6 <- function(start, end, path) { } plot_bridges_ipv6 <- function(start, end, path) { - all_bridge_data <- read.csv( - "/srv/metrics.torproject.org/metrics/shared/stats/ipv6servers.csv", + all_bridge_data <- read.csv(paste(stats_dir, "ipv6servers.csv", sep = ""), colClasses = c("valid_after_date" = "Date")) %>% filter(server == "bridge") start_date <- max(as.Date(start), min(all_bridge_data$valid_after_date)) @@ -1202,8 +1202,7 @@ plot_bridges_ipv6 <- function(start, end, path) { } plot_advbw_ipv6 <- function(start, end, path) { - all_relay_data <- read.csv( - "/srv/metrics.torproject.org/metrics/shared/stats/ipv6servers.csv", + all_relay_data <- read.csv(paste(stats_dir, "ipv6servers.csv", sep = ""), colClasses = c("valid_after_date" = "Date")) %>% filter(server == "relay") start_date <- max(as.Date(start), min(all_relay_data$valid_after_date))

1 0