diff --git a/README.md b/README.md index 3469f2e..b585aea 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,11 @@ +# END OF LIFE NOTICE + +Flexpool.io was the main source of information for the mining dashboards and it +[has shut +down](https://www.reddit.com/r/Flexpool/comments/16q72ul/action_required_flexpoolio_shutdown_notice_nov_1/). +Due to the lack of activity on this repository for the last couple of years, +I'm archiving it. Don't hesitate to fork it! + # Mining dashboards Grafana dashboards for cryptocurrency miners. @@ -55,22 +63,22 @@ Telegraf inputs configurations are stored in [telegraf](telegraf) directory. You command: ``` -docker run --rm -e "MINER_ADDRESS=${MINER_ADDRESS}" \ +docker run --rm -e "MINER_ADDRESS=${MINER_ADDRESS}" -e "COIN=${COIN}" \ -v "${PWD}/docker/telegraf.conf:/etc/telegraf/telegraf.conf:ro" -v "${PWD}/telegraf:/etc/telegraf/telegraf.d:ro" \ - telegraf:1.15.4 telegraf -test -config /etc/telegraf/telegraf.conf -config-directory /etc/telegraf/telegraf.d + telegraf:1.19.2 telegraf -test -config /etc/telegraf/telegraf.conf -config-directory /etc/telegraf/telegraf.d ``` Example: ``` -2021-02-02T14:39:57Z I! Starting Telegraf 1.15.4 -> currencies,from=ETH,host=docker,to=EUR value=1171.49 1612276798000000000 -> currencies,from=ETH,host=docker,to=USD value=1411.03 1612276798000000000 -> flexpool_balance,host=docker,miner=0x3e2251567f87E4B6a3927158AF9c678ECa87a337 result=69375170480923064 1612276798000000000 -> flexpool_workers,host=docker,miner=0x3e2251567f87E4B6a3927158AF9c678ECa87a337,name=rig1 effective_hashrate=86666666,invalid_shares=0,reported_hashrate=96304517,stale_shares=3,valid_shares=2008 1612276798000000000 -> flexpool_daily_revenue_estimation,host=docker,miner=0x3e2251567f87E4B6a3927158AF9c678ECa87a337 result=6710141993155250 1612276798000000000 -> flexpool_paid,host=docker,miner=0x3e2251567f87E4B6a3927158AF9c678ECa87a337 result=0 1612276798000000000 -> flexpool_stats,host=docker,miner=0x3e2251567f87E4B6a3927158AF9c678ECa87a337 current_effective_hashrate=86666666,current_reported_hashrate=96304517,daily_effective_hashrate=92962962.625,daily_invalid_shares=0,daily_reported_hashrate=96286435.27777778,daily_stale_shares=3,daily_valid_shares=2008 1612276798000000000 +2021-08-18T09:05:45Z I! Starting Telegraf 1.19.2 +> flexpool_pool_workers_count,coin=eth,host=docker result=43022 1629277546000000000 +> flexpool_pool_blocks,coin=eth,host=docker,miner=0x80072FDaB52a9BED1f77A4f47CE8590eCF2d69Dd difficulty=8038304869759675,luck=0.2723280636238729,mevReward=74193593913914900,number=13046195,reward=2244945505143161600,roundTime=266,staticBlockReward=2000000000000000000,txFeeReward=170751911229246620 1629248941000000000 +> flexpool_pool_blocks,coin=eth,host=docker,miner=0xc0224A1F6B7296598a09746b4106612562248F02 difficulty=8018674568139472,luck=0.9997781967425715,mevReward=0,number=13046171,reward=2093729787481399800,roundTime=969,staticBlockReward=2000000000000000000,txFeeReward=93729787481399740 1629248676000000000 +> flexpool_pool_blocks,coin=eth,host=docker,miner=0xbe6Fa3d44e4fD10fE05d8e90fD820d1f16EEd9e2 difficulty=8069770590952829,luck=0.7709800334318287,mevReward=56831219018865630,number=13046106,reward=2162018055750582000,roundTime=753,staticBlockReward=2000000000000000000,txFeeReward=105186836731716500 1629247706000000000 +> flexpool_pool_blocks,coin=eth,host=docker,miner=0xbF846283Ab2BE655844807FB9DbA086AF202a4d2 difficulty=8046149393032298,luck=1.4665340430067546,mevReward=29415246569886180,number=13046045,reward=2072298444980926500,roundTime=1425,staticBlockReward=2000000000000000000,txFeeReward=42883198411040420 1629246953000000000 +> flexpool_pool_blocks,coin=eth,host=docker,miner=0xdF44B7Dce392a0267f315c2c7711200c9620981C difficulty=8050114629713925,luck=1.66199322809835,mevReward=0,number=13045942,reward=2141479945370403800,roundTime=1612,staticBlockReward=2000000000000000000,txFeeReward=141479945370403760 1629245528000000000 +> flexpool_pool_blocks,coin=eth,host=docker,miner=0xE1E5372F00Fe6b05FD89c8110D4a29b29B916a7d difficulty=8109240971665971,luck=0.9366252682018412,mevReward=15080560933545792,number=13045830,reward=2088916235271470600,roundTime=918,staticBlockReward=2000000000000000000,txFeeReward=73835674337924700 1629243916000000000 ``` Once you are confident with your configuration, reload the container: diff --git a/docker-compose.yml b/docker-compose.yml index a755892..69d2ae2 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -32,7 +32,7 @@ services: entrypoint: telegraf -config /etc/telegraf/telegraf.conf -config-directory /etc/telegraf/telegraf.d env_file: - ./docker/environment - image: telegraf:1.17 + image: telegraf:1.19.2 volumes: - ./docker/telegraf.conf:/etc/telegraf/telegraf.conf - ./telegraf:/etc/telegraf/telegraf.d diff --git a/docker/environment.example b/docker/environment.example index 11494f6..2e3587f 100644 --- a/docker/environment.example +++ b/docker/environment.example @@ -1,6 +1,8 @@ MINER_ADDRESS= +COIN= HIVEOS_TOKEN= ETHERSCAN_TOKEN= +ETHGASSTATION_TOKEN= GF_SECURITY_ADMIN_USER=admin GF_SECURITY_ADMIN_PASSWORD= GF_USERS_DEFAULT_THEME=light diff --git a/grafana/eth-gas-station.json b/grafana/eth-gas-station.json new file mode 100644 index 0000000..3c17841 --- /dev/null +++ b/grafana/eth-gas-station.json @@ -0,0 +1,895 @@ +{ + "__inputs": [ + { + "name": "DS_INFLUXDB", + "label": "InfluxDB", + "description": "", + "type": "datasource", + "pluginId": "influxdb", + "pluginName": "InfluxDB" + } + ], + "__requires": [ + { + "type": "panel", + "id": "bargauge", + "name": "Bar gauge", + "version": "" + }, + { + "type": "grafana", + "id": "grafana", + "name": "Grafana", + "version": "7.3.7" + }, + { + "type": "panel", + "id": "graph", + "name": "Graph", + "version": "" + }, + { + "type": "datasource", + "id": "influxdb", + "name": "InfluxDB", + "version": "1.0.0" + }, + { + "type": "panel", + "id": "stat", + "name": "Stat", + "version": "" + }, + { + "type": "panel", + "id": "text", + "name": "Text", + "version": "" + } + ], + "annotations": { + "list": [ + { + "builtIn": 1, + "datasource": "-- Grafana --", + "enable": true, + "hide": true, + "iconColor": "rgba(0, 211, 255, 1)", + "name": "Annotations & Alerts", + "type": "dashboard" + } + ] + }, + "editable": true, + "gnetId": null, + "graphTooltip": 0, + "id": null, + "links": [], + "panels": [ + { + "aliasColors": {}, + "bars": false, + "dashLength": 10, + "dashes": false, + "datasource": "${DS_INFLUXDB}", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, + "fill": 1, + "fillGradient": 0, + "gridPos": { + "h": 9, + "w": 12, + "x": 0, + "y": 0 + }, + "hiddenSeries": false, + "id": 2, + "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": "low", + "groupBy": [ + { + "params": [ + "$__interval" + ], + "type": "time" + }, + { + "params": [ + "linear" + ], + "type": "fill" + } + ], + "measurement": "ethgasstation_ethgasapi", + "orderByTime": "ASC", + "policy": "default", + "refId": "C", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "safeLow" + ], + "type": "field" + }, + { + "params": [], + "type": "mean" + }, + { + "params": [ + "/10" + ], + "type": "math" + } + ] + ], + "tags": [] + }, + { + "alias": "average", + "groupBy": [ + { + "params": [ + "$__interval" + ], + "type": "time" + }, + { + "params": [ + "linear" + ], + "type": "fill" + } + ], + "measurement": "ethgasstation_ethgasapi", + "orderByTime": "ASC", + "policy": "default", + "refId": "A", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "average" + ], + "type": "field" + }, + { + "params": [], + "type": "mean" + }, + { + "params": [ + "/10" + ], + "type": "math" + } + ] + ], + "tags": [] + }, + { + "alias": "high", + "groupBy": [ + { + "params": [ + "$__interval" + ], + "type": "time" + }, + { + "params": [ + "linear" + ], + "type": "fill" + } + ], + "measurement": "ethgasstation_ethgasapi", + "orderByTime": "ASC", + "policy": "default", + "refId": "B", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "fast" + ], + "type": "field" + }, + { + "params": [], + "type": "mean" + }, + { + "params": [ + "/10" + ], + "type": "math" + } + ] + ], + "tags": [] + } + ], + "thresholds": [], + "timeFrom": null, + "timeRegions": [], + "timeShift": null, + "title": "Gas price", + "tooltip": { + "shared": true, + "sort": 0, + "value_type": "individual" + }, + "type": "graph", + "xaxis": { + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] + }, + "yaxes": [ + { + "$$hashKey": "object:136", + "format": "short", + "label": null, + "logBase": 1, + "max": null, + "min": "0", + "show": true + }, + { + "$$hashKey": "object:137", + "format": "short", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": true + } + ], + "yaxis": { + "align": false, + "alignLevel": null + } + }, + { + "datasource": "${DS_INFLUXDB}", + "fieldConfig": { + "defaults": { + "color": { + "fixedColor": "green", + "mode": "fixed" + }, + "custom": {}, + "mappings": [], + "min": 0, + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + } + ] + } + }, + "overrides": [ + { + "matcher": { + "id": "byName", + "options": "average" + }, + "properties": [ + { + "id": "color", + "value": { + "fixedColor": "orange", + "mode": "fixed" + } + } + ] + }, + { + "matcher": { + "id": "byName", + "options": "high" + }, + "properties": [ + { + "id": "color", + "value": { + "fixedColor": "red", + "mode": "fixed" + } + } + ] + } + ] + }, + "gridPos": { + "h": 9, + "w": 12, + "x": 12, + "y": 0 + }, + "id": 4, + "options": { + "displayMode": "basic", + "orientation": "auto", + "reduceOptions": { + "calcs": [ + "mean" + ], + "fields": "", + "values": false + }, + "showUnfilled": true + }, + "pluginVersion": "7.3.7", + "targets": [ + { + "alias": "low", + "groupBy": [], + "measurement": "ethgasstation_ethgasapi", + "orderByTime": "ASC", + "policy": "default", + "refId": "A", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "safeLow" + ], + "type": "field" + }, + { + "params": [], + "type": "last" + }, + { + "params": [ + "/10" + ], + "type": "math" + } + ] + ], + "tags": [] + }, + { + "alias": "average", + "groupBy": [], + "measurement": "ethgasstation_ethgasapi", + "orderByTime": "ASC", + "policy": "default", + "refId": "B", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "average" + ], + "type": "field" + }, + { + "params": [], + "type": "last" + }, + { + "params": [ + "/10" + ], + "type": "math" + } + ] + ], + "tags": [] + }, + { + "alias": "high", + "groupBy": [], + "measurement": "ethgasstation_ethgasapi", + "orderByTime": "ASC", + "policy": "default", + "refId": "C", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "fast" + ], + "type": "field" + }, + { + "params": [ + "/10" + ], + "type": "math" + } + ] + ], + "tags": [] + } + ], + "timeFrom": null, + "timeShift": null, + "title": "Current gas price", + "type": "bargauge" + }, + { + "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": 9 + }, + "hiddenSeries": false, + "id": 6, + "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": "low", + "groupBy": [ + { + "params": [ + "$__interval" + ], + "type": "time" + }, + { + "params": [ + "linear" + ], + "type": "fill" + } + ], + "measurement": "ethgasstation_ethgasapi", + "orderByTime": "ASC", + "policy": "default", + "refId": "A", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "safeLowWait" + ], + "type": "field" + }, + { + "params": [], + "type": "mean" + } + ] + ], + "tags": [] + }, + { + "alias": "average", + "groupBy": [ + { + "params": [ + "$__interval" + ], + "type": "time" + }, + { + "params": [ + "linear" + ], + "type": "fill" + } + ], + "measurement": "ethgasstation_ethgasapi", + "orderByTime": "ASC", + "policy": "default", + "refId": "B", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "avgWait" + ], + "type": "field" + }, + { + "params": [], + "type": "mean" + } + ] + ], + "tags": [] + }, + { + "alias": "fast", + "groupBy": [ + { + "params": [ + "$__interval" + ], + "type": "time" + }, + { + "params": [ + "linear" + ], + "type": "fill" + } + ], + "measurement": "ethgasstation_ethgasapi", + "orderByTime": "ASC", + "policy": "default", + "refId": "C", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "fastWait" + ], + "type": "field" + }, + { + "params": [], + "type": "mean" + } + ] + ], + "tags": [] + } + ], + "thresholds": [], + "timeFrom": null, + "timeRegions": [], + "timeShift": null, + "title": "Waiting times", + "tooltip": { + "shared": true, + "sort": 0, + "value_type": "individual" + }, + "type": "graph", + "xaxis": { + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] + }, + "yaxes": [ + { + "$$hashKey": "object:578", + "format": "m", + "label": null, + "logBase": 1, + "max": null, + "min": "0", + "show": true + }, + { + "$$hashKey": "object:579", + "format": "short", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": true + } + ], + "yaxis": { + "align": false, + "alignLevel": null + } + }, + { + "datasource": "${DS_INFLUXDB}", + "fieldConfig": { + "defaults": { + "color": { + "fixedColor": "green", + "mode": "fixed" + }, + "custom": {}, + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + } + ] + }, + "unit": "m" + }, + "overrides": [ + { + "matcher": { + "id": "byName", + "options": "average" + }, + "properties": [ + { + "id": "color", + "value": { + "fixedColor": "orange", + "mode": "fixed" + } + } + ] + }, + { + "matcher": { + "id": "byName", + "options": "low" + }, + "properties": [ + { + "id": "color", + "value": { + "fixedColor": "red", + "mode": "fixed" + } + } + ] + } + ] + }, + "gridPos": { + "h": 8, + "w": 12, + "x": 12, + "y": 9 + }, + "id": 8, + "options": { + "colorMode": "value", + "graphMode": "none", + "justifyMode": "auto", + "orientation": "auto", + "reduceOptions": { + "calcs": [ + "mean" + ], + "fields": "", + "values": false + }, + "textMode": "auto" + }, + "pluginVersion": "7.3.7", + "targets": [ + { + "alias": "low", + "groupBy": [], + "measurement": "ethgasstation_ethgasapi", + "orderByTime": "ASC", + "policy": "default", + "refId": "A", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "safeLowWait" + ], + "type": "field" + }, + { + "params": [], + "type": "last" + } + ] + ], + "tags": [] + }, + { + "alias": "average", + "groupBy": [], + "measurement": "ethgasstation_ethgasapi", + "orderByTime": "ASC", + "policy": "default", + "refId": "B", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "avgWait" + ], + "type": "field" + }, + { + "params": [], + "type": "last" + } + ] + ], + "tags": [] + }, + { + "alias": "high", + "groupBy": [], + "measurement": "ethgasstation_ethgasapi", + "orderByTime": "ASC", + "policy": "default", + "refId": "C", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "fastWait" + ], + "type": "field" + }, + { + "params": [], + "type": "last" + } + ] + ], + "tags": [] + } + ], + "timeFrom": null, + "timeShift": null, + "title": "Current waiting times", + "type": "stat" + }, + { + "datasource": "${DS_INFLUXDB}", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, + "gridPos": { + "h": 2, + "w": 24, + "x": 0, + "y": 17 + }, + "id": 10, + "options": { + "content": "

Powered by ETH Gas Station API

", + "mode": "html" + }, + "pluginVersion": "7.3.7", + "targets": [ + { + "groupBy": [ + { + "params": [ + "$__interval" + ], + "type": "time" + }, + { + "params": [ + "null" + ], + "type": "fill" + } + ], + "orderByTime": "ASC", + "policy": "default", + "refId": "A", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "value" + ], + "type": "field" + }, + { + "params": [], + "type": "mean" + } + ] + ], + "tags": [] + } + ], + "timeFrom": null, + "timeShift": null, + "title": "Footnotes", + "type": "text" + } + ], + "schemaVersion": 26, + "style": "dark", + "tags": [ + "ethereum", + "ethgasstation" + ], + "templating": { + "list": [] + }, + "time": { + "from": "now-7d", + "to": "now" + }, + "timepicker": {}, + "timezone": "", + "title": "ETH Gas Station", + "uid": "-vMvzbXGk", + "version": 3 +} \ No newline at end of file diff --git a/grafana/etherscan.json b/grafana/etherscan.json index 59ab5ed..de3308b 100644 --- a/grafana/etherscan.json +++ b/grafana/etherscan.json @@ -60,6 +60,18 @@ "id": null, "links": [], "panels": [ + { + "datasource": "${DS_INFLUXDB}", + "gridPos": { + "h": 1, + "w": 24, + "x": 0, + "y": 0 + }, + "id": 9, + "title": "Gas prices", + "type": "row" + }, { "aliasColors": {}, "bars": false, @@ -79,7 +91,7 @@ "h": 8, "w": 12, "x": 0, - "y": 0 + "y": 1 }, "hiddenSeries": false, "id": 2, @@ -109,7 +121,7 @@ "steppedLine": false, "targets": [ { - "alias": "safe", + "alias": "low", "groupBy": [ { "params": [ @@ -146,7 +158,7 @@ "tags": [] }, { - "alias": "propose", + "alias": "average", "groupBy": [ { "params": [ @@ -183,7 +195,7 @@ "tags": [] }, { - "alias": "fast", + "alias": "high", "groupBy": [ { "params": [ @@ -267,6 +279,10 @@ "datasource": "${DS_INFLUXDB}", "fieldConfig": { "defaults": { + "color": { + "fixedColor": "green", + "mode": "fixed" + }, "custom": {}, "mappings": [], "min": 0, @@ -280,13 +296,44 @@ ] } }, - "overrides": [] + "overrides": [ + { + "matcher": { + "id": "byName", + "options": "average" + }, + "properties": [ + { + "id": "color", + "value": { + "fixedColor": "orange", + "mode": "fixed" + } + } + ] + }, + { + "matcher": { + "id": "byName", + "options": "high" + }, + "properties": [ + { + "id": "color", + "value": { + "fixedColor": "red", + "mode": "fixed" + } + } + ] + } + ] }, "gridPos": { "h": 8, "w": 12, "x": 12, - "y": 0 + "y": 1 }, "id": 4, "options": { @@ -304,21 +351,8 @@ "pluginVersion": "7.3.7", "targets": [ { - "alias": "safe", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], + "alias": "low", + "groupBy": [], "measurement": "etherscan_gastracker_gasoracle", "orderByTime": "ASC", "policy": "default", @@ -341,7 +375,259 @@ "tags": [] }, { - "alias": "propose", + "alias": "average", + "groupBy": [], + "measurement": "etherscan_gastracker_gasoracle", + "orderByTime": "ASC", + "policy": "default", + "refId": "B", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "ProposeGasPrice" + ], + "type": "field" + }, + { + "params": [], + "type": "last" + } + ] + ], + "tags": [] + }, + { + "alias": "high", + "groupBy": [], + "measurement": "etherscan_gastracker_gasoracle", + "orderByTime": "ASC", + "policy": "default", + "refId": "C", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "FastGasPrice" + ], + "type": "field" + }, + { + "params": [], + "type": "last" + } + ] + ], + "tags": [] + } + ], + "timeFrom": null, + "timeShift": null, + "title": "Current gas price", + "type": "bargauge" + }, + { + "datasource": "${DS_INFLUXDB}", + "description": "", + "fieldConfig": { + "defaults": { + "color": { + "fixedColor": "green", + "mode": "fixed" + }, + "custom": {}, + "mappings": [], + "min": 0, + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + } + ] + } + }, + "overrides": [] + }, + "gridPos": { + "h": 8, + "w": 8, + "x": 0, + "y": 9 + }, + "id": 10, + "options": { + "displayMode": "basic", + "orientation": "auto", + "reduceOptions": { + "calcs": [ + "mean" + ], + "fields": "", + "values": false + }, + "showUnfilled": true + }, + "pluginVersion": "7.3.7", + "targets": [ + { + "alias": "minimum", + "groupBy": [], + "measurement": "etherscan_gastracker_gasoracle", + "orderByTime": "ASC", + "policy": "default", + "refId": "A", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "SafeGasPrice" + ], + "type": "field" + }, + { + "params": [], + "type": "min" + } + ] + ], + "tags": [] + }, + { + "alias": "average", + "groupBy": [ + { + "params": [ + "$interval" + ], + "type": "time" + } + ], + "measurement": "etherscan_gastracker_gasoracle", + "orderByTime": "ASC", + "policy": "default", + "refId": "B", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "SafeGasPrice" + ], + "type": "field" + }, + { + "params": [], + "type": "mean" + } + ] + ], + "tags": [] + }, + { + "alias": "maximum", + "groupBy": [], + "measurement": "etherscan_gastracker_gasoracle", + "orderByTime": "ASC", + "policy": "default", + "refId": "C", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "SafeGasPrice" + ], + "type": "field" + }, + { + "params": [], + "type": "max" + } + ] + ], + "tags": [] + } + ], + "timeFrom": null, + "timeShift": null, + "title": "Low statistics", + "type": "bargauge" + }, + { + "datasource": "${DS_INFLUXDB}", + "fieldConfig": { + "defaults": { + "color": { + "fixedColor": "orange", + "mode": "fixed" + }, + "custom": {}, + "mappings": [], + "min": 0, + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + } + ] + } + }, + "overrides": [] + }, + "gridPos": { + "h": 8, + "w": 8, + "x": 8, + "y": 9 + }, + "id": 11, + "options": { + "displayMode": "basic", + "orientation": "auto", + "reduceOptions": { + "calcs": [ + "mean" + ], + "fields": "", + "values": false + }, + "showUnfilled": true + }, + "pluginVersion": "7.3.7", + "targets": [ + { + "alias": "minimum", + "groupBy": [], + "measurement": "etherscan_gastracker_gasoracle", + "orderByTime": "ASC", + "policy": "default", + "refId": "A", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "ProposeGasPrice" + ], + "type": "field" + }, + { + "params": [], + "type": "min" + } + ] + ], + "tags": [] + }, + { + "alias": "average", "groupBy": [ { "params": [ @@ -371,14 +657,112 @@ }, { "params": [], - "type": "last" + "type": "mean" } ] ], "tags": [] }, { - "alias": "fast", + "alias": "maximum", + "groupBy": [], + "measurement": "etherscan_gastracker_gasoracle", + "orderByTime": "ASC", + "policy": "default", + "refId": "C", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "ProposeGasPrice" + ], + "type": "field" + }, + { + "params": [], + "type": "max" + } + ] + ], + "tags": [] + } + ], + "timeFrom": null, + "timeShift": null, + "title": "Average statistics", + "type": "bargauge" + }, + { + "datasource": "${DS_INFLUXDB}", + "fieldConfig": { + "defaults": { + "color": { + "fixedColor": "red", + "mode": "fixed" + }, + "custom": {}, + "mappings": [], + "min": 0, + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + } + ] + } + }, + "overrides": [] + }, + "gridPos": { + "h": 8, + "w": 8, + "x": 16, + "y": 9 + }, + "id": 12, + "options": { + "displayMode": "basic", + "orientation": "auto", + "reduceOptions": { + "calcs": [ + "mean" + ], + "fields": "", + "values": false + }, + "showUnfilled": true + }, + "pluginVersion": "7.3.7", + "targets": [ + { + "alias": "minimum", + "groupBy": [], + "measurement": "etherscan_gastracker_gasoracle", + "orderByTime": "ASC", + "policy": "default", + "refId": "A", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "FastGasPrice" + ], + "type": "field" + }, + { + "params": [], + "type": "min" + } + ] + ], + "tags": [] + }, + { + "alias": "average", "groupBy": [ { "params": [ @@ -396,6 +780,30 @@ "measurement": "etherscan_gastracker_gasoracle", "orderByTime": "ASC", "policy": "default", + "refId": "B", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "FastGasPrice" + ], + "type": "field" + }, + { + "params": [], + "type": "mean" + } + ] + ], + "tags": [] + }, + { + "alias": "maximum", + "groupBy": [], + "measurement": "etherscan_gastracker_gasoracle", + "orderByTime": "ASC", + "policy": "default", "refId": "C", "resultFormat": "time_series", "select": [ @@ -408,7 +816,7 @@ }, { "params": [], - "type": "last" + "type": "max" } ] ], @@ -417,7 +825,7 @@ ], "timeFrom": null, "timeShift": null, - "title": "Gas price", + "title": "High statistics", "type": "bargauge" }, { @@ -432,7 +840,7 @@ "h": 2, "w": 24, "x": 0, - "y": 8 + "y": 17 }, "id": 6, "options": { @@ -485,7 +893,10 @@ ], "schemaVersion": 26, "style": "dark", - "tags": [], + "tags": [ + "etherscan", + "ethereum" + ], "templating": { "list": [] }, @@ -497,5 +908,5 @@ "timezone": "", "title": "Etherscan", "uid": "OHZGmm_Gk", - "version": 5 + "version": 9 } \ No newline at end of file diff --git a/grafana/flexpool-miners.json b/grafana/flexpool-miners.json index e271008..930b194 100644 --- a/grafana/flexpool-miners.json +++ b/grafana/flexpool-miners.json @@ -59,7 +59,7 @@ "gnetId": null, "graphTooltip": 0, "id": null, - "iteration": 1617293846981, + "iteration": 1629269857941, "links": [], "panels": [ { @@ -88,7 +88,32 @@ "custom": {}, "links": [] }, - "overrides": [] + "overrides": [ + { + "matcher": { + "id": "byRegexp", + "options": "/XCH/" + }, + "properties": [ + { + "id": "unit", + "value": "XCH" + } + ] + }, + { + "matcher": { + "id": "byRegexp", + "options": "/ETH/" + }, + "properties": [ + { + "id": "unit", + "value": "ETH" + } + ] + } + ] }, "fill": 1, "fillGradient": 0, @@ -133,7 +158,7 @@ "steppedLine": false, "targets": [ { - "alias": "revenue", + "alias": "revenue (ETH)", "groupBy": [ { "params": [ @@ -145,7 +170,7 @@ "measurement": "flexpool_miner_balance", "orderByTime": "ASC", "policy": "default", - "query": "SELECT sum(balance_increase)/1000000000000000000 FROM (select non_negative_difference(\"result\") AS balance_increase FROM \"flexpool_miner_balance\" WHERE \"miner\" =~ /^$miner$/ AND $timeFilter) GROUP BY time(1d) TZ('$timezone');", + "query": "SELECT sum(balance_increase)/1000000000000000000 FROM (select non_negative_difference(\"balance\") AS balance_increase FROM \"flexpool_miner_balance\" WHERE \"miner\" =~ /^$miner$/ AND \"coin\" = 'eth' AND $timeFilter) GROUP BY time(1d) TZ('$timezone');", "rawQuery": true, "refId": "A", "resultFormat": "time_series", @@ -201,7 +226,7 @@ ], "orderByTime": "ASC", "policy": "default", - "query": "SELECT sum(balance_increase)/1000000000000000000*$exchange_rate FROM (select non_negative_difference(\"result\") AS balance_increase FROM \"flexpool_miner_balance\" WHERE \"miner\" =~ /^$miner$/ AND $timeFilter) GROUP BY time(1d) TZ('$timezone');", + "query": "SELECT sum(balance_increase)/1000000000000000000*$exchange_rate FROM (select non_negative_difference(\"balance\") AS balance_increase FROM \"flexpool_miner_balance\" WHERE \"miner\" =~ /^$miner$/ AND \"coin\" = 'eth' AND $timeFilter) GROUP BY time(1d) TZ('$timezone');", "rawQuery": true, "refId": "B", "resultFormat": "time_series", @@ -220,6 +245,95 @@ ] ], "tags": [] + }, + { + "alias": "revenue (XCH)", + "groupBy": [ + { + "params": [ + "1d" + ], + "type": "time" + } + ], + "measurement": "flexpool_miner_balance", + "orderByTime": "ASC", + "policy": "default", + "query": "SELECT sum(balance_increase)/1000000000000 FROM (select non_negative_difference(\"balance\") AS balance_increase FROM \"flexpool_miner_balance\" WHERE \"miner\" =~ /^$miner$/ AND \"coin\" = 'xch' AND $timeFilter) GROUP BY time(1d) TZ('$timezone');", + "rawQuery": true, + "refId": "C", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "result" + ], + "type": "field" + }, + { + "params": [], + "type": "mean" + }, + { + "params": [ + "1d" + ], + "type": "non_negative_derivative" + }, + { + "params": [ + " / 1000000000000000000" + ], + "type": "math" + } + ] + ], + "tags": [ + { + "key": "miner", + "operator": "=~", + "value": "/^$miner$/" + } + ] + }, + { + "alias": "revenue (fiat)", + "groupBy": [ + { + "params": [ + "$__interval" + ], + "type": "time" + }, + { + "params": [ + "null" + ], + "type": "fill" + } + ], + "orderByTime": "ASC", + "policy": "default", + "query": "SELECT sum(balance_increase)/1000000000000*$exchange_rate FROM (select non_negative_difference(\"balance\") AS balance_increase FROM \"flexpool_miner_balance\" WHERE \"miner\" =~ /^$miner$/ AND \"coin\" = 'xch' AND $timeFilter) GROUP BY time(1d) TZ('$timezone');", + "rawQuery": true, + "refId": "D", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "value" + ], + "type": "field" + }, + { + "params": [], + "type": "mean" + } + ] + ], + "tags": [] } ], "thresholds": [], @@ -244,7 +358,7 @@ { "$$hashKey": "object:180", "decimals": 5, - "format": "ETH", + "format": "XCH", "label": "income", "logBase": 1, "max": null, @@ -321,7 +435,7 @@ "groupBy": [ { "params": [ - "$__interval" + "1d" ], "type": "time" }, @@ -332,17 +446,18 @@ "type": "fill" } ], + "measurement": "flexpool_pool_blocks_chart", "orderByTime": "ASC", "policy": "default", "query": "SELECT sum(blocks_increase) FROM (select non_negative_difference(\"confirmed\") AS blocks_increase FROM \"flexpool_pool_block_count\" WHERE $timeFilter) GROUP BY time(1d) TZ('$timezone');", - "rawQuery": true, + "rawQuery": false, "refId": "A", "resultFormat": "time_series", "select": [ [ { "params": [ - "value" + "blockCount" ], "type": "field" }, @@ -352,7 +467,13 @@ } ] ], - "tags": [] + "tags": [ + { + "key": "coin", + "operator": "=~", + "value": "/^$coin$/" + } + ] } ], "thresholds": [], @@ -412,7 +533,32 @@ "custom": {}, "links": [] }, - "overrides": [] + "overrides": [ + { + "matcher": { + "id": "byRegexp", + "options": "/XCH/" + }, + "properties": [ + { + "id": "unit", + "value": "XCH" + } + ] + }, + { + "matcher": { + "id": "byRegexp", + "options": "/ETH/" + }, + "properties": [ + { + "id": "unit", + "value": "ETH" + } + ] + } + ] }, "fill": 1, "fillGradient": 0, @@ -457,7 +603,7 @@ "steppedLine": false, "targets": [ { - "alias": "revenue", + "alias": "revenue (XCH)", "groupBy": [ { "params": [ @@ -469,7 +615,7 @@ "measurement": "flexpool_miner_balance", "orderByTime": "ASC", "policy": "default", - "query": "SELECT sum(balance_increase)/1000000000000000000 FROM (select non_negative_difference(\"result\") AS balance_increase FROM \"flexpool_miner_balance\" WHERE \"miner\" =~ /^$miner$/ AND $timeFilter) GROUP BY time(30d) TZ('$timezone');", + "query": "SELECT sum(balance_increase)/1000000000000000000 FROM (select non_negative_difference(\"balance\") AS balance_increase FROM \"flexpool_miner_balance\" WHERE \"miner\" =~ /^$miner$/ AND coin = 'xch' AND $timeFilter) GROUP BY time(30d) TZ('$timezone');", "rawQuery": true, "refId": "A", "resultFormat": "time_series", @@ -525,7 +671,7 @@ ], "orderByTime": "ASC", "policy": "default", - "query": "SELECT sum(balance_increase)/1000000000000000000*$exchange_rate FROM (select non_negative_difference(\"result\") AS balance_increase FROM \"flexpool_miner_balance\" WHERE \"miner\" =~ /^$miner$/ AND $timeFilter) GROUP BY time(30d) TZ('$timezone');", + "query": "SELECT sum(balance_increase)/1000000000000000000*$exchange_rate FROM (select non_negative_difference(\"balance\") AS balance_increase FROM \"flexpool_miner_balance\" WHERE \"miner\" =~ /^$miner$/ AND coin = 'xch' AND $timeFilter) GROUP BY time(30d) TZ('$timezone');", "rawQuery": true, "refId": "B", "resultFormat": "time_series", @@ -544,6 +690,96 @@ ] ], "tags": [] + }, + { + "alias": "revenue (ETH)", + "groupBy": [ + { + "params": [ + "30d" + ], + "type": "time" + } + ], + "measurement": "flexpool_miner_balance", + "orderByTime": "ASC", + "policy": "default", + "query": "SELECT sum(balance_increase)/1000000000000000000 FROM (select non_negative_difference(\"balance\") AS balance_increase FROM \"flexpool_miner_balance\" WHERE \"miner\" =~ /^$miner$/ AND coin = 'eth' AND $timeFilter) GROUP BY time(30d) TZ('$timezone');", + "rawQuery": true, + "refId": "C", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "result" + ], + "type": "field" + }, + { + "params": [], + "type": "mean" + }, + { + "params": [ + "30d" + ], + "type": "non_negative_derivative" + }, + { + "params": [ + " / 1000000000000000000" + ], + "type": "math" + } + ] + ], + "tags": [ + { + "key": "miner", + "operator": "=~", + "value": "/^$miner$/" + } + ] + }, + { + "alias": "revenue (fiat)", + "groupBy": [ + { + "params": [ + "$__interval" + ], + "type": "time" + }, + { + "params": [ + "null" + ], + "type": "fill" + } + ], + "hide": false, + "orderByTime": "ASC", + "policy": "default", + "query": "SELECT sum(balance_increase)/1000000000000000000 *$exchange_rate FROM (select non_negative_difference(\"balance\") AS balance_increase FROM \"flexpool_miner_balance\" WHERE \"miner\" =~ /^$miner$/ AND coin = 'eth' AND $timeFilter) GROUP BY time(30d) TZ('$timezone');", + "rawQuery": true, + "refId": "D", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "value" + ], + "type": "field" + }, + { + "params": [], + "type": "mean" + } + ] + ], + "tags": [] } ], "thresholds": [], @@ -569,7 +805,7 @@ { "$$hashKey": "object:180", "decimals": 5, - "format": "ETH", + "format": "XCH", "label": "income", "logBase": 1, "max": null, @@ -645,7 +881,7 @@ "groupBy": [ { "params": [ - "$__interval" + "31d" ], "type": "time" }, @@ -656,27 +892,34 @@ "type": "fill" } ], + "measurement": "flexpool_pool_blocks_chart", "orderByTime": "ASC", "policy": "default", "query": "SELECT sum(blocks_increase) FROM (select non_negative_difference(\"confirmed\") AS blocks_increase FROM \"flexpool_pool_block_count\" WHERE $timeFilter) GROUP BY time(30d) TZ('$timezone');", - "rawQuery": true, + "rawQuery": false, "refId": "A", "resultFormat": "time_series", "select": [ [ { "params": [ - "value" + "blockCount" ], "type": "field" }, { "params": [], - "type": "mean" + "type": "sum" } ] ], - "tags": [] + "tags": [ + { + "key": "coin", + "operator": "=~", + "value": "/^$coin$/" + } + ] } ], "thresholds": [], @@ -735,7 +978,32 @@ "custom": {}, "links": [] }, - "overrides": [] + "overrides": [ + { + "matcher": { + "id": "byRegexp", + "options": "/XCH/" + }, + "properties": [ + { + "id": "unit", + "value": "XCH" + } + ] + }, + { + "matcher": { + "id": "byRegexp", + "options": "/ETH/" + }, + "properties": [ + { + "id": "unit", + "value": "ETH" + } + ] + } + ] }, "fill": 1, "fillGradient": 0, @@ -781,7 +1049,7 @@ "steppedLine": false, "targets": [ { - "alias": "balance", + "alias": "balance (XCH)", "groupBy": [ { "params": [ @@ -800,20 +1068,26 @@ "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": [ [ { "params": [ - "result" + "balance" ], "type": "field" }, { "params": [], "type": "mean" + }, + { + "params": [ + "/1000000000000" + ], + "type": "math" } ] ], @@ -822,6 +1096,12 @@ "key": "miner", "operator": "=~", "value": "/^$miner$/" + }, + { + "condition": "AND", + "key": "coin", + "operator": "=", + "value": "xch" } ] }, @@ -841,27 +1121,160 @@ "type": "fill" } ], + "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, - "refId": "B", + "query": "SELECT mean(\"result\")/1000000000000000000 FROM \"flexpool_miner_balance\" WHERE (\"miner\" =~ /^$miner$/) AND $timeFilter GROUP BY time($__interval) fill(null)", + "rawQuery": false, + "refId": "C", "resultFormat": "time_series", "select": [ [ { "params": [ - "value" + "balance" ], "type": "field" }, { "params": [], "type": "mean" + }, + { + "params": [ + "/1000000000000*$exchange_rate" + ], + "type": "math" } ] ], - "tags": [] + "tags": [ + { + "key": "miner", + "operator": "=~", + "value": "/^$miner$/" + }, + { + "condition": "AND", + "key": "coin", + "operator": "=", + "value": "xch" + } + ] + }, + { + "alias": "balance (ETH)", + "groupBy": [ + { + "params": [ + "$__interval" + ], + "type": "time" + }, + { + "params": [ + "null" + ], + "type": "fill" + } + ], + "measurement": "flexpool_miner_balance", + "orderByTime": "ASC", + "policy": "default", + "query": "SELECT mean(\"value\") FROM \"measurement\" WHERE $timeFilter GROUP BY time($__interval) fill(null)", + "rawQuery": false, + "refId": "B", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "balance" + ], + "type": "field" + }, + { + "params": [], + "type": "mean" + }, + { + "params": [ + "/1000000000000000000" + ], + "type": "math" + } + ] + ], + "tags": [ + { + "key": "miner", + "operator": "=~", + "value": "/^$miner$/" + }, + { + "condition": "AND", + "key": "coin", + "operator": "=", + "value": "eth" + } + ] + }, + { + "alias": "balance (fiat)", + "groupBy": [ + { + "params": [ + "$__interval" + ], + "type": "time" + }, + { + "params": [ + "null" + ], + "type": "fill" + } + ], + "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": false, + "refId": "D", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "balance" + ], + "type": "field" + }, + { + "params": [], + "type": "mean" + }, + { + "params": [ + "/1000000000000000000*$exchange_rate" + ], + "type": "math" + } + ] + ], + "tags": [ + { + "key": "miner", + "operator": "=~", + "value": "/^$miner$/" + }, + { + "condition": "AND", + "key": "coin", + "operator": "=", + "value": "eth" + } + ] } ], "thresholds": [], @@ -886,7 +1299,7 @@ { "$$hashKey": "object:1341", "decimals": 5, - "format": "ETH", + "format": "XCH", "label": "balance", "logBase": 1, "max": null, @@ -966,39 +1379,32 @@ "pluginVersion": "7.3.7", "targets": [ { - "alias": "balance", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], + "alias": "balance (XCH)", + "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": [ [ { "params": [ - "result" + "balance" ], "type": "field" }, { "params": [], - "type": "mean" + "type": "last" + }, + { + "params": [ + "/1000000000000" + ], + "type": "math" } ] ], @@ -1007,148 +1413,40 @@ "key": "miner", "operator": "=~", "value": "/^$miner$/" + }, + { + "condition": "AND", + "key": "coin", + "operator": "=", + "value": "xch" } ] }, { "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" + "balance" ], "type": "field" }, { "params": [], - "type": "mean" - } - ] - ], - "tags": [] - } - ], - "timeFrom": "5m", - "timeShift": null, - "title": "Unpaid balance", - "type": "stat" - }, - { - "aliasColors": {}, - "bars": false, - "dashLength": 10, - "dashes": false, - "datasource": "${DS_INFLUXDB}", - "description": "", - "fieldConfig": { - "defaults": { - "custom": {}, - "links": [] - }, - "overrides": [] - }, - "fill": 1, - "fillGradient": 0, - "gridPos": { - "h": 8, - "w": 12, - "x": 0, - "y": 25 - }, - "hiddenSeries": false, - "id": 36, - "legend": { - "avg": false, - "current": false, - "max": false, - "min": false, - "show": true, - "total": false, - "values": false - }, - "lines": true, - "linewidth": 1, - "nullPointMode": "null", - "options": { - "alertThreshold": true, - "dataLinks": [] - }, - "percentage": false, - "pluginVersion": "7.3.7", - "pointradius": 2, - "points": false, - "renderer": "flot", - "seriesOverrides": [ - { - "$$hashKey": "object:596", - "alias": "revenue (fiat)", - "lines": false, - "yaxis": 2 - } - ], - "spaceLength": 10, - "stack": false, - "steppedLine": false, - "targets": [ - { - "alias": "revenue", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], - "measurement": "flexpool_miner_daily_revenue_estimation", - "orderByTime": "ASC", - "policy": "default", - "query": "SELECT mean(\"result\") FROM \"flexpool_miner_daily_revenue_estimation\" WHERE (\"miner\" =~ /^$miner$/) AND $timeFilter GROUP BY time($__interval) fill(null)", - "rawQuery": false, - "refId": "A", - "resultFormat": "time_series", - "select": [ - [ - { - "params": [ - "result" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" + "type": "last" }, { "params": [ - "/ 1000000000000000000" + "/1000000000000*$exchange_rate" ], "type": "math" } @@ -1159,205 +1457,36 @@ "key": "miner", "operator": "=~", "value": "/^$miner$/" + }, + { + "condition": "AND", + "key": "coin", + "operator": "=", + "value": "xch" } ] }, { - "alias": "revenue (fiat)", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], - "measurement": "flexpool_miner_daily_revenue_estimation", + "alias": "balance (ETH)", + "groupBy": [], + "measurement": "flexpool_miner_balance", "orderByTime": "ASC", "policy": "default", - "query": "SELECT mean(\"result\") / 1000000000000000000 * $echange_rate FROM \"flexpool_miner_daily_revenue_estimation\" WHERE (\"miner\" =~ /^$miner$/) AND $timeFilter GROUP BY time($__interval) fill(null)", + "query": "SELECT mean(\"result\")/1000000000000000000 FROM \"flexpool_miner_balance\" WHERE (\"miner\" =~ /^$miner$/) AND $timeFilter GROUP BY time($__interval) fill(null)", "rawQuery": false, - "refId": "B", + "refId": "C", "resultFormat": "time_series", "select": [ [ { "params": [ - "result" + "balance" ], "type": "field" }, { "params": [], - "type": "mean" - }, - { - "params": [ - "/ 1000000000000000000 * $exchange_rate" - ], - "type": "math" - } - ] - ], - "tags": [ - { - "key": "miner", - "operator": "=~", - "value": "/^$miner$/" - } - ] - } - ], - "thresholds": [], - "timeFrom": null, - "timeRegions": [], - "timeShift": null, - "title": "Estimated daily revenue", - "tooltip": { - "shared": true, - "sort": 0, - "value_type": "individual" - }, - "type": "graph", - "xaxis": { - "buckets": null, - "mode": "time", - "name": null, - "show": true, - "values": [] - }, - "yaxes": [ - { - "$$hashKey": "object:442", - "decimals": 5, - "format": "ETH", - "label": null, - "logBase": 1, - "max": null, - "min": "0", - "show": true - }, - { - "$$hashKey": "object:443", - "decimals": 2, - "format": "short", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": true - } - ], - "yaxis": { - "align": false, - "alignLevel": null - } - }, - { - "datasource": "${DS_INFLUXDB}", - "fieldConfig": { - "defaults": { - "custom": {}, - "decimals": 5, - "mappings": [], - "thresholds": { - "mode": "absolute", - "steps": [ - { - "color": "red", - "value": null - }, - { - "color": "green", - "value": 0.00001 - } - ] - }, - "unit": "ETH" - }, - "overrides": [ - { - "matcher": { - "id": "byRegexp", - "options": ".*fiat.*" - }, - "properties": [ - { - "id": "unit", - "value": "short" - }, - { - "id": "decimals", - "value": 2 - } - ] - } - ] - }, - "gridPos": { - "h": 8, - "w": 12, - "x": 12, - "y": 25 - }, - "hideTimeOverride": true, - "id": 70, - "options": { - "colorMode": "value", - "graphMode": "none", - "justifyMode": "center", - "orientation": "auto", - "reduceOptions": { - "calcs": [ - "mean" - ], - "fields": "", - "values": false - }, - "textMode": "auto" - }, - "pluginVersion": "7.3.7", - "targets": [ - { - "alias": "daily", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], - "measurement": "flexpool_miner_daily_revenue_estimation", - "orderByTime": "ASC", - "policy": "default", - "query": "SELECT mean(\"result\")/1000000000000000000 FROM \"flexpool_miner_daily_revenue_estimation\" WHERE (\"miner\" =~ /^$miner$/) AND $timeFilter GROUP BY time($__interval) fill(null)", - "rawQuery": false, - "refId": "A", - "resultFormat": "time_series", - "select": [ - [ - { - "params": [ - "result" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" + "type": "last" }, { "params": [ @@ -1372,194 +1501,40 @@ "key": "miner", "operator": "=~", "value": "/^$miner$/" + }, + { + "condition": "AND", + "key": "coin", + "operator": "=", + "value": "eth" } ] }, { - "alias": "weekly", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], - "measurement": "flexpool_miner_daily_revenue_estimation", + "alias": "balance (fiat)", + "groupBy": [], + "measurement": "flexpool_miner_balance", "orderByTime": "ASC", "policy": "default", - "refId": "C", - "resultFormat": "time_series", - "select": [ - [ - { - "params": [ - "result" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - }, - { - "params": [ - "/1000000000000000000*7" - ], - "type": "math" - } - ] - ], - "tags": [ - { - "key": "miner", - "operator": "=~", - "value": "/^$miner$/" - } - ] - }, - { - "alias": "monthly", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], - "measurement": "flexpool_miner_daily_revenue_estimation", - "orderByTime": "ASC", - "policy": "default", - "refId": "E", - "resultFormat": "time_series", - "select": [ - [ - { - "params": [ - "result" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - }, - { - "params": [ - "/1000000000000000000*30" - ], - "type": "math" - } - ] - ], - "tags": [ - { - "key": "miner", - "operator": "=~", - "value": "/^$miner$/" - } - ] - }, - { - "alias": "daily (fiat)", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], - "measurement": "flexpool_miner_daily_revenue_estimation", - "orderByTime": "ASC", - "policy": "default", - "query": "SELECT mean(\"value\") FROM \"measurement\" WHERE $timeFilter GROUP BY time($__interval) fill(null)", + "query": "SELECT mean(\"result\")/1000000000000000000*$exchange_rate FROM \"flexpool_miner_balance\" WHERE (\"miner\" =~ /^$miner$/) AND $timeFilter GROUP BY time($__interval) fill(null)", "rawQuery": false, - "refId": "B", - "resultFormat": "time_series", - "select": [ - [ - { - "params": [ - "result" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - }, - { - "params": [ - "/1000000000000000000 * $exchange_rate" - ], - "type": "math" - } - ] - ], - "tags": [ - { - "key": "miner", - "operator": "=~", - "value": "/^$miner$/" - } - ] - }, - { - "alias": "weekly (fiat)", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], - "measurement": "flexpool_miner_daily_revenue_estimation", - "orderByTime": "ASC", - "policy": "default", "refId": "D", "resultFormat": "time_series", "select": [ [ { "params": [ - "result" + "balance" ], "type": "field" }, { "params": [], - "type": "mean" + "type": "last" }, { "params": [ - "/1000000000000000000*7*$exchange_rate" + "/1000000000000000000*$exchange_rate" ], "type": "math" } @@ -1570,62 +1545,19 @@ "key": "miner", "operator": "=~", "value": "/^$miner$/" - } - ] - }, - { - "alias": "monthly (fiat)", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" }, { - "params": [ - "null" - ], - "type": "fill" - } - ], - "measurement": "flexpool_miner_daily_revenue_estimation", - "orderByTime": "ASC", - "policy": "default", - "refId": "F", - "resultFormat": "time_series", - "select": [ - [ - { - "params": [ - "result" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - }, - { - "params": [ - "/1000000000000000000*30*$exchange_rate" - ], - "type": "math" - } - ] - ], - "tags": [ - { - "key": "miner", - "operator": "=~", - "value": "/^$miner$/" + "condition": "AND", + "key": "coin", + "operator": "=", + "value": "eth" } ] } ], "timeFrom": "5m", "timeShift": null, - "title": "Estimated revenue", + "title": "Unpaid balance", "type": "stat" }, { @@ -1639,7 +1571,32 @@ "custom": {}, "links": [] }, - "overrides": [] + "overrides": [ + { + "matcher": { + "id": "byRegexp", + "options": "/XCH/" + }, + "properties": [ + { + "id": "unit", + "value": "XCH" + } + ] + }, + { + "matcher": { + "id": "byRegexp", + "options": "/ETH/" + }, + "properties": [ + { + "id": "unit", + "value": "ETH" + } + ] + } + ] }, "fill": 1, "fillGradient": 0, @@ -1647,7 +1604,7 @@ "h": 8, "w": 6, "x": 0, - "y": 33 + "y": 25 }, "hiddenSeries": false, "id": 40, @@ -1685,39 +1642,28 @@ "steppedLine": false, "targets": [ { - "alias": "paid", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], + "alias": "paid (XCH)", + "groupBy": [], "measurement": "flexpool_miner_paid", "orderByTime": "ASC", "policy": "default", "query": "SELECT mean(\"result\")/1000000000000000000 FROM \"flexpool_miner_paid\" WHERE (\"miner\" =~ /^$miner$/) AND $timeFilter GROUP BY time($__interval) fill(null)", - "rawQuery": true, + "rawQuery": false, "refId": "A", "resultFormat": "time_series", "select": [ [ { "params": [ - "result" + "stats_totalPaid" ], "type": "field" }, { - "params": [], - "type": "mean" + "params": [ + "/1000000000000" + ], + "type": "math" } ] ], @@ -1726,6 +1672,12 @@ "key": "miner", "operator": "=~", "value": "/^$miner$/" + }, + { + "condition": "AND", + "key": "coin", + "operator": "=", + "value": "xch" } ] }, @@ -1745,27 +1697,143 @@ "type": "fill" } ], + "measurement": "flexpool_miner_paid", "orderByTime": "ASC", "policy": "default", "query": "SELECT mean(\"result\")/1000000000000000000*$exchange_rate FROM \"flexpool_miner_paid\" WHERE (\"miner\" =~ /^$miner$/) AND $timeFilter GROUP BY time($__interval) fill(null)", - "rawQuery": true, + "rawQuery": false, "refId": "B", "resultFormat": "time_series", "select": [ [ { "params": [ - "value" + "stats_totalPaid" ], "type": "field" }, { "params": [], "type": "mean" + }, + { + "params": [ + " / 1000000000000 * $exchange_rate" + ], + "type": "math" } ] ], - "tags": [] + "tags": [ + { + "key": "miner", + "operator": "=~", + "value": "/^$miner$/" + }, + { + "condition": "AND", + "key": "coin", + "operator": "=", + "value": "xch" + } + ] + }, + { + "alias": "paid (ETH)", + "groupBy": [], + "measurement": "flexpool_miner_paid", + "orderByTime": "ASC", + "policy": "default", + "query": "SELECT mean(\"result\")/1000000000000000000 FROM \"flexpool_miner_paid\" WHERE (\"miner\" =~ /^$miner$/) AND $timeFilter GROUP BY time($__interval) fill(null)", + "rawQuery": false, + "refId": "C", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "stats_totalPaid" + ], + "type": "field" + }, + { + "params": [ + "/1000000000000000000" + ], + "type": "math" + } + ] + ], + "tags": [ + { + "key": "miner", + "operator": "=~", + "value": "/^$miner$/" + }, + { + "condition": "AND", + "key": "coin", + "operator": "=", + "value": "eth" + } + ] + }, + { + "alias": "paid (fiat)", + "groupBy": [ + { + "params": [ + "$__interval" + ], + "type": "time" + }, + { + "params": [ + "null" + ], + "type": "fill" + } + ], + "measurement": "flexpool_miner_paid", + "orderByTime": "ASC", + "policy": "default", + "query": "SELECT mean(\"result\")/1000000000000000000*$exchange_rate FROM \"flexpool_miner_paid\" WHERE (\"miner\" =~ /^$miner$/) AND $timeFilter GROUP BY time($__interval) fill(null)", + "rawQuery": false, + "refId": "D", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "stats_totalPaid" + ], + "type": "field" + }, + { + "params": [], + "type": "mean" + }, + { + "params": [ + " / 1000000000000000000 * $exchange_rate" + ], + "type": "math" + } + ] + ], + "tags": [ + { + "key": "miner", + "operator": "=~", + "value": "/^$miner$/" + }, + { + "condition": "AND", + "key": "coin", + "operator": "=", + "value": "eth" + } + ] } ], "thresholds": [], @@ -1790,7 +1858,7 @@ { "$$hashKey": "object:722", "decimals": 5, - "format": "ETH", + "format": "XCH", "label": "paid", "logBase": 1, "max": null, @@ -1851,7 +1919,7 @@ "h": 8, "w": 6, "x": 6, - "y": 33 + "y": 25 }, "hideTimeOverride": true, "id": 42, @@ -1872,39 +1940,32 @@ "pluginVersion": "7.3.7", "targets": [ { - "alias": "paid", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], + "alias": "paid (XCH)", + "groupBy": [], "measurement": "flexpool_miner_paid", "orderByTime": "ASC", "policy": "default", "query": "SELECT mean(\"result\")/1000000000000000000 FROM \"flexpool_miner_paid\" WHERE (\"miner\" =~ /^$miner$/) AND $timeFilter GROUP BY time($__interval) fill(null)", - "rawQuery": true, + "rawQuery": false, "refId": "A", "resultFormat": "time_series", "select": [ [ { "params": [ - "result" + "stats_totalPaid" ], "type": "field" }, { "params": [], - "type": "mean" + "type": "last" + }, + { + "params": [ + " / 1000000000000" + ], + "type": "math" } ] ], @@ -1913,46 +1974,138 @@ "key": "miner", "operator": "=~", "value": "/^$miner$/" + }, + { + "condition": "AND", + "key": "coin", + "operator": "=", + "value": "xch" } ] }, { "alias": "paid (fiat)", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], + "groupBy": [], + "measurement": "flexpool_miner_paid", "orderByTime": "ASC", "policy": "default", "query": "SELECT mean(\"result\")/1000000000000000000*$exchange_rate FROM \"flexpool_miner_paid\" WHERE (\"miner\" =~ /^$miner$/) AND $timeFilter GROUP BY time($__interval) fill(null)", - "rawQuery": true, + "rawQuery": false, "refId": "B", "resultFormat": "time_series", "select": [ [ { "params": [ - "value" + "stats_totalPaid" + ], + "type": "field" + }, + { + "params": [ + " / 1000000000000*$exchange_rate" + ], + "type": "math" + } + ] + ], + "tags": [ + { + "key": "miner", + "operator": "=~", + "value": "/^$miner$/" + }, + { + "condition": "AND", + "key": "coin", + "operator": "=", + "value": "xch" + } + ] + }, + { + "alias": "paid (ETH)", + "groupBy": [], + "measurement": "flexpool_miner_paid", + "orderByTime": "ASC", + "policy": "default", + "query": "SELECT mean(\"result\")/1000000000000000000 FROM \"flexpool_miner_paid\" WHERE (\"miner\" =~ /^$miner$/) AND $timeFilter GROUP BY time($__interval) fill(null)", + "rawQuery": false, + "refId": "C", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "stats_totalPaid" ], "type": "field" }, { "params": [], - "type": "mean" + "type": "last" + }, + { + "params": [ + "/ 1000000000000000000" + ], + "type": "math" } ] ], - "tags": [] + "tags": [ + { + "key": "miner", + "operator": "=~", + "value": "/^$miner$/" + }, + { + "condition": "AND", + "key": "coin", + "operator": "=", + "value": "eth" + } + ] + }, + { + "alias": "paid (fiat)", + "groupBy": [], + "measurement": "flexpool_miner_paid", + "orderByTime": "ASC", + "policy": "default", + "query": "SELECT mean(\"result\")/1000000000000000000*$exchange_rate FROM \"flexpool_miner_paid\" WHERE (\"miner\" =~ /^$miner$/) AND $timeFilter GROUP BY time($__interval) fill(null)", + "rawQuery": false, + "refId": "D", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "stats_totalPaid" + ], + "type": "field" + }, + { + "params": [ + " / 1000000000000000000*$exchange_rate" + ], + "type": "math" + } + ] + ], + "tags": [ + { + "key": "miner", + "operator": "=~", + "value": "/^$miner$/" + }, + { + "condition": "AND", + "key": "coin", + "operator": "=", + "value": "eth" + } + ] } ], "timeFrom": "5m", @@ -1986,8 +2139,20 @@ "overrides": [ { "matcher": { - "id": "byName", - "options": "amount" + "id": "byRegexp", + "options": "/XCH/" + }, + "properties": [ + { + "id": "decimals", + "value": 5 + } + ] + }, + { + "matcher": { + "id": "byRegexp", + "options": "/ETH/" }, "properties": [ { @@ -1999,16 +2164,12 @@ { "matcher": { "id": "byName", - "options": "amount (fiat)" + "options": "paid (fiat)" }, "properties": [ { "id": "decimals", "value": 2 - }, - { - "id": "custom.width", - "value": null } ] }, @@ -2030,7 +2191,7 @@ "h": 8, "w": 12, "x": 12, - "y": 33 + "y": 25 }, "id": 64, "options": { @@ -2044,7 +2205,7 @@ "measurement": "flexpool_miner_payments", "orderByTime": "ASC", "policy": "default", - "query": "SELECT \"amount\"/1000000000000000000, \"amount\"/1000000000000000000*$exchange_rate as \"amount (fiat)\", \"duration\" FROM \"flexpool_miner_payments\" WHERE (\"miner\" =~ /^$miner$/) order by time desc limit 6", + "query": "SELECT \"value\" / 1000000000000 AS \"paid (XCH)\", \"value\" / 1000000000000 * $exchange_rate AS \"paid (fiat)\", \"duration\" FROM \"flexpool_miner_payments\" WHERE (\"miner\" =~ /^$miner$/ AND coin = 'xch') ORDER BY time DESC LIMIT 6", "rawQuery": true, "refId": "A", "resultFormat": "table", @@ -2052,9 +2213,100 @@ [ { "params": [ - "amount" + "value" ], "type": "field" + }, + { + "params": [ + " / 1000000000000" + ], + "type": "math" + }, + { + "params": [ + "paid" + ], + "type": "alias" + } + ], + [ + { + "params": [ + "value" + ], + "type": "field" + }, + { + "params": [ + " / 1000000000000*$exchange_rate" + ], + "type": "math" + }, + { + "params": [ + "paid (fiat)" + ], + "type": "alias" + } + ] + ], + "tags": [ + { + "key": "miner", + "operator": "=~", + "value": "/^$miner$/" + } + ] + }, + { + "groupBy": [], + "measurement": "flexpool_miner_payments", + "orderByTime": "ASC", + "policy": "default", + "query": "SELECT \"value\" / 1000000000000000000 AS \"paid (ETH)\", \"value\" / 1000000000000000000 * $exchange_rate AS \"paid (fiat)\", \"duration\" FROM \"flexpool_miner_payments\" WHERE (\"miner\" =~ /^$miner$/ AND coin = 'eth') ORDER BY time DESC LIMIT 6", + "rawQuery": true, + "refId": "B", + "resultFormat": "table", + "select": [ + [ + { + "params": [ + "value" + ], + "type": "field" + }, + { + "params": [ + " / 1000000000000" + ], + "type": "math" + }, + { + "params": [ + "paid" + ], + "type": "alias" + } + ], + [ + { + "params": [ + "value" + ], + "type": "field" + }, + { + "params": [ + " / 1000000000000*$exchange_rate" + ], + "type": "math" + }, + { + "params": [ + "paid (fiat)" + ], + "type": "alias" } ] ], @@ -2079,7 +2331,7 @@ "h": 1, "w": 24, "x": 0, - "y": 41 + "y": 33 }, "id": 26, "panels": [], @@ -2112,7 +2364,32 @@ ] } }, - "overrides": [] + "overrides": [ + { + "matcher": { + "id": "byRegexp", + "options": "/XCH/" + }, + "properties": [ + { + "id": "unit", + "value": "bytes" + } + ] + }, + { + "matcher": { + "id": "byRegexp", + "options": "/ETH/" + }, + "properties": [ + { + "id": "unit", + "value": "Hs" + } + ] + } + ] }, "fill": 1, "fillGradient": 0, @@ -2120,7 +2397,7 @@ "h": 8, "w": 12, "x": 0, - "y": 42 + "y": 34 }, "hiddenSeries": false, "id": 44, @@ -2151,7 +2428,7 @@ "steppedLine": false, "targets": [ { - "alias": "effective", + "alias": "effective (XCH)", "groupBy": [ { "params": [ @@ -2175,7 +2452,7 @@ [ { "params": [ - "current_effective_hashrate" + "currentEffectiveHashrate" ], "type": "field" }, @@ -2190,11 +2467,17 @@ "key": "miner", "operator": "=~", "value": "/^$miner$/" + }, + { + "condition": "AND", + "key": "coin", + "operator": "=", + "value": "xch" } ] }, { - "alias": "reported", + "alias": "reported (XCH)", "groupBy": [ { "params": [ @@ -2218,7 +2501,7 @@ [ { "params": [ - "current_reported_hashrate" + "reportedHashrate" ], "type": "field" }, @@ -2233,11 +2516,17 @@ "key": "miner", "operator": "=~", "value": "/^$miner$/" + }, + { + "condition": "AND", + "key": "coin", + "operator": "=", + "value": "xch" } ] }, { - "alias": "daily effective", + "alias": "average effective (XCH)", "groupBy": [ { "params": [ @@ -2261,7 +2550,7 @@ [ { "params": [ - "daily_effective_hashrate" + "averageEffectiveHashrate" ], "type": "field" }, @@ -2276,6 +2565,159 @@ "key": "miner", "operator": "=~", "value": "/^$miner$/" + }, + { + "condition": "AND", + "key": "coin", + "operator": "=", + "value": "xch" + } + ] + }, + { + "alias": "effective (ETH)", + "groupBy": [ + { + "params": [ + "$__interval" + ], + "type": "time" + }, + { + "params": [ + "previous" + ], + "type": "fill" + } + ], + "measurement": "flexpool_miner_stats", + "orderByTime": "ASC", + "policy": "default", + "refId": "D", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "currentEffectiveHashrate" + ], + "type": "field" + }, + { + "params": [], + "type": "mean" + } + ] + ], + "tags": [ + { + "key": "miner", + "operator": "=~", + "value": "/^$miner$/" + }, + { + "condition": "AND", + "key": "coin", + "operator": "=", + "value": "eth" + } + ] + }, + { + "alias": "reported (ETH)", + "groupBy": [ + { + "params": [ + "$__interval" + ], + "type": "time" + }, + { + "params": [ + "previous" + ], + "type": "fill" + } + ], + "measurement": "flexpool_miner_stats", + "orderByTime": "ASC", + "policy": "default", + "refId": "E", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "reportedHashrate" + ], + "type": "field" + }, + { + "params": [], + "type": "mean" + } + ] + ], + "tags": [ + { + "key": "miner", + "operator": "=~", + "value": "/^$miner$/" + }, + { + "condition": "AND", + "key": "coin", + "operator": "=", + "value": "eth" + } + ] + }, + { + "alias": "average effective (ETH)", + "groupBy": [ + { + "params": [ + "$__interval" + ], + "type": "time" + }, + { + "params": [ + "previous" + ], + "type": "fill" + } + ], + "measurement": "flexpool_miner_stats", + "orderByTime": "ASC", + "policy": "default", + "refId": "F", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "averageEffectiveHashrate" + ], + "type": "field" + }, + { + "params": [], + "type": "mean" + } + ] + ], + "tags": [ + { + "key": "miner", + "operator": "=~", + "value": "/^$miner$/" + }, + { + "condition": "AND", + "key": "coin", + "operator": "=", + "value": "eth" } ] } @@ -2287,7 +2729,7 @@ "title": "Hashrates", "tooltip": { "shared": true, - "sort": 0, + "sort": 2, "value_type": "individual" }, "type": "graph", @@ -2301,7 +2743,7 @@ "yaxes": [ { "$$hashKey": "object:154", - "format": "Hs", + "format": "bytes", "label": null, "logBase": 1, "max": null, @@ -2342,15 +2784,40 @@ } ] }, - "unit": "Hs" + "unit": "short" }, - "overrides": [] + "overrides": [ + { + "matcher": { + "id": "byRegexp", + "options": "/XCH/" + }, + "properties": [ + { + "id": "unit", + "value": "bytes" + } + ] + }, + { + "matcher": { + "id": "byRegexp", + "options": "/ETH/" + }, + "properties": [ + { + "id": "unit", + "value": "Hs" + } + ] + } + ] }, "gridPos": { "h": 8, "w": 12, "x": 12, - "y": 42 + "y": 34 }, "hideTimeOverride": true, "id": 18, @@ -2371,21 +2838,8 @@ "pluginVersion": "7.3.7", "targets": [ { - "alias": "effective", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], + "alias": "effective (XCH)", + "groupBy": [], "measurement": "flexpool_miner_stats", "orderByTime": "ASC", "policy": "default", @@ -2395,13 +2849,13 @@ [ { "params": [ - "current_effective_hashrate" + "currentEffectiveHashrate" ], "type": "field" }, { "params": [], - "type": "mean" + "type": "last" } ] ], @@ -2410,25 +2864,18 @@ "key": "miner", "operator": "=~", "value": "/^$miner$/" + }, + { + "condition": "AND", + "key": "coin", + "operator": "=", + "value": "xch" } ] }, { - "alias": "reported", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], + "alias": "reported (XCH)", + "groupBy": [], "measurement": "flexpool_miner_stats", "orderByTime": "ASC", "policy": "default", @@ -2438,13 +2885,13 @@ [ { "params": [ - "current_reported_hashrate" + "reportedHashrate" ], "type": "field" }, { "params": [], - "type": "mean" + "type": "last" } ] ], @@ -2453,25 +2900,18 @@ "key": "miner", "operator": "=~", "value": "/^$miner$/" + }, + { + "condition": "AND", + "key": "coin", + "operator": "=", + "value": "xch" } ] }, { - "alias": "daily effective", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], + "alias": "average effective (XCH)", + "groupBy": [], "measurement": "flexpool_miner_stats", "orderByTime": "ASC", "policy": "default", @@ -2481,13 +2921,13 @@ [ { "params": [ - "daily_effective_hashrate" + "averageEffectiveHashrate" ], "type": "field" }, { "params": [], - "type": "mean" + "type": "last" } ] ], @@ -2496,6 +2936,120 @@ "key": "miner", "operator": "=~", "value": "/^$miner$/" + }, + { + "condition": "AND", + "key": "coin", + "operator": "=", + "value": "xch" + } + ] + }, + { + "alias": "effective (ETH)", + "groupBy": [], + "measurement": "flexpool_miner_stats", + "orderByTime": "ASC", + "policy": "default", + "refId": "D", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "currentEffectiveHashrate" + ], + "type": "field" + }, + { + "params": [], + "type": "last" + } + ] + ], + "tags": [ + { + "key": "miner", + "operator": "=~", + "value": "/^$miner$/" + }, + { + "condition": "AND", + "key": "coin", + "operator": "=", + "value": "eth" + } + ] + }, + { + "alias": "reported (ETH)", + "groupBy": [], + "measurement": "flexpool_miner_stats", + "orderByTime": "ASC", + "policy": "default", + "refId": "E", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "reportedHashrate" + ], + "type": "field" + }, + { + "params": [], + "type": "last" + } + ] + ], + "tags": [ + { + "key": "miner", + "operator": "=~", + "value": "/^$miner$/" + }, + { + "condition": "AND", + "key": "coin", + "operator": "=", + "value": "eth" + } + ] + }, + { + "alias": "average effective (ETH)", + "groupBy": [], + "measurement": "flexpool_miner_stats", + "orderByTime": "ASC", + "policy": "default", + "refId": "F", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "averageEffectiveHashrate" + ], + "type": "field" + }, + { + "params": [], + "type": "last" + } + ] + ], + "tags": [ + { + "key": "miner", + "operator": "=~", + "value": "/^$miner$/" + }, + { + "condition": "AND", + "key": "coin", + "operator": "=", + "value": "eth" } ] } @@ -2512,7 +3066,7 @@ "h": 1, "w": 24, "x": 0, - "y": 50 + "y": 42 }, "id": 14, "panels": [], @@ -2539,7 +3093,7 @@ "h": 8, "w": 12, "x": 0, - "y": 51 + "y": 43 }, "hiddenSeries": false, "id": 6, @@ -2566,14 +3120,17 @@ "renderer": "flot", "seriesOverrides": [ { + "$$hashKey": "object:2759", "alias": "valid", "color": "#56A64B" }, { + "$$hashKey": "object:2760", "alias": "stale", "color": "#F2CC0C" }, { + "$$hashKey": "object:2761", "alias": "invalid", "color": "#E02F44" } @@ -2607,7 +3164,7 @@ [ { "params": [ - "daily_valid_shares" + "validShares" ], "type": "field" }, @@ -2650,7 +3207,7 @@ [ { "params": [ - "daily_stale_shares" + "staleShares" ], "type": "field" }, @@ -2693,7 +3250,7 @@ [ { "params": [ - "daily_invalid_shares" + "invalidShares" ], "type": "field" }, @@ -2710,7 +3267,7 @@ "timeFrom": null, "timeRegions": [], "timeShift": null, - "title": "Daily shares", + "title": "Shares", "tooltip": { "shared": true, "sort": 0, @@ -2726,6 +3283,7 @@ }, "yaxes": [ { + "$$hashKey": "object:2780", "format": "short", "label": null, "logBase": 1, @@ -2734,6 +3292,7 @@ "show": true }, { + "$$hashKey": "object:2781", "format": "short", "label": null, "logBase": 1, @@ -2773,7 +3332,7 @@ "h": 8, "w": 4, "x": 12, - "y": 51 + "y": 43 }, "hideTimeOverride": true, "id": 8, @@ -2795,20 +3354,7 @@ "targets": [ { "alias": "valid", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], + "groupBy": [], "measurement": "flexpool_miner_stats", "orderByTime": "ASC", "policy": "default", @@ -2818,13 +3364,13 @@ [ { "params": [ - "daily_valid_shares" + "validShares" ], "type": "field" }, { "params": [], - "type": "mean" + "type": "last" } ] ], @@ -2871,7 +3417,7 @@ "h": 8, "w": 4, "x": 16, - "y": 51 + "y": 43 }, "hideTimeOverride": true, "id": 10, @@ -2893,20 +3439,7 @@ "targets": [ { "alias": "stale", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], + "groupBy": [], "measurement": "flexpool_miner_stats", "orderByTime": "ASC", "policy": "default", @@ -2916,13 +3449,13 @@ [ { "params": [ - "daily_stale_shares" + "staleShares" ], "type": "field" }, { "params": [], - "type": "mean" + "type": "last" } ] ], @@ -2970,7 +3503,7 @@ "h": 8, "w": 4, "x": 20, - "y": 51 + "y": 43 }, "hideTimeOverride": true, "id": 12, @@ -2992,20 +3525,7 @@ "targets": [ { "alias": "invalid", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], + "groupBy": [], "measurement": "flexpool_miner_stats", "orderByTime": "ASC", "policy": "default", @@ -3015,13 +3535,13 @@ [ { "params": [ - "daily_invalid_shares" + "invalidShares" ], "type": "field" }, { "params": [], - "type": "mean" + "type": "last" } ] ], @@ -3040,6 +3560,7 @@ "type": "stat" } ], + "refresh": false, "schemaVersion": 26, "style": "dark", "tags": [ @@ -3048,6 +3569,29 @@ ], "templating": { "list": [ + { + "allValue": null, + "current": {}, + "datasource": "${DS_INFLUXDB}", + "definition": "", + "error": null, + "hide": 0, + "includeAll": false, + "label": null, + "multi": false, + "name": "coin", + "options": [], + "query": "SHOW TAG VALUES FROM flexpool_miner_stats WITH KEY = \"coin\"", + "refresh": 1, + "regex": "", + "skipUrlSync": false, + "sort": 1, + "tagValuesQuery": "", + "tags": [], + "tagsQuery": "", + "type": "query", + "useTags": false + }, { "allValue": null, "current": {}, @@ -3060,7 +3604,7 @@ "multi": false, "name": "miner", "options": [], - "query": "SHOW TAG VALUES FROM flexpool_miner_stats WITH KEY = \"miner\"", + "query": "SHOW TAG VALUES FROM flexpool_miner_stats WITH KEY = \"miner\" WHERE \"coin\" = '$coin'", "refresh": 1, "regex": "", "skipUrlSync": false, @@ -3098,7 +3642,7 @@ "allValue": null, "current": {}, "datasource": "${DS_INFLUXDB}", - "definition": "select value from currencies where \"to\" =~ /^$currency$/ order by desc limit 1", + "definition": "", "error": null, "hide": 2, "includeAll": false, @@ -3106,7 +3650,7 @@ "multi": false, "name": "exchange_rate", "options": [], - "query": "select value from currencies where \"to\" =~ /^$currency$/ order by desc limit 1", + "query": "select value from currencies where \"to\" =~ /^$currency$/ and \"from\" =~ /^(?i)$coin$/ order by desc limit 1", "refresh": 1, "regex": "", "skipUrlSync": false, @@ -3245,9 +3789,14 @@ "selected": false, "text": "Europe/Zurich", "value": "Europe/Zurich" + }, + { + "selected": false, + "text": "Pacific/Auckland", + "value": "Pacific/Auckland" } ], - "query": "UTC,Africa/Tunis,America/Chicago,America/Fortaleza,America/Los_Angeles,America/New_York,America/Moncton,America/New_York,America/Sao_Paulo,America/St_Johns,America/Toronto,America/Vancouver,Asia/Jakarta,Asia/Karachi,Asia/Kolkata,Asia/Singapore,Europe/Berlin,Europe/Kiev,Europe/London,Europe/Moscow,Europe/Paris,Europe/Zagreb,Europe/Zurich", + "query": "UTC,Africa/Tunis,America/Chicago,America/Fortaleza,America/Los_Angeles,America/New_York,America/Moncton,America/New_York,America/Sao_Paulo,America/St_Johns,America/Toronto,America/Vancouver,Asia/Jakarta,Asia/Karachi,Asia/Kolkata,Asia/Singapore,Europe/Berlin,Europe/Kiev,Europe/London,Europe/Moscow,Europe/Paris,Europe/Zagreb,Europe/Zurich,Pacific/Auckland", "queryValue": "", "skipUrlSync": false, "type": "custom" @@ -3274,5 +3823,5 @@ "timezone": "utc", "title": "Flexpool miners", "uid": "Q3JPASkgz", - "version": 4 + "version": 21 } \ No newline at end of file diff --git a/grafana/flexpool-pool.json b/grafana/flexpool-pool.json index cf215fa..52665ab 100644 --- a/grafana/flexpool-pool.json +++ b/grafana/flexpool-pool.json @@ -53,7 +53,7 @@ "gnetId": null, "graphTooltip": 0, "id": null, - "iteration": 1617293861537, + "iteration": 1629216495656, "links": [], "panels": [ { @@ -80,7 +80,32 @@ "defaults": { "custom": {} }, - "overrides": [] + "overrides": [ + { + "matcher": { + "id": "byRegexp", + "options": "/XCH/" + }, + "properties": [ + { + "id": "unit", + "value": "bytes" + } + ] + }, + { + "matcher": { + "id": "byRegexp", + "options": "/ETH/" + }, + "properties": [ + { + "id": "unit", + "value": "Hs" + } + ] + } + ] }, "fill": 1, "fillGradient": 0, @@ -118,7 +143,7 @@ "steppedLine": false, "targets": [ { - "alias": "total", + "alias": "total (ETH)", "groupBy": [ { "params": [ @@ -152,7 +177,70 @@ } ] ], - "tags": [] + "tags": [ + { + "key": "coin", + "operator": "=", + "value": "eth" + }, + { + "condition": "AND", + "key": "coin", + "operator": "=~", + "value": "/^$coin$/" + } + ] + }, + { + "alias": "total (XCH)", + "groupBy": [ + { + "params": [ + "$__interval" + ], + "type": "time" + }, + { + "params": [ + "null" + ], + "type": "fill" + } + ], + "measurement": "flexpool_pool_hashrate", + "orderByTime": "ASC", + "policy": "default", + "query": "SELECT mean(\"total\") FROM \"flexpool_pool_hashrate\" WHERE (\"coin\" = 'xch' AND \"coin\" =~ /^$coin$/) AND $timeFilter GROUP BY time($__interval) fill(null)", + "rawQuery": false, + "refId": "B", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "total" + ], + "type": "field" + }, + { + "params": [], + "type": "mean" + } + ] + ], + "tags": [ + { + "key": "coin", + "operator": "=", + "value": "xch" + }, + { + "condition": "AND", + "key": "coin", + "operator": "=~", + "value": "/^$coin$/" + } + ] } ], "thresholds": [], @@ -213,9 +301,34 @@ } ] }, - "unit": "Hs" + "unit": "short" }, - "overrides": [] + "overrides": [ + { + "matcher": { + "id": "byRegexp", + "options": "/XCH/" + }, + "properties": [ + { + "id": "unit", + "value": "bytes" + } + ] + }, + { + "matcher": { + "id": "byRegexp", + "options": "/ETH/" + }, + "properties": [ + { + "id": "unit", + "value": "Hs" + } + ] + } + ] }, "gridPos": { "h": 9, @@ -241,21 +354,8 @@ "pluginVersion": "7.3.7", "targets": [ { - "alias": "total", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], + "alias": "total (XCH)", + "groupBy": [], "measurement": "flexpool_pool_hashrate", "orderByTime": "ASC", "policy": "default", @@ -275,7 +375,55 @@ } ] ], - "tags": [] + "tags": [ + { + "key": "coin", + "operator": "=", + "value": "xch" + }, + { + "condition": "AND", + "key": "coin", + "operator": "=~", + "value": "/^$coin$/" + } + ] + }, + { + "alias": "total (ETH)", + "groupBy": [], + "measurement": "flexpool_pool_hashrate", + "orderByTime": "ASC", + "policy": "default", + "refId": "B", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "total" + ], + "type": "field" + }, + { + "params": [], + "type": "last" + } + ] + ], + "tags": [ + { + "key": "coin", + "operator": "=", + "value": "eth" + }, + { + "condition": "AND", + "key": "coin", + "operator": "=~", + "value": "/^$coin$/" + } + ] } ], "timeFrom": null, @@ -294,7 +442,32 @@ "defaults": { "custom": {} }, - "overrides": [] + "overrides": [ + { + "matcher": { + "id": "byRegexp", + "options": "/XCH/" + }, + "properties": [ + { + "id": "unit", + "value": "bytes" + } + ] + }, + { + "matcher": { + "id": "byRegexp", + "options": "/ETH/" + }, + "properties": [ + { + "id": "unit", + "value": "Hs" + } + ] + } + ] }, "fill": 1, "fillGradient": 0, @@ -332,118 +505,7 @@ "steppedLine": false, "targets": [ { - "alias": "eu", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], - "measurement": "flexpool_pool_hashrate", - "orderByTime": "ASC", - "policy": "default", - "refId": "C", - "resultFormat": "time_series", - "select": [ - [ - { - "params": [ - "eu" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - } - ] - ], - "tags": [] - }, - { - "alias": "us", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], - "measurement": "flexpool_pool_hashrate", - "orderByTime": "ASC", - "policy": "default", - "refId": "E", - "resultFormat": "time_series", - "select": [ - [ - { - "params": [ - "us" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - } - ] - ], - "tags": [] - }, - { - "alias": "sa", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], - "measurement": "flexpool_pool_hashrate", - "orderByTime": "ASC", - "policy": "default", - "refId": "D", - "resultFormat": "time_series", - "select": [ - [ - { - "params": [ - "sa" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - } - ] - ], - "tags": [] - }, - { - "alias": "as", + "alias": "as (XCH)", "groupBy": [ { "params": [ @@ -467,7 +529,7 @@ [ { "params": [ - "as" + "regions_as" ], "type": "field" }, @@ -477,10 +539,22 @@ } ] ], - "tags": [] + "tags": [ + { + "key": "coin", + "operator": "=", + "value": "xch" + }, + { + "condition": "AND", + "key": "coin", + "operator": "=~", + "value": "/^$coin$/" + } + ] }, { - "alias": "au", + "alias": "au (XCH)", "groupBy": [ { "params": [ @@ -504,7 +578,7 @@ [ { "params": [ - "au" + "regions_au" ], "type": "field" }, @@ -514,7 +588,411 @@ } ] ], - "tags": [] + "tags": [ + { + "key": "coin", + "operator": "=", + "value": "xch" + }, + { + "condition": "AND", + "key": "coin", + "operator": "=~", + "value": "/^$coin$/" + } + ] + }, + { + "alias": "eu (XCH)", + "groupBy": [ + { + "params": [ + "$__interval" + ], + "type": "time" + }, + { + "params": [ + "null" + ], + "type": "fill" + } + ], + "measurement": "flexpool_pool_hashrate", + "orderByTime": "ASC", + "policy": "default", + "refId": "C", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "regions_eu" + ], + "type": "field" + }, + { + "params": [], + "type": "mean" + } + ] + ], + "tags": [ + { + "key": "coin", + "operator": "=", + "value": "xch" + }, + { + "condition": "AND", + "key": "coin", + "operator": "=~", + "value": "/^$coin$/" + } + ] + }, + { + "alias": "sa (XCH)", + "groupBy": [ + { + "params": [ + "$__interval" + ], + "type": "time" + }, + { + "params": [ + "null" + ], + "type": "fill" + } + ], + "measurement": "flexpool_pool_hashrate", + "orderByTime": "ASC", + "policy": "default", + "refId": "D", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "regions_sa" + ], + "type": "field" + }, + { + "params": [], + "type": "mean" + } + ] + ], + "tags": [ + { + "key": "coin", + "operator": "=", + "value": "xch" + }, + { + "condition": "AND", + "key": "coin", + "operator": "=~", + "value": "/^$coin$/" + } + ] + }, + { + "alias": "us (XCH)", + "groupBy": [ + { + "params": [ + "$__interval" + ], + "type": "time" + }, + { + "params": [ + "null" + ], + "type": "fill" + } + ], + "measurement": "flexpool_pool_hashrate", + "orderByTime": "ASC", + "policy": "default", + "refId": "E", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "regions_us" + ], + "type": "field" + }, + { + "params": [], + "type": "mean" + } + ] + ], + "tags": [ + { + "key": "coin", + "operator": "=", + "value": "xch" + }, + { + "condition": "AND", + "key": "coin", + "operator": "=~", + "value": "/^$coin$/" + } + ] + }, + { + "alias": "as (ETH)", + "groupBy": [ + { + "params": [ + "$__interval" + ], + "type": "time" + }, + { + "params": [ + "null" + ], + "type": "fill" + } + ], + "measurement": "flexpool_pool_hashrate", + "orderByTime": "ASC", + "policy": "default", + "refId": "F", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "regions_as" + ], + "type": "field" + }, + { + "params": [], + "type": "mean" + } + ] + ], + "tags": [ + { + "key": "coin", + "operator": "=", + "value": "eth" + }, + { + "condition": "AND", + "key": "coin", + "operator": "=~", + "value": "/^$coin$/" + } + ] + }, + { + "alias": "au (ETH)", + "groupBy": [ + { + "params": [ + "$__interval" + ], + "type": "time" + }, + { + "params": [ + "null" + ], + "type": "fill" + } + ], + "measurement": "flexpool_pool_hashrate", + "orderByTime": "ASC", + "policy": "default", + "refId": "G", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "regions_au" + ], + "type": "field" + }, + { + "params": [], + "type": "mean" + } + ] + ], + "tags": [ + { + "key": "coin", + "operator": "=", + "value": "eth" + }, + { + "condition": "AND", + "key": "coin", + "operator": "=~", + "value": "/^$coin$/" + } + ] + }, + { + "alias": "eu (ETH)", + "groupBy": [ + { + "params": [ + "$__interval" + ], + "type": "time" + }, + { + "params": [ + "null" + ], + "type": "fill" + } + ], + "measurement": "flexpool_pool_hashrate", + "orderByTime": "ASC", + "policy": "default", + "refId": "H", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "regions_eu" + ], + "type": "field" + }, + { + "params": [], + "type": "mean" + } + ] + ], + "tags": [ + { + "key": "coin", + "operator": "=", + "value": "eth" + }, + { + "condition": "AND", + "key": "coin", + "operator": "=~", + "value": "/^$coin$/" + } + ] + }, + { + "alias": "sa (ETH)", + "groupBy": [ + { + "params": [ + "$__interval" + ], + "type": "time" + }, + { + "params": [ + "null" + ], + "type": "fill" + } + ], + "measurement": "flexpool_pool_hashrate", + "orderByTime": "ASC", + "policy": "default", + "refId": "I", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "regions_sa" + ], + "type": "field" + }, + { + "params": [], + "type": "mean" + } + ] + ], + "tags": [ + { + "key": "coin", + "operator": "=", + "value": "eth" + }, + { + "condition": "AND", + "key": "coin", + "operator": "=~", + "value": "/^$coin$/" + } + ] + }, + { + "alias": "us (ETH)", + "groupBy": [ + { + "params": [ + "$__interval" + ], + "type": "time" + }, + { + "params": [ + "null" + ], + "type": "fill" + } + ], + "measurement": "flexpool_pool_hashrate", + "orderByTime": "ASC", + "policy": "default", + "refId": "J", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "regions_us" + ], + "type": "field" + }, + { + "params": [], + "type": "mean" + } + ] + ], + "tags": [ + { + "key": "coin", + "operator": "=", + "value": "eth" + }, + { + "condition": "AND", + "key": "coin", + "operator": "=~", + "value": "/^$coin$/" + } + ] } ], "thresholds": [], @@ -576,9 +1054,34 @@ } ] }, - "unit": "Hs" + "unit": "short" }, - "overrides": [] + "overrides": [ + { + "matcher": { + "id": "byRegexp", + "options": "/XCH/" + }, + "properties": [ + { + "id": "unit", + "value": "bytes" + } + ] + }, + { + "matcher": { + "id": "byRegexp", + "options": "/ETH/" + }, + "properties": [ + { + "id": "unit", + "value": "Hs" + } + ] + } + ] }, "gridPos": { "h": 9, @@ -604,132 +1107,8 @@ "pluginVersion": "7.3.7", "targets": [ { - "alias": "eu", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], - "measurement": "flexpool_pool_hashrate", - "orderByTime": "ASC", - "policy": "default", - "refId": "C", - "resultFormat": "time_series", - "select": [ - [ - { - "params": [ - "eu" - ], - "type": "field" - }, - { - "params": [], - "type": "last" - } - ] - ], - "tags": [] - }, - { - "alias": "us", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], - "measurement": "flexpool_pool_hashrate", - "orderByTime": "ASC", - "policy": "default", - "refId": "E", - "resultFormat": "time_series", - "select": [ - [ - { - "params": [ - "us" - ], - "type": "field" - }, - { - "params": [], - "type": "last" - } - ] - ], - "tags": [] - }, - { - "alias": "sa", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], - "measurement": "flexpool_pool_hashrate", - "orderByTime": "ASC", - "policy": "default", - "refId": "D", - "resultFormat": "time_series", - "select": [ - [ - { - "params": [ - "sa" - ], - "type": "field" - }, - { - "params": [], - "type": "last" - } - ] - ], - "tags": [] - }, - { - "alias": "as", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], + "alias": "as (XCH)", + "groupBy": [], "measurement": "flexpool_pool_hashrate", "orderByTime": "ASC", "policy": "default", @@ -739,7 +1118,7 @@ [ { "params": [ - "as" + "regions_as" ], "type": "field" }, @@ -749,24 +1128,23 @@ } ] ], - "tags": [] - }, - { - "alias": "au", - "groupBy": [ + "tags": [ { - "params": [ - "$__interval" - ], - "type": "time" + "key": "coin", + "operator": "=", + "value": "xch" }, { - "params": [ - "null" - ], - "type": "fill" + "condition": "AND", + "key": "coin", + "operator": "=~", + "value": "/^$coin$/" } - ], + ] + }, + { + "alias": "au (XCH)", + "groupBy": [], "measurement": "flexpool_pool_hashrate", "orderByTime": "ASC", "policy": "default", @@ -776,7 +1154,7 @@ [ { "params": [ - "au" + "regions_au" ], "type": "field" }, @@ -786,7 +1164,307 @@ } ] ], - "tags": [] + "tags": [ + { + "key": "coin", + "operator": "=", + "value": "xch" + }, + { + "condition": "AND", + "key": "coin", + "operator": "=~", + "value": "/^$coin$/" + } + ] + }, + { + "alias": "eu (XCH)", + "groupBy": [], + "measurement": "flexpool_pool_hashrate", + "orderByTime": "ASC", + "policy": "default", + "refId": "C", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "regions_eu" + ], + "type": "field" + }, + { + "params": [], + "type": "last" + } + ] + ], + "tags": [ + { + "key": "coin", + "operator": "=", + "value": "xch" + }, + { + "condition": "AND", + "key": "coin", + "operator": "=~", + "value": "/^$coin$/" + } + ] + }, + { + "alias": "sa (XCH)", + "groupBy": [], + "measurement": "flexpool_pool_hashrate", + "orderByTime": "ASC", + "policy": "default", + "refId": "D", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "regions_sa" + ], + "type": "field" + }, + { + "params": [], + "type": "last" + } + ] + ], + "tags": [ + { + "key": "coin", + "operator": "=", + "value": "xch" + }, + { + "condition": "AND", + "key": "coin", + "operator": "=~", + "value": "/^$coin$/" + } + ] + }, + { + "alias": "us (XCH)", + "groupBy": [], + "measurement": "flexpool_pool_hashrate", + "orderByTime": "ASC", + "policy": "default", + "refId": "E", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "regions_us" + ], + "type": "field" + }, + { + "params": [], + "type": "last" + } + ] + ], + "tags": [ + { + "key": "coin", + "operator": "=", + "value": "xch" + }, + { + "condition": "AND", + "key": "coin", + "operator": "=~", + "value": "/^$coin$/" + } + ] + }, + { + "alias": "as (ETH)", + "groupBy": [], + "measurement": "flexpool_pool_hashrate", + "orderByTime": "ASC", + "policy": "default", + "refId": "F", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "regions_as" + ], + "type": "field" + }, + { + "params": [], + "type": "last" + } + ] + ], + "tags": [ + { + "key": "coin", + "operator": "=", + "value": "eth" + }, + { + "condition": "AND", + "key": "coin", + "operator": "=~", + "value": "/^$coin$/" + } + ] + }, + { + "alias": "au (ETH)", + "groupBy": [], + "measurement": "flexpool_pool_hashrate", + "orderByTime": "ASC", + "policy": "default", + "refId": "G", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "regions_au" + ], + "type": "field" + }, + { + "params": [], + "type": "last" + } + ] + ], + "tags": [ + { + "key": "coin", + "operator": "=", + "value": "eth" + }, + { + "condition": "AND", + "key": "coin", + "operator": "=~", + "value": "/^$coin$/" + } + ] + }, + { + "alias": "eu (ETH)", + "groupBy": [], + "measurement": "flexpool_pool_hashrate", + "orderByTime": "ASC", + "policy": "default", + "refId": "H", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "regions_eu" + ], + "type": "field" + }, + { + "params": [], + "type": "last" + } + ] + ], + "tags": [ + { + "key": "coin", + "operator": "=", + "value": "eth" + }, + { + "condition": "AND", + "key": "coin", + "operator": "=~", + "value": "/^$coin$/" + } + ] + }, + { + "alias": "sa (ETH)", + "groupBy": [], + "measurement": "flexpool_pool_hashrate", + "orderByTime": "ASC", + "policy": "default", + "refId": "I", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "regions_sa" + ], + "type": "field" + }, + { + "params": [], + "type": "last" + } + ] + ], + "tags": [ + { + "key": "coin", + "operator": "=", + "value": "eth" + }, + { + "condition": "AND", + "key": "coin", + "operator": "=~", + "value": "/^$coin$/" + } + ] + }, + { + "alias": "us (ETH)", + "groupBy": [], + "measurement": "flexpool_pool_hashrate", + "orderByTime": "ASC", + "policy": "default", + "refId": "J", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "regions_us" + ], + "type": "field" + }, + { + "params": [], + "type": "last" + } + ] + ], + "tags": [ + { + "key": "coin", + "operator": "=", + "value": "eth" + }, + { + "condition": "AND", + "key": "coin", + "operator": "=~", + "value": "/^$coin$/" + } + ] } ], "timeFrom": null, @@ -872,7 +1550,7 @@ "type": "fill" } ], - "measurement": "flexpool_pool_miners_online", + "measurement": "flexpool_pool_miners_count", "orderByTime": "ASC", "policy": "default", "refId": "A", @@ -891,7 +1569,13 @@ } ] ], - "tags": [] + "tags": [ + { + "key": "coin", + "operator": "=~", + "value": "/^$coin$/" + } + ] } ], "thresholds": [], @@ -981,21 +1665,8 @@ "targets": [ { "alias": "online miners", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], - "measurement": "flexpool_pool_miners_online", + "groupBy": [], + "measurement": "flexpool_pool_miners_count", "orderByTime": "ASC", "policy": "default", "refId": "A", @@ -1014,7 +1685,13 @@ } ] ], - "tags": [] + "tags": [ + { + "key": "coin", + "operator": "=~", + "value": "/^$coin$/" + } + ] } ], "timeFrom": null, @@ -1085,7 +1762,7 @@ "type": "fill" } ], - "measurement": "flexpool_pool_workers_online", + "measurement": "flexpool_pool_workers_count", "orderByTime": "ASC", "policy": "default", "refId": "A", @@ -1104,7 +1781,13 @@ } ] ], - "tags": [] + "tags": [ + { + "key": "coin", + "operator": "=~", + "value": "/^$coin$/" + } + ] } ], "thresholds": [], @@ -1193,21 +1876,8 @@ "targets": [ { "alias": "online workers", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], - "measurement": "flexpool_pool_workers_online", + "groupBy": [], + "measurement": "flexpool_pool_workers_count", "orderByTime": "ASC", "policy": "default", "refId": "A", @@ -1226,7 +1896,13 @@ } ] ], - "tags": [] + "tags": [ + { + "key": "coin", + "operator": "=~", + "value": "/^$coin$/" + } + ] } ], "timeFrom": null, @@ -1297,40 +1973,31 @@ "targets": [ { "alias": "count", - "groupBy": [ - { - "params": [ - "1d" - ], - "type": "time" - }, - { - "params": [ - "linear" - ], - "type": "fill" - } - ], - "measurement": "flexpool_pool_blocks", + "groupBy": [], + "measurement": "flexpool_pool_blocks_chart", "orderByTime": "ASC", "policy": "default", + "query": "SELECT \"blockCount\" FROM \"flexpool_pool_blocks_chart\" WHERE (\"coin\" =~ /^$coin$/) AND $timeFilter tz('$timezone')", + "rawQuery": false, "refId": "A", "resultFormat": "time_series", "select": [ [ { "params": [ - "number" + "blockCount" ], "type": "field" - }, - { - "params": [], - "type": "count" } ] ], - "tags": [], + "tags": [ + { + "key": "coin", + "operator": "=~", + "value": "/^$coin$/" + } + ], "tz": "$timezone" } ], @@ -1390,10 +2057,6 @@ { "color": "green", "value": null - }, - { - "color": "red", - "value": 80 } ] } @@ -1426,21 +2089,8 @@ "targets": [ { "alias": "blocks", - "groupBy": [ - { - "params": [ - "1d" - ], - "type": "time" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], - "measurement": "flexpool_pool_blocks", + "groupBy": [], + "measurement": "flexpool_pool_blocks_chart", "orderByTime": "ASC", "policy": "default", "refId": "A", @@ -1449,17 +2099,23 @@ [ { "params": [ - "number" + "blockCount" ], "type": "field" }, { "params": [], - "type": "count" + "type": "mean" } ] ], - "tags": [], + "tags": [ + { + "key": "coin", + "operator": "=~", + "value": "/^$coin$/" + } + ], "tz": "$timezone" } ], @@ -1478,7 +2134,32 @@ "defaults": { "custom": {} }, - "overrides": [] + "overrides": [ + { + "matcher": { + "id": "byRegexp", + "options": "/XCH/" + }, + "properties": [ + { + "id": "unit", + "value": "XCH" + } + ] + }, + { + "matcher": { + "id": "byRegexp", + "options": "/ETH/" + }, + "properties": [ + { + "id": "unit", + "value": "ETH" + } + ] + } + ] }, "fill": 1, "fillGradient": 0, @@ -1516,7 +2197,7 @@ "steppedLine": false, "targets": [ { - "alias": "Block reward", + "alias": "Block reward (ETH)", "groupBy": [ { "params": [ @@ -1540,7 +2221,7 @@ [ { "params": [ - "total_rewards" + "reward" ], "type": "field" }, @@ -1556,7 +2237,74 @@ } ] ], - "tags": [] + "tags": [ + { + "key": "coin", + "operator": "=", + "value": "eth" + }, + { + "condition": "AND", + "key": "coin", + "operator": "=~", + "value": "/^$coin$/" + } + ] + }, + { + "alias": "Block reward (XCH)", + "groupBy": [ + { + "params": [ + "$__interval" + ], + "type": "time" + }, + { + "params": [ + "linear" + ], + "type": "fill" + } + ], + "measurement": "flexpool_pool_blocks", + "orderByTime": "ASC", + "policy": "default", + "refId": "B", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "reward" + ], + "type": "field" + }, + { + "params": [], + "type": "mean" + }, + { + "params": [ + " / 1000000000000" + ], + "type": "math" + } + ] + ], + "tags": [ + { + "key": "coin", + "operator": "=", + "value": "xch" + }, + { + "condition": "AND", + "key": "coin", + "operator": "=~", + "value": "/^$coin$/" + } + ] } ], "thresholds": [], @@ -1616,16 +2364,61 @@ { "color": "green", "value": null - }, - { - "color": "red", - "value": 80 } ] }, - "unit": "ETH" + "unit": "short" }, - "overrides": [] + "overrides": [ + { + "matcher": { + "id": "byRegexp", + "options": "/XCH/" + }, + "properties": [ + { + "id": "unit", + "value": "XCH" + } + ] + }, + { + "matcher": { + "id": "byRegexp", + "options": "/ETH/" + }, + "properties": [ + { + "id": "unit", + "value": "ETH" + } + ] + }, + { + "matcher": { + "id": "byRegexp", + "options": "/XCH/" + }, + "properties": [ + { + "id": "decimals", + "value": 2 + } + ] + }, + { + "matcher": { + "id": "byRegexp", + "options": "/ETH/" + }, + "properties": [ + { + "id": "decimals", + "value": 5 + } + ] + } + ] }, "gridPos": { "h": 8, @@ -1651,7 +2444,7 @@ "pluginVersion": "7.3.7", "targets": [ { - "alias": "rewards", + "alias": "rewards (XCH)", "groupBy": [ { "params": [ @@ -1675,7 +2468,62 @@ [ { "params": [ - "total_rewards" + "reward" + ], + "type": "field" + }, + { + "params": [], + "type": "mean" + }, + { + "params": [ + "/ 1000000000000" + ], + "type": "math" + } + ] + ], + "tags": [ + { + "key": "coin", + "operator": "=", + "value": "xch" + }, + { + "condition": "AND", + "key": "coin", + "operator": "=~", + "value": "/^$coin$/" + } + ] + }, + { + "alias": "rewards (ETH)", + "groupBy": [ + { + "params": [ + "$__interval" + ], + "type": "time" + }, + { + "params": [ + "null" + ], + "type": "fill" + } + ], + "measurement": "flexpool_pool_blocks", + "orderByTime": "ASC", + "policy": "default", + "refId": "B", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "reward" ], "type": "field" }, @@ -1691,7 +2539,19 @@ } ] ], - "tags": [] + "tags": [ + { + "key": "coin", + "operator": "=", + "value": "eth" + }, + { + "condition": "AND", + "key": "coin", + "operator": "=~", + "value": "/^$coin$/" + } + ] } ], "timeFrom": null, @@ -1709,7 +2569,32 @@ "defaults": { "custom": {} }, - "overrides": [] + "overrides": [ + { + "matcher": { + "id": "byRegexp", + "options": "/XCH/" + }, + "properties": [ + { + "id": "unit", + "value": "XCH" + } + ] + }, + { + "matcher": { + "id": "byRegexp", + "options": "/ETH/" + }, + "properties": [ + { + "id": "unit", + "value": "ETH" + } + ] + } + ] }, "fill": 1, "fillGradient": 0, @@ -1747,7 +2632,7 @@ "steppedLine": false, "targets": [ { - "alias": "total rewards", + "alias": "total rewards (XCH)", "groupBy": [ { "params": [ @@ -1762,7 +2647,7 @@ "type": "fill" } ], - "measurement": "flexpool_pool_blocks", + "measurement": "flexpool_pool_blocks_chart", "orderByTime": "ASC", "policy": "default", "refId": "A", @@ -1771,7 +2656,63 @@ [ { "params": [ - "total_rewards" + "rewards" + ], + "type": "field" + }, + { + "params": [], + "type": "sum" + }, + { + "params": [ + "/1000000000000" + ], + "type": "math" + } + ] + ], + "tags": [ + { + "key": "coin", + "operator": "=", + "value": "xch" + }, + { + "condition": "AND", + "key": "coin", + "operator": "=~", + "value": "/^$coin$/" + } + ], + "tz": "$timezone" + }, + { + "alias": "total rewards (ETH)", + "groupBy": [ + { + "params": [ + "1d" + ], + "type": "time" + }, + { + "params": [ + "null" + ], + "type": "fill" + } + ], + "measurement": "flexpool_pool_blocks_chart", + "orderByTime": "ASC", + "policy": "default", + "refId": "B", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "rewards" ], "type": "field" }, @@ -1787,7 +2728,19 @@ } ] ], - "tags": [], + "tags": [ + { + "key": "coin", + "operator": "=", + "value": "eth" + }, + { + "condition": "AND", + "key": "coin", + "operator": "=~", + "value": "/^$coin$/" + } + ], "tz": "$timezone" } ], @@ -1840,7 +2793,6 @@ "fieldConfig": { "defaults": { "custom": {}, - "decimals": 5, "mappings": [], "thresholds": { "mode": "absolute", @@ -1851,9 +2803,42 @@ } ] }, - "unit": "ETH" + "unit": "short" }, - "overrides": [] + "overrides": [ + { + "matcher": { + "id": "byRegexp", + "options": "/XCH/" + }, + "properties": [ + { + "id": "unit", + "value": "XCH" + }, + { + "id": "decimals", + "value": 2 + } + ] + }, + { + "matcher": { + "id": "byRegexp", + "options": "/ETH/" + }, + "properties": [ + { + "id": "unit", + "value": "ETH" + }, + { + "id": "decimals", + "value": 5 + } + ] + } + ] }, "gridPos": { "h": 8, @@ -1879,22 +2864,16 @@ "pluginVersion": "7.3.7", "targets": [ { - "alias": "total rewards", + "alias": "total rewards (XCH)", "groupBy": [ { "params": [ "1d" ], "type": "time" - }, - { - "params": [ - "null" - ], - "type": "fill" } ], - "measurement": "flexpool_pool_blocks", + "measurement": "flexpool_pool_blocks_chart", "orderByTime": "ASC", "policy": "default", "refId": "A", @@ -1903,7 +2882,57 @@ [ { "params": [ - "total_rewards" + "rewards" + ], + "type": "field" + }, + { + "params": [], + "type": "sum" + }, + { + "params": [ + "/1000000000000" + ], + "type": "math" + } + ] + ], + "tags": [ + { + "key": "coin", + "operator": "=", + "value": "xch" + }, + { + "condition": "AND", + "key": "coin", + "operator": "=~", + "value": "/^$coin$/" + } + ], + "tz": "$timezone" + }, + { + "alias": "total rewards (ETH)", + "groupBy": [ + { + "params": [ + "1d" + ], + "type": "time" + } + ], + "measurement": "flexpool_pool_blocks_chart", + "orderByTime": "ASC", + "policy": "default", + "refId": "B", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "rewards" ], "type": "field" }, @@ -1919,7 +2948,19 @@ } ] ], - "tags": [], + "tags": [ + { + "key": "coin", + "operator": "=", + "value": "eth" + }, + { + "condition": "AND", + "key": "coin", + "operator": "=~", + "value": "/^$coin$/" + } + ], "tz": "$timezone" } ], @@ -2000,7 +3041,7 @@ [ { "params": [ - "round_time" + "roundTime" ], "type": "field" }, @@ -2010,7 +3051,13 @@ } ] ], - "tags": [] + "tags": [ + { + "key": "coin", + "operator": "=~", + "value": "/^$coin$/" + } + ] } ], "thresholds": [], @@ -2039,7 +3086,7 @@ "label": null, "logBase": 1, "max": null, - "min": null, + "min": "0", "show": true }, { @@ -2101,6 +3148,333 @@ "targets": [ { "alias": "round time", + "groupBy": [], + "measurement": "flexpool_pool_blocks", + "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": [ + "roundTime" + ], + "type": "field" + }, + { + "params": [], + "type": "last" + } + ] + ], + "tags": [ + { + "key": "coin", + "operator": "=~", + "value": "/^$coin$/" + } + ] + } + ], + "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": [ + "$__interval" + ], + "type": "time" + }, + { + "params": [ + "linear" + ], + "type": "fill" + } + ], + "measurement": "flexpool_pool_blocks", + "orderByTime": "ASC", + "policy": "default", + "query": "SELECT mean(\"luck\") *100 FROM \"flexpool_pool_blocks\" WHERE (\"coin\" =~ /^$coin$/) AND $timeFilter GROUP BY time($__interval) fill(linear)", + "rawQuery": false, + "refId": "A", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "luck" + ], + "type": "field" + }, + { + "params": [], + "type": "mean" + }, + { + "params": [ + "*100" + ], + "type": "math" + } + ] + ], + "tags": [ + { + "key": "coin", + "operator": "=~", + "value": "/^$coin$/" + } + ] + } + ], + "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_current_luck", + "orderByTime": "ASC", + "policy": "default", + "refId": "A", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "result" + ], + "type": "field" + }, + { + "params": [], + "type": "last" + }, + { + "params": [ + "*100" + ], + "type": "math" + } + ] + ], + "tags": [ + { + "key": "coin", + "operator": "=~", + "value": "/^$coin$/" + } + ] + } + ], + "timeFrom": null, + "timeShift": null, + "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": [ @@ -2115,22 +3489,161 @@ "type": "fill" } ], - "measurement": "flexpool_pool_blocks", + "measurement": "flexpool_pool_average_luck_round_time", "orderByTime": "ASC", "policy": "default", + "query": "SELECT 1/mean(\"result\") *100 FROM \"flexpool_pool_current_luck\" WHERE coin =~ /^$coin$/ AND $timeFilter GROUP BY time($__interval) fill(null)", + "rawQuery": true, "refId": "A", "resultFormat": "time_series", "select": [ [ { "params": [ - "round_time" + "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(\"result\") *100 FROM \"flexpool_pool_current_luck\" WHERE coin =~ /^$coin$/ AND $timeFilter GROUP BY time($__interval) fill(null)", + "rawQuery": true, + "refId": "A", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "luck" + ], + "type": "field" + }, + { + "params": [], + "type": "last" + }, + { + "params": [ + "*100" + ], + "type": "math" } ] ], @@ -2139,10 +3652,11 @@ ], "timeFrom": null, "timeShift": null, - "title": "Round time", + "title": "Current effort", "type": "stat" } ], + "refresh": false, "schemaVersion": 26, "style": "dark", "tags": [ @@ -2279,12 +3793,40 @@ "selected": false, "text": "Europe/Zurich", "value": "Europe/Zurich" + }, + { + "selected": false, + "text": "Pacific/Auckland", + "value": "Pacific/Auckland" } ], - "query": "UTC,Africa/Tunis,America/Chicago,America/Fortaleza,America/Los_Angeles,America/New_York,America/Moncton,America/New_York,America/Sao_Paulo,America/St_Johns,America/Toronto,America/Vancouver,Asia/Jakarta,Asia/Karachi,Asia/Kolkata,Asia/Singapore,Europe/Berlin,Europe/Kiev,Europe/London,Europe/Moscow,Europe/Paris,Europe/Zagreb,Europe/Zurich", + "query": "UTC,Africa/Tunis,America/Chicago,America/Fortaleza,America/Los_Angeles,America/New_York,America/Moncton,America/New_York,America/Sao_Paulo,America/St_Johns,America/Toronto,America/Vancouver,Asia/Jakarta,Asia/Karachi,Asia/Kolkata,Asia/Singapore,Europe/Berlin,Europe/Kiev,Europe/London,Europe/Moscow,Europe/Paris,Europe/Zagreb,Europe/Zurich,Pacific/Auckland", "queryValue": "", "skipUrlSync": false, "type": "custom" + }, + { + "allValue": null, + "current": {}, + "datasource": "${DS_INFLUXDB}", + "definition": "", + "error": null, + "hide": 0, + "includeAll": false, + "label": null, + "multi": false, + "name": "coin", + "options": [], + "query": "SHOW TAG VALUES FROM flexpool_pool_hashrate WITH KEY = \"coin\"", + "refresh": 1, + "regex": "", + "skipUrlSync": false, + "sort": 1, + "tagValuesQuery": "", + "tags": [], + "tagsQuery": "", + "type": "query", + "useTags": false } ] }, @@ -2296,5 +3838,5 @@ "timezone": "utc", "title": "Flexpool pool", "uid": "_vo2TQQMk", - "version": 20 -} \ No newline at end of file + "version": 11 +} diff --git a/grafana/flexpool-workers.json b/grafana/flexpool-workers.json index c051f7b..bc3e981 100644 --- a/grafana/flexpool-workers.json +++ b/grafana/flexpool-workers.json @@ -53,7 +53,7 @@ "gnetId": null, "graphTooltip": 0, "id": null, - "iteration": 1617000842181, + "iteration": 1629269888685, "links": [], "panels": [ { @@ -82,7 +82,32 @@ "custom": {}, "links": [] }, - "overrides": [] + "overrides": [ + { + "matcher": { + "id": "byRegexp", + "options": "/XCH/" + }, + "properties": [ + { + "id": "unit", + "value": "bytes" + } + ] + }, + { + "matcher": { + "id": "byRegexp", + "options": "/ETH/" + }, + "properties": [ + { + "id": "unit", + "value": "Hs" + } + ] + } + ] }, "fill": 1, "fillGradient": 0, @@ -120,7 +145,7 @@ "steppedLine": false, "targets": [ { - "alias": "effective", + "alias": "current effective (XCH)", "groupBy": [ { "params": [ @@ -128,69 +153,6 @@ ], "type": "time" }, - { - "params": [ - "miner" - ], - "type": "tag" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], - "measurement": "flexpool_miner_workers", - "orderByTime": "ASC", - "policy": "home", - "query": "SELECT mean(\"effective_hashrate\") FROM \"flexpool_miner_workers\" WHERE (\"miner\" =~ /^$miner$/ AND \"name\" =~ /^$worker$/) AND $timeFilter GROUP BY time($__interval), \"miner\" fill(null)", - "rawQuery": true, - "refId": "A", - "resultFormat": "time_series", - "select": [ - [ - { - "params": [ - "effective_hashrate" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - } - ] - ], - "tags": [ - { - "key": "miner", - "operator": "=~", - "value": "/^$miner$/" - }, - { - "condition": "AND", - "key": "name", - "operator": "=~", - "value": "/^$worker$/" - } - ] - }, - { - "alias": "reported", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - }, - { - "params": [ - "miner" - ], - "type": "tag" - }, { "params": [ "null" @@ -201,15 +163,13 @@ "measurement": "flexpool_miner_workers", "orderByTime": "ASC", "policy": "default", - "query": "SELECT mean(\"reported_hashrate\") FROM \"flexpool_miner_workers\" WHERE (\"miner\" =~ /^$miner$/ AND \"name\" =~ /^$worker$/) AND $timeFilter GROUP BY time($__interval), \"miner\" fill(null)", - "rawQuery": true, - "refId": "B", + "refId": "A", "resultFormat": "time_series", "select": [ [ { "params": [ - "reported_hashrate" + "currentEffectiveHashrate" ], "type": "field" }, @@ -221,6 +181,12 @@ ], "tags": [ { + "key": "coin", + "operator": "=~", + "value": "/^$coin$/" + }, + { + "condition": "AND", "key": "miner", "operator": "=~", "value": "/^$miner$/" @@ -230,6 +196,195 @@ "key": "name", "operator": "=~", "value": "/^$worker$/" + }, + { + "condition": "AND", + "key": "coin", + "operator": "=", + "value": "xch" + } + ] + }, + { + "alias": "average effective (XCH)", + "groupBy": [ + { + "params": [ + "$__interval" + ], + "type": "time" + }, + { + "params": [ + "null" + ], + "type": "fill" + } + ], + "measurement": "flexpool_miner_workers", + "orderByTime": "ASC", + "policy": "default", + "refId": "B", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "averageEffectiveHashrate" + ], + "type": "field" + }, + { + "params": [], + "type": "mean" + } + ] + ], + "tags": [ + { + "key": "coin", + "operator": "=~", + "value": "/^$coin$/" + }, + { + "condition": "AND", + "key": "miner", + "operator": "=~", + "value": "/^$miner$/" + }, + { + "condition": "AND", + "key": "name", + "operator": "=~", + "value": "/^$worker$/" + }, + { + "condition": "AND", + "key": "coin", + "operator": "=", + "value": "xch" + } + ] + }, + { + "alias": "current effective (ETH)", + "groupBy": [ + { + "params": [ + "$__interval" + ], + "type": "time" + }, + { + "params": [ + "null" + ], + "type": "fill" + } + ], + "measurement": "flexpool_miner_workers", + "orderByTime": "ASC", + "policy": "default", + "refId": "C", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "currentEffectiveHashrate" + ], + "type": "field" + }, + { + "params": [], + "type": "mean" + } + ] + ], + "tags": [ + { + "key": "coin", + "operator": "=~", + "value": "/^$coin$/" + }, + { + "condition": "AND", + "key": "miner", + "operator": "=~", + "value": "/^$miner$/" + }, + { + "condition": "AND", + "key": "name", + "operator": "=~", + "value": "/^$worker$/" + }, + { + "condition": "AND", + "key": "coin", + "operator": "=", + "value": "eth" + } + ] + }, + { + "alias": "average effective (ETH)", + "groupBy": [ + { + "params": [ + "$__interval" + ], + "type": "time" + }, + { + "params": [ + "null" + ], + "type": "fill" + } + ], + "measurement": "flexpool_miner_workers", + "orderByTime": "ASC", + "policy": "default", + "refId": "D", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "averageEffectiveHashrate" + ], + "type": "field" + }, + { + "params": [], + "type": "mean" + } + ] + ], + "tags": [ + { + "key": "coin", + "operator": "=~", + "value": "/^$coin$/" + }, + { + "condition": "AND", + "key": "miner", + "operator": "=~", + "value": "/^$miner$/" + }, + { + "condition": "AND", + "key": "name", + "operator": "=~", + "value": "/^$worker$/" + }, + { + "condition": "AND", + "key": "coin", + "operator": "=", + "value": "eth" } ] } @@ -254,6 +409,7 @@ }, "yaxes": [ { + "$$hashKey": "object:7053", "format": "Hs", "label": null, "logBase": 1, @@ -262,6 +418,7 @@ "show": true }, { + "$$hashKey": "object:7054", "format": "Hs", "label": null, "logBase": 1, @@ -294,9 +451,34 @@ } ] }, - "unit": "Hs" + "unit": "short" }, - "overrides": [] + "overrides": [ + { + "matcher": { + "id": "byRegexp", + "options": "/XCH/" + }, + "properties": [ + { + "id": "unit", + "value": "bytes" + } + ] + }, + { + "matcher": { + "id": "byRegexp", + "options": "/ETH/" + }, + "properties": [ + { + "id": "unit", + "value": "Hs" + } + ] + } + ] }, "gridPos": { "h": 8, @@ -322,21 +504,8 @@ "pluginVersion": "7.3.7", "targets": [ { - "alias": "hashrate", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], + "alias": "hashrate (XCH)", + "groupBy": [], "measurement": "flexpool_miner_workers", "orderByTime": "ASC", "policy": "default", @@ -346,13 +515,13 @@ [ { "params": [ - "effective_hashrate" + "currentEffectiveHashrate" ], "type": "field" }, { "params": [], - "type": "mean" + "type": "last" } ] ], @@ -367,6 +536,66 @@ "key": "name", "operator": "=~", "value": "/^$worker$/" + }, + { + "condition": "AND", + "key": "coin", + "operator": "=~", + "value": "/^$coin$/" + }, + { + "condition": "AND", + "key": "coin", + "operator": "=", + "value": "xch" + } + ] + }, + { + "alias": "hashrate (ETH)", + "groupBy": [], + "measurement": "flexpool_miner_workers", + "orderByTime": "ASC", + "policy": "default", + "refId": "B", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "currentEffectiveHashrate" + ], + "type": "field" + }, + { + "params": [], + "type": "last" + } + ] + ], + "tags": [ + { + "key": "miner", + "operator": "=~", + "value": "/^$miner$/" + }, + { + "condition": "AND", + "key": "name", + "operator": "=~", + "value": "/^$worker$/" + }, + { + "condition": "AND", + "key": "coin", + "operator": "=~", + "value": "/^$coin$/" + }, + { + "condition": "AND", + "key": "coin", + "operator": "=", + "value": "eth" } ] } @@ -395,9 +624,34 @@ } ] }, - "unit": "Hs" + "unit": "short" }, - "overrides": [] + "overrides": [ + { + "matcher": { + "id": "byRegexp", + "options": "/XCH/" + }, + "properties": [ + { + "id": "unit", + "value": "bytes" + } + ] + }, + { + "matcher": { + "id": "byRegexp", + "options": "/ETH/" + }, + "properties": [ + { + "id": "unit", + "value": "Hs" + } + ] + } + ] }, "gridPos": { "h": 8, @@ -423,37 +677,26 @@ "pluginVersion": "7.3.7", "targets": [ { - "alias": "hashrate", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], + "alias": "hashrate (XCH)", + "groupBy": [], "measurement": "flexpool_miner_workers", "orderByTime": "ASC", "policy": "default", + "query": "SELECT last(\"reported_hashrate\") FROM \"flexpool_miner_workers\" WHERE (\"miner\" =~ /^$miner$/ AND \"name\" =~ /^$worker$/) AND $timeFilter", + "rawQuery": false, "refId": "A", "resultFormat": "time_series", "select": [ [ { "params": [ - "reported_hashrate" + "reportedHashrate" ], "type": "field" }, { "params": [], - "type": "mean" + "type": "last" } ] ], @@ -468,6 +711,68 @@ "key": "name", "operator": "=~", "value": "/^$worker$/" + }, + { + "condition": "AND", + "key": "coin", + "operator": "=~", + "value": "/^$coin$/" + }, + { + "condition": "AND", + "key": "coin", + "operator": "=", + "value": "xch" + } + ] + }, + { + "alias": "hashrate (ETH)", + "groupBy": [], + "measurement": "flexpool_miner_workers", + "orderByTime": "ASC", + "policy": "default", + "query": "SELECT last(\"reported_hashrate\") FROM \"flexpool_miner_workers\" WHERE (\"miner\" =~ /^$miner$/ AND \"name\" =~ /^$worker$/) AND $timeFilter", + "rawQuery": false, + "refId": "B", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "reportedHashrate" + ], + "type": "field" + }, + { + "params": [], + "type": "last" + } + ] + ], + "tags": [ + { + "key": "miner", + "operator": "=~", + "value": "/^$miner$/" + }, + { + "condition": "AND", + "key": "name", + "operator": "=~", + "value": "/^$worker$/" + }, + { + "condition": "AND", + "key": "coin", + "operator": "=~", + "value": "/^$coin$/" + }, + { + "condition": "AND", + "key": "coin", + "operator": "=", + "value": "eth" } ] } @@ -537,15 +842,18 @@ "renderer": "flot", "seriesOverrides": [ { - "alias": "valid", + "$$hashKey": "object:8033", + "alias": "/valid/", "color": "#56A64B" }, { - "alias": "stale", + "$$hashKey": "object:8034", + "alias": "/stale/", "color": "#F2CC0C" }, { - "alias": "invalid", + "$$hashKey": "object:8035", + "alias": "/invalid/", "color": "#E02F44" } ], @@ -578,7 +886,7 @@ [ { "params": [ - "valid_shares" + "validShares" ], "type": "field" }, @@ -599,6 +907,12 @@ "key": "name", "operator": "=~", "value": "/^$worker$/" + }, + { + "condition": "AND", + "key": "coin", + "operator": "=~", + "value": "/^$coin$/" } ] }, @@ -627,7 +941,7 @@ [ { "params": [ - "stale_shares" + "staleShares" ], "type": "field" }, @@ -648,6 +962,12 @@ "key": "name", "operator": "=~", "value": "/^$worker$/" + }, + { + "condition": "AND", + "key": "coin", + "operator": "=~", + "value": "/^$coin$/" } ] }, @@ -697,6 +1017,12 @@ "key": "name", "operator": "=~", "value": "/^$worker$/" + }, + { + "condition": "AND", + "key": "coin", + "operator": "=~", + "value": "/^$coin$/" } ] } @@ -705,7 +1031,7 @@ "timeFrom": null, "timeRegions": [], "timeShift": null, - "title": "Daily shares", + "title": "Shares", "tooltip": { "shared": true, "sort": 0, @@ -721,6 +1047,7 @@ }, "yaxes": [ { + "$$hashKey": "object:8054", "format": "short", "label": null, "logBase": 1, @@ -729,6 +1056,7 @@ "show": true }, { + "$$hashKey": "object:8055", "format": "short", "label": null, "logBase": 1, @@ -789,20 +1117,7 @@ "targets": [ { "alias": "valid", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], + "groupBy": [], "measurement": "flexpool_miner_workers", "orderByTime": "ASC", "policy": "default", @@ -812,13 +1127,13 @@ [ { "params": [ - "valid_shares" + "validShares" ], "type": "field" }, { "params": [], - "type": "mean" + "type": "last" } ] ], @@ -833,6 +1148,12 @@ "key": "name", "operator": "=~", "value": "/^$worker$/" + }, + { + "condition": "AND", + "key": "coin", + "operator": "=~", + "value": "/^$coin$/" } ] } @@ -892,20 +1213,7 @@ "targets": [ { "alias": "stale", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], + "groupBy": [], "measurement": "flexpool_miner_workers", "orderByTime": "ASC", "policy": "default", @@ -915,13 +1223,13 @@ [ { "params": [ - "stale_shares" + "staleShares" ], "type": "field" }, { "params": [], - "type": "mean" + "type": "last" } ] ], @@ -936,6 +1244,12 @@ "key": "name", "operator": "=~", "value": "/^$worker$/" + }, + { + "condition": "AND", + "key": "coin", + "operator": "=~", + "value": "/^$coin$/" } ] } @@ -996,20 +1310,7 @@ "targets": [ { "alias": "invalid", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], + "groupBy": [], "measurement": "flexpool_miner_workers", "orderByTime": "ASC", "policy": "default", @@ -1019,13 +1320,13 @@ [ { "params": [ - "invalid_shares" + "invalidShares" ], "type": "field" }, { "params": [], - "type": "mean" + "type": "last" } ] ], @@ -1040,6 +1341,12 @@ "key": "name", "operator": "=~", "value": "/^$worker$/" + }, + { + "condition": "AND", + "key": "coin", + "operator": "=~", + "value": "/^$coin$/" } ] } @@ -1062,7 +1369,28 @@ "allValue": null, "current": {}, "datasource": "${DS_INFLUXDB}", - "definition": "", + "error": null, + "hide": 0, + "includeAll": false, + "label": null, + "multi": false, + "name": "coin", + "options": [], + "query": "SHOW TAG VALUES FROM flexpool_miner_workers WITH KEY = \"coin\"", + "refresh": 1, + "regex": "", + "skipUrlSync": false, + "sort": 5, + "tagValuesQuery": "", + "tags": [], + "tagsQuery": "", + "type": "query", + "useTags": false + }, + { + "allValue": null, + "current": {}, + "datasource": "${DS_INFLUXDB}", "error": null, "hide": 0, "includeAll": false, @@ -1070,7 +1398,7 @@ "multi": false, "name": "miner", "options": [], - "query": "SHOW TAG VALUES FROM flexpool_miner_workers WITH KEY = \"miner\"", + "query": "SHOW TAG VALUES FROM flexpool_miner_workers WITH KEY = \"miner\" WHERE coin =~ /^$coin$/", "refresh": 1, "regex": "", "skipUrlSync": false, @@ -1107,7 +1435,7 @@ ] }, "time": { - "from": "now-6h", + "from": "now-2d", "to": "now" }, "timepicker": { diff --git a/images/grafana-010.png b/images/grafana-010.png index 48f8c40..de7953f 100644 Binary files a/images/grafana-010.png and b/images/grafana-010.png differ diff --git a/telegraf/currencies.conf b/telegraf/currencies.conf index a4c8b44..6672727 100644 --- a/telegraf/currencies.conf +++ b/telegraf/currencies.conf @@ -18,6 +18,26 @@ from = "ETH" to = "USD" +[[inputs.http]] + name_override = "currencies" + urls = ["https://api.coingecko.com/api/v3/simple/price?ids=chia&vs_currencies=eur"] + data_format = "json" + tagexclude = ["url"] + json_query = "chia" + [inputs.http.tags] + from = "XCH" + to = "EUR" + +[[inputs.http]] + name_override = "currencies" + urls = ["https://api.coingecko.com/api/v3/simple/price?ids=chia&vs_currencies=usd"] + data_format = "json" + tagexclude = ["url"] + json_query = "chia" + [inputs.http.tags] + from = "XCH" + to = "USD" + [[processors.rename]] namepass = ["currencies"] [[processors.rename.replace]] diff --git a/telegraf/ethgasstation.conf b/telegraf/ethgasstation.conf new file mode 100644 index 0000000..2786d4c --- /dev/null +++ b/telegraf/ethgasstation.conf @@ -0,0 +1,5 @@ +[[inputs.http]] + name_override = "ethgasstation_ethgasapi" + urls = ["https://ethgasstation.info/api/ethgasAPI.json?api-key=${ETHGASSTATION_TOKEN}"] + data_format = "json" + tagexclude = ["url"] diff --git a/telegraf/flexpool-miner.conf b/telegraf/flexpool-miner.conf index d56920a..63cb241 100644 --- a/telegraf/flexpool-miner.conf +++ b/telegraf/flexpool-miner.conf @@ -1,51 +1,49 @@ [[inputs.http]] name_override = "flexpool_miner_balance" - urls = ["https://flexpool.io/api/v1/miner/${MINER_ADDRESS}/balance"] + urls = ["https://api.flexpool.io/v2/miner/balance?coin=${COIN}&address=${MINER_ADDRESS}"] data_format = "json" tagexclude = ["url"] - [inputs.http.tags] - miner = "${MINER_ADDRESS}" - -[[inputs.http]] - name_override = "flexpool_miner_stats" - urls = ["https://flexpool.io/api/v1/miner/${MINER_ADDRESS}/stats"] - data_format = "json" - fieldpass = ["*hashrate", "*shares"] - tagexclude = ["url"] json_query = "result" [inputs.http.tags] miner = "${MINER_ADDRESS}" + coin = "${COIN}" + +[[inputs.http]] + name_override = "flexpool_miner_stats" + urls = ["https://api.flexpool.io/v2/miner/stats?coin=${COIN}&address=${MINER_ADDRESS}"] + data_format = "json" + fieldpass = ["*Hashrate", "*Shares"] + tagexclude = ["url"] + json_query = "result" + [inputs.http.tags] + miner = "${MINER_ADDRESS}" + coin = "${COIN}" [[inputs.http]] name_override = "flexpool_miner_workers" - urls = ["https://flexpool.io/api/v1/miner/${MINER_ADDRESS}/workers"] + urls = ["https://api.flexpool.io/v2/miner/workers?coin=${COIN}&address=${MINER_ADDRESS}"] data_format = "json" tagexclude = ["url"] - fieldpass = ["*hashrate", "*shares"] + fieldpass = ["*Hashrate", "*Shares"] tag_keys = ["name"] json_query = "result" [inputs.http.tags] miner = "${MINER_ADDRESS}" + coin = "${COIN}" [[inputs.http]] name_override = "flexpool_miner_paid" - urls = ["https://flexpool.io/api/v1/miner/${MINER_ADDRESS}/totalPaid"] - data_format = "json" - tagexclude = ["url"] - [inputs.http.tags] - miner = "${MINER_ADDRESS}" - -[[inputs.http]] - name_override = "flexpool_miner_daily_revenue_estimation" - urls = ["https://flexpool.io/api/v1/miner/${MINER_ADDRESS}/estimatedDailyRevenue"] + urls = ["https://api.flexpool.io/v2/miner/paymentsStats?coin=${COIN}&address=${MINER_ADDRESS}"] data_format = "json" tagexclude = ["url"] + json_query = "result" [inputs.http.tags] miner = "${MINER_ADDRESS}" + coin = "${COIN}" [[inputs.http]] name_override = "flexpool_miner_payments" - urls = ["https://flexpool.io/api/v1/miner/${MINER_ADDRESS}/payments/?page=0"] + urls = ["https://api.flexpool.io/v2/miner/payments?coin=${COIN}&address=${MINER_ADDRESS}&page=0"] data_format = "json" tagexclude = ["url"] json_query = "result.data" @@ -53,3 +51,4 @@ json_time_key = "timestamp" [inputs.http.tags] miner = "${MINER_ADDRESS}" + coin = "${COIN}" diff --git a/telegraf/flexpool-pool.conf b/telegraf/flexpool-pool.conf index 5dbb556..c5521cd 100644 --- a/telegraf/flexpool-pool.conf +++ b/telegraf/flexpool-pool.conf @@ -1,18 +1,22 @@ [[inputs.http]] - name_override = "flexpool_pool_block_count" - urls = ["https://flexpool.io/api/v1/pool/blockCount"] + name_override = "flexpool_pool_blocks_chart" + urls = ["https://api.flexpool.io/v2/pool/blocksChart?coin=${COIN}"] data_format = "json" tagexclude = ["url"] json_query = "result" + json_time_format = "unix" + json_time_key = "timestamp" + [inputs.http.tags] + coin = "${COIN}" [[inputs.http]] name_override = "flexpool_pool_blocks" urls = [ - "https://flexpool.io/api/v1/pool/blocks/?page=0", - "https://flexpool.io/api/v1/pool/blocks/?page=1", - "https://flexpool.io/api/v1/pool/blocks/?page=2", - "https://flexpool.io/api/v1/pool/blocks/?page=3", - "https://flexpool.io/api/v1/pool/blocks/?page=4" + "https://api.flexpool.io/v2/pool/blocks?coin=${COIN}&page=0", + "https://api.flexpool.io/v2/pool/blocks?coin=${COIN}&page=1", + "https://api.flexpool.io/v2/pool/blocks?coin=${COIN}&page=2", + "https://api.flexpool.io/v2/pool/blocks?coin=${COIN}&page=3", + "https://api.flexpool.io/v2/pool/blocks?coin=${COIN}&page=4" ] data_format = "json" tagexclude = ["url"] @@ -20,35 +24,38 @@ json_time_format = "unix" json_time_key = "timestamp" tag_keys = ["miner"] + [inputs.http.tags] + coin = "${COIN}" [[inputs.http]] name_override = "flexpool_pool_hashrate" - urls = ["https://flexpool.io/api/v1/pool/hashrate"] + urls = ["https://api.flexpool.io/v2/pool/hashrate?coin=${COIN}"] data_format = "json" tagexclude = ["url"] json_query = "result" + [inputs.http.tags] + coin = "${COIN}" [[inputs.http]] - name_override = "flexpool_pool_miners_online" - urls = ["https://flexpool.io/api/v1/pool/minersOnline"] + name_override = "flexpool_pool_miners_count" + urls = ["https://api.flexpool.io/v2/pool/minerCount?coin=${COIN}"] data_format = "json" tagexclude = ["url"] + [inputs.http.tags] + coin = "${COIN}" [[inputs.http]] - name_override = "flexpool_pool_workers_online" - urls = ["https://flexpool.io/api/v1/pool/workersOnline"] + name_override = "flexpool_pool_workers_count" + urls = ["https://api.flexpool.io/v2/pool/workerCount?coin=${COIN}"] data_format = "json" tagexclude = ["url"] - -[[inputs.http]] - name_override = "flexpool_pool_average_luck_round_time" - urls = ["https://flexpool.io/api/v1/pool/avgLuckRoundtime"] - data_format = "json" - tagexclude = ["url"] - json_query = "result" + [inputs.http.tags] + coin = "${COIN}" [[inputs.http]] name_override = "flexpool_pool_current_luck" - urls = ["https://flexpool.io/api/v1/pool/currentLuck"] + urls = ["https://api.flexpool.io/v2/pool/currentLuck?coin=${COIN}"] data_format = "json" tagexclude = ["url"] + [inputs.http.tags] + coin = "${COIN}"