From 651680bc58a29b480220dceeab8743cba0d5ce46 Mon Sep 17 00:00:00 2001 From: muXxer Date: Tue, 12 Mar 2024 16:36:16 +0100 Subject: [PATCH] Fix grafana dashboard topic names --- .../provisioning/dashboards/local_dashboard.json | 4 ++-- .../provisioning/dashboards/local_dashboard_old.json | 10 +++++----- .../provisioning/dashboards/local_dashboard.json | 4 ++-- .../provisioning/dashboards/local_dashboard_old.json | 10 +++++----- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/deploy/ansible/roles/metrics/files/grafana/provisioning/dashboards/local_dashboard.json b/deploy/ansible/roles/metrics/files/grafana/provisioning/dashboards/local_dashboard.json index 571712c82..ecf6effea 100644 --- a/deploy/ansible/roles/metrics/files/grafana/provisioning/dashboards/local_dashboard.json +++ b/deploy/ansible/roles/metrics/files/grafana/provisioning/dashboards/local_dashboard.json @@ -172,7 +172,7 @@ }, "editorMode": "code", "exemplar": true, - "expr": "irate(tangle_blocks_total{instance=~\"$instance\"}[5m])", + "expr": "irate(tangle_booked_blocks_total{instance=~\"$instance\"}[5m])", "interval": "", "legendFormat": "Total BPS", "range": true, @@ -455,7 +455,7 @@ }, "editorMode": "code", "exemplar": true, - "expr": "irate(tangle_blocks_total{instance=~\"$instance\"}[5m])", + "expr": "irate(tangle_booked_blocks_total{instance=~\"$instance\"}[5m])", "hide": false, "interval": "", "legendFormat": "Block Per Second {{block_type}}", diff --git a/deploy/ansible/roles/metrics/files/grafana/provisioning/dashboards/local_dashboard_old.json b/deploy/ansible/roles/metrics/files/grafana/provisioning/dashboards/local_dashboard_old.json index 320e8c1a6..80cbdaa3f 100644 --- a/deploy/ansible/roles/metrics/files/grafana/provisioning/dashboards/local_dashboard_old.json +++ b/deploy/ansible/roles/metrics/files/grafana/provisioning/dashboards/local_dashboard_old.json @@ -172,7 +172,7 @@ }, "editorMode": "code", "exemplar": true, - "expr": "irate(tangle_blocks_total{instance=~\"$instance\"}[5m])", + "expr": "irate(tangle_booked_blocks_total{instance=~\"$instance\"}[5m])", "interval": "", "legendFormat": "Total BPS", "range": true, @@ -576,7 +576,7 @@ }, "editorMode": "code", "exemplar": true, - "expr": "irate(tangle_blocks_total{instance=~\"$instance\"}[5m])", + "expr": "irate(tangle_booked_blocks_total{instance=~\"$instance\"}[5m])", "hide": false, "interval": "", "legendFormat": "Block Per Second {{block_type}}", @@ -3895,7 +3895,7 @@ "targets": [ { "exemplar": true, - "expr": "topk(15, sum by (node_id) (scheduler_queue_size_per_node_bytes{instance=~\"$instance\"}/scheduler_mana_per_node{instance=~\"$instance\"}))", + "expr": "topk(15, sum by (node_id) (scheduler_queue_size_per_node_work{instance=~\"$instance\"}/scheduler_mana_per_node{instance=~\"$instance\"}))", "instant": true, "interval": "", "legendFormat": "Node: {{node_id}}", @@ -4320,7 +4320,7 @@ }, "editorMode": "code", "exemplar": false, - "expr": "topk(15, sum by (node_id) (scheduler_queue_size_per_node_bytes{instance=~\"$instance\"}))", + "expr": "topk(15, sum by (node_id) (scheduler_queue_size_per_node_work{instance=~\"$instance\"}))", "instant": true, "interval": "", "legendFormat": "Node: {{node_id}}", @@ -4578,7 +4578,7 @@ "uid": "PBFA97CFB590B2093" }, "exemplar": true, - "expr": "scheduler_queue_size_per_node_bytes{node_id=\"$NodeID\",instance=~\"$instance\"}", + "expr": "scheduler_queue_size_per_node_work{node_id=\"$NodeID\",instance=~\"$instance\"}", "hide": false, "interval": "", "legendFormat": "Own scheduler queue size", diff --git a/tools/docker-network/grafana/provisioning/dashboards/local_dashboard.json b/tools/docker-network/grafana/provisioning/dashboards/local_dashboard.json index 571712c82..ecf6effea 100644 --- a/tools/docker-network/grafana/provisioning/dashboards/local_dashboard.json +++ b/tools/docker-network/grafana/provisioning/dashboards/local_dashboard.json @@ -172,7 +172,7 @@ }, "editorMode": "code", "exemplar": true, - "expr": "irate(tangle_blocks_total{instance=~\"$instance\"}[5m])", + "expr": "irate(tangle_booked_blocks_total{instance=~\"$instance\"}[5m])", "interval": "", "legendFormat": "Total BPS", "range": true, @@ -455,7 +455,7 @@ }, "editorMode": "code", "exemplar": true, - "expr": "irate(tangle_blocks_total{instance=~\"$instance\"}[5m])", + "expr": "irate(tangle_booked_blocks_total{instance=~\"$instance\"}[5m])", "hide": false, "interval": "", "legendFormat": "Block Per Second {{block_type}}", diff --git a/tools/docker-network/grafana/provisioning/dashboards/local_dashboard_old.json b/tools/docker-network/grafana/provisioning/dashboards/local_dashboard_old.json index 320e8c1a6..80cbdaa3f 100644 --- a/tools/docker-network/grafana/provisioning/dashboards/local_dashboard_old.json +++ b/tools/docker-network/grafana/provisioning/dashboards/local_dashboard_old.json @@ -172,7 +172,7 @@ }, "editorMode": "code", "exemplar": true, - "expr": "irate(tangle_blocks_total{instance=~\"$instance\"}[5m])", + "expr": "irate(tangle_booked_blocks_total{instance=~\"$instance\"}[5m])", "interval": "", "legendFormat": "Total BPS", "range": true, @@ -576,7 +576,7 @@ }, "editorMode": "code", "exemplar": true, - "expr": "irate(tangle_blocks_total{instance=~\"$instance\"}[5m])", + "expr": "irate(tangle_booked_blocks_total{instance=~\"$instance\"}[5m])", "hide": false, "interval": "", "legendFormat": "Block Per Second {{block_type}}", @@ -3895,7 +3895,7 @@ "targets": [ { "exemplar": true, - "expr": "topk(15, sum by (node_id) (scheduler_queue_size_per_node_bytes{instance=~\"$instance\"}/scheduler_mana_per_node{instance=~\"$instance\"}))", + "expr": "topk(15, sum by (node_id) (scheduler_queue_size_per_node_work{instance=~\"$instance\"}/scheduler_mana_per_node{instance=~\"$instance\"}))", "instant": true, "interval": "", "legendFormat": "Node: {{node_id}}", @@ -4320,7 +4320,7 @@ }, "editorMode": "code", "exemplar": false, - "expr": "topk(15, sum by (node_id) (scheduler_queue_size_per_node_bytes{instance=~\"$instance\"}))", + "expr": "topk(15, sum by (node_id) (scheduler_queue_size_per_node_work{instance=~\"$instance\"}))", "instant": true, "interval": "", "legendFormat": "Node: {{node_id}}", @@ -4578,7 +4578,7 @@ "uid": "PBFA97CFB590B2093" }, "exemplar": true, - "expr": "scheduler_queue_size_per_node_bytes{node_id=\"$NodeID\",instance=~\"$instance\"}", + "expr": "scheduler_queue_size_per_node_work{node_id=\"$NodeID\",instance=~\"$instance\"}", "hide": false, "interval": "", "legendFormat": "Own scheduler queue size",