diff --git a/grafana/flexpool-pool.json b/grafana/flexpool-pool.json index 09bae7c..b1f8d8e 100644 --- a/grafana/flexpool-pool.json +++ b/grafana/flexpool-pool.json @@ -53,7 +53,7 @@ "gnetId": null, "graphTooltip": 0, "id": null, - "iteration": 1617344353818, + "iteration": 1617517178341, "links": [], "panels": [ { @@ -242,20 +242,7 @@ "targets": [ { "alias": "total", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], + "groupBy": [], "measurement": "flexpool_pool_hashrate", "orderByTime": "ASC", "policy": "default", @@ -605,20 +592,7 @@ "targets": [ { "alias": "eu", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], + "groupBy": [], "measurement": "flexpool_pool_hashrate", "orderByTime": "ASC", "policy": "default", @@ -642,20 +616,7 @@ }, { "alias": "us", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], + "groupBy": [], "measurement": "flexpool_pool_hashrate", "orderByTime": "ASC", "policy": "default", @@ -679,20 +640,7 @@ }, { "alias": "sa", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], + "groupBy": [], "measurement": "flexpool_pool_hashrate", "orderByTime": "ASC", "policy": "default", @@ -716,20 +664,7 @@ }, { "alias": "as", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], + "groupBy": [], "measurement": "flexpool_pool_hashrate", "orderByTime": "ASC", "policy": "default", @@ -753,20 +688,7 @@ }, { "alias": "au", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], + "groupBy": [], "measurement": "flexpool_pool_hashrate", "orderByTime": "ASC", "policy": "default", @@ -981,20 +903,7 @@ "targets": [ { "alias": "online miners", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], + "groupBy": [], "measurement": "flexpool_pool_miners_online", "orderByTime": "ASC", "policy": "default", @@ -1193,20 +1102,7 @@ "targets": [ { "alias": "online workers", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], + "groupBy": [], "measurement": "flexpool_pool_workers_online", "orderByTime": "ASC", "policy": "default", @@ -1991,7 +1887,7 @@ "type": "fill" } ], - "measurement": "flexpool_pool_blocks", + "measurement": "flexpool_pool_average_luck_round_time", "orderByTime": "ASC", "policy": "default", "refId": "A", @@ -2039,7 +1935,7 @@ "label": null, "logBase": 1, "max": null, - "min": null, + "min": "0", "show": true }, { @@ -2101,6 +1997,100 @@ "targets": [ { "alias": "round time", + "groupBy": [], + "measurement": "flexpool_pool_average_luck_round_time", + "orderByTime": "ASC", + "policy": "default", + "query": "SELECT mean(\"round_time\") FROM \"flexpool_pool_average_luck_round_time\" WHERE $timeFilter GROUP BY time($__interval) fill(null)", + "rawQuery": false, + "refId": "A", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "round_time" + ], + "type": "field" + }, + { + "params": [], + "type": "last" + } + ] + ], + "tags": [] + } + ], + "timeFrom": null, + "timeShift": null, + "title": "Round time", + "type": "stat" + }, + { + "collapsed": false, + "datasource": "${DS_INFLUXDB}", + "gridPos": { + "h": 1, + "w": 24, + "x": 0, + "y": 69 + }, + "id": 48, + "panels": [], + "title": "Luck and effort", + "type": "row" + }, + { + "aliasColors": {}, + "bars": false, + "dashLength": 10, + "dashes": false, + "datasource": "${DS_INFLUXDB}", + "description": "", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, + "fill": 1, + "fillGradient": 0, + "gridPos": { + "h": 8, + "w": 12, + "x": 0, + "y": 70 + }, + "hiddenSeries": false, + "id": 50, + "legend": { + "avg": false, + "current": false, + "max": false, + "min": false, + "show": true, + "total": false, + "values": false + }, + "lines": true, + "linewidth": 1, + "nullPointMode": "null", + "options": { + "alertThreshold": true + }, + "percentage": false, + "pluginVersion": "7.3.7", + "pointradius": 2, + "points": false, + "renderer": "flot", + "seriesOverrides": [], + "spaceLength": 10, + "stack": false, + "steppedLine": false, + "targets": [ + { + "alias": "Average luck", "groupBy": [ { "params": [ @@ -2115,7 +2105,7 @@ "type": "fill" } ], - "measurement": "flexpool_pool_blocks", + "measurement": "flexpool_pool_average_luck_round_time", "orderByTime": "ASC", "policy": "default", "refId": "A", @@ -2124,13 +2114,135 @@ [ { "params": [ - "round_time" + "luck" ], "type": "field" }, { "params": [], "type": "mean" + }, + { + "params": [ + "*100" + ], + "type": "math" + } + ] + ], + "tags": [] + } + ], + "thresholds": [], + "timeFrom": null, + "timeRegions": [], + "timeShift": null, + "title": "Luck", + "tooltip": { + "shared": true, + "sort": 0, + "value_type": "individual" + }, + "type": "graph", + "xaxis": { + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] + }, + "yaxes": [ + { + "$$hashKey": "object:135", + "format": "percent", + "label": null, + "logBase": 1, + "max": null, + "min": "0", + "show": true + }, + { + "$$hashKey": "object:136", + "format": "short", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": true + } + ], + "yaxis": { + "align": false, + "alignLevel": null + } + }, + { + "datasource": "${DS_INFLUXDB}", + "fieldConfig": { + "defaults": { + "custom": {}, + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + } + ] + }, + "unit": "percent" + }, + "overrides": [] + }, + "gridPos": { + "h": 8, + "w": 12, + "x": 12, + "y": 70 + }, + "id": 53, + "options": { + "colorMode": "value", + "graphMode": "none", + "justifyMode": "auto", + "orientation": "auto", + "reduceOptions": { + "calcs": [ + "mean" + ], + "fields": "", + "values": false + }, + "textMode": "auto" + }, + "pluginVersion": "7.3.7", + "targets": [ + { + "alias": "luck", + "groupBy": [], + "measurement": "flexpool_pool_average_luck_round_time", + "orderByTime": "ASC", + "policy": "default", + "refId": "A", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "luck" + ], + "type": "field" + }, + { + "params": [], + "type": "last" + }, + { + "params": [ + "*100" + ], + "type": "math" } ] ], @@ -2139,10 +2251,241 @@ ], "timeFrom": null, "timeShift": null, - "title": "Round time", + "title": "Current luck", + "type": "stat" + }, + { + "aliasColors": {}, + "bars": false, + "dashLength": 10, + "dashes": false, + "datasource": "${DS_INFLUXDB}", + "description": "", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, + "fill": 1, + "fillGradient": 0, + "gridPos": { + "h": 8, + "w": 12, + "x": 0, + "y": 78 + }, + "hiddenSeries": false, + "id": 51, + "legend": { + "avg": false, + "current": false, + "max": false, + "min": false, + "show": true, + "total": false, + "values": false + }, + "lines": true, + "linewidth": 1, + "nullPointMode": "null", + "options": { + "alertThreshold": true + }, + "percentage": false, + "pluginVersion": "7.3.7", + "pointradius": 2, + "points": false, + "renderer": "flot", + "seriesOverrides": [], + "spaceLength": 10, + "stack": false, + "steppedLine": false, + "targets": [ + { + "alias": "Average effort", + "groupBy": [ + { + "params": [ + "$__interval" + ], + "type": "time" + }, + { + "params": [ + "null" + ], + "type": "fill" + } + ], + "measurement": "flexpool_pool_average_luck_round_time", + "orderByTime": "ASC", + "policy": "default", + "query": "SELECT 1/mean(\"luck\") *100 FROM \"flexpool_pool_average_luck_round_time\" WHERE $timeFilter GROUP BY time($__interval) fill(null)", + "rawQuery": true, + "refId": "A", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "luck" + ], + "type": "field" + }, + { + "params": [], + "type": "mean" + }, + { + "params": [ + "*100" + ], + "type": "math" + } + ] + ], + "tags": [] + } + ], + "thresholds": [], + "timeFrom": null, + "timeRegions": [], + "timeShift": null, + "title": "Effort", + "tooltip": { + "shared": true, + "sort": 0, + "value_type": "individual" + }, + "type": "graph", + "xaxis": { + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] + }, + "yaxes": [ + { + "$$hashKey": "object:135", + "format": "percent", + "label": null, + "logBase": 1, + "max": null, + "min": "0", + "show": true + }, + { + "$$hashKey": "object:136", + "format": "short", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": true + } + ], + "yaxis": { + "align": false, + "alignLevel": null + } + }, + { + "datasource": "${DS_INFLUXDB}", + "fieldConfig": { + "defaults": { + "custom": {}, + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + } + ] + }, + "unit": "percent" + }, + "overrides": [] + }, + "gridPos": { + "h": 8, + "w": 12, + "x": 12, + "y": 78 + }, + "id": 54, + "options": { + "colorMode": "value", + "graphMode": "none", + "justifyMode": "auto", + "orientation": "auto", + "reduceOptions": { + "calcs": [ + "mean" + ], + "fields": "", + "values": false + }, + "textMode": "auto" + }, + "pluginVersion": "7.3.7", + "targets": [ + { + "alias": "effort", + "groupBy": [ + { + "params": [ + "$__interval" + ], + "type": "time" + }, + { + "params": [ + "null" + ], + "type": "fill" + } + ], + "measurement": "flexpool_pool_average_luck_round_time", + "orderByTime": "ASC", + "policy": "default", + "query": "SELECT 1/last(\"luck\") *100 FROM \"flexpool_pool_average_luck_round_time\" WHERE $timeFilter fill(null)", + "rawQuery": true, + "refId": "A", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "luck" + ], + "type": "field" + }, + { + "params": [], + "type": "last" + }, + { + "params": [ + "*100" + ], + "type": "math" + } + ] + ], + "tags": [] + } + ], + "timeFrom": null, + "timeShift": null, + "title": "Current effort", "type": "stat" } ], + "refresh": false, "schemaVersion": 26, "style": "dark", "tags": [ @@ -2301,5 +2644,5 @@ "timezone": "utc", "title": "Flexpool pool", "uid": "_vo2TQQMk", - "version": 22 + "version": 27 } \ No newline at end of file