From 2d5007dc6140021a44bbd7a7b6eca33656c42624 Mon Sep 17 00:00:00 2001 From: Julien Riou Date: Fri, 9 Apr 2021 08:37:11 +0200 Subject: [PATCH] Remove group by time interval (#6) On Flexpool miners, workers and Etherscan dashboards, min, max and last computations where based on multiple small time intervals instead of the big time interval. Removing "group by" solved the computations. Signed-off-by: Julien Riou --- grafana/etherscan.json | 145 ++---------------- grafana/flexpool-miners.json | 269 +++++++--------------------------- grafana/flexpool-workers.json | 89 ++--------- 3 files changed, 76 insertions(+), 427 deletions(-) diff --git a/grafana/etherscan.json b/grafana/etherscan.json index 89df374..de3308b 100644 --- a/grafana/etherscan.json +++ b/grafana/etherscan.json @@ -352,20 +352,7 @@ "targets": [ { "alias": "low", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], + "groupBy": [], "measurement": "etherscan_gastracker_gasoracle", "orderByTime": "ASC", "policy": "default", @@ -389,20 +376,7 @@ }, { "alias": "average", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], + "groupBy": [], "measurement": "etherscan_gastracker_gasoracle", "orderByTime": "ASC", "policy": "default", @@ -426,20 +400,7 @@ }, { "alias": "high", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], + "groupBy": [], "measurement": "etherscan_gastracker_gasoracle", "orderByTime": "ASC", "policy": "default", @@ -514,20 +475,7 @@ "targets": [ { "alias": "minimum", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], + "groupBy": [], "measurement": "etherscan_gastracker_gasoracle", "orderByTime": "ASC", "policy": "default", @@ -554,15 +502,9 @@ "groupBy": [ { "params": [ - "$__interval" + "$interval" ], "type": "time" - }, - { - "params": [ - "null" - ], - "type": "fill" } ], "measurement": "etherscan_gastracker_gasoracle", @@ -588,20 +530,7 @@ }, { "alias": "maximum", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], + "groupBy": [], "measurement": "etherscan_gastracker_gasoracle", "orderByTime": "ASC", "policy": "default", @@ -675,20 +604,7 @@ "targets": [ { "alias": "minimum", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], + "groupBy": [], "measurement": "etherscan_gastracker_gasoracle", "orderByTime": "ASC", "policy": "default", @@ -749,20 +665,7 @@ }, { "alias": "maximum", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], + "groupBy": [], "measurement": "etherscan_gastracker_gasoracle", "orderByTime": "ASC", "policy": "default", @@ -836,20 +739,7 @@ "targets": [ { "alias": "minimum", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], + "groupBy": [], "measurement": "etherscan_gastracker_gasoracle", "orderByTime": "ASC", "policy": "default", @@ -910,20 +800,7 @@ }, { "alias": "maximum", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], + "groupBy": [], "measurement": "etherscan_gastracker_gasoracle", "orderByTime": "ASC", "policy": "default", @@ -1031,5 +908,5 @@ "timezone": "", "title": "Etherscan", "uid": "OHZGmm_Gk", - "version": 8 + "version": 9 } \ No newline at end of file diff --git a/grafana/flexpool-miners.json b/grafana/flexpool-miners.json index 8752e23..84bf7cf 100644 --- a/grafana/flexpool-miners.json +++ b/grafana/flexpool-miners.json @@ -59,7 +59,7 @@ "gnetId": null, "graphTooltip": 0, "id": null, - "iteration": 1617344481018, + "iteration": 1617949390461, "links": [], "panels": [ { @@ -967,25 +967,12 @@ "targets": [ { "alias": "balance", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], + "groupBy": [], "measurement": "flexpool_miner_balance", "orderByTime": "ASC", "policy": "default", "query": "SELECT mean(\"result\")/1000000000000000000 FROM \"flexpool_miner_balance\" WHERE (\"miner\" =~ /^$miner$/) AND $timeFilter GROUP BY time($__interval) fill(null)", - "rawQuery": true, + "rawQuery": false, "refId": "A", "resultFormat": "time_series", "select": [ @@ -998,7 +985,13 @@ }, { "params": [], - "type": "mean" + "type": "last" + }, + { + "params": [ + "/1000000000000000000" + ], + "type": "math" } ] ], @@ -1012,41 +1005,41 @@ }, { "alias": "balance (fiat)", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], + "groupBy": [], + "measurement": "flexpool_miner_balance", "orderByTime": "ASC", "policy": "default", "query": "SELECT mean(\"result\")/1000000000000000000*$exchange_rate FROM \"flexpool_miner_balance\" WHERE (\"miner\" =~ /^$miner$/) AND $timeFilter GROUP BY time($__interval) fill(null)", - "rawQuery": true, + "rawQuery": false, "refId": "B", "resultFormat": "time_series", "select": [ [ { "params": [ - "value" + "result" ], "type": "field" }, { "params": [], - "type": "mean" + "type": "last" + }, + { + "params": [ + "/1000000000000000000*$exchange_rate" + ], + "type": "math" } ] ], - "tags": [] + "tags": [ + { + "key": "miner", + "operator": "=~", + "value": "/^$miner$/" + } + ] } ], "timeFrom": "5m", @@ -1326,20 +1319,7 @@ "targets": [ { "alias": "daily", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], + "groupBy": [], "measurement": "flexpool_miner_daily_revenue_estimation", "orderByTime": "ASC", "policy": "default", @@ -1357,7 +1337,7 @@ }, { "params": [], - "type": "mean" + "type": "last" }, { "params": [ @@ -1377,20 +1357,7 @@ }, { "alias": "weekly", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], + "groupBy": [], "measurement": "flexpool_miner_daily_revenue_estimation", "orderByTime": "ASC", "policy": "default", @@ -1406,7 +1373,7 @@ }, { "params": [], - "type": "mean" + "type": "last" }, { "params": [ @@ -1426,20 +1393,7 @@ }, { "alias": "monthly", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], + "groupBy": [], "measurement": "flexpool_miner_daily_revenue_estimation", "orderByTime": "ASC", "policy": "default", @@ -1455,7 +1409,7 @@ }, { "params": [], - "type": "mean" + "type": "last" }, { "params": [ @@ -1475,20 +1429,7 @@ }, { "alias": "daily (fiat)", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], + "groupBy": [], "measurement": "flexpool_miner_daily_revenue_estimation", "orderByTime": "ASC", "policy": "default", @@ -1506,7 +1447,7 @@ }, { "params": [], - "type": "mean" + "type": "last" }, { "params": [ @@ -1526,20 +1467,7 @@ }, { "alias": "weekly (fiat)", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], + "groupBy": [], "measurement": "flexpool_miner_daily_revenue_estimation", "orderByTime": "ASC", "policy": "default", @@ -1555,7 +1483,7 @@ }, { "params": [], - "type": "mean" + "type": "last" }, { "params": [ @@ -1575,20 +1503,7 @@ }, { "alias": "monthly (fiat)", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], + "groupBy": [], "measurement": "flexpool_miner_daily_revenue_estimation", "orderByTime": "ASC", "policy": "default", @@ -1604,7 +1519,7 @@ }, { "params": [], - "type": "mean" + "type": "last" }, { "params": [ @@ -2372,20 +2287,7 @@ "targets": [ { "alias": "effective", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], + "groupBy": [], "measurement": "flexpool_miner_stats", "orderByTime": "ASC", "policy": "default", @@ -2401,7 +2303,7 @@ }, { "params": [], - "type": "mean" + "type": "last" } ] ], @@ -2415,20 +2317,7 @@ }, { "alias": "reported", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], + "groupBy": [], "measurement": "flexpool_miner_stats", "orderByTime": "ASC", "policy": "default", @@ -2444,7 +2333,7 @@ }, { "params": [], - "type": "mean" + "type": "last" } ] ], @@ -2458,20 +2347,7 @@ }, { "alias": "daily effective", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], + "groupBy": [], "measurement": "flexpool_miner_stats", "orderByTime": "ASC", "policy": "default", @@ -2487,7 +2363,7 @@ }, { "params": [], - "type": "mean" + "type": "last" } ] ], @@ -2795,20 +2671,7 @@ "targets": [ { "alias": "valid", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], + "groupBy": [], "measurement": "flexpool_miner_stats", "orderByTime": "ASC", "policy": "default", @@ -2824,7 +2687,7 @@ }, { "params": [], - "type": "mean" + "type": "last" } ] ], @@ -2893,20 +2756,7 @@ "targets": [ { "alias": "stale", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], + "groupBy": [], "measurement": "flexpool_miner_stats", "orderByTime": "ASC", "policy": "default", @@ -2922,7 +2772,7 @@ }, { "params": [], - "type": "mean" + "type": "last" } ] ], @@ -2992,20 +2842,7 @@ "targets": [ { "alias": "invalid", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], + "groupBy": [], "measurement": "flexpool_miner_stats", "orderByTime": "ASC", "policy": "default", @@ -3021,7 +2858,7 @@ }, { "params": [], - "type": "mean" + "type": "last" } ] ], @@ -3279,5 +3116,5 @@ "timezone": "utc", "title": "Flexpool miners", "uid": "Q3JPASkgz", - "version": 5 + "version": 6 } \ No newline at end of file diff --git a/grafana/flexpool-workers.json b/grafana/flexpool-workers.json index c051f7b..d704876 100644 --- a/grafana/flexpool-workers.json +++ b/grafana/flexpool-workers.json @@ -53,7 +53,7 @@ "gnetId": null, "graphTooltip": 0, "id": null, - "iteration": 1617000842181, + "iteration": 1617949836004, "links": [], "panels": [ { @@ -323,20 +323,7 @@ "targets": [ { "alias": "hashrate", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], + "groupBy": [], "measurement": "flexpool_miner_workers", "orderByTime": "ASC", "policy": "default", @@ -352,7 +339,7 @@ }, { "params": [], - "type": "mean" + "type": "last" } ] ], @@ -424,20 +411,7 @@ "targets": [ { "alias": "hashrate", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], + "groupBy": [], "measurement": "flexpool_miner_workers", "orderByTime": "ASC", "policy": "default", @@ -453,7 +427,7 @@ }, { "params": [], - "type": "mean" + "type": "last" } ] ], @@ -789,20 +763,7 @@ "targets": [ { "alias": "valid", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], + "groupBy": [], "measurement": "flexpool_miner_workers", "orderByTime": "ASC", "policy": "default", @@ -818,7 +779,7 @@ }, { "params": [], - "type": "mean" + "type": "last" } ] ], @@ -892,20 +853,7 @@ "targets": [ { "alias": "stale", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], + "groupBy": [], "measurement": "flexpool_miner_workers", "orderByTime": "ASC", "policy": "default", @@ -921,7 +869,7 @@ }, { "params": [], - "type": "mean" + "type": "last" } ] ], @@ -996,20 +944,7 @@ "targets": [ { "alias": "invalid", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], + "groupBy": [], "measurement": "flexpool_miner_workers", "orderByTime": "ASC", "policy": "default", @@ -1025,7 +960,7 @@ }, { "params": [], - "type": "mean" + "type": "last" } ] ], @@ -1126,5 +1061,5 @@ "timezone": "utc", "title": "Flexpool workers", "uid": "slcUBSzgz", - "version": 3 + "version": 4 } \ No newline at end of file