commit 63f45ac7d7979b11c390dae24abdca0cbead260c Author: Karsten Loesing <karsten.loesing@gmx.net> Date: Sun Jan 19 11:29:06 2020 +0100 Provide similar graphs in all document types. Fixes #27981. --- CHANGELOG.md | 4 ++++ .../metrics/onionoo/writer/BandwidthDocumentWriter.java | 8 +------- .../torproject/metrics/onionoo/writer/ClientsDocumentWriter.java | 3 +++ .../torproject/metrics/onionoo/writer/UptimeDocumentWriter.java | 3 --- .../torproject/metrics/onionoo/writer/WeightsDocumentWriter.java | 3 --- 5 files changed, 8 insertions(+), 13 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c4f9c30..9b7eaf7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,10 @@ - Include graph history objects even if the time period they cover are already contained in other graph history objects with shorter time periods and higher data resolutions. + - Remove "3 days" and "1 week" bandwidth graphs, change "1 month" + bandwidth graph to a data resolution of 24 hours, add back "1 + month" clients graph, and remove "1 week" uptime and weights + graphs. # Changes in version 7.1-1.24.1 - 2020-02-14 diff --git a/src/main/java/org/torproject/metrics/onionoo/writer/BandwidthDocumentWriter.java b/src/main/java/org/torproject/metrics/onionoo/writer/BandwidthDocumentWriter.java index 53cb95b..18317d9 100644 --- a/src/main/java/org/torproject/metrics/onionoo/writer/BandwidthDocumentWriter.java +++ b/src/main/java/org/torproject/metrics/onionoo/writer/BandwidthDocumentWriter.java @@ -64,25 +64,19 @@ public class BandwidthDocumentWriter implements DocumentWriter { } private String[] graphNames = new String[] { - "3_days", - "1_week", "1_month", "6_months", "1_year", "5_years" }; private Period[] graphIntervals = new Period[] { - Period.ofDays(3), - Period.ofWeeks(1), Period.ofMonths(1), Period.ofMonths(6), Period.ofYears(1), Period.ofYears(5) }; private long[] dataPointIntervals = new long[] { - DateTimeHelper.FIFTEEN_MINUTES, - DateTimeHelper.ONE_HOUR, - DateTimeHelper.FOUR_HOURS, + DateTimeHelper.ONE_DAY, DateTimeHelper.ONE_DAY, DateTimeHelper.TWO_DAYS, DateTimeHelper.TEN_DAYS }; diff --git a/src/main/java/org/torproject/metrics/onionoo/writer/ClientsDocumentWriter.java b/src/main/java/org/torproject/metrics/onionoo/writer/ClientsDocumentWriter.java index 9727403..33b8a99 100644 --- a/src/main/java/org/torproject/metrics/onionoo/writer/ClientsDocumentWriter.java +++ b/src/main/java/org/torproject/metrics/onionoo/writer/ClientsDocumentWriter.java @@ -78,17 +78,20 @@ public class ClientsDocumentWriter implements DocumentWriter { } private String[] graphNames = new String[] { + "1_month", "6_months", "1_year", "5_years" }; private Period[] graphIntervals = new Period[] { + Period.ofMonths(1), Period.ofMonths(6), Period.ofYears(1), Period.ofYears(5) }; private long[] dataPointIntervals = new long[] { DateTimeHelper.ONE_DAY, + DateTimeHelper.ONE_DAY, DateTimeHelper.TWO_DAYS, DateTimeHelper.TEN_DAYS }; diff --git a/src/main/java/org/torproject/metrics/onionoo/writer/UptimeDocumentWriter.java b/src/main/java/org/torproject/metrics/onionoo/writer/UptimeDocumentWriter.java index 45d9242..f03b730 100644 --- a/src/main/java/org/torproject/metrics/onionoo/writer/UptimeDocumentWriter.java +++ b/src/main/java/org/torproject/metrics/onionoo/writer/UptimeDocumentWriter.java @@ -77,21 +77,18 @@ public class UptimeDocumentWriter implements DocumentWriter { } private String[] graphNames = new String[] { - "1_week", "1_month", "6_months", "1_year", "5_years" }; private Period[] graphIntervals = new Period[] { - Period.ofWeeks(1), Period.ofMonths(1), Period.ofMonths(6), Period.ofYears(1), Period.ofYears(5) }; private long[] dataPointIntervals = new long[] { - DateTimeHelper.ONE_HOUR, DateTimeHelper.FOUR_HOURS, DateTimeHelper.TWELVE_HOURS, DateTimeHelper.TWO_DAYS, diff --git a/src/main/java/org/torproject/metrics/onionoo/writer/WeightsDocumentWriter.java b/src/main/java/org/torproject/metrics/onionoo/writer/WeightsDocumentWriter.java index 361528a..ceda9ef 100644 --- a/src/main/java/org/torproject/metrics/onionoo/writer/WeightsDocumentWriter.java +++ b/src/main/java/org/torproject/metrics/onionoo/writer/WeightsDocumentWriter.java @@ -53,21 +53,18 @@ public class WeightsDocumentWriter implements DocumentWriter { } private String[] graphNames = new String[] { - "1_week", "1_month", "6_months", "1_year", "5_years" }; private Period[] graphIntervals = new Period[] { - Period.ofWeeks(1), Period.ofMonths(1), Period.ofMonths(6), Period.ofYears(1), Period.ofYears(5) }; private long[] dataPointIntervals = new long[] { - DateTimeHelper.ONE_HOUR, DateTimeHelper.FOUR_HOURS, DateTimeHelper.ONE_DAY, DateTimeHelper.TWO_DAYS,