[tor-commits] [metrics-web/master] Remove hidserv-frac-reporting graph and CSV file.
karsten at torproject.org
karsten at torproject.org
Wed Aug 15 10:53:22 UTC 2018
commit ec86ad02973963e9efad46b0ac21ae4f04c87fc6
Author: Karsten Loesing <karsten.loesing at gmx.net>
Date: Thu Aug 9 16:13:45 2018 +0200
Remove hidserv-frac-reporting graph and CSV file.
This was the graph showing the "Fraction of relays reporting
onion-service statistics". Fraction values will still be available as
part of the other onion-service statistics' per-graph CSV files.
Implements #26950.
---
src/main/R/rserver/graphs.R | 34 ----------------------
src/main/resources/web.xml | 4 ---
src/main/resources/web/json/categories.json | 3 +-
src/main/resources/web/json/metrics.json | 11 -------
.../resources/web/jsps/reproducible-metrics.jsp | 1 -
src/main/resources/web/jsps/stats.jsp | 25 ----------------
6 files changed, 1 insertion(+), 77 deletions(-)
diff --git a/src/main/R/rserver/graphs.R b/src/main/R/rserver/graphs.R
index ab37a32..66a1414 100644
--- a/src/main/R/rserver/graphs.R
+++ b/src/main/R/rserver/graphs.R
@@ -1287,40 +1287,6 @@ write_hidserv_rend_relayed_cells <- function(start_p = NULL, end_p = NULL,
write.csv(path_p, quote = FALSE, row.names = FALSE, na = "")
}
-prepare_hidserv_frac_reporting <- function(start_p, end_p) {
- read.csv(paste(stats_dir, "hidserv.csv", sep = ""),
- colClasses = c("date" = "Date")) %>%
- filter(if (!is.null(start_p)) date >= as.Date(start_p) else TRUE) %>%
- filter(if (!is.null(end_p)) date <= as.Date(end_p) else TRUE) %>%
- select(date, frac, type)
-}
-
-plot_hidserv_frac_reporting <- function(start_p, end_p, path_p) {
- prepare_hidserv_frac_reporting(start_p, end_p) %>%
- ggplot(aes(x = date, y = frac, colour = type)) +
- geom_line() +
- geom_hline(yintercept = 0.01, linetype = 2) +
- scale_x_date(name = "", breaks = custom_breaks,
- labels = custom_labels, minor_breaks = custom_minor_breaks) +
- scale_y_continuous(name = "", labels = percent, limits = c(0, NA)) +
- scale_colour_hue(name = "",
- breaks = c("rend-relayed-cells", "dir-onions-seen"),
- labels = c("Onion-service traffic",
- "Unique .onion addresses")) +
- ggtitle(paste("Fraction of relays reporting onion-service",
- "statistics")) +
- labs(caption = copyright_notice) +
- theme(legend.position = "top")
- ggsave(filename = path_p, width = 8, height = 5, dpi = 150)
-}
-
-write_hidserv_frac_reporting <- function(start_p = NULL, end_p = NULL, path_p) {
- prepare_hidserv_frac_reporting(start_p, end_p) %>%
- mutate(type = ifelse(type == "dir-onions-seen", "onions", "relayed")) %>%
- spread(type, frac) %>%
- write.csv(path_p, quote = FALSE, row.names = FALSE, na = "")
-}
-
prepare_webstats_tb <- function(start_p, end_p) {
load(paste(rdata_dir, "webstats-tb.RData", sep = ""))
data %>%
diff --git a/src/main/resources/web.xml b/src/main/resources/web.xml
index ae252da..5c88564 100644
--- a/src/main/resources/web.xml
+++ b/src/main/resources/web.xml
@@ -48,7 +48,6 @@
<url-pattern>/connbidirect.html</url-pattern>
<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>/webstats-tb.html</url-pattern>
<url-pattern>/webstats-tb-platform.html</url-pattern>
<url-pattern>/webstats-tb-locale.html</url-pattern>
@@ -190,9 +189,6 @@
<url-pattern>/hidserv-rend-relayed-cells.png</url-pattern>
<url-pattern>/hidserv-rend-relayed-cells.pdf</url-pattern>
<url-pattern>/hidserv-rend-relayed-cells.csv</url-pattern>
- <url-pattern>/hidserv-frac-reporting.png</url-pattern>
- <url-pattern>/hidserv-frac-reporting.pdf</url-pattern>
- <url-pattern>/hidserv-frac-reporting.csv</url-pattern>
<url-pattern>/webstats-tb.png</url-pattern>
<url-pattern>/webstats-tb.pdf</url-pattern>
<url-pattern>/webstats-tb.csv</url-pattern>
diff --git a/src/main/resources/web/json/categories.json b/src/main/resources/web/json/categories.json
index 23e6ee4..a5a4fcf 100644
--- a/src/main/resources/web/json/categories.json
+++ b/src/main/resources/web/json/categories.json
@@ -74,8 +74,7 @@
"description": "Onion services are services that are only accessible via the Tor network.",
"metrics": [
"hidserv-dir-onions-seen",
- "hidserv-rend-relayed-cells",
- "hidserv-frac-reporting"
+ "hidserv-rend-relayed-cells"
]
},
{
diff --git a/src/main/resources/web/json/metrics.json b/src/main/resources/web/json/metrics.json
index 0f85a28..ab5d98d 100644
--- a/src/main/resources/web/json/metrics.json
+++ b/src/main/resources/web/json/metrics.json
@@ -367,17 +367,6 @@
]
},
{
- "id": "hidserv-frac-reporting",
- "title": "Fraction of relays reporting onion-service statistics",
- "type": "Graph",
- "description": "<p>This graph shows the fraction of <a href=\"glossary.html#relay\">relays</a> that report statistics on <a href=\"glossary.html#onion-service\">onion service</a> usage. If at least 1% of relays report a statistic, it gets extrapolated towards a network total, where higher fractions are produce more accurate results. For more details on the extrapolation algorithm, see <a href=\"https://blog.torproject.org/blog/some-statistics-about-onions\">this blog post</a> and <a href=\"https://research.torproject.org/techreports/extrapolating-hidserv-stats-2015-01-31.pdf\">this technical report</a>.</p>",
- "function": "hidserv_frac_reporting",
- "parameters": [
- "start",
- "end"
- ]
- },
- {
"id": "uncharted-data-flow",
"title": "“TorFlow”",
"type": "Link",
diff --git a/src/main/resources/web/jsps/reproducible-metrics.jsp b/src/main/resources/web/jsps/reproducible-metrics.jsp
index dc00751..87f692e 100644
--- a/src/main/resources/web/jsps/reproducible-metrics.jsp
+++ b/src/main/resources/web/jsps/reproducible-metrics.jsp
@@ -671,7 +671,6 @@ For further background on the following steps, refer to the technical report tit
<ul>
<li>Unique .onion addresses (version 2 only) <a href="/hidserv-dir-onions-seen.html" class="btn btn-primary btn-xs"><i class="fa fa-chevron-right" aria-hidden="true"></i> graph</a></li>
<li>Onion-service traffic (versions 2 and 3) <a href="/hidserv-rend-relayed-cells.html" class="btn btn-primary btn-xs"><i class="fa fa-chevron-right" aria-hidden="true"></i> graph</a></li>
-<li>Fraction of relays reporting onion-service statistics <a href="/hidserv-frac-reporting.html" class="btn btn-primary btn-xs"><i class="fa fa-chevron-right" aria-hidden="true"></i> graph</a></li>
</ul>
<h4>Step 1: Parse reported statistics from extra-info descriptors</h4>
diff --git a/src/main/resources/web/jsps/stats.jsp b/src/main/resources/web/jsps/stats.jsp
index 719176c..565f235 100644
--- a/src/main/resources/web/jsps/stats.jsp
+++ b/src/main/resources/web/jsps/stats.jsp
@@ -633,31 +633,6 @@ Onion Services <a href="#onion-services" name="servers" class="anchor">#</a></h2
<li><b>frac:</b> Total network fraction of statistics reported by rendezvous points.</li>
</ul>
-<h3>Fraction of relays reporting onion-service statistics
-<a href="/hidserv-frac-reporting.html" class="btn btn-primary btn-xs"><i class="fa fa-chevron-right" aria-hidden="true"></i> graph</a>
-<a href="/hidserv-frac-reporting.csv" class="btn btn-primary btn-xs"><i class="fa fa-chevron-right" aria-hidden="true"></i> data</a>
-<a href="/hidserv-frac-reporting">#</a></h3>
-
-<h4>Parameters</h4>
-
-<ul>
-<li><b>start:</b> First UTC date (YYYY-MM-DD) to include in the file.</li>
-<li><b>end:</b> Last UTC date (YYYY-MM-DD) to include in the file.</li>
-</ul>
-
-<h4>Columns</h4>
-
-<ul>
-<li><b>date:</b> UTC date (YYYY-MM-DD) when relays have been listed as running.</li>
-<li><b>onions:</b> Total network fraction of statistics reported by onion-service directories.</li>
-<li><b>relayed:</b> Total network fraction of statistics reported by rendezvous points.</li>
-</ul>
-
-<div class="bs-callout bs-callout-warning">
-<h3>Suggested change</h3>
-<p>Remove section and data as suggested on <a href="https://bugs.torproject.org/26950">#26950</a>.</p>
-</div>
-
</div>
<div class="container">
More information about the tor-commits
mailing list