diff --git a/README.md b/README.md index b585aea..3469f2e 100644 --- a/README.md +++ b/README.md @@ -1,11 +1,3 @@ -# 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. @@ -63,22 +55,22 @@ Telegraf inputs configurations are stored in [telegraf](telegraf) directory. You command: ``` -docker run --rm -e "MINER_ADDRESS=${MINER_ADDRESS}" -e "COIN=${COIN}" \ +docker run --rm -e "MINER_ADDRESS=${MINER_ADDRESS}" \ -v "${PWD}/docker/telegraf.conf:/etc/telegraf/telegraf.conf:ro" -v "${PWD}/telegraf:/etc/telegraf/telegraf.d:ro" \ - telegraf:1.19.2 telegraf -test -config /etc/telegraf/telegraf.conf -config-directory /etc/telegraf/telegraf.d + telegraf:1.15.4 telegraf -test -config /etc/telegraf/telegraf.conf -config-directory /etc/telegraf/telegraf.d ``` Example: ``` -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 +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 ``` Once you are confident with your configuration, reload the container: diff --git a/docker-compose.yml b/docker-compose.yml index 69d2ae2..a755892 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.19.2 + image: telegraf:1.17 volumes: - ./docker/telegraf.conf:/etc/telegraf/telegraf.conf - ./telegraf:/etc/telegraf/telegraf.d diff --git a/docker/environment.example b/docker/environment.example index 2e3587f..11494f6 100644 --- a/docker/environment.example +++ b/docker/environment.example @@ -1,8 +1,6 @@ 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 deleted file mode 100644 index 3c17841..0000000 --- a/grafana/eth-gas-station.json +++ /dev/null @@ -1,895 +0,0 @@ -{ - "__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 de3308b..59ab5ed 100644 --- a/grafana/etherscan.json +++ b/grafana/etherscan.json @@ -60,18 +60,6 @@ "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, @@ -91,7 +79,7 @@ "h": 8, "w": 12, "x": 0, - "y": 1 + "y": 0 }, "hiddenSeries": false, "id": 2, @@ -121,7 +109,7 @@ "steppedLine": false, "targets": [ { - "alias": "low", + "alias": "safe", "groupBy": [ { "params": [ @@ -158,7 +146,7 @@ "tags": [] }, { - "alias": "average", + "alias": "propose", "groupBy": [ { "params": [ @@ -195,7 +183,7 @@ "tags": [] }, { - "alias": "high", + "alias": "fast", "groupBy": [ { "params": [ @@ -279,10 +267,6 @@ "datasource": "${DS_INFLUXDB}", "fieldConfig": { "defaults": { - "color": { - "fixedColor": "green", - "mode": "fixed" - }, "custom": {}, "mappings": [], "min": 0, @@ -296,44 +280,13 @@ ] } }, - "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" - } - } - ] - } - ] + "overrides": [] }, "gridPos": { "h": 8, "w": 12, "x": 12, - "y": 1 + "y": 0 }, "id": 4, "options": { @@ -351,283 +304,44 @@ "pluginVersion": "7.3.7", "targets": [ { - "alias": "low", - "groupBy": [], - "measurement": "etherscan_gastracker_gasoracle", - "orderByTime": "ASC", - "policy": "default", - "refId": "A", - "resultFormat": "time_series", - "select": [ - [ - { - "params": [ - "SafeGasPrice" - ], - "type": "field" - }, - { - "params": [], - "type": "last" - } - ] - ], - "tags": [] - }, - { - "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", + "alias": "safe", "groupBy": [ { "params": [ - "$interval" + "$__interval" ], "type": "time" + }, + { + "params": [ + "null" + ], + "type": "fill" } ], "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" + "SafeGasPrice" ], "type": "field" }, { "params": [], - "type": "min" + "type": "last" } ] ], "tags": [] }, { - "alias": "average", + "alias": "propose", "groupBy": [ { "params": [ @@ -657,112 +371,14 @@ }, { "params": [], - "type": "mean" + "type": "last" } ] ], "tags": [] }, { - "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", + "alias": "fast", "groupBy": [ { "params": [ @@ -780,30 +396,6 @@ "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": [ @@ -816,7 +408,7 @@ }, { "params": [], - "type": "max" + "type": "last" } ] ], @@ -825,7 +417,7 @@ ], "timeFrom": null, "timeShift": null, - "title": "High statistics", + "title": "Gas price", "type": "bargauge" }, { @@ -840,7 +432,7 @@ "h": 2, "w": 24, "x": 0, - "y": 17 + "y": 8 }, "id": 6, "options": { @@ -893,10 +485,7 @@ ], "schemaVersion": 26, "style": "dark", - "tags": [ - "etherscan", - "ethereum" - ], + "tags": [], "templating": { "list": [] }, @@ -908,5 +497,5 @@ "timezone": "", "title": "Etherscan", "uid": "OHZGmm_Gk", - "version": 9 + "version": 5 } \ No newline at end of file diff --git a/grafana/flexpool-miners.json b/grafana/flexpool-miners.json index 930b194..e271008 100644 --- a/grafana/flexpool-miners.json +++ b/grafana/flexpool-miners.json @@ -59,7 +59,7 @@ "gnetId": null, "graphTooltip": 0, "id": null, - "iteration": 1629269857941, + "iteration": 1617293846981, "links": [], "panels": [ { @@ -88,32 +88,7 @@ "custom": {}, "links": [] }, - "overrides": [ - { - "matcher": { - "id": "byRegexp", - "options": "/XCH/" - }, - "properties": [ - { - "id": "unit", - "value": "XCH" - } - ] - }, - { - "matcher": { - "id": "byRegexp", - "options": "/ETH/" - }, - "properties": [ - { - "id": "unit", - "value": "ETH" - } - ] - } - ] + "overrides": [] }, "fill": 1, "fillGradient": 0, @@ -158,7 +133,7 @@ "steppedLine": false, "targets": [ { - "alias": "revenue (ETH)", + "alias": "revenue", "groupBy": [ { "params": [ @@ -170,7 +145,7 @@ "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(1d) TZ('$timezone');", + "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');", "rawQuery": true, "refId": "A", "resultFormat": "time_series", @@ -226,7 +201,7 @@ ], "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(1d) TZ('$timezone');", + "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');", "rawQuery": true, "refId": "B", "resultFormat": "time_series", @@ -245,95 +220,6 @@ ] ], "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": [], @@ -358,7 +244,7 @@ { "$$hashKey": "object:180", "decimals": 5, - "format": "XCH", + "format": "ETH", "label": "income", "logBase": 1, "max": null, @@ -435,7 +321,7 @@ "groupBy": [ { "params": [ - "1d" + "$__interval" ], "type": "time" }, @@ -446,18 +332,17 @@ "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": false, + "rawQuery": true, "refId": "A", "resultFormat": "time_series", "select": [ [ { "params": [ - "blockCount" + "value" ], "type": "field" }, @@ -467,13 +352,7 @@ } ] ], - "tags": [ - { - "key": "coin", - "operator": "=~", - "value": "/^$coin$/" - } - ] + "tags": [] } ], "thresholds": [], @@ -533,32 +412,7 @@ "custom": {}, "links": [] }, - "overrides": [ - { - "matcher": { - "id": "byRegexp", - "options": "/XCH/" - }, - "properties": [ - { - "id": "unit", - "value": "XCH" - } - ] - }, - { - "matcher": { - "id": "byRegexp", - "options": "/ETH/" - }, - "properties": [ - { - "id": "unit", - "value": "ETH" - } - ] - } - ] + "overrides": [] }, "fill": 1, "fillGradient": 0, @@ -603,7 +457,7 @@ "steppedLine": false, "targets": [ { - "alias": "revenue (XCH)", + "alias": "revenue", "groupBy": [ { "params": [ @@ -615,7 +469,7 @@ "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 = 'xch' AND $timeFilter) GROUP BY time(30d) TZ('$timezone');", + "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');", "rawQuery": true, "refId": "A", "resultFormat": "time_series", @@ -671,7 +525,7 @@ ], "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 = 'xch' AND $timeFilter) GROUP BY time(30d) TZ('$timezone');", + "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');", "rawQuery": true, "refId": "B", "resultFormat": "time_series", @@ -690,96 +544,6 @@ ] ], "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": [], @@ -805,7 +569,7 @@ { "$$hashKey": "object:180", "decimals": 5, - "format": "XCH", + "format": "ETH", "label": "income", "logBase": 1, "max": null, @@ -881,7 +645,7 @@ "groupBy": [ { "params": [ - "31d" + "$__interval" ], "type": "time" }, @@ -892,34 +656,27 @@ "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": false, + "rawQuery": true, "refId": "A", "resultFormat": "time_series", "select": [ [ { "params": [ - "blockCount" + "value" ], "type": "field" }, { "params": [], - "type": "sum" + "type": "mean" } ] ], - "tags": [ - { - "key": "coin", - "operator": "=~", - "value": "/^$coin$/" - } - ] + "tags": [] } ], "thresholds": [], @@ -978,32 +735,7 @@ "custom": {}, "links": [] }, - "overrides": [ - { - "matcher": { - "id": "byRegexp", - "options": "/XCH/" - }, - "properties": [ - { - "id": "unit", - "value": "XCH" - } - ] - }, - { - "matcher": { - "id": "byRegexp", - "options": "/ETH/" - }, - "properties": [ - { - "id": "unit", - "value": "ETH" - } - ] - } - ] + "overrides": [] }, "fill": 1, "fillGradient": 0, @@ -1049,7 +781,7 @@ "steppedLine": false, "targets": [ { - "alias": "balance (XCH)", + "alias": "balance", "groupBy": [ { "params": [ @@ -1068,26 +800,20 @@ "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, + "rawQuery": true, "refId": "A", "resultFormat": "time_series", "select": [ [ { "params": [ - "balance" + "result" ], "type": "field" }, { "params": [], "type": "mean" - }, - { - "params": [ - "/1000000000000" - ], - "type": "math" } ] ], @@ -1096,12 +822,6 @@ "key": "miner", "operator": "=~", "value": "/^$miner$/" - }, - { - "condition": "AND", - "key": "coin", - "operator": "=", - "value": "xch" } ] }, @@ -1121,160 +841,27 @@ "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": "C", - "resultFormat": "time_series", - "select": [ - [ - { - "params": [ - "balance" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - }, - { - "params": [ - "/1000000000000*$exchange_rate" - ], - "type": "math" - } - ] - ], - "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, + "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", "resultFormat": "time_series", "select": [ [ { "params": [ - "balance" + "value" ], "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" - } - ] + "tags": [] } ], "thresholds": [], @@ -1299,7 +886,7 @@ { "$$hashKey": "object:1341", "decimals": 5, - "format": "XCH", + "format": "ETH", "label": "balance", "logBase": 1, "max": null, @@ -1379,12 +966,171 @@ "pluginVersion": "7.3.7", "targets": [ { - "alias": "balance (XCH)", - "groupBy": [], + "alias": "balance", + "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": true, + "refId": "A", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "result" + ], + "type": "field" + }, + { + "params": [], + "type": "mean" + } + ] + ], + "tags": [ + { + "key": "miner", + "operator": "=~", + "value": "/^$miner$/" + } + ] + }, + { + "alias": "balance (fiat)", + "groupBy": [ + { + "params": [ + "$__interval" + ], + "type": "time" + }, + { + "params": [ + "null" + ], + "type": "fill" + } + ], + "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", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "value" + ], + "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", @@ -1392,17 +1138,17 @@ [ { "params": [ - "balance" + "result" ], "type": "field" }, { "params": [], - "type": "last" + "type": "mean" }, { "params": [ - "/1000000000000" + "/ 1000000000000000000" ], "type": "math" } @@ -1413,22 +1159,29 @@ "key": "miner", "operator": "=~", "value": "/^$miner$/" - }, - { - "condition": "AND", - "key": "coin", - "operator": "=", - "value": "xch" } ] }, { - "alias": "balance (fiat)", - "groupBy": [], - "measurement": "flexpool_miner_balance", + "alias": "revenue (fiat)", + "groupBy": [ + { + "params": [ + "$__interval" + ], + "type": "time" + }, + { + "params": [ + "null" + ], + "type": "fill" + } + ], + "measurement": "flexpool_miner_daily_revenue_estimation", "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)", + "query": "SELECT mean(\"result\") / 1000000000000000000 * $echange_rate FROM \"flexpool_miner_daily_revenue_estimation\" WHERE (\"miner\" =~ /^$miner$/) AND $timeFilter GROUP BY time($__interval) fill(null)", "rawQuery": false, "refId": "B", "resultFormat": "time_series", @@ -1436,17 +1189,17 @@ [ { "params": [ - "balance" + "result" ], "type": "field" }, { "params": [], - "type": "last" + "type": "mean" }, { "params": [ - "/1000000000000*$exchange_rate" + "/ 1000000000000000000 * $exchange_rate" ], "type": "math" } @@ -1457,36 +1210,154 @@ "key": "miner", "operator": "=~", "value": "/^$miner$/" - }, - { - "condition": "AND", - "key": "coin", - "operator": "=", - "value": "xch" } ] + } + ], + "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 }, { - "alias": "balance (ETH)", - "groupBy": [], - "measurement": "flexpool_miner_balance", + "$$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_balance\" WHERE (\"miner\" =~ /^$miner$/) AND $timeFilter GROUP BY time($__interval) fill(null)", + "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": "C", + "refId": "A", "resultFormat": "time_series", "select": [ [ { "params": [ - "balance" + "result" ], "type": "field" }, { "params": [], - "type": "last" + "type": "mean" }, { "params": [ @@ -1501,40 +1372,45 @@ "key": "miner", "operator": "=~", "value": "/^$miner$/" - }, - { - "condition": "AND", - "key": "coin", - "operator": "=", - "value": "eth" } ] }, { - "alias": "balance (fiat)", - "groupBy": [], - "measurement": "flexpool_miner_balance", + "alias": "weekly", + "groupBy": [ + { + "params": [ + "$__interval" + ], + "type": "time" + }, + { + "params": [ + "null" + ], + "type": "fill" + } + ], + "measurement": "flexpool_miner_daily_revenue_estimation", "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": false, - "refId": "D", + "refId": "C", "resultFormat": "time_series", "select": [ [ { "params": [ - "balance" + "result" ], "type": "field" }, { "params": [], - "type": "last" + "type": "mean" }, { "params": [ - "/1000000000000000000*$exchange_rate" + "/1000000000000000000*7" ], "type": "math" } @@ -1545,19 +1421,211 @@ "key": "miner", "operator": "=~", "value": "/^$miner$/" + } + ] + }, + { + "alias": "monthly", + "groupBy": [ + { + "params": [ + "$__interval" + ], + "type": "time" }, { - "condition": "AND", - "key": "coin", - "operator": "=", - "value": "eth" + "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)", + "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" + ], + "type": "field" + }, + { + "params": [], + "type": "mean" + }, + { + "params": [ + "/1000000000000000000*7*$exchange_rate" + ], + "type": "math" + } + ] + ], + "tags": [ + { + "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$/" } ] } ], "timeFrom": "5m", "timeShift": null, - "title": "Unpaid balance", + "title": "Estimated revenue", "type": "stat" }, { @@ -1571,32 +1639,7 @@ "custom": {}, "links": [] }, - "overrides": [ - { - "matcher": { - "id": "byRegexp", - "options": "/XCH/" - }, - "properties": [ - { - "id": "unit", - "value": "XCH" - } - ] - }, - { - "matcher": { - "id": "byRegexp", - "options": "/ETH/" - }, - "properties": [ - { - "id": "unit", - "value": "ETH" - } - ] - } - ] + "overrides": [] }, "fill": 1, "fillGradient": 0, @@ -1604,7 +1647,7 @@ "h": 8, "w": 6, "x": 0, - "y": 25 + "y": 33 }, "hiddenSeries": false, "id": 40, @@ -1642,28 +1685,39 @@ "steppedLine": false, "targets": [ { - "alias": "paid (XCH)", - "groupBy": [], + "alias": "paid", + "groupBy": [ + { + "params": [ + "$__interval" + ], + "type": "time" + }, + { + "params": [ + "null" + ], + "type": "fill" + } + ], "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, + "rawQuery": true, "refId": "A", "resultFormat": "time_series", "select": [ [ { "params": [ - "stats_totalPaid" + "result" ], "type": "field" }, { - "params": [ - "/1000000000000" - ], - "type": "math" + "params": [], + "type": "mean" } ] ], @@ -1672,12 +1726,6 @@ "key": "miner", "operator": "=~", "value": "/^$miner$/" - }, - { - "condition": "AND", - "key": "coin", - "operator": "=", - "value": "xch" } ] }, @@ -1697,143 +1745,27 @@ "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, + "rawQuery": true, "refId": "B", "resultFormat": "time_series", "select": [ [ { "params": [ - "stats_totalPaid" + "value" ], "type": "field" }, { "params": [], "type": "mean" - }, - { - "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": [ - "/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" - } - ] + "tags": [] } ], "thresholds": [], @@ -1858,7 +1790,7 @@ { "$$hashKey": "object:722", "decimals": 5, - "format": "XCH", + "format": "ETH", "label": "paid", "logBase": 1, "max": null, @@ -1919,7 +1851,7 @@ "h": 8, "w": 6, "x": 6, - "y": 25 + "y": 33 }, "hideTimeOverride": true, "id": 42, @@ -1940,32 +1872,39 @@ "pluginVersion": "7.3.7", "targets": [ { - "alias": "paid (XCH)", - "groupBy": [], + "alias": "paid", + "groupBy": [ + { + "params": [ + "$__interval" + ], + "type": "time" + }, + { + "params": [ + "null" + ], + "type": "fill" + } + ], "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, + "rawQuery": true, "refId": "A", "resultFormat": "time_series", "select": [ [ { "params": [ - "stats_totalPaid" + "result" ], "type": "field" }, { "params": [], - "type": "last" - }, - { - "params": [ - " / 1000000000000" - ], - "type": "math" + "type": "mean" } ] ], @@ -1974,138 +1913,46 @@ "key": "miner", "operator": "=~", "value": "/^$miner$/" - }, - { - "condition": "AND", - "key": "coin", - "operator": "=", - "value": "xch" } ] }, { "alias": "paid (fiat)", - "groupBy": [], - "measurement": "flexpool_miner_paid", + "groupBy": [ + { + "params": [ + "$__interval" + ], + "type": "time" + }, + { + "params": [ + "null" + ], + "type": "fill" + } + ], "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, + "rawQuery": true, "refId": "B", "resultFormat": "time_series", "select": [ [ { "params": [ - "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" + "value" ], "type": "field" }, { "params": [], - "type": "last" - }, - { - "params": [ - "/ 1000000000000000000" - ], - "type": "math" + "type": "mean" } ] ], - "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" - } - ] + "tags": [] } ], "timeFrom": "5m", @@ -2139,20 +1986,8 @@ "overrides": [ { "matcher": { - "id": "byRegexp", - "options": "/XCH/" - }, - "properties": [ - { - "id": "decimals", - "value": 5 - } - ] - }, - { - "matcher": { - "id": "byRegexp", - "options": "/ETH/" + "id": "byName", + "options": "amount" }, "properties": [ { @@ -2164,12 +1999,16 @@ { "matcher": { "id": "byName", - "options": "paid (fiat)" + "options": "amount (fiat)" }, "properties": [ { "id": "decimals", "value": 2 + }, + { + "id": "custom.width", + "value": null } ] }, @@ -2191,7 +2030,7 @@ "h": 8, "w": 12, "x": 12, - "y": 25 + "y": 33 }, "id": 64, "options": { @@ -2205,7 +2044,7 @@ "measurement": "flexpool_miner_payments", "orderByTime": "ASC", "policy": "default", - "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", + "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", "rawQuery": true, "refId": "A", "resultFormat": "table", @@ -2213,100 +2052,9 @@ [ { "params": [ - "value" + "amount" ], "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" } ] ], @@ -2331,7 +2079,7 @@ "h": 1, "w": 24, "x": 0, - "y": 33 + "y": 41 }, "id": 26, "panels": [], @@ -2364,32 +2112,7 @@ ] } }, - "overrides": [ - { - "matcher": { - "id": "byRegexp", - "options": "/XCH/" - }, - "properties": [ - { - "id": "unit", - "value": "bytes" - } - ] - }, - { - "matcher": { - "id": "byRegexp", - "options": "/ETH/" - }, - "properties": [ - { - "id": "unit", - "value": "Hs" - } - ] - } - ] + "overrides": [] }, "fill": 1, "fillGradient": 0, @@ -2397,7 +2120,7 @@ "h": 8, "w": 12, "x": 0, - "y": 34 + "y": 42 }, "hiddenSeries": false, "id": 44, @@ -2428,7 +2151,7 @@ "steppedLine": false, "targets": [ { - "alias": "effective (XCH)", + "alias": "effective", "groupBy": [ { "params": [ @@ -2452,7 +2175,7 @@ [ { "params": [ - "currentEffectiveHashrate" + "current_effective_hashrate" ], "type": "field" }, @@ -2467,17 +2190,11 @@ "key": "miner", "operator": "=~", "value": "/^$miner$/" - }, - { - "condition": "AND", - "key": "coin", - "operator": "=", - "value": "xch" } ] }, { - "alias": "reported (XCH)", + "alias": "reported", "groupBy": [ { "params": [ @@ -2501,7 +2218,7 @@ [ { "params": [ - "reportedHashrate" + "current_reported_hashrate" ], "type": "field" }, @@ -2516,17 +2233,11 @@ "key": "miner", "operator": "=~", "value": "/^$miner$/" - }, - { - "condition": "AND", - "key": "coin", - "operator": "=", - "value": "xch" } ] }, { - "alias": "average effective (XCH)", + "alias": "daily effective", "groupBy": [ { "params": [ @@ -2550,7 +2261,7 @@ [ { "params": [ - "averageEffectiveHashrate" + "daily_effective_hashrate" ], "type": "field" }, @@ -2565,159 +2276,6 @@ "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" } ] } @@ -2729,7 +2287,7 @@ "title": "Hashrates", "tooltip": { "shared": true, - "sort": 2, + "sort": 0, "value_type": "individual" }, "type": "graph", @@ -2743,7 +2301,7 @@ "yaxes": [ { "$$hashKey": "object:154", - "format": "bytes", + "format": "Hs", "label": null, "logBase": 1, "max": null, @@ -2784,40 +2342,15 @@ } ] }, - "unit": "short" + "unit": "Hs" }, - "overrides": [ - { - "matcher": { - "id": "byRegexp", - "options": "/XCH/" - }, - "properties": [ - { - "id": "unit", - "value": "bytes" - } - ] - }, - { - "matcher": { - "id": "byRegexp", - "options": "/ETH/" - }, - "properties": [ - { - "id": "unit", - "value": "Hs" - } - ] - } - ] + "overrides": [] }, "gridPos": { "h": 8, "w": 12, "x": 12, - "y": 34 + "y": 42 }, "hideTimeOverride": true, "id": 18, @@ -2838,8 +2371,21 @@ "pluginVersion": "7.3.7", "targets": [ { - "alias": "effective (XCH)", - "groupBy": [], + "alias": "effective", + "groupBy": [ + { + "params": [ + "$__interval" + ], + "type": "time" + }, + { + "params": [ + "null" + ], + "type": "fill" + } + ], "measurement": "flexpool_miner_stats", "orderByTime": "ASC", "policy": "default", @@ -2849,13 +2395,13 @@ [ { "params": [ - "currentEffectiveHashrate" + "current_effective_hashrate" ], "type": "field" }, { "params": [], - "type": "last" + "type": "mean" } ] ], @@ -2864,18 +2410,25 @@ "key": "miner", "operator": "=~", "value": "/^$miner$/" - }, - { - "condition": "AND", - "key": "coin", - "operator": "=", - "value": "xch" } ] }, { - "alias": "reported (XCH)", - "groupBy": [], + "alias": "reported", + "groupBy": [ + { + "params": [ + "$__interval" + ], + "type": "time" + }, + { + "params": [ + "null" + ], + "type": "fill" + } + ], "measurement": "flexpool_miner_stats", "orderByTime": "ASC", "policy": "default", @@ -2885,13 +2438,13 @@ [ { "params": [ - "reportedHashrate" + "current_reported_hashrate" ], "type": "field" }, { "params": [], - "type": "last" + "type": "mean" } ] ], @@ -2900,18 +2453,25 @@ "key": "miner", "operator": "=~", "value": "/^$miner$/" - }, - { - "condition": "AND", - "key": "coin", - "operator": "=", - "value": "xch" } ] }, { - "alias": "average effective (XCH)", - "groupBy": [], + "alias": "daily effective", + "groupBy": [ + { + "params": [ + "$__interval" + ], + "type": "time" + }, + { + "params": [ + "null" + ], + "type": "fill" + } + ], "measurement": "flexpool_miner_stats", "orderByTime": "ASC", "policy": "default", @@ -2921,13 +2481,13 @@ [ { "params": [ - "averageEffectiveHashrate" + "daily_effective_hashrate" ], "type": "field" }, { "params": [], - "type": "last" + "type": "mean" } ] ], @@ -2936,120 +2496,6 @@ "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" } ] } @@ -3066,7 +2512,7 @@ "h": 1, "w": 24, "x": 0, - "y": 42 + "y": 50 }, "id": 14, "panels": [], @@ -3093,7 +2539,7 @@ "h": 8, "w": 12, "x": 0, - "y": 43 + "y": 51 }, "hiddenSeries": false, "id": 6, @@ -3120,17 +2566,14 @@ "renderer": "flot", "seriesOverrides": [ { - "$$hashKey": "object:2759", "alias": "valid", "color": "#56A64B" }, { - "$$hashKey": "object:2760", "alias": "stale", "color": "#F2CC0C" }, { - "$$hashKey": "object:2761", "alias": "invalid", "color": "#E02F44" } @@ -3164,7 +2607,7 @@ [ { "params": [ - "validShares" + "daily_valid_shares" ], "type": "field" }, @@ -3207,7 +2650,7 @@ [ { "params": [ - "staleShares" + "daily_stale_shares" ], "type": "field" }, @@ -3250,7 +2693,7 @@ [ { "params": [ - "invalidShares" + "daily_invalid_shares" ], "type": "field" }, @@ -3267,7 +2710,7 @@ "timeFrom": null, "timeRegions": [], "timeShift": null, - "title": "Shares", + "title": "Daily shares", "tooltip": { "shared": true, "sort": 0, @@ -3283,7 +2726,6 @@ }, "yaxes": [ { - "$$hashKey": "object:2780", "format": "short", "label": null, "logBase": 1, @@ -3292,7 +2734,6 @@ "show": true }, { - "$$hashKey": "object:2781", "format": "short", "label": null, "logBase": 1, @@ -3332,7 +2773,7 @@ "h": 8, "w": 4, "x": 12, - "y": 43 + "y": 51 }, "hideTimeOverride": true, "id": 8, @@ -3354,7 +2795,20 @@ "targets": [ { "alias": "valid", - "groupBy": [], + "groupBy": [ + { + "params": [ + "$__interval" + ], + "type": "time" + }, + { + "params": [ + "null" + ], + "type": "fill" + } + ], "measurement": "flexpool_miner_stats", "orderByTime": "ASC", "policy": "default", @@ -3364,13 +2818,13 @@ [ { "params": [ - "validShares" + "daily_valid_shares" ], "type": "field" }, { "params": [], - "type": "last" + "type": "mean" } ] ], @@ -3417,7 +2871,7 @@ "h": 8, "w": 4, "x": 16, - "y": 43 + "y": 51 }, "hideTimeOverride": true, "id": 10, @@ -3439,7 +2893,20 @@ "targets": [ { "alias": "stale", - "groupBy": [], + "groupBy": [ + { + "params": [ + "$__interval" + ], + "type": "time" + }, + { + "params": [ + "null" + ], + "type": "fill" + } + ], "measurement": "flexpool_miner_stats", "orderByTime": "ASC", "policy": "default", @@ -3449,13 +2916,13 @@ [ { "params": [ - "staleShares" + "daily_stale_shares" ], "type": "field" }, { "params": [], - "type": "last" + "type": "mean" } ] ], @@ -3503,7 +2970,7 @@ "h": 8, "w": 4, "x": 20, - "y": 43 + "y": 51 }, "hideTimeOverride": true, "id": 12, @@ -3525,7 +2992,20 @@ "targets": [ { "alias": "invalid", - "groupBy": [], + "groupBy": [ + { + "params": [ + "$__interval" + ], + "type": "time" + }, + { + "params": [ + "null" + ], + "type": "fill" + } + ], "measurement": "flexpool_miner_stats", "orderByTime": "ASC", "policy": "default", @@ -3535,13 +3015,13 @@ [ { "params": [ - "invalidShares" + "daily_invalid_shares" ], "type": "field" }, { "params": [], - "type": "last" + "type": "mean" } ] ], @@ -3560,7 +3040,6 @@ "type": "stat" } ], - "refresh": false, "schemaVersion": 26, "style": "dark", "tags": [ @@ -3569,29 +3048,6 @@ ], "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": {}, @@ -3604,7 +3060,7 @@ "multi": false, "name": "miner", "options": [], - "query": "SHOW TAG VALUES FROM flexpool_miner_stats WITH KEY = \"miner\" WHERE \"coin\" = '$coin'", + "query": "SHOW TAG VALUES FROM flexpool_miner_stats WITH KEY = \"miner\"", "refresh": 1, "regex": "", "skipUrlSync": false, @@ -3642,7 +3098,7 @@ "allValue": null, "current": {}, "datasource": "${DS_INFLUXDB}", - "definition": "", + "definition": "select value from currencies where \"to\" =~ /^$currency$/ order by desc limit 1", "error": null, "hide": 2, "includeAll": false, @@ -3650,7 +3106,7 @@ "multi": false, "name": "exchange_rate", "options": [], - "query": "select value from currencies where \"to\" =~ /^$currency$/ and \"from\" =~ /^(?i)$coin$/ order by desc limit 1", + "query": "select value from currencies where \"to\" =~ /^$currency$/ order by desc limit 1", "refresh": 1, "regex": "", "skipUrlSync": false, @@ -3789,14 +3245,9 @@ "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,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", "queryValue": "", "skipUrlSync": false, "type": "custom" @@ -3823,5 +3274,5 @@ "timezone": "utc", "title": "Flexpool miners", "uid": "Q3JPASkgz", - "version": 21 + "version": 4 } \ No newline at end of file diff --git a/grafana/flexpool-pool.json b/grafana/flexpool-pool.json index 52665ab..cf215fa 100644 --- a/grafana/flexpool-pool.json +++ b/grafana/flexpool-pool.json @@ -53,7 +53,7 @@ "gnetId": null, "graphTooltip": 0, "id": null, - "iteration": 1629216495656, + "iteration": 1617293861537, "links": [], "panels": [ { @@ -80,32 +80,7 @@ "defaults": { "custom": {} }, - "overrides": [ - { - "matcher": { - "id": "byRegexp", - "options": "/XCH/" - }, - "properties": [ - { - "id": "unit", - "value": "bytes" - } - ] - }, - { - "matcher": { - "id": "byRegexp", - "options": "/ETH/" - }, - "properties": [ - { - "id": "unit", - "value": "Hs" - } - ] - } - ] + "overrides": [] }, "fill": 1, "fillGradient": 0, @@ -143,7 +118,7 @@ "steppedLine": false, "targets": [ { - "alias": "total (ETH)", + "alias": "total", "groupBy": [ { "params": [ @@ -177,70 +152,7 @@ } ] ], - "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$/" - } - ] + "tags": [] } ], "thresholds": [], @@ -301,34 +213,9 @@ } ] }, - "unit": "short" + "unit": "Hs" }, - "overrides": [ - { - "matcher": { - "id": "byRegexp", - "options": "/XCH/" - }, - "properties": [ - { - "id": "unit", - "value": "bytes" - } - ] - }, - { - "matcher": { - "id": "byRegexp", - "options": "/ETH/" - }, - "properties": [ - { - "id": "unit", - "value": "Hs" - } - ] - } - ] + "overrides": [] }, "gridPos": { "h": 9, @@ -354,8 +241,21 @@ "pluginVersion": "7.3.7", "targets": [ { - "alias": "total (XCH)", - "groupBy": [], + "alias": "total", + "groupBy": [ + { + "params": [ + "$__interval" + ], + "type": "time" + }, + { + "params": [ + "null" + ], + "type": "fill" + } + ], "measurement": "flexpool_pool_hashrate", "orderByTime": "ASC", "policy": "default", @@ -375,55 +275,7 @@ } ] ], - "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$/" - } - ] + "tags": [] } ], "timeFrom": null, @@ -442,32 +294,7 @@ "defaults": { "custom": {} }, - "overrides": [ - { - "matcher": { - "id": "byRegexp", - "options": "/XCH/" - }, - "properties": [ - { - "id": "unit", - "value": "bytes" - } - ] - }, - { - "matcher": { - "id": "byRegexp", - "options": "/ETH/" - }, - "properties": [ - { - "id": "unit", - "value": "Hs" - } - ] - } - ] + "overrides": [] }, "fill": 1, "fillGradient": 0, @@ -505,105 +332,7 @@ "steppedLine": false, "targets": [ { - "alias": "as (XCH)", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], - "measurement": "flexpool_pool_hashrate", - "orderByTime": "ASC", - "policy": "default", - "refId": "A", - "resultFormat": "time_series", - "select": [ - [ - { - "params": [ - "regions_as" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - } - ] - ], - "tags": [ - { - "key": "coin", - "operator": "=", - "value": "xch" - }, - { - "condition": "AND", - "key": "coin", - "operator": "=~", - "value": "/^$coin$/" - } - ] - }, - { - "alias": "au (XCH)", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], - "measurement": "flexpool_pool_hashrate", - "orderByTime": "ASC", - "policy": "default", - "refId": "B", - "resultFormat": "time_series", - "select": [ - [ - { - "params": [ - "regions_au" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - } - ] - ], - "tags": [ - { - "key": "coin", - "operator": "=", - "value": "xch" - }, - { - "condition": "AND", - "key": "coin", - "operator": "=~", - "value": "/^$coin$/" - } - ] - }, - { - "alias": "eu (XCH)", + "alias": "eu", "groupBy": [ { "params": [ @@ -627,7 +356,7 @@ [ { "params": [ - "regions_eu" + "eu" ], "type": "field" }, @@ -637,71 +366,10 @@ } ] ], - "tags": [ - { - "key": "coin", - "operator": "=", - "value": "xch" - }, - { - "condition": "AND", - "key": "coin", - "operator": "=~", - "value": "/^$coin$/" - } - ] + "tags": [] }, { - "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)", + "alias": "us", "groupBy": [ { "params": [ @@ -725,7 +393,7 @@ [ { "params": [ - "regions_us" + "us" ], "type": "field" }, @@ -735,22 +403,10 @@ } ] ], - "tags": [ - { - "key": "coin", - "operator": "=", - "value": "xch" - }, - { - "condition": "AND", - "key": "coin", - "operator": "=~", - "value": "/^$coin$/" - } - ] + "tags": [] }, { - "alias": "as (ETH)", + "alias": "sa", "groupBy": [ { "params": [ @@ -768,13 +424,13 @@ "measurement": "flexpool_pool_hashrate", "orderByTime": "ASC", "policy": "default", - "refId": "F", + "refId": "D", "resultFormat": "time_series", "select": [ [ { "params": [ - "regions_as" + "sa" ], "type": "field" }, @@ -784,22 +440,10 @@ } ] ], - "tags": [ - { - "key": "coin", - "operator": "=", - "value": "eth" - }, - { - "condition": "AND", - "key": "coin", - "operator": "=~", - "value": "/^$coin$/" - } - ] + "tags": [] }, { - "alias": "au (ETH)", + "alias": "as", "groupBy": [ { "params": [ @@ -817,13 +461,13 @@ "measurement": "flexpool_pool_hashrate", "orderByTime": "ASC", "policy": "default", - "refId": "G", + "refId": "A", "resultFormat": "time_series", "select": [ [ { "params": [ - "regions_au" + "as" ], "type": "field" }, @@ -833,22 +477,10 @@ } ] ], - "tags": [ - { - "key": "coin", - "operator": "=", - "value": "eth" - }, - { - "condition": "AND", - "key": "coin", - "operator": "=~", - "value": "/^$coin$/" - } - ] + "tags": [] }, { - "alias": "eu (ETH)", + "alias": "au", "groupBy": [ { "params": [ @@ -866,13 +498,13 @@ "measurement": "flexpool_pool_hashrate", "orderByTime": "ASC", "policy": "default", - "refId": "H", + "refId": "B", "resultFormat": "time_series", "select": [ [ { "params": [ - "regions_eu" + "au" ], "type": "field" }, @@ -882,117 +514,7 @@ } ] ], - "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$/" - } - ] + "tags": [] } ], "thresholds": [], @@ -1054,34 +576,9 @@ } ] }, - "unit": "short" + "unit": "Hs" }, - "overrides": [ - { - "matcher": { - "id": "byRegexp", - "options": "/XCH/" - }, - "properties": [ - { - "id": "unit", - "value": "bytes" - } - ] - }, - { - "matcher": { - "id": "byRegexp", - "options": "/ETH/" - }, - "properties": [ - { - "id": "unit", - "value": "Hs" - } - ] - } - ] + "overrides": [] }, "gridPos": { "h": 9, @@ -1107,80 +604,21 @@ "pluginVersion": "7.3.7", "targets": [ { - "alias": "as (XCH)", - "groupBy": [], - "measurement": "flexpool_pool_hashrate", - "orderByTime": "ASC", - "policy": "default", - "refId": "A", - "resultFormat": "time_series", - "select": [ - [ - { - "params": [ - "regions_as" - ], - "type": "field" - }, - { - "params": [], - "type": "last" - } - ] - ], - "tags": [ + "alias": "eu", + "groupBy": [ { - "key": "coin", - "operator": "=", - "value": "xch" + "params": [ + "$__interval" + ], + "type": "time" }, { - "condition": "AND", - "key": "coin", - "operator": "=~", - "value": "/^$coin$/" + "params": [ + "null" + ], + "type": "fill" } - ] - }, - { - "alias": "au (XCH)", - "groupBy": [], - "measurement": "flexpool_pool_hashrate", - "orderByTime": "ASC", - "policy": "default", - "refId": "B", - "resultFormat": "time_series", - "select": [ - [ - { - "params": [ - "regions_au" - ], - "type": "field" - }, - { - "params": [], - "type": "last" - } - ] ], - "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", @@ -1190,7 +628,7 @@ [ { "params": [ - "regions_eu" + "eu" ], "type": "field" }, @@ -1200,59 +638,24 @@ } ] ], - "tags": [ - { - "key": "coin", - "operator": "=", - "value": "xch" - }, - { - "condition": "AND", - "key": "coin", - "operator": "=~", - "value": "/^$coin$/" - } - ] + "tags": [] }, { - "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" - } - ] + "alias": "us", + "groupBy": [ + { + "params": [ + "$__interval" + ], + "type": "time" + }, + { + "params": [ + "null" + ], + "type": "fill" + } ], - "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", @@ -1262,7 +665,7 @@ [ { "params": [ - "regions_us" + "us" ], "type": "field" }, @@ -1272,33 +675,34 @@ } ] ], - "tags": [ - { - "key": "coin", - "operator": "=", - "value": "xch" - }, - { - "condition": "AND", - "key": "coin", - "operator": "=~", - "value": "/^$coin$/" - } - ] + "tags": [] }, { - "alias": "as (ETH)", - "groupBy": [], + "alias": "sa", + "groupBy": [ + { + "params": [ + "$__interval" + ], + "type": "time" + }, + { + "params": [ + "null" + ], + "type": "fill" + } + ], "measurement": "flexpool_pool_hashrate", "orderByTime": "ASC", "policy": "default", - "refId": "F", + "refId": "D", "resultFormat": "time_series", "select": [ [ { "params": [ - "regions_as" + "sa" ], "type": "field" }, @@ -1308,33 +712,34 @@ } ] ], - "tags": [ - { - "key": "coin", - "operator": "=", - "value": "eth" - }, - { - "condition": "AND", - "key": "coin", - "operator": "=~", - "value": "/^$coin$/" - } - ] + "tags": [] }, { - "alias": "au (ETH)", - "groupBy": [], + "alias": "as", + "groupBy": [ + { + "params": [ + "$__interval" + ], + "type": "time" + }, + { + "params": [ + "null" + ], + "type": "fill" + } + ], "measurement": "flexpool_pool_hashrate", "orderByTime": "ASC", "policy": "default", - "refId": "G", + "refId": "A", "resultFormat": "time_series", "select": [ [ { "params": [ - "regions_au" + "as" ], "type": "field" }, @@ -1344,33 +749,34 @@ } ] ], - "tags": [ - { - "key": "coin", - "operator": "=", - "value": "eth" - }, - { - "condition": "AND", - "key": "coin", - "operator": "=~", - "value": "/^$coin$/" - } - ] + "tags": [] }, { - "alias": "eu (ETH)", - "groupBy": [], + "alias": "au", + "groupBy": [ + { + "params": [ + "$__interval" + ], + "type": "time" + }, + { + "params": [ + "null" + ], + "type": "fill" + } + ], "measurement": "flexpool_pool_hashrate", "orderByTime": "ASC", "policy": "default", - "refId": "H", + "refId": "B", "resultFormat": "time_series", "select": [ [ { "params": [ - "regions_eu" + "au" ], "type": "field" }, @@ -1380,91 +786,7 @@ } ] ], - "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$/" - } - ] + "tags": [] } ], "timeFrom": null, @@ -1550,7 +872,7 @@ "type": "fill" } ], - "measurement": "flexpool_pool_miners_count", + "measurement": "flexpool_pool_miners_online", "orderByTime": "ASC", "policy": "default", "refId": "A", @@ -1569,13 +891,7 @@ } ] ], - "tags": [ - { - "key": "coin", - "operator": "=~", - "value": "/^$coin$/" - } - ] + "tags": [] } ], "thresholds": [], @@ -1665,8 +981,21 @@ "targets": [ { "alias": "online miners", - "groupBy": [], - "measurement": "flexpool_pool_miners_count", + "groupBy": [ + { + "params": [ + "$__interval" + ], + "type": "time" + }, + { + "params": [ + "null" + ], + "type": "fill" + } + ], + "measurement": "flexpool_pool_miners_online", "orderByTime": "ASC", "policy": "default", "refId": "A", @@ -1685,13 +1014,7 @@ } ] ], - "tags": [ - { - "key": "coin", - "operator": "=~", - "value": "/^$coin$/" - } - ] + "tags": [] } ], "timeFrom": null, @@ -1762,7 +1085,7 @@ "type": "fill" } ], - "measurement": "flexpool_pool_workers_count", + "measurement": "flexpool_pool_workers_online", "orderByTime": "ASC", "policy": "default", "refId": "A", @@ -1781,13 +1104,7 @@ } ] ], - "tags": [ - { - "key": "coin", - "operator": "=~", - "value": "/^$coin$/" - } - ] + "tags": [] } ], "thresholds": [], @@ -1876,8 +1193,21 @@ "targets": [ { "alias": "online workers", - "groupBy": [], - "measurement": "flexpool_pool_workers_count", + "groupBy": [ + { + "params": [ + "$__interval" + ], + "type": "time" + }, + { + "params": [ + "null" + ], + "type": "fill" + } + ], + "measurement": "flexpool_pool_workers_online", "orderByTime": "ASC", "policy": "default", "refId": "A", @@ -1896,13 +1226,7 @@ } ] ], - "tags": [ - { - "key": "coin", - "operator": "=~", - "value": "/^$coin$/" - } - ] + "tags": [] } ], "timeFrom": null, @@ -1973,31 +1297,40 @@ "targets": [ { "alias": "count", - "groupBy": [], - "measurement": "flexpool_pool_blocks_chart", + "groupBy": [ + { + "params": [ + "1d" + ], + "type": "time" + }, + { + "params": [ + "linear" + ], + "type": "fill" + } + ], + "measurement": "flexpool_pool_blocks", "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": [ - "blockCount" + "number" ], "type": "field" + }, + { + "params": [], + "type": "count" } ] ], - "tags": [ - { - "key": "coin", - "operator": "=~", - "value": "/^$coin$/" - } - ], + "tags": [], "tz": "$timezone" } ], @@ -2057,6 +1390,10 @@ { "color": "green", "value": null + }, + { + "color": "red", + "value": 80 } ] } @@ -2089,8 +1426,21 @@ "targets": [ { "alias": "blocks", - "groupBy": [], - "measurement": "flexpool_pool_blocks_chart", + "groupBy": [ + { + "params": [ + "1d" + ], + "type": "time" + }, + { + "params": [ + "null" + ], + "type": "fill" + } + ], + "measurement": "flexpool_pool_blocks", "orderByTime": "ASC", "policy": "default", "refId": "A", @@ -2099,23 +1449,17 @@ [ { "params": [ - "blockCount" + "number" ], "type": "field" }, { "params": [], - "type": "mean" + "type": "count" } ] ], - "tags": [ - { - "key": "coin", - "operator": "=~", - "value": "/^$coin$/" - } - ], + "tags": [], "tz": "$timezone" } ], @@ -2134,32 +1478,7 @@ "defaults": { "custom": {} }, - "overrides": [ - { - "matcher": { - "id": "byRegexp", - "options": "/XCH/" - }, - "properties": [ - { - "id": "unit", - "value": "XCH" - } - ] - }, - { - "matcher": { - "id": "byRegexp", - "options": "/ETH/" - }, - "properties": [ - { - "id": "unit", - "value": "ETH" - } - ] - } - ] + "overrides": [] }, "fill": 1, "fillGradient": 0, @@ -2197,7 +1516,7 @@ "steppedLine": false, "targets": [ { - "alias": "Block reward (ETH)", + "alias": "Block reward", "groupBy": [ { "params": [ @@ -2221,7 +1540,7 @@ [ { "params": [ - "reward" + "total_rewards" ], "type": "field" }, @@ -2237,74 +1556,7 @@ } ] ], - "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$/" - } - ] + "tags": [] } ], "thresholds": [], @@ -2364,61 +1616,16 @@ { "color": "green", "value": null + }, + { + "color": "red", + "value": 80 } ] }, - "unit": "short" + "unit": "ETH" }, - "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 - } - ] - } - ] + "overrides": [] }, "gridPos": { "h": 8, @@ -2444,7 +1651,7 @@ "pluginVersion": "7.3.7", "targets": [ { - "alias": "rewards (XCH)", + "alias": "rewards", "groupBy": [ { "params": [ @@ -2468,62 +1675,7 @@ [ { "params": [ - "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" + "total_rewards" ], "type": "field" }, @@ -2539,19 +1691,7 @@ } ] ], - "tags": [ - { - "key": "coin", - "operator": "=", - "value": "eth" - }, - { - "condition": "AND", - "key": "coin", - "operator": "=~", - "value": "/^$coin$/" - } - ] + "tags": [] } ], "timeFrom": null, @@ -2569,32 +1709,7 @@ "defaults": { "custom": {} }, - "overrides": [ - { - "matcher": { - "id": "byRegexp", - "options": "/XCH/" - }, - "properties": [ - { - "id": "unit", - "value": "XCH" - } - ] - }, - { - "matcher": { - "id": "byRegexp", - "options": "/ETH/" - }, - "properties": [ - { - "id": "unit", - "value": "ETH" - } - ] - } - ] + "overrides": [] }, "fill": 1, "fillGradient": 0, @@ -2632,7 +1747,7 @@ "steppedLine": false, "targets": [ { - "alias": "total rewards (XCH)", + "alias": "total rewards", "groupBy": [ { "params": [ @@ -2647,7 +1762,7 @@ "type": "fill" } ], - "measurement": "flexpool_pool_blocks_chart", + "measurement": "flexpool_pool_blocks", "orderByTime": "ASC", "policy": "default", "refId": "A", @@ -2656,63 +1771,7 @@ [ { "params": [ - "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" + "total_rewards" ], "type": "field" }, @@ -2728,19 +1787,7 @@ } ] ], - "tags": [ - { - "key": "coin", - "operator": "=", - "value": "eth" - }, - { - "condition": "AND", - "key": "coin", - "operator": "=~", - "value": "/^$coin$/" - } - ], + "tags": [], "tz": "$timezone" } ], @@ -2793,6 +1840,7 @@ "fieldConfig": { "defaults": { "custom": {}, + "decimals": 5, "mappings": [], "thresholds": { "mode": "absolute", @@ -2803,42 +1851,9 @@ } ] }, - "unit": "short" + "unit": "ETH" }, - "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 - } - ] - } - ] + "overrides": [] }, "gridPos": { "h": 8, @@ -2864,16 +1879,22 @@ "pluginVersion": "7.3.7", "targets": [ { - "alias": "total rewards (XCH)", + "alias": "total rewards", "groupBy": [ { "params": [ "1d" ], "type": "time" + }, + { + "params": [ + "null" + ], + "type": "fill" } ], - "measurement": "flexpool_pool_blocks_chart", + "measurement": "flexpool_pool_blocks", "orderByTime": "ASC", "policy": "default", "refId": "A", @@ -2882,57 +1903,7 @@ [ { "params": [ - "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" + "total_rewards" ], "type": "field" }, @@ -2948,19 +1919,7 @@ } ] ], - "tags": [ - { - "key": "coin", - "operator": "=", - "value": "eth" - }, - { - "condition": "AND", - "key": "coin", - "operator": "=~", - "value": "/^$coin$/" - } - ], + "tags": [], "tz": "$timezone" } ], @@ -3041,7 +2000,7 @@ [ { "params": [ - "roundTime" + "round_time" ], "type": "field" }, @@ -3051,13 +2010,7 @@ } ] ], - "tags": [ - { - "key": "coin", - "operator": "=~", - "value": "/^$coin$/" - } - ] + "tags": [] } ], "thresholds": [], @@ -3086,7 +2039,7 @@ "label": null, "logBase": 1, "max": null, - "min": "0", + "min": null, "show": true }, { @@ -3148,515 +2101,48 @@ "targets": [ { "alias": "round time", - "groupBy": [], + "groupBy": [ + { + "params": [ + "$__interval" + ], + "type": "time" + }, + { + "params": [ + "null" + ], + "type": "fill" + } + ], "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" + "round_time" ], "type": "field" }, { "params": [], - "type": "last" + "type": "mean" } ] ], - "tags": [ - { - "key": "coin", - "operator": "=~", - "value": "/^$coin$/" - } - ] + "tags": [] } ], "timeFrom": null, "timeShift": null, "title": "Round time", "type": "stat" - }, - { - "collapsed": false, - "datasource": "${DS_INFLUXDB}", - "gridPos": { - "h": 1, - "w": 24, - "x": 0, - "y": 69 - }, - "id": 48, - "panels": [], - "title": "Luck and effort", - "type": "row" - }, - { - "aliasColors": {}, - "bars": false, - "dashLength": 10, - "dashes": false, - "datasource": "${DS_INFLUXDB}", - "description": "", - "fieldConfig": { - "defaults": { - "custom": {} - }, - "overrides": [] - }, - "fill": 1, - "fillGradient": 0, - "gridPos": { - "h": 8, - "w": 12, - "x": 0, - "y": 70 - }, - "hiddenSeries": false, - "id": 50, - "legend": { - "avg": false, - "current": false, - "max": false, - "min": false, - "show": true, - "total": false, - "values": false - }, - "lines": true, - "linewidth": 1, - "nullPointMode": "null", - "options": { - "alertThreshold": true - }, - "percentage": false, - "pluginVersion": "7.3.7", - "pointradius": 2, - "points": false, - "renderer": "flot", - "seriesOverrides": [], - "spaceLength": 10, - "stack": false, - "steppedLine": false, - "targets": [ - { - "alias": "Average luck", - "groupBy": [ - { - "params": [ - "$__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": [ - "$__interval" - ], - "type": "time" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], - "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": [ - "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" - } - ] - ], - "tags": [] - } - ], - "timeFrom": null, - "timeShift": null, - "title": "Current effort", - "type": "stat" } ], - "refresh": false, "schemaVersion": 26, "style": "dark", "tags": [ @@ -3793,40 +2279,12 @@ "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,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", "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 } ] }, @@ -3838,5 +2296,5 @@ "timezone": "utc", "title": "Flexpool pool", "uid": "_vo2TQQMk", - "version": 11 -} + "version": 20 +} \ No newline at end of file diff --git a/grafana/flexpool-workers.json b/grafana/flexpool-workers.json index bc3e981..c051f7b 100644 --- a/grafana/flexpool-workers.json +++ b/grafana/flexpool-workers.json @@ -53,7 +53,7 @@ "gnetId": null, "graphTooltip": 0, "id": null, - "iteration": 1629269888685, + "iteration": 1617000842181, "links": [], "panels": [ { @@ -82,32 +82,7 @@ "custom": {}, "links": [] }, - "overrides": [ - { - "matcher": { - "id": "byRegexp", - "options": "/XCH/" - }, - "properties": [ - { - "id": "unit", - "value": "bytes" - } - ] - }, - { - "matcher": { - "id": "byRegexp", - "options": "/ETH/" - }, - "properties": [ - { - "id": "unit", - "value": "Hs" - } - ] - } - ] + "overrides": [] }, "fill": 1, "fillGradient": 0, @@ -145,7 +120,7 @@ "steppedLine": false, "targets": [ { - "alias": "current effective (XCH)", + "alias": "effective", "groupBy": [ { "params": [ @@ -153,6 +128,12 @@ ], "type": "time" }, + { + "params": [ + "miner" + ], + "type": "tag" + }, { "params": [ "null" @@ -162,14 +143,16 @@ ], "measurement": "flexpool_miner_workers", "orderByTime": "ASC", - "policy": "default", + "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": [ - "currentEffectiveHashrate" + "effective_hashrate" ], "type": "field" }, @@ -181,12 +164,6 @@ ], "tags": [ { - "key": "coin", - "operator": "=~", - "value": "/^$coin$/" - }, - { - "condition": "AND", "key": "miner", "operator": "=~", "value": "/^$miner$/" @@ -196,17 +173,11 @@ "key": "name", "operator": "=~", "value": "/^$worker$/" - }, - { - "condition": "AND", - "key": "coin", - "operator": "=", - "value": "xch" } ] }, { - "alias": "average effective (XCH)", + "alias": "reported", "groupBy": [ { "params": [ @@ -214,6 +185,12 @@ ], "type": "time" }, + { + "params": [ + "miner" + ], + "type": "tag" + }, { "params": [ "null" @@ -224,13 +201,15 @@ "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", "resultFormat": "time_series", "select": [ [ { "params": [ - "averageEffectiveHashrate" + "reported_hashrate" ], "type": "field" }, @@ -242,12 +221,6 @@ ], "tags": [ { - "key": "coin", - "operator": "=~", - "value": "/^$coin$/" - }, - { - "condition": "AND", "key": "miner", "operator": "=~", "value": "/^$miner$/" @@ -257,134 +230,6 @@ "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" } ] } @@ -409,7 +254,6 @@ }, "yaxes": [ { - "$$hashKey": "object:7053", "format": "Hs", "label": null, "logBase": 1, @@ -418,7 +262,6 @@ "show": true }, { - "$$hashKey": "object:7054", "format": "Hs", "label": null, "logBase": 1, @@ -451,34 +294,9 @@ } ] }, - "unit": "short" + "unit": "Hs" }, - "overrides": [ - { - "matcher": { - "id": "byRegexp", - "options": "/XCH/" - }, - "properties": [ - { - "id": "unit", - "value": "bytes" - } - ] - }, - { - "matcher": { - "id": "byRegexp", - "options": "/ETH/" - }, - "properties": [ - { - "id": "unit", - "value": "Hs" - } - ] - } - ] + "overrides": [] }, "gridPos": { "h": 8, @@ -504,8 +322,21 @@ "pluginVersion": "7.3.7", "targets": [ { - "alias": "hashrate (XCH)", - "groupBy": [], + "alias": "hashrate", + "groupBy": [ + { + "params": [ + "$__interval" + ], + "type": "time" + }, + { + "params": [ + "null" + ], + "type": "fill" + } + ], "measurement": "flexpool_miner_workers", "orderByTime": "ASC", "policy": "default", @@ -515,13 +346,13 @@ [ { "params": [ - "currentEffectiveHashrate" + "effective_hashrate" ], "type": "field" }, { "params": [], - "type": "last" + "type": "mean" } ] ], @@ -536,66 +367,6 @@ "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" } ] } @@ -624,34 +395,9 @@ } ] }, - "unit": "short" + "unit": "Hs" }, - "overrides": [ - { - "matcher": { - "id": "byRegexp", - "options": "/XCH/" - }, - "properties": [ - { - "id": "unit", - "value": "bytes" - } - ] - }, - { - "matcher": { - "id": "byRegexp", - "options": "/ETH/" - }, - "properties": [ - { - "id": "unit", - "value": "Hs" - } - ] - } - ] + "overrides": [] }, "gridPos": { "h": 8, @@ -677,26 +423,37 @@ "pluginVersion": "7.3.7", "targets": [ { - "alias": "hashrate (XCH)", - "groupBy": [], + "alias": "hashrate", + "groupBy": [ + { + "params": [ + "$__interval" + ], + "type": "time" + }, + { + "params": [ + "null" + ], + "type": "fill" + } + ], "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": [ - "reportedHashrate" + "reported_hashrate" ], "type": "field" }, { "params": [], - "type": "last" + "type": "mean" } ] ], @@ -711,68 +468,6 @@ "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" } ] } @@ -842,18 +537,15 @@ "renderer": "flot", "seriesOverrides": [ { - "$$hashKey": "object:8033", - "alias": "/valid/", + "alias": "valid", "color": "#56A64B" }, { - "$$hashKey": "object:8034", - "alias": "/stale/", + "alias": "stale", "color": "#F2CC0C" }, { - "$$hashKey": "object:8035", - "alias": "/invalid/", + "alias": "invalid", "color": "#E02F44" } ], @@ -886,7 +578,7 @@ [ { "params": [ - "validShares" + "valid_shares" ], "type": "field" }, @@ -907,12 +599,6 @@ "key": "name", "operator": "=~", "value": "/^$worker$/" - }, - { - "condition": "AND", - "key": "coin", - "operator": "=~", - "value": "/^$coin$/" } ] }, @@ -941,7 +627,7 @@ [ { "params": [ - "staleShares" + "stale_shares" ], "type": "field" }, @@ -962,12 +648,6 @@ "key": "name", "operator": "=~", "value": "/^$worker$/" - }, - { - "condition": "AND", - "key": "coin", - "operator": "=~", - "value": "/^$coin$/" } ] }, @@ -1017,12 +697,6 @@ "key": "name", "operator": "=~", "value": "/^$worker$/" - }, - { - "condition": "AND", - "key": "coin", - "operator": "=~", - "value": "/^$coin$/" } ] } @@ -1031,7 +705,7 @@ "timeFrom": null, "timeRegions": [], "timeShift": null, - "title": "Shares", + "title": "Daily shares", "tooltip": { "shared": true, "sort": 0, @@ -1047,7 +721,6 @@ }, "yaxes": [ { - "$$hashKey": "object:8054", "format": "short", "label": null, "logBase": 1, @@ -1056,7 +729,6 @@ "show": true }, { - "$$hashKey": "object:8055", "format": "short", "label": null, "logBase": 1, @@ -1117,7 +789,20 @@ "targets": [ { "alias": "valid", - "groupBy": [], + "groupBy": [ + { + "params": [ + "$__interval" + ], + "type": "time" + }, + { + "params": [ + "null" + ], + "type": "fill" + } + ], "measurement": "flexpool_miner_workers", "orderByTime": "ASC", "policy": "default", @@ -1127,13 +812,13 @@ [ { "params": [ - "validShares" + "valid_shares" ], "type": "field" }, { "params": [], - "type": "last" + "type": "mean" } ] ], @@ -1148,12 +833,6 @@ "key": "name", "operator": "=~", "value": "/^$worker$/" - }, - { - "condition": "AND", - "key": "coin", - "operator": "=~", - "value": "/^$coin$/" } ] } @@ -1213,7 +892,20 @@ "targets": [ { "alias": "stale", - "groupBy": [], + "groupBy": [ + { + "params": [ + "$__interval" + ], + "type": "time" + }, + { + "params": [ + "null" + ], + "type": "fill" + } + ], "measurement": "flexpool_miner_workers", "orderByTime": "ASC", "policy": "default", @@ -1223,13 +915,13 @@ [ { "params": [ - "staleShares" + "stale_shares" ], "type": "field" }, { "params": [], - "type": "last" + "type": "mean" } ] ], @@ -1244,12 +936,6 @@ "key": "name", "operator": "=~", "value": "/^$worker$/" - }, - { - "condition": "AND", - "key": "coin", - "operator": "=~", - "value": "/^$coin$/" } ] } @@ -1310,7 +996,20 @@ "targets": [ { "alias": "invalid", - "groupBy": [], + "groupBy": [ + { + "params": [ + "$__interval" + ], + "type": "time" + }, + { + "params": [ + "null" + ], + "type": "fill" + } + ], "measurement": "flexpool_miner_workers", "orderByTime": "ASC", "policy": "default", @@ -1320,13 +1019,13 @@ [ { "params": [ - "invalidShares" + "invalid_shares" ], "type": "field" }, { "params": [], - "type": "last" + "type": "mean" } ] ], @@ -1341,12 +1040,6 @@ "key": "name", "operator": "=~", "value": "/^$worker$/" - }, - { - "condition": "AND", - "key": "coin", - "operator": "=~", - "value": "/^$coin$/" } ] } @@ -1369,28 +1062,7 @@ "allValue": null, "current": {}, "datasource": "${DS_INFLUXDB}", - "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}", + "definition": "", "error": null, "hide": 0, "includeAll": false, @@ -1398,7 +1070,7 @@ "multi": false, "name": "miner", "options": [], - "query": "SHOW TAG VALUES FROM flexpool_miner_workers WITH KEY = \"miner\" WHERE coin =~ /^$coin$/", + "query": "SHOW TAG VALUES FROM flexpool_miner_workers WITH KEY = \"miner\"", "refresh": 1, "regex": "", "skipUrlSync": false, @@ -1435,7 +1107,7 @@ ] }, "time": { - "from": "now-2d", + "from": "now-6h", "to": "now" }, "timepicker": { diff --git a/images/grafana-010.png b/images/grafana-010.png index de7953f..48f8c40 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 6672727..a4c8b44 100644 --- a/telegraf/currencies.conf +++ b/telegraf/currencies.conf @@ -18,26 +18,6 @@ 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 deleted file mode 100644 index 2786d4c..0000000 --- a/telegraf/ethgasstation.conf +++ /dev/null @@ -1,5 +0,0 @@ -[[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 63cb241..d56920a 100644 --- a/telegraf/flexpool-miner.conf +++ b/telegraf/flexpool-miner.conf @@ -1,49 +1,51 @@ [[inputs.http]] name_override = "flexpool_miner_balance" - urls = ["https://api.flexpool.io/v2/miner/balance?coin=${COIN}&address=${MINER_ADDRESS}"] + urls = ["https://flexpool.io/api/v1/miner/${MINER_ADDRESS}/balance"] data_format = "json" 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}"] + urls = ["https://flexpool.io/api/v1/miner/${MINER_ADDRESS}/stats"] data_format = "json" - fieldpass = ["*Hashrate", "*Shares"] + 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://api.flexpool.io/v2/miner/workers?coin=${COIN}&address=${MINER_ADDRESS}"] + urls = ["https://flexpool.io/api/v1/miner/${MINER_ADDRESS}/workers"] 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://api.flexpool.io/v2/miner/paymentsStats?coin=${COIN}&address=${MINER_ADDRESS}"] + 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"] 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://api.flexpool.io/v2/miner/payments?coin=${COIN}&address=${MINER_ADDRESS}&page=0"] + urls = ["https://flexpool.io/api/v1/miner/${MINER_ADDRESS}/payments/?page=0"] data_format = "json" tagexclude = ["url"] json_query = "result.data" @@ -51,4 +53,3 @@ 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 c5521cd..5dbb556 100644 --- a/telegraf/flexpool-pool.conf +++ b/telegraf/flexpool-pool.conf @@ -1,22 +1,18 @@ [[inputs.http]] - name_override = "flexpool_pool_blocks_chart" - urls = ["https://api.flexpool.io/v2/pool/blocksChart?coin=${COIN}"] + name_override = "flexpool_pool_block_count" + urls = ["https://flexpool.io/api/v1/pool/blockCount"] 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://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" + "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" ] data_format = "json" tagexclude = ["url"] @@ -24,38 +20,35 @@ 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://api.flexpool.io/v2/pool/hashrate?coin=${COIN}"] + urls = ["https://flexpool.io/api/v1/pool/hashrate"] data_format = "json" tagexclude = ["url"] json_query = "result" - [inputs.http.tags] - coin = "${COIN}" [[inputs.http]] - name_override = "flexpool_pool_miners_count" - urls = ["https://api.flexpool.io/v2/pool/minerCount?coin=${COIN}"] + name_override = "flexpool_pool_miners_online" + urls = ["https://flexpool.io/api/v1/pool/minersOnline"] data_format = "json" tagexclude = ["url"] - [inputs.http.tags] - coin = "${COIN}" [[inputs.http]] - name_override = "flexpool_pool_workers_count" - urls = ["https://api.flexpool.io/v2/pool/workerCount?coin=${COIN}"] + name_override = "flexpool_pool_workers_online" + urls = ["https://flexpool.io/api/v1/pool/workersOnline"] data_format = "json" tagexclude = ["url"] - [inputs.http.tags] - coin = "${COIN}" + +[[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]] name_override = "flexpool_pool_current_luck" - urls = ["https://api.flexpool.io/v2/pool/currentLuck?coin=${COIN}"] + urls = ["https://flexpool.io/api/v1/pool/currentLuck"] data_format = "json" tagexclude = ["url"] - [inputs.http.tags] - coin = "${COIN}"