Skip to content

Commit

Permalink
Upgrade grafana datasource name and documentation (#236)
Browse files Browse the repository at this point in the history
  • Loading branch information
wanliqun authored Oct 18, 2024
1 parent 09ee1a8 commit df78ee7
Show file tree
Hide file tree
Showing 15 changed files with 50 additions and 48 deletions.
2 changes: 1 addition & 1 deletion doc/DEPLOY.md
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ To set up Grafana, follow these steps:
1. Configure InfluxDB as a Data Source:
- Open the Grafana web interface.
- Go to the data sources section and add InfluxDB as a data source.
- Name the data source `infura_testnet` or `infura_mainet`, depending on your environment.
- Name the data source `confura_testnet` or `confura_mainnet`, depending on your environment.

2. Import the Dashboard Configuration:
- Refer to the [Grafana Dashboard](../grafana/README.md) for the provided dashboard configuration files.
Expand Down
18 changes: 9 additions & 9 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ services:
environment:
- INFURA_METRICS_ENABLED=true
- INFURA_METRICS_INFLUXDB_HOST=http://influxdb:8086
- INFURA_METRICS_INFLUXDB_DB=infura_testnet
- INFURA_METRICS_INFLUXDB_DB=confura_testnet
container_name: confura-node-management

ethnode-management:
Expand All @@ -32,7 +32,7 @@ services:
environment:
- INFURA_METRICS_ENABLED=true
- INFURA_METRICS_INFLUXDB_HOST=http://influxdb:8086
- INFURA_METRICS_INFLUXDB_DB=infura_testnet
- INFURA_METRICS_INFLUXDB_DB=confura_testnet
container_name: confura-ethnode-management

# blockchain sync
Expand All @@ -51,7 +51,7 @@ services:
- INFURA_STORE_MYSQL_DSN=root:root@tcp(db:3306)/confura_cfx?parseTime=true
- INFURA_METRICS_ENABLED=true
- INFURA_METRICS_INFLUXDB_HOST=http://influxdb:8086
- INFURA_METRICS_INFLUXDB_DB=infura_testnet
- INFURA_METRICS_INFLUXDB_DB=confura_testnet
container_name: confura-sync

ethchain-sync:
Expand All @@ -70,7 +70,7 @@ services:
- INFURA_SYNC_ETH_FROMBLOCK=36935000
- INFURA_METRICS_ENABLED=true
- INFURA_METRICS_INFLUXDB_HOST=http://influxdb:8086
- INFURA_METRICS_INFLUXDB_DB=infura_testnet
- INFURA_METRICS_INFLUXDB_DB=confura_testnet
container_name: confura-ethsync

# virtual filter
Expand All @@ -91,7 +91,7 @@ services:
- INFURA_STORE_MYSQL_DSN=root:root@tcp(db:3306)/confura_cfx?parseTime=true
- INFURA_METRICS_ENABLED=true
- INFURA_METRICS_INFLUXDB_HOST=http://influxdb:8086
- INFURA_METRICS_INFLUXDB_DB=infura_testnet
- INFURA_METRICS_INFLUXDB_DB=confura_testnet
container_name: confura-virtual-filter

ethvirtual-filter:
Expand All @@ -111,7 +111,7 @@ services:
- INFURA_ETHSTORE_MYSQL_DSN=root:root@tcp(db:3306)/confura_eth?parseTime=true
- INFURA_METRICS_ENABLED=true
- INFURA_METRICS_INFLUXDB_HOST=http://influxdb:8086
- INFURA_METRICS_INFLUXDB_DB=infura_testnet
- INFURA_METRICS_INFLUXDB_DB=confura_testnet
container_name: confura-ethvirtual-filter

# rpc proxy
Expand All @@ -137,7 +137,7 @@ services:
- INFURA_VIRTUALFILTERS_CLIENT_SERVICERPCURL=http://virtual-filter:42537
- INFURA_METRICS_ENABLED=true
- INFURA_METRICS_INFLUXDB_HOST=http://influxdb:8086
- INFURA_METRICS_INFLUXDB_DB=infura_testnet
- INFURA_METRICS_INFLUXDB_DB=confura_testnet
container_name: confura-rpc

ethrpc-proxy:
Expand All @@ -162,7 +162,7 @@ services:
- INFURA_ETHVIRTUALFILTERS_CLIENT_SERVICERPCURL=http://ethvirtual-filter:48545
- INFURA_METRICS_ENABLED=true
- INFURA_METRICS_INFLUXDB_HOST=http://influxdb:8086
- INFURA_METRICS_INFLUXDB_DB=infura_testnet
- INFURA_METRICS_INFLUXDB_DB=confura_testnet
container_name: confura-ethrpc

# middlewares
Expand Down Expand Up @@ -190,7 +190,7 @@ services:
- path: .env
required: false
environment:
- INFLUXDB_DB=infura_testnet
- INFLUXDB_DB=confura_testnet
volumes:
- influxdb-data:/var/lib/influxdb
container_name: confura-influxdb
Expand Down
4 changes: 2 additions & 2 deletions grafana/Node-Management.json
Original file line number Diff line number Diff line change
Expand Up @@ -457,8 +457,8 @@
{
"current": {
"selected": false,
"text": "infura_mainet",
"value": "infura_mainet"
"text": "confura_mainnet",
"value": "confura_mainnet"
},
"description": null,
"error": null,
Expand Down
8 changes: 5 additions & 3 deletions grafana/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,18 @@
This folder contains all dashboard JSON models which can be imported into Grafana.
| Json Model | Description |
|--------------------- |------------------------------------------- |
| RPC-RED-Overview | RED metrics overview for RPC proxy |
| RPC-RED-Drilldown | RED metrics drilldown for RPC proxy |
| RPC-RED-Overview | `RED` metrics overview for RPC proxy |
| RPC-RED-Drilldown | `RED` metrics drilldown for RPC proxy |
| RPC-Input-Breakdown | Input parameter breakdown for RPC proxy |
| RPC-Batch | JSON-RPC batch requests for RPC proxy |
| RPC-PubSub | Websocket Pub/Sub metrics for RPC proxy |
| RPC-Fullnode-Proxy | Full node proxy metrics for RPC proxy |
| RPC-Store-Ops | Store operation metrics for RPC proxy |
| Node-Management | Node cluster management metrics |
| Sync-RED | RED metrics for indexing sync |
| Sync-RED | `RED` metrics for indexing sync |
| Sync-Fullnode-Query | Full node query metrics for indexing sync |
| Sync-Store-Ops | Store operation metrics for indexing sync |
| Virtual-Filter | Operation (eg., polling) metrics for filter |

*`RED`: Three key metrics are collected: `Rate`, `Error` and `Duration`.*
> **Note**: Any InfluxDB data sources created in Grafana must have a name starting with the `confura_*` prefix for proper integration with these dashboards.
6 changes: 3 additions & 3 deletions grafana/RPC-Batch.json
Original file line number Diff line number Diff line change
Expand Up @@ -471,8 +471,8 @@
{
"current": {
"selected": false,
"text": "infura_mainet",
"value": "infura_mainet"
"text": "confura_mainnet",
"value": "confura_mainnet"
},
"description": null,
"error": null,
Expand All @@ -485,7 +485,7 @@
"query": "influxdb",
"queryValue": "",
"refresh": 1,
"regex": "/.*infura_*./",
"regex": "/.*confura_*./",
"skipUrlSync": false,
"type": "datasource"
}
Expand Down
6 changes: 3 additions & 3 deletions grafana/RPC-Fullnode-Proxy.json
Original file line number Diff line number Diff line change
Expand Up @@ -924,8 +924,8 @@
{
"current": {
"selected": false,
"text": "infura_mainet",
"value": "infura_mainet"
"text": "confura_mainnet",
"value": "confura_mainnet"
},
"description": null,
"error": null,
Expand All @@ -938,7 +938,7 @@
"query": "influxdb",
"queryValue": "",
"refresh": 1,
"regex": "/.*infura_*./",
"regex": "/.*confura_*./",
"skipUrlSync": false,
"type": "datasource"
},
Expand Down
6 changes: 3 additions & 3 deletions grafana/RPC-Input-Breakdown.json
Original file line number Diff line number Diff line change
Expand Up @@ -1057,8 +1057,8 @@
{
"current": {
"selected": false,
"text": "infura_testnet",
"value": "infura_testnet"
"text": "confura_testnet",
"value": "confura_testnet"
},
"description": null,
"error": null,
Expand All @@ -1071,7 +1071,7 @@
"query": "influxdb",
"queryValue": "",
"refresh": 1,
"regex": "/.*infura_*./",
"regex": "/.*confura_*./",
"skipUrlSync": false,
"type": "datasource"
},
Expand Down
6 changes: 3 additions & 3 deletions grafana/RPC-PubSub.json
Original file line number Diff line number Diff line change
Expand Up @@ -284,8 +284,8 @@
{
"current": {
"selected": false,
"text": "infura_mainet",
"value": "infura_mainet"
"text": "confura_mainnet",
"value": "confura_mainnet"
},
"description": null,
"error": null,
Expand All @@ -298,7 +298,7 @@
"query": "influxdb",
"queryValue": "",
"refresh": 1,
"regex": "/.*infura_*./",
"regex": "/.*confura_*./",
"skipUrlSync": false,
"type": "datasource"
},
Expand Down
6 changes: 3 additions & 3 deletions grafana/RPC-RED-Drilldown.json
Original file line number Diff line number Diff line change
Expand Up @@ -859,8 +859,8 @@
{
"current": {
"selected": false,
"text": "infura_mainet",
"value": "infura_mainet"
"text": "confura_mainnet",
"value": "confura_mainnet"
},
"description": null,
"error": null,
Expand All @@ -873,7 +873,7 @@
"query": "influxdb",
"queryValue": "",
"refresh": 1,
"regex": "/.*infura_*./",
"regex": "/.*confura_*./",
"skipUrlSync": false,
"type": "datasource"
},
Expand Down
6 changes: 3 additions & 3 deletions grafana/RPC-RED-Overview.json
Original file line number Diff line number Diff line change
Expand Up @@ -1951,8 +1951,8 @@
{
"current": {
"selected": false,
"text": "infura_mainet",
"value": "infura_mainet"
"text": "confura_mainnet",
"value": "confura_mainnet"
},
"description": null,
"error": null,
Expand All @@ -1965,7 +1965,7 @@
"query": "influxdb",
"queryValue": "",
"refresh": 1,
"regex": "/.*infura_*./",
"regex": "/.*confura_*./",
"skipUrlSync": false,
"type": "datasource"
},
Expand Down
6 changes: 3 additions & 3 deletions grafana/RPC-Store-Ops.json
Original file line number Diff line number Diff line change
Expand Up @@ -558,8 +558,8 @@
{
"current": {
"selected": false,
"text": "infura_mainet",
"value": "infura_mainet"
"text": "confura_mainnet",
"value": "confura_mainnet"
},
"description": null,
"error": null,
Expand All @@ -572,7 +572,7 @@
"query": "influxdb",
"queryValue": "",
"refresh": 1,
"regex": "/.*infura_*./",
"regex": "/.*confura_*./",
"skipUrlSync": false,
"type": "datasource"
},
Expand Down
6 changes: 3 additions & 3 deletions grafana/Sync-Fullnode-Query.json
Original file line number Diff line number Diff line change
Expand Up @@ -996,8 +996,8 @@
{
"current": {
"selected": false,
"text": "infura_mainet",
"value": "infura_mainet"
"text": "confura_mainnet",
"value": "confura_mainnet"
},
"description": null,
"error": null,
Expand All @@ -1010,7 +1010,7 @@
"query": "influxdb",
"queryValue": "",
"refresh": 1,
"regex": "/.*infura_*./",
"regex": "/.*confura_*./",
"skipUrlSync": false,
"type": "datasource"
}
Expand Down
6 changes: 3 additions & 3 deletions grafana/Sync-RED.json
Original file line number Diff line number Diff line change
Expand Up @@ -1883,8 +1883,8 @@
{
"current": {
"selected": false,
"text": "infura_mainet",
"value": "infura_mainet"
"text": "confura_mainnet",
"value": "confura_mainnet"
},
"description": null,
"error": null,
Expand All @@ -1897,7 +1897,7 @@
"query": "influxdb",
"queryValue": "",
"refresh": 1,
"regex": "/.*infura_*./",
"regex": "/.*confura_*./",
"skipUrlSync": false,
"type": "datasource"
}
Expand Down
6 changes: 3 additions & 3 deletions grafana/Sync-Store-Ops.json
Original file line number Diff line number Diff line change
Expand Up @@ -796,8 +796,8 @@
{
"current": {
"selected": false,
"text": "infura_mainet",
"value": "infura_mainet"
"text": "confura_mainnet",
"value": "confura_mainnet"
},
"description": null,
"error": null,
Expand All @@ -810,7 +810,7 @@
"query": "influxdb",
"queryValue": "",
"refresh": 1,
"regex": "/.*infura_*./",
"regex": "/.*confura_*./",
"skipUrlSync": false,
"type": "datasource"
},
Expand Down
6 changes: 3 additions & 3 deletions grafana/Virtual-Filter.json
Original file line number Diff line number Diff line change
Expand Up @@ -1439,8 +1439,8 @@
{
"current": {
"selected": true,
"text": "infura_testnet",
"value": "infura_testnet"
"text": "confura_testnet",
"value": "confura_testnet"
},
"description": null,
"error": null,
Expand All @@ -1453,7 +1453,7 @@
"query": "influxdb",
"queryValue": "",
"refresh": 1,
"regex": "/.*infura_*./",
"regex": "/.*confura_*./",
"skipUrlSync": false,
"type": "datasource"
},
Expand Down

0 comments on commit df78ee7

Please sign in to comment.