Skip to content

Commit

Permalink
Fix multiple series on blockchain state & mempool (#84)
Browse files Browse the repository at this point in the history 
* Fix multiple series on blockchain state

* Fix multiple series on mempool
  • Loading branch information
@cmmarslender
cmmarslender authored Mar 27, 2024
1 parent 49a5242 commit 087de86
Show file tree
Hide file tree
Showing 2 changed files with 87 additions and 86 deletions.
101 changes: 48 additions & 53 deletions dashboards/blockchain/blockchain-state.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,8 +75,7 @@
}
]
},
"unit": "mbytes",
"unitScale": true
"unit": "mbytes"
},
"overrides": []
},
Expand Down Expand Up @@ -104,17 +103,19 @@
"textMode": "value",
"wideLayout": true
},
"pluginVersion": "10.3.3",
"pluginVersion": "10.4.1",
"targets": [
{
"datasource": {
"type": "prometheus",
"uid": "PB06BBC9CA81C548D"
},
"editorMode": "code",
"exemplar": false,
"expr": "sum without(cluster, application, component, pod, service, instance, namespace, job, instance_name, ref, container, group, endpoint, region) (\n topk(1, \n chia_blockchain_netspace_mib{network=\"$network\"} or \n (chia_full_node_netspace_mib{network=\"$network\"} and on (instance) (chia_full_node_node_synced{network=\"$network\"} == 1)) !=0\n )\n)",
"expr": "sum without(cluster, application, component, pod, service, instance, namespace, job, instance_name, ref, container, group, endpoint, region, exported_network) (\n topk(1, \n chia_blockchain_netspace_mib{network=\"$network\"} or \n (chia_full_node_netspace_mib{network=\"$network\"} and on (instance) (chia_full_node_node_synced{network=\"$network\"} == 1)) !=0\n )\n)",
"interval": "",
"legendFormat": "Netspace",
"range": true,
"refId": "A"
}
],
Expand Down Expand Up @@ -142,8 +143,7 @@
}
]
},
"unit": "mbytes",
"unitScale": true
"unit": "mbytes"
},
"overrides": []
},
Expand Down Expand Up @@ -171,7 +171,7 @@
"textMode": "value",
"wideLayout": true
},
"pluginVersion": "10.3.3",
"pluginVersion": "10.4.1",
"targets": [
{
"datasource": {
Expand Down Expand Up @@ -209,8 +209,7 @@
"value": null
}
]
},
"unitScale": true
}
},
"overrides": []
},
Expand Down Expand Up @@ -238,17 +237,19 @@
"textMode": "value",
"wideLayout": true
},
"pluginVersion": "10.3.3",
"pluginVersion": "10.4.1",
"targets": [
{
"datasource": {
"type": "prometheus",
"uid": "PB06BBC9CA81C548D"
},
"editorMode": "code",
"exemplar": false,
"expr": "sum without(cluster, application, component, pod, service, instance, namespace, job, instance_name, ref, container, group, endpoint, region) (\n topk(1, \n chia_blockchain_height{network=\"$network\"} !=0 or \n chia_full_node_node_height{network=\"$network\"} !=0\n )\n)",
"expr": "sum without(cluster, application, component, pod, service, instance, namespace, job, instance_name, ref, container, group, endpoint, region, exported_network) (\n topk(1, \n chia_blockchain_height{network=\"$network\"} !=0 or \n chia_full_node_node_height{network=\"$network\"} !=0\n )\n)",
"interval": "",
"legendFormat": "Height",
"range": true,
"refId": "A"
}
],
Expand All @@ -275,8 +276,7 @@
"value": null
}
]
},
"unitScale": true
}
},
"overrides": []
},
Expand Down Expand Up @@ -304,15 +304,16 @@
"textMode": "value",
"wideLayout": true
},
"pluginVersion": "10.3.3",
"pluginVersion": "10.4.1",
"targets": [
{
"datasource": {
"type": "prometheus",
"uid": "PB06BBC9CA81C548D"
},
"editorMode": "code",
"exemplar": false,
"expr": "sum without(cluster, application, component, pod, service, instance, namespace, job, instance_name, ref, container, group, endpoint, region) (\n topk(1, \n chia_blockchain_height{network=\"$network\"} or \n chia_full_node_node_height{network=\"$network\"} != 0)) \n- \nsum without(cluster, application, component, pod, service, instance, namespace, job, instance_name, ref, container, group, endpoint, region) (\n topk(1, \n chia_blockchain_height{network=\"$network\"} offset $__range or \n chia_full_node_node_height{network=\"$network\"} offset $__range != 0))",
"expr": "sum without(cluster, application, component, pod, service, instance, namespace, job, instance_name, ref, container, group, endpoint, region, exported_network) (\n topk(1, \n chia_blockchain_height{network=\"$network\"} or \n chia_full_node_node_height{network=\"$network\"} != 0)) \n- \nsum without(cluster, application, component, pod, service, instance, namespace, job, instance_name, ref, container, group, endpoint, region, exported_network) (\n topk(1, \n chia_blockchain_height{network=\"$network\"} offset $__range or \n chia_full_node_node_height{network=\"$network\"} offset $__range != 0))",
"instant": false,
"interval": "",
"legendFormat": "Height",
Expand Down Expand Up @@ -348,8 +349,7 @@
}
]
},
"unit": "short",
"unitScale": true
"unit": "short"
},
"overrides": []
},
Expand All @@ -376,15 +376,15 @@
"textMode": "auto",
"wideLayout": true
},
"pluginVersion": "10.3.3",
"pluginVersion": "10.4.1",
"targets": [
{
"datasource": {
"type": "prometheus",
"uid": "PB06BBC9CA81C548D"
},
"editorMode": "code",
"expr": "1/sum without(cluster, application, component, pod, service, instance, namespace, job, instance_name, ref, container, group, endpoint, region) (\n topk(1, rate(chia_full_node_transaction_blocks{network=\"$network\"}[5m]))\n)",
"expr": "1/sum without(cluster, application, component, pod, service, instance, namespace, job, instance_name, ref, container, group, endpoint, region, exported_network) (\n topk(1, rate(chia_full_node_transaction_blocks{network=\"$network\"}[5m]))\n)",
"instant": false,
"legendFormat": "__auto",
"range": true,
Expand Down Expand Up @@ -414,8 +414,7 @@
"value": null
}
]
},
"unitScale": true
}
},
"overrides": []
},
Expand Down Expand Up @@ -443,17 +442,19 @@
"textMode": "value",
"wideLayout": true
},
"pluginVersion": "10.3.3",
"pluginVersion": "10.4.1",
"targets": [
{
"datasource": {
"type": "prometheus",
"uid": "PB06BBC9CA81C548D"
},
"editorMode": "code",
"exemplar": false,
"expr": "sum without(cluster, application, component, pod, service, instance, namespace, job, instance_name, ref, container, group, endpoint, region) (\n topk(1,\n chia_blockchain_difficulty{network=\"$network\"} or\n chia_full_node_difficulty{network=\"$network\"} !=0 \n )\n)",
"expr": "sum without(cluster, application, component, pod, service, instance, namespace, job, instance_name, ref, container, group, endpoint, region, exported_network) (\n topk(1,\n chia_blockchain_difficulty{network=\"$network\"} or\n chia_full_node_difficulty{network=\"$network\"} !=0 \n )\n)",
"interval": "",
"legendFormat": "Difficulty",
"range": true,
"refId": "A"
}
],
Expand All @@ -480,8 +481,7 @@
"value": null
}
]
},
"unitScale": true
}
},
"overrides": []
},
Expand Down Expand Up @@ -509,7 +509,7 @@
"textMode": "value",
"wideLayout": true
},
"pluginVersion": "10.3.3",
"pluginVersion": "10.4.1",
"targets": [
{
"datasource": {
Expand Down Expand Up @@ -548,8 +548,7 @@
"value": null
}
]
},
"unitScale": true
}
},
"overrides": []
},
Expand Down Expand Up @@ -577,7 +576,7 @@
"textMode": "value",
"wideLayout": true
},
"pluginVersion": "10.3.3",
"pluginVersion": "10.4.1",
"targets": [
{
"datasource": {
Expand Down Expand Up @@ -617,8 +616,7 @@
"value": null
}
]
},
"unitScale": true
}
},
"overrides": []
},
Expand Down Expand Up @@ -646,17 +644,19 @@
"textMode": "value",
"wideLayout": true
},
"pluginVersion": "10.3.3",
"pluginVersion": "10.4.1",
"targets": [
{
"datasource": {
"type": "prometheus",
"uid": "PB06BBC9CA81C548D"
},
"editorMode": "code",
"exemplar": false,
"expr": "$__range_s/(\n sum without(cluster, application, component, pod, service, instance, namespace, job, instance_name, ref, container, group, endpoint, region) (\n topk(1, \n chia_blockchain_height{network=\"$network\"} or\n chia_full_node_node_height{network=\"$network\"}\n ) != 0\n ) - \n sum without(cluster, application, component, pod, service, instance, namespace, job, instance_name, ref, container, group, endpoint, region) (\n topk(1, \n chia_blockchain_height{network=\"$network\"} offset $__range or\n chia_full_node_node_height{network=\"$network\"} offset $__range\n ) != 0\n )\n)",
"expr": "$__range_s/(\n sum without(cluster, application, component, pod, service, instance, namespace, job, instance_name, ref, container, group, endpoint, region, exported_network) (\n topk(1, \n chia_blockchain_height{network=\"$network\"} or\n chia_full_node_node_height{network=\"$network\"}\n ) != 0\n ) - \n sum without(cluster, application, component, pod, service, instance, namespace, job, instance_name, ref, container, group, endpoint, region, exported_network) (\n topk(1, \n chia_blockchain_height{network=\"$network\"} offset $__range or\n chia_full_node_node_height{network=\"$network\"} offset $__range\n ) != 0\n )\n)",
"interval": "",
"legendFormat": "Difficulty",
"range": true,
"refId": "A"
}
],
Expand Down Expand Up @@ -746,8 +746,7 @@
}
]
},
"unit": "mbytes",
"unitScale": true
"unit": "mbytes"
},
"overrides": []
},
Expand Down Expand Up @@ -869,8 +868,7 @@
"value": 80
}
]
},
"unitScale": true
}
},
"overrides": [
{
Expand Down Expand Up @@ -1000,8 +998,7 @@
"value": 80
}
]
},
"unitScale": true
}
},
"overrides": [
{
Expand Down Expand Up @@ -1058,19 +1055,22 @@
"type": "prometheus",
"uid": "PB06BBC9CA81C548D"
},
"editorMode": "code",
"exemplar": false,
"expr": "sum without(cluster, application, component, pod, service, instance, namespace, job, instance_name, ref, container, group, endpoint, region) (\n topk(1, \n chia_blockchain_height{network=\"$network\"} or\n chia_full_node_node_height{network=\"$network\"} !=0\n )\n)",
"expr": "sum without(cluster, application, component, pod, service, instance, namespace, job, instance_name, ref, container, group, endpoint, region, exported_network) (\n topk(1, \n chia_blockchain_height{network=\"$network\"} or\n chia_full_node_node_height{network=\"$network\"} !=0\n )\n)",
"interval": "",
"legendFormat": "Height",
"range": true,
"refId": "A"
},
{
"datasource": {
"type": "prometheus",
"uid": "PB06BBC9CA81C548D"
},
"editorMode": "code",
"exemplar": true,
"expr": "((\n sum without(cluster, application, component, pod, service, instance, namespace, job, instance_name, ref, container, group, endpoint, region) (\n topk(1, \n chia_blockchain_height{network=\"$network\"} or\n chia_full_node_node_height{network=\"$network\"}\n ) != 0\n ) - \n sum without(cluster, application, component, pod, service, instance, namespace, job, instance_name, ref, container, group, endpoint, region) (\n topk(1, \n chia_blockchain_height{network=\"$network\"} offset 3600s or\n chia_full_node_node_height{network=\"$network\"} offset 3600s\n ) != 0\n )\n)/(3600/18.75))",
"expr": "((\n sum without(cluster, application, component, pod, service, instance, namespace, job, instance_name, ref, container, group, endpoint, region, exported_network) (\n topk(1, \n chia_blockchain_height{network=\"$network\"} or\n chia_full_node_node_height{network=\"$network\"}\n ) != 0\n ) - \n sum without(cluster, application, component, pod, service, instance, namespace, job, instance_name, ref, container, group, endpoint, region, exported_network) (\n topk(1, \n chia_blockchain_height{network=\"$network\"} offset 3600s or\n chia_full_node_node_height{network=\"$network\"} offset 3600s\n ) != 0\n )\n)/(3600/18.75))",
"hide": false,
"instant": false,
"interval": "",
Expand Down Expand Up @@ -1137,8 +1137,7 @@
"value": 80
}
]
},
"unitScale": true
}
},
"overrides": [
{
Expand Down Expand Up @@ -1259,8 +1258,7 @@
}
]
},
"unit": "percentunit",
"unitScale": true
"unit": "percentunit"
},
"overrides": []
},
Expand Down Expand Up @@ -1357,8 +1355,7 @@
"value": 80
}
]
},
"unitScale": true
}
},
"overrides": []
},
Expand Down Expand Up @@ -1420,8 +1417,7 @@
}
]
},
"unit": "percentunit",
"unitScale": true
"unit": "percentunit"
},
"overrides": []
},
Expand Down Expand Up @@ -1450,7 +1446,7 @@
"sizing": "auto",
"valueMode": "color"
},
"pluginVersion": "10.3.3",
"pluginVersion": "10.4.1",
"targets": [
{
"datasource": {
Expand Down Expand Up @@ -1534,8 +1530,7 @@
"value": 80
}
]
},
"unitScale": true
}
},
"overrides": []
},
Expand Down Expand Up @@ -1623,6 +1618,6 @@
"timezone": "",
"title": "Blockchain State",
"uid": "CL1X4UWnk",
"version": 10,
"version": 21,
"weekStart": ""
}
Loading

0 comments on commit 087de86

Please sign in to comment.