diff --git a/metrics/provisioning/grafana/dashboards/common_dashboards/ethereum_metrics_exporter.json b/metrics/provisioning/grafana/dashboards/common_dashboards/ethereum_metrics_exporter.json index 5a628c1f016..a9b23d04e17 100644 --- a/metrics/provisioning/grafana/dashboards/common_dashboards/ethereum_metrics_exporter.json +++ b/metrics/provisioning/grafana/dashboards/common_dashboards/ethereum_metrics_exporter.json @@ -1,53 +1,4 @@ { - "__inputs": [ - { - "name": "DS_PROMETHEUS", - "label": "Prometheus", - "description": "", - "type": "datasource", - "pluginId": "prometheus", - "pluginName": "Prometheus" - } - ], - "__elements": {}, - "__requires": [ - { - "type": "grafana", - "id": "grafana", - "name": "Grafana", - "version": "9.3.1" - }, - { - "type": "panel", - "id": "heatmap", - "name": "Heatmap", - "version": "" - }, - { - "type": "datasource", - "id": "prometheus", - "name": "Prometheus", - "version": "1.0.0" - }, - { - "type": "panel", - "id": "stat", - "name": "Stat", - "version": "" - }, - { - "type": "panel", - "id": "table", - "name": "Table", - "version": "" - }, - { - "type": "panel", - "id": "timeseries", - "name": "Time series", - "version": "" - } - ], "annotations": { "list": [ { @@ -73,17 +24,12 @@ "description": "Companion dashboard for https://github.com/samcm/ethereum-metrics-exporter", "editable": true, "fiscalYearStartMonth": 0, - "gnetId": 16277, "graphTooltip": 0, - "id": null, + "id": 11, "links": [], - "liveNow": false, "panels": [ { - "datasource": { - "type": "prometheus", - "uid": "ndvLBM54z" - }, + "collapsed": false, "gridPos": { "h": 1, "w": 24, @@ -91,6 +37,7 @@ "y": 0 }, "id": 5, + "panels": [], "title": "Overview", "type": "row" }, @@ -104,13 +51,26 @@ "color": { "mode": "thresholds" }, + "custom": { + "align": "auto", + "cellOptions": { + "type": "auto" + }, + "filterable": true, + "footer": { + "reducers": [] + }, + "inspect": false, + "wrapHeaderText": false, + "wrapText": false + }, "mappings": [], "thresholds": { "mode": "absolute", "steps": [ { "color": "green", - "value": null + "value": 0 }, { "color": "red", @@ -123,42 +83,60 @@ "overrides": [] }, "gridPos": { - "h": 4, - "w": 9, + "h": 5, + "w": 15, "x": 0, "y": 1 }, "id": 10, "options": { - "colorMode": "value", - "graphMode": "none", - "justifyMode": "auto", - "orientation": "auto", - "reduceOptions": { - "calcs": [ - "lastNotNull" - ], - "fields": "", - "values": false - }, - "textMode": "name" + "cellHeight": "sm", + "enablePagination": false, + "showHeader": true, + "sortBy": [ + { + "desc": false, + "displayName": "version" + } + ] }, - "pluginVersion": "9.3.1", + "pluginVersion": "12.2.0", "targets": [ { "datasource": { "type": "prometheus", "uid": "prom-001" }, - "exemplar": true, - "expr": "max by (version)(eth_exe_web3_client_version{instance=~\"$instance\"})", + "editorMode": "code", + "exemplar": false, + "expr": "max by (instance, client, version)(eth_exe_web3_client_version{instance=~\"$instance\"})", + "format": "table", + "instant": true, "interval": "", "legendFormat": "{{ version }}", + "range": false, "refId": "A" } ], "title": "Execution Client", - "type": "stat" + "transformations": [ + { + "id": "organize", + "options": { + "excludeByName": { + "Time": true, + "Value": true + }, + "includeByName": {}, + "indexByName": {}, + "orderByMode": "manual", + "renameByName": { + "instance": "Instance" + } + } + } + ], + "type": "table" }, { "datasource": { @@ -167,13 +145,27 @@ }, "fieldConfig": { "defaults": { + "color": { + "mode": "thresholds" + }, + "custom": { + "align": "auto", + "cellOptions": { + "type": "auto" + }, + "filterable": true, + "footer": { + "reducers": [] + }, + "inspect": false + }, "mappings": [], "thresholds": { "mode": "absolute", "steps": [ { "color": "green", - "value": null + "value": 0 }, { "color": "red", @@ -188,40 +180,55 @@ "gridPos": { "h": 5, "w": 9, - "x": 9, + "x": 15, "y": 1 }, "id": 29, "options": { - "colorMode": "none", - "graphMode": "none", - "justifyMode": "auto", - "orientation": "auto", - "reduceOptions": { - "calcs": [ - "lastNotNull" - ], - "fields": "", - "values": false - }, - "textMode": "name" + "cellHeight": "sm", + "showHeader": true }, - "pluginVersion": "9.3.1", + "pluginVersion": "12.2.0", "targets": [ { "datasource": { "type": "prometheus", "uid": "prom-001" }, - "exemplar": true, + "editorMode": "code", + "exemplar": false, "expr": "eth_con_spec_config_name{instance=~\"$instance\"}", + "format": "table", + "instant": true, "interval": "", "legendFormat": "{{ name }}", + "range": false, "refId": "A" } ], "title": "Consensus Config", - "type": "stat" + "transformations": [ + { + "id": "organize", + "options": { + "excludeByName": { + "Time": true, + "Value": true, + "__name__": true, + "job": true, + "module": true, + "node": true + }, + "includeByName": {}, + "indexByName": {}, + "renameByName": { + "instance": "Instance", + "name": "config" + } + } + } + ], + "type": "table" }, { "datasource": { @@ -230,13 +237,27 @@ }, "fieldConfig": { "defaults": { + "color": { + "mode": "thresholds" + }, + "custom": { + "align": "auto", + "cellOptions": { + "type": "auto" + }, + "filterable": true, + "footer": { + "reducers": [] + }, + "inspect": false + }, "mappings": [], "thresholds": { "mode": "absolute", "steps": [ { "color": "green", - "value": null + "value": 0 }, { "color": "red", @@ -244,47 +265,64 @@ } ] }, - "unit": "short" + "unit": "none" }, "overrides": [] }, "gridPos": { "h": 4, - "w": 6, - "x": 18, - "y": 1 + "w": 15, + "x": 0, + "y": 6 }, - "id": 40, + "id": 31, "options": { - "colorMode": "none", - "graphMode": "none", - "justifyMode": "auto", - "orientation": "auto", - "reduceOptions": { - "calcs": [ - "lastNotNull" - ], - "fields": "", - "values": false - }, - "textMode": "name" + "cellHeight": "sm", + "enablePagination": false, + "showHeader": true, + "sortBy": [ + { + "desc": true, + "displayName": "instance" + } + ] }, - "pluginVersion": "9.3.1", + "pluginVersion": "12.2.0", "targets": [ { "datasource": { "type": "prometheus", "uid": "prom-001" }, - "exemplar": true, - "expr": "eth_con_fork_current{instance=~\"$instance\"}", + "editorMode": "code", + "exemplar": false, + "expr": "max by (instance, client, version) (\n eth_con_node_version{instance=~\"$instance\"}\n)", + "format": "table", + "instant": true, "interval": "", - "legendFormat": "{{ fork }}", + "legendFormat": "{{ version }}", + "range": false, "refId": "A" } ], - "title": "Consensus Fork", - "type": "stat" + "title": "Consensus Client", + "transformations": [ + { + "id": "organize", + "options": { + "excludeByName": { + "Time": true, + "Value": true + }, + "includeByName": {}, + "indexByName": {}, + "renameByName": { + "instance": "Instance" + } + } + } + ], + "type": "table" }, { "datasource": { @@ -296,13 +334,24 @@ "color": { "mode": "thresholds" }, + "custom": { + "align": "auto", + "cellOptions": { + "type": "auto" + }, + "filterable": true, + "footer": { + "reducers": [] + }, + "inspect": false + }, "mappings": [], "thresholds": { "mode": "absolute", "steps": [ { "color": "green", - "value": null + "value": 0 }, { "color": "red", @@ -310,47 +359,61 @@ } ] }, - "unit": "none" + "unit": "short" }, "overrides": [] }, "gridPos": { - "h": 5, + "h": 4, "w": 9, - "x": 0, - "y": 5 + "x": 15, + "y": 6 }, - "id": 31, + "id": 30, "options": { - "colorMode": "value", - "graphMode": "none", - "justifyMode": "auto", - "orientation": "auto", - "reduceOptions": { - "calcs": [ - "lastNotNull" - ], - "fields": "", - "values": false - }, - "textMode": "name" + "cellHeight": "sm", + "showHeader": true }, - "pluginVersion": "9.3.1", + "pluginVersion": "12.2.0", "targets": [ { "datasource": { "type": "prometheus", "uid": "prom-001" }, - "exemplar": true, - "expr": "max by (version)(eth_con_node_version{instance=~\"$instance\"})", + "editorMode": "code", + "exemplar": false, + "expr": "eth_con_spec_preset_base{instance=~\"$instance\"}", + "format": "table", + "instant": true, "interval": "", - "legendFormat": "{{ version }}", + "legendFormat": "{{ preset }}", + "range": false, "refId": "A" } ], - "title": "Consensus Client", - "type": "stat" + "title": "Consensus Preset", + "transformations": [ + { + "id": "organize", + "options": { + "excludeByName": { + "Time": true, + "Value": true, + "__name__": true, + "job": true, + "module": true, + "node": true + }, + "includeByName": {}, + "indexByName": {}, + "renameByName": { + "instance": "Instance" + } + } + } + ], + "type": "table" }, { "datasource": { @@ -362,13 +425,24 @@ "color": { "mode": "thresholds" }, + "custom": { + "align": "auto", + "cellOptions": { + "type": "auto" + }, + "filterable": true, + "footer": { + "reducers": [] + }, + "inspect": false + }, "mappings": [], "thresholds": { "mode": "absolute", "steps": [ { "color": "green", - "value": null + "value": 0 }, { "color": "red", @@ -376,47 +450,71 @@ } ] }, - "unit": "none" + "unit": "short" }, "overrides": [] }, "gridPos": { "h": 5, - "w": 3, - "x": 18, - "y": 5 + "w": 7, + "x": 0, + "y": 10 }, - "id": 2, + "id": 40, "options": { - "colorMode": "value", - "graphMode": "none", - "justifyMode": "auto", - "orientation": "auto", - "reduceOptions": { - "calcs": [ - "lastNotNull" - ], - "fields": "", - "values": false - }, - "textMode": "auto" + "cellHeight": "sm", + "showHeader": true }, - "pluginVersion": "9.3.1", + "pluginVersion": "12.2.0", "targets": [ { "datasource": { "type": "prometheus", "uid": "prom-001" }, - "exemplar": true, - "expr": "eth_exe_chain_id{instance=~\"$instance\"}", + "editorMode": "code", + "exemplar": false, + "expr": "eth_con_fork_current{instance=~\"$instance\"}", + "format": "table", + "instant": true, "interval": "", - "legendFormat": "", + "legendFormat": "{{ fork }}", + "range": false, "refId": "A" } ], - "title": "Execution Chain ID", - "type": "stat" + "title": "Consensus Fork", + "transformations": [ + { + "id": "organize", + "options": { + "excludeByName": { + "Time": true, + "Value": true, + "__name__": true, + "job": true, + "module": true, + "node": true + }, + "includeByName": {}, + "indexByName": { + "Time": 0, + "Value": 7, + "__name__": 1, + "fork": 3, + "instance": 2, + "job": 4, + "module": 5, + "node": 6 + }, + "orderByMode": "manual", + "renameByName": { + "instance": "Instance" + } + } + } + ], + "type": "table" }, { "datasource": { @@ -428,13 +526,23 @@ "color": { "mode": "thresholds" }, + "custom": { + "align": "left", + "cellOptions": { + "type": "auto" + }, + "footer": { + "reducers": [] + }, + "inspect": false + }, "mappings": [], "thresholds": { "mode": "absolute", "steps": [ { "color": "green", - "value": null + "value": 0 }, { "color": "red", @@ -448,41 +556,56 @@ }, "gridPos": { "h": 5, - "w": 3, - "x": 21, - "y": 5 + "w": 8, + "x": 7, + "y": 10 }, - "id": 3, + "id": 2, "options": { - "colorMode": "value", - "graphMode": "none", - "justifyMode": "auto", - "orientation": "auto", - "reduceOptions": { - "calcs": [ - "lastNotNull" - ], - "fields": "", - "values": false - }, - "textMode": "auto" + "cellHeight": "sm", + "showHeader": true }, - "pluginVersion": "9.3.1", + "pluginVersion": "12.2.0", "targets": [ { "datasource": { "type": "prometheus", "uid": "prom-001" }, - "exemplar": true, - "expr": "eth_exe_network_id{instance=~\"$instance\"}", + "editorMode": "code", + "exemplar": false, + "expr": "eth_exe_chain_id{instance=~\"$instance\"}", + "format": "table", + "instant": true, "interval": "", "legendFormat": "", + "range": false, "refId": "A" } ], - "title": "Execution Network ID", - "type": "stat" + "title": "Execution Chain ID", + "transformations": [ + { + "id": "organize", + "options": { + "excludeByName": { + "Time": true, + "__name__": true, + "ethereum_role": true, + "job": true, + "module": true, + "node_name": true + }, + "includeByName": {}, + "indexByName": {}, + "renameByName": { + "Value": "Chain ID", + "instance": "Instance" + } + } + } + ], + "type": "table" }, { "datasource": { @@ -491,13 +614,27 @@ }, "fieldConfig": { "defaults": { + "color": { + "mode": "thresholds" + }, + "custom": { + "align": "left", + "cellOptions": { + "type": "auto" + }, + "filterable": true, + "footer": { + "reducers": [] + }, + "inspect": false + }, "mappings": [], "thresholds": { "mode": "absolute", "steps": [ { "color": "green", - "value": null + "value": 0 }, { "color": "red", @@ -505,59 +642,70 @@ } ] }, - "unit": "short" + "unit": "none" }, "overrides": [] }, "gridPos": { - "h": 4, + "h": 5, "w": 9, - "x": 9, - "y": 6 + "x": 15, + "y": 10 }, - "id": 30, + "id": 3, "options": { - "colorMode": "none", - "graphMode": "none", - "justifyMode": "auto", - "orientation": "auto", - "reduceOptions": { - "calcs": [ - "lastNotNull" - ], - "fields": "", - "values": false - }, - "textMode": "name" + "cellHeight": "sm", + "showHeader": true }, - "pluginVersion": "9.3.1", + "pluginVersion": "12.2.0", "targets": [ { "datasource": { "type": "prometheus", "uid": "prom-001" }, - "exemplar": true, - "expr": "eth_con_spec_preset_base{instance=~\"$instance\"}", + "editorMode": "code", + "exemplar": false, + "expr": "eth_exe_network_id{instance=~\"$instance\"}", + "format": "table", + "instant": true, "interval": "", - "legendFormat": "{{ preset }}", + "legendFormat": "", + "range": false, "refId": "A" } ], - "title": "Consensus Preset", - "type": "stat" + "title": "Execution Network ID", + "transformations": [ + { + "id": "organize", + "options": { + "excludeByName": { + "Time": true, + "__name__": true, + "ethereum_role": true, + "job": true, + "module": true, + "node_name": true + }, + "includeByName": {}, + "indexByName": {}, + "renameByName": { + "Value": "Network ID", + "instance": "Instance" + } + } + } + ], + "type": "table" }, { "collapsed": false, - "datasource": { - "type": "prometheus", - "uid": "prometheus" - }, "gridPos": { "h": 1, "w": 24, "x": 0, - "y": 10 + "y": 15 }, "id": 7, "panels": [], @@ -591,7 +739,7 @@ "steps": [ { "color": "green", - "value": null + "value": 0 }, { "color": "green", @@ -611,7 +759,7 @@ "h": 6, "w": 5, "x": 0, - "y": 11 + "y": 16 }, "id": 19, "options": { @@ -619,6 +767,7 @@ "graphMode": "none", "justifyMode": "auto", "orientation": "auto", + "percentChangeColorMode": "standard", "reduceOptions": { "calcs": [ "lastNotNull" @@ -626,9 +775,11 @@ "fields": "", "values": false }, - "textMode": "auto" + "showPercentChange": false, + "textMode": "auto", + "wideLayout": true }, - "pluginVersion": "9.3.1", + "pluginVersion": "12.2.0", "targets": [ { "datasource": { @@ -656,11 +807,13 @@ "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, "axisCenteredZero": false, "axisColorMode": "text", "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, + "barWidthFactor": 0.6, "drawStyle": "line", "fillOpacity": 0, "gradientMode": "none", @@ -669,6 +822,7 @@ "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 1, @@ -676,6 +830,7 @@ "type": "linear" }, "showPoints": "auto", + "showValues": false, "spanNulls": false, "stacking": { "group": "A", @@ -691,7 +846,7 @@ "steps": [ { "color": "green", - "value": null + "value": 0 }, { "color": "red", @@ -707,7 +862,7 @@ "h": 6, "w": 5, "x": 5, - "y": 11 + "y": 16 }, "id": 22, "options": { @@ -718,10 +873,12 @@ "showLegend": true }, "tooltip": { + "hideZeros": false, "mode": "single", "sort": "none" } }, + "pluginVersion": "12.2.0", "targets": [ { "datasource": { @@ -749,11 +906,13 @@ "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, "axisCenteredZero": false, "axisColorMode": "text", "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, + "barWidthFactor": 0.6, "drawStyle": "line", "fillOpacity": 0, "gradientMode": "none", @@ -762,6 +921,7 @@ "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 1, @@ -769,6 +929,7 @@ "type": "linear" }, "showPoints": "auto", + "showValues": false, "spanNulls": false, "stacking": { "group": "A", @@ -784,7 +945,7 @@ "steps": [ { "color": "green", - "value": null + "value": 0 }, { "color": "red", @@ -799,7 +960,7 @@ "h": 6, "w": 6, "x": 10, - "y": 11 + "y": 16 }, "id": 12, "options": { @@ -810,10 +971,12 @@ "showLegend": true }, "tooltip": { + "hideZeros": false, "mode": "single", "sort": "none" } }, + "pluginVersion": "12.2.0", "targets": [ { "datasource": { @@ -843,11 +1006,13 @@ "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, "axisCenteredZero": false, "axisColorMode": "text", "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, + "barWidthFactor": 0.6, "drawStyle": "line", "fillOpacity": 0, "gradientMode": "none", @@ -856,6 +1021,7 @@ "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 1, @@ -863,6 +1029,7 @@ "type": "linear" }, "showPoints": "auto", + "showValues": false, "spanNulls": false, "stacking": { "group": "A", @@ -878,7 +1045,7 @@ "steps": [ { "color": "green", - "value": null + "value": 0 }, { "color": "red", @@ -893,7 +1060,7 @@ "h": 6, "w": 4, "x": 16, - "y": 11 + "y": 16 }, "id": 48, "options": { @@ -904,10 +1071,12 @@ "showLegend": true }, "tooltip": { + "hideZeros": false, "mode": "single", "sort": "none" } }, + "pluginVersion": "12.2.0", "targets": [ { "datasource": { @@ -935,11 +1104,13 @@ "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, "axisCenteredZero": false, "axisColorMode": "text", "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, + "barWidthFactor": 0.6, "drawStyle": "line", "fillOpacity": 0, "gradientMode": "none", @@ -948,6 +1119,7 @@ "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 1, @@ -955,6 +1127,7 @@ "type": "linear" }, "showPoints": "auto", + "showValues": false, "spanNulls": false, "stacking": { "group": "A", @@ -970,7 +1143,7 @@ "steps": [ { "color": "green", - "value": null + "value": 0 }, { "color": "red", @@ -986,7 +1159,7 @@ "h": 6, "w": 4, "x": 20, - "y": 11 + "y": 16 }, "id": 17, "options": { @@ -997,10 +1170,12 @@ "showLegend": true }, "tooltip": { + "hideZeros": false, "mode": "single", "sort": "none" } }, + "pluginVersion": "12.2.0", "targets": [ { "datasource": { @@ -1041,11 +1216,13 @@ "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, "axisCenteredZero": false, "axisColorMode": "text", "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, + "barWidthFactor": 0.6, "drawStyle": "line", "fillOpacity": 0, "gradientMode": "none", @@ -1054,6 +1231,7 @@ "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 1, @@ -1061,6 +1239,7 @@ "type": "linear" }, "showPoints": "auto", + "showValues": false, "spanNulls": false, "stacking": { "group": "A", @@ -1076,7 +1255,7 @@ "steps": [ { "color": "green", - "value": null + "value": 0 }, { "color": "red", @@ -1092,7 +1271,7 @@ "h": 6, "w": 3, "x": 0, - "y": 17 + "y": 22 }, "id": 21, "options": { @@ -1103,10 +1282,12 @@ "showLegend": true }, "tooltip": { + "hideZeros": false, "mode": "single", "sort": "none" } }, + "pluginVersion": "12.2.0", "targets": [ { "datasource": { @@ -1134,11 +1315,13 @@ "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, "axisCenteredZero": false, "axisColorMode": "text", "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, + "barWidthFactor": 0.6, "drawStyle": "line", "fillOpacity": 0, "gradientMode": "none", @@ -1147,6 +1330,7 @@ "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 1, @@ -1154,6 +1338,7 @@ "type": "linear" }, "showPoints": "auto", + "showValues": false, "spanNulls": false, "stacking": { "group": "A", @@ -1169,7 +1354,7 @@ "steps": [ { "color": "green", - "value": null + "value": 0 }, { "color": "red", @@ -1185,7 +1370,7 @@ "h": 6, "w": 3, "x": 3, - "y": 17 + "y": 22 }, "id": 23, "options": { @@ -1196,10 +1381,12 @@ "showLegend": true }, "tooltip": { + "hideZeros": false, "mode": "single", "sort": "none" } }, + "pluginVersion": "12.2.0", "targets": [ { "datasource": { @@ -1230,11 +1417,13 @@ "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, "axisCenteredZero": false, "axisColorMode": "text", "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, + "barWidthFactor": 0.6, "drawStyle": "line", "fillOpacity": 0, "gradientMode": "none", @@ -1243,6 +1432,7 @@ "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 1, @@ -1250,6 +1440,7 @@ "type": "linear" }, "showPoints": "auto", + "showValues": false, "spanNulls": false, "stacking": { "group": "A", @@ -1265,7 +1456,7 @@ "steps": [ { "color": "green", - "value": null + "value": 0 }, { "color": "red", @@ -1280,7 +1471,7 @@ "h": 6, "w": 4, "x": 6, - "y": 17 + "y": 22 }, "id": 68, "options": { @@ -1291,10 +1482,12 @@ "showLegend": true }, "tooltip": { + "hideZeros": false, "mode": "single", "sort": "none" } }, + "pluginVersion": "12.2.0", "targets": [ { "datasource": { @@ -1324,11 +1517,13 @@ "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, "axisCenteredZero": false, "axisColorMode": "text", "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, + "barWidthFactor": 0.6, "drawStyle": "line", "fillOpacity": 0, "gradientMode": "none", @@ -1337,6 +1532,7 @@ "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 1, @@ -1344,6 +1540,7 @@ "type": "linear" }, "showPoints": "auto", + "showValues": false, "spanNulls": false, "stacking": { "group": "A", @@ -1359,7 +1556,7 @@ "steps": [ { "color": "green", - "value": null + "value": 0 }, { "color": "red", @@ -1375,7 +1572,7 @@ "h": 6, "w": 6, "x": 10, - "y": 17 + "y": 22 }, "id": 15, "options": { @@ -1386,10 +1583,12 @@ "showLegend": true }, "tooltip": { + "hideZeros": false, "mode": "single", "sort": "none" } }, + "pluginVersion": "12.2.0", "targets": [ { "datasource": { @@ -1447,11 +1646,13 @@ "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, "axisCenteredZero": false, "axisColorMode": "text", "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, + "barWidthFactor": 0.6, "drawStyle": "line", "fillOpacity": 0, "gradientMode": "none", @@ -1460,6 +1661,7 @@ "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 1, @@ -1467,6 +1669,7 @@ "type": "linear" }, "showPoints": "auto", + "showValues": false, "spanNulls": false, "stacking": { "group": "A", @@ -1482,7 +1685,7 @@ "steps": [ { "color": "green", - "value": null + "value": 0 }, { "color": "red", @@ -1497,7 +1700,7 @@ "h": 6, "w": 4, "x": 16, - "y": 17 + "y": 22 }, "id": 67, "options": { @@ -1508,10 +1711,12 @@ "showLegend": true }, "tooltip": { + "hideZeros": false, "mode": "single", "sort": "none" } }, + "pluginVersion": "12.2.0", "targets": [ { "datasource": { @@ -1599,11 +1804,13 @@ "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, "axisCenteredZero": false, "axisColorMode": "text", "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, + "barWidthFactor": 0.6, "drawStyle": "line", "fillOpacity": 0, "gradientMode": "none", @@ -1612,6 +1819,7 @@ "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 1, @@ -1620,6 +1828,7 @@ "type": "log" }, "showPoints": "auto", + "showValues": false, "spanNulls": false, "stacking": { "group": "A", @@ -1635,7 +1844,7 @@ "steps": [ { "color": "green", - "value": null + "value": 0 }, { "color": "red", @@ -1651,7 +1860,7 @@ "h": 6, "w": 4, "x": 20, - "y": 17 + "y": 22 }, "id": 60, "options": { @@ -1662,10 +1871,12 @@ "showLegend": true }, "tooltip": { + "hideZeros": false, "mode": "single", "sort": "none" } }, + "pluginVersion": "12.2.0", "targets": [ { "datasource": { @@ -1709,7 +1920,7 @@ "h": 7, "w": 6, "x": 0, - "y": 23 + "y": 28 }, "id": 69, "options": { @@ -1746,7 +1957,8 @@ "layout": "auto" }, "tooltip": { - "show": true, + "mode": "single", + "showColorScale": false, "yHistogram": false }, "yAxis": { @@ -1755,7 +1967,7 @@ "unit": "s" } }, - "pluginVersion": "9.3.1", + "pluginVersion": "12.2.0", "targets": [ { "datasource": { @@ -1785,11 +1997,13 @@ "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, "axisCenteredZero": false, "axisColorMode": "text", "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, + "barWidthFactor": 0.6, "drawStyle": "line", "fillOpacity": 0, "gradientMode": "none", @@ -1798,6 +2012,7 @@ "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 1, @@ -1805,6 +2020,7 @@ "type": "linear" }, "showPoints": "auto", + "showValues": false, "spanNulls": false, "stacking": { "group": "A", @@ -1820,7 +2036,7 @@ "steps": [ { "color": "green", - "value": null + "value": 0 }, { "color": "red", @@ -1849,7 +2065,7 @@ "h": 7, "w": 5, "x": 6, - "y": 23 + "y": 28 }, "id": 72, "options": { @@ -1860,10 +2076,12 @@ "showLegend": true }, "tooltip": { + "hideZeros": false, "mode": "single", "sort": "none" } }, + "pluginVersion": "12.2.0", "targets": [ { "datasource": { @@ -1921,11 +2139,13 @@ "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, "axisCenteredZero": false, "axisColorMode": "text", "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, + "barWidthFactor": 0.6, "drawStyle": "line", "fillOpacity": 0, "gradientMode": "none", @@ -1934,6 +2154,7 @@ "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 1, @@ -1941,6 +2162,7 @@ "type": "linear" }, "showPoints": "auto", + "showValues": false, "spanNulls": false, "stacking": { "group": "A", @@ -1956,7 +2178,7 @@ "steps": [ { "color": "green", - "value": null + "value": 0 }, { "color": "red", @@ -1972,7 +2194,7 @@ "h": 7, "w": 5, "x": 11, - "y": 23 + "y": 28 }, "id": 71, "options": { @@ -1983,10 +2205,12 @@ "showLegend": true }, "tooltip": { + "hideZeros": false, "mode": "single", "sort": "none" } }, + "pluginVersion": "12.2.0", "targets": [ { "datasource": { @@ -2016,11 +2240,13 @@ "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, "axisCenteredZero": false, "axisColorMode": "text", "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, + "barWidthFactor": 0.6, "drawStyle": "line", "fillOpacity": 0, "gradientMode": "none", @@ -2029,6 +2255,7 @@ "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 1, @@ -2036,6 +2263,7 @@ "type": "linear" }, "showPoints": "auto", + "showValues": false, "spanNulls": false, "stacking": { "group": "A", @@ -2052,7 +2280,7 @@ "steps": [ { "color": "green", - "value": null + "value": 0 }, { "color": "red", @@ -2068,7 +2296,7 @@ "h": 7, "w": 4, "x": 16, - "y": 23 + "y": 28 }, "id": 70, "options": { @@ -2079,10 +2307,12 @@ "showLegend": true }, "tooltip": { + "hideZeros": false, "mode": "single", "sort": "none" } }, + "pluginVersion": "12.2.0", "targets": [ { "datasource": { @@ -2113,11 +2343,13 @@ "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, "axisCenteredZero": false, "axisColorMode": "text", "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, + "barWidthFactor": 0.6, "drawStyle": "line", "fillOpacity": 0, "gradientMode": "none", @@ -2126,6 +2358,7 @@ "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 1, @@ -2133,6 +2366,7 @@ "type": "linear" }, "showPoints": "auto", + "showValues": false, "spanNulls": false, "stacking": { "group": "A", @@ -2148,7 +2382,7 @@ "steps": [ { "color": "green", - "value": null + "value": 0 }, { "color": "red", @@ -2164,7 +2398,7 @@ "h": 7, "w": 4, "x": 20, - "y": 23 + "y": 28 }, "id": 28, "options": { @@ -2175,10 +2409,12 @@ "showLegend": true }, "tooltip": { + "hideZeros": false, "mode": "single", "sort": "none" } }, + "pluginVersion": "12.2.0", "targets": [ { "datasource": { @@ -2198,15 +2434,11 @@ }, { "collapsed": false, - "datasource": { - "type": "prometheus", - "uid": "prometheus" - }, "gridPos": { "h": 1, "w": 24, "x": 0, - "y": 30 + "y": 35 }, "id": 9, "panels": [], @@ -2240,7 +2472,7 @@ "steps": [ { "color": "green", - "value": null + "value": 0 }, { "color": "green", @@ -2260,7 +2492,7 @@ "h": 6, "w": 5, "x": 0, - "y": 31 + "y": 36 }, "id": 24, "options": { @@ -2268,6 +2500,7 @@ "graphMode": "none", "justifyMode": "auto", "orientation": "auto", + "percentChangeColorMode": "standard", "reduceOptions": { "calcs": [ "lastNotNull" @@ -2275,9 +2508,11 @@ "fields": "", "values": false }, - "textMode": "auto" + "showPercentChange": false, + "textMode": "auto", + "wideLayout": true }, - "pluginVersion": "9.3.1", + "pluginVersion": "12.2.0", "targets": [ { "datasource": { @@ -2305,11 +2540,13 @@ "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, "axisCenteredZero": false, "axisColorMode": "text", "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, + "barWidthFactor": 0.6, "drawStyle": "line", "fillOpacity": 0, "gradientMode": "none", @@ -2318,6 +2555,7 @@ "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 1, @@ -2325,6 +2563,7 @@ "type": "linear" }, "showPoints": "auto", + "showValues": false, "spanNulls": false, "stacking": { "group": "A", @@ -2340,7 +2579,7 @@ "steps": [ { "color": "green", - "value": null + "value": 0 }, { "color": "red", @@ -2356,7 +2595,7 @@ "h": 6, "w": 7, "x": 5, - "y": 31 + "y": 36 }, "id": 34, "options": { @@ -2367,10 +2606,12 @@ "showLegend": true }, "tooltip": { + "hideZeros": false, "mode": "single", "sort": "none" } }, + "pluginVersion": "12.2.0", "targets": [ { "datasource": { @@ -2398,11 +2639,13 @@ "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, "axisCenteredZero": false, "axisColorMode": "text", "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, + "barWidthFactor": 0.6, "drawStyle": "line", "fillOpacity": 0, "gradientMode": "none", @@ -2411,6 +2654,7 @@ "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 1, @@ -2418,6 +2662,7 @@ "type": "linear" }, "showPoints": "auto", + "showValues": false, "spanNulls": false, "stacking": { "group": "A", @@ -2433,7 +2678,7 @@ "steps": [ { "color": "green", - "value": null + "value": 0 }, { "color": "red", @@ -2449,7 +2694,7 @@ "h": 6, "w": 7, "x": 12, - "y": 31 + "y": 36 }, "id": 39, "options": { @@ -2460,10 +2705,12 @@ "showLegend": true }, "tooltip": { + "hideZeros": false, "mode": "single", "sort": "none" } }, + "pluginVersion": "12.2.0", "targets": [ { "datasource": { @@ -2491,11 +2738,13 @@ "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, "axisCenteredZero": false, "axisColorMode": "text", "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, + "barWidthFactor": 0.6, "drawStyle": "line", "fillOpacity": 0, "gradientMode": "none", @@ -2504,6 +2753,7 @@ "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 1, @@ -2511,6 +2761,7 @@ "type": "linear" }, "showPoints": "auto", + "showValues": false, "spanNulls": false, "stacking": { "group": "A", @@ -2526,7 +2777,7 @@ "steps": [ { "color": "green", - "value": null + "value": 0 }, { "color": "red", @@ -2542,7 +2793,7 @@ "h": 6, "w": 5, "x": 19, - "y": 31 + "y": 36 }, "id": 45, "options": { @@ -2553,10 +2804,12 @@ "showLegend": true }, "tooltip": { + "hideZeros": false, "mode": "single", "sort": "none" } }, + "pluginVersion": "12.2.0", "targets": [ { "datasource": { @@ -2584,11 +2837,13 @@ "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, "axisCenteredZero": false, "axisColorMode": "text", "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, + "barWidthFactor": 0.6, "drawStyle": "line", "fillOpacity": 0, "gradientMode": "none", @@ -2597,6 +2852,7 @@ "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 1, @@ -2604,6 +2860,7 @@ "type": "linear" }, "showPoints": "auto", + "showValues": false, "spanNulls": false, "stacking": { "group": "A", @@ -2619,7 +2876,7 @@ "steps": [ { "color": "green", - "value": null + "value": 0 }, { "color": "red", @@ -2635,7 +2892,7 @@ "h": 6, "w": 5, "x": 0, - "y": 37 + "y": 42 }, "id": 35, "options": { @@ -2646,10 +2903,12 @@ "showLegend": true }, "tooltip": { + "hideZeros": false, "mode": "single", "sort": "none" } }, + "pluginVersion": "12.2.0", "targets": [ { "datasource": { @@ -2677,11 +2936,13 @@ "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, "axisCenteredZero": false, "axisColorMode": "text", "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, + "barWidthFactor": 0.6, "drawStyle": "line", "fillOpacity": 0, "gradientMode": "none", @@ -2690,6 +2951,7 @@ "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 1, @@ -2697,6 +2959,7 @@ "type": "linear" }, "showPoints": "auto", + "showValues": false, "spanNulls": false, "stacking": { "group": "A", @@ -2712,7 +2975,7 @@ "steps": [ { "color": "green", - "value": null + "value": 0 }, { "color": "red", @@ -2728,7 +2991,7 @@ "h": 6, "w": 5, "x": 5, - "y": 37 + "y": 42 }, "id": 36, "options": { @@ -2739,10 +3002,12 @@ "showLegend": true }, "tooltip": { + "hideZeros": false, "mode": "single", "sort": "none" } }, + "pluginVersion": "12.2.0", "targets": [ { "datasource": { @@ -2770,11 +3035,13 @@ "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, "axisCenteredZero": false, "axisColorMode": "text", "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, + "barWidthFactor": 0.6, "drawStyle": "line", "fillOpacity": 0, "gradientMode": "none", @@ -2783,6 +3050,7 @@ "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 1, @@ -2790,6 +3058,7 @@ "type": "linear" }, "showPoints": "auto", + "showValues": false, "spanNulls": false, "stacking": { "group": "A", @@ -2805,7 +3074,7 @@ "steps": [ { "color": "green", - "value": null + "value": 0 }, { "color": "red", @@ -2821,7 +3090,7 @@ "h": 6, "w": 5, "x": 10, - "y": 37 + "y": 42 }, "id": 38, "options": { @@ -2832,10 +3101,12 @@ "showLegend": true }, "tooltip": { + "hideZeros": false, "mode": "single", "sort": "none" } }, + "pluginVersion": "12.2.0", "targets": [ { "datasource": { @@ -2863,11 +3134,13 @@ "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, "axisCenteredZero": false, "axisColorMode": "text", "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, + "barWidthFactor": 0.6, "drawStyle": "line", "fillOpacity": 0, "gradientMode": "none", @@ -2876,6 +3149,7 @@ "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 1, @@ -2883,6 +3157,7 @@ "type": "linear" }, "showPoints": "auto", + "showValues": false, "spanNulls": false, "stacking": { "group": "A", @@ -2898,7 +3173,7 @@ "steps": [ { "color": "green", - "value": null + "value": 0 }, { "color": "red", @@ -2914,7 +3189,7 @@ "h": 6, "w": 9, "x": 15, - "y": 37 + "y": 42 }, "id": 54, "options": { @@ -2925,10 +3200,12 @@ "showLegend": true }, "tooltip": { + "hideZeros": false, "mode": "single", "sort": "none" } }, + "pluginVersion": "12.2.0", "targets": [ { "datasource": { @@ -2958,11 +3235,13 @@ "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, "axisCenteredZero": false, "axisColorMode": "text", "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, + "barWidthFactor": 0.6, "drawStyle": "line", "fillOpacity": 0, "gradientMode": "none", @@ -2971,6 +3250,7 @@ "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 1, @@ -2978,6 +3258,7 @@ "type": "linear" }, "showPoints": "auto", + "showValues": false, "spanNulls": false, "stacking": { "group": "A", @@ -2993,7 +3274,7 @@ "steps": [ { "color": "green", - "value": null + "value": 0 }, { "color": "red", @@ -3008,7 +3289,7 @@ "h": 6, "w": 5, "x": 0, - "y": 43 + "y": 48 }, "id": 49, "options": { @@ -3019,10 +3300,12 @@ "showLegend": true }, "tooltip": { + "hideZeros": false, "mode": "single", "sort": "none" } }, + "pluginVersion": "12.2.0", "targets": [ { "datasource": { @@ -3052,11 +3335,13 @@ "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, "axisCenteredZero": false, "axisColorMode": "text", "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, + "barWidthFactor": 0.6, "drawStyle": "line", "fillOpacity": 0, "gradientMode": "none", @@ -3065,6 +3350,7 @@ "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 1, @@ -3072,6 +3358,7 @@ "type": "linear" }, "showPoints": "auto", + "showValues": false, "spanNulls": false, "stacking": { "group": "A", @@ -3087,7 +3374,7 @@ "steps": [ { "color": "green", - "value": null + "value": 0 }, { "color": "red", @@ -3103,7 +3390,7 @@ "h": 6, "w": 5, "x": 5, - "y": 43 + "y": 48 }, "id": 56, "options": { @@ -3114,10 +3401,12 @@ "showLegend": true }, "tooltip": { + "hideZeros": false, "mode": "single", "sort": "none" } }, + "pluginVersion": "12.2.0", "targets": [ { "datasource": { @@ -3147,11 +3436,13 @@ "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, "axisCenteredZero": false, "axisColorMode": "text", "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, + "barWidthFactor": 0.6, "drawStyle": "line", "fillOpacity": 0, "gradientMode": "none", @@ -3160,6 +3451,7 @@ "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 1, @@ -3167,6 +3459,7 @@ "type": "linear" }, "showPoints": "auto", + "showValues": false, "spanNulls": false, "stacking": { "group": "A", @@ -3182,7 +3475,7 @@ "steps": [ { "color": "green", - "value": null + "value": 0 }, { "color": "red", @@ -3198,7 +3491,7 @@ "h": 6, "w": 5, "x": 10, - "y": 43 + "y": 48 }, "id": 55, "options": { @@ -3209,10 +3502,12 @@ "showLegend": true }, "tooltip": { + "hideZeros": false, "mode": "single", "sort": "none" } }, + "pluginVersion": "12.2.0", "targets": [ { "datasource": { @@ -3242,11 +3537,13 @@ "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, "axisCenteredZero": false, "axisColorMode": "text", "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, + "barWidthFactor": 0.6, "drawStyle": "line", "fillOpacity": 0, "gradientMode": "none", @@ -3255,6 +3552,7 @@ "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 1, @@ -3262,6 +3560,7 @@ "type": "linear" }, "showPoints": "auto", + "showValues": false, "spanNulls": false, "stacking": { "group": "A", @@ -3277,7 +3576,7 @@ "steps": [ { "color": "green", - "value": null + "value": 0 }, { "color": "red", @@ -3293,7 +3592,7 @@ "h": 6, "w": 5, "x": 15, - "y": 43 + "y": 48 }, "id": 53, "options": { @@ -3304,10 +3603,12 @@ "showLegend": true }, "tooltip": { + "hideZeros": false, "mode": "single", "sort": "none" } }, + "pluginVersion": "12.2.0", "targets": [ { "datasource": { @@ -3335,11 +3636,13 @@ "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, "axisCenteredZero": false, "axisColorMode": "text", "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, + "barWidthFactor": 0.6, "drawStyle": "line", "fillOpacity": 0, "gradientMode": "none", @@ -3348,6 +3651,7 @@ "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 1, @@ -3355,6 +3659,7 @@ "type": "linear" }, "showPoints": "auto", + "showValues": false, "spanNulls": false, "stacking": { "group": "A", @@ -3370,7 +3675,7 @@ "steps": [ { "color": "green", - "value": null + "value": 0 }, { "color": "red", @@ -3386,7 +3691,7 @@ "h": 6, "w": 4, "x": 20, - "y": 43 + "y": 48 }, "id": 52, "options": { @@ -3397,10 +3702,12 @@ "showLegend": true }, "tooltip": { + "hideZeros": false, "mode": "single", "sort": "none" } }, + "pluginVersion": "12.2.0", "targets": [ { "datasource": { @@ -3419,15 +3726,11 @@ }, { "collapsed": true, - "datasource": { - "type": "prometheus", - "uid": "prometheus" - }, "gridPos": { "h": 1, "w": 24, "x": 0, - "y": 49 + "y": 54 }, "id": 42, "panels": [ @@ -3443,7 +3746,9 @@ }, "custom": { "align": "auto", - "displayMode": "auto", + "cellOptions": { + "type": "auto" + }, "inspect": false }, "mappings": [], @@ -3503,9 +3808,9 @@ "type": "row" } ], + "preload": false, "refresh": "5s", - "schemaVersion": 37, - "style": "dark", + "schemaVersion": 42, "tags": [], "templating": { "list": [ @@ -3516,9 +3821,8 @@ "uid": "prom-001" }, "definition": "label_values(eth_con_beacon_slot, instance)", - "hide": 0, - "includeAll": false, - "multi": false, + "includeAll": true, + "multi": true, "name": "instance", "options": [], "query": { @@ -3527,8 +3831,6 @@ }, "refresh": 2, "regex": "", - "skipUrlSync": false, - "sort": 0, "type": "query" } ] @@ -3541,6 +3843,5 @@ "timezone": "", "title": "Ethereum Metrics Exporter (Single)", "uid": "M2TT9Su7z", - "version": 4, - "weekStart": "" + "version": 5 } diff --git a/metrics/provisioning/grafana/dashboards/common_dashboards/ethrex_comparison.json b/metrics/provisioning/grafana/dashboards/common_dashboards/ethrex_comparison.json new file mode 100644 index 00000000000..ab791b5c1b3 --- /dev/null +++ b/metrics/provisioning/grafana/dashboards/common_dashboards/ethrex_comparison.json @@ -0,0 +1,1535 @@ +{ + "annotations": { + "list": [ + { + "builtIn": 1, + "datasource": { + "type": "grafana", + "uid": "-- Grafana --" + }, + "enable": true, + "hide": true, + "iconColor": "rgba(0, 211, 255, 1)", + "name": "Annotations & Alerts", + "type": "dashboard" + } + ] + }, + "editable": true, + "fiscalYearStartMonth": 0, + "graphTooltip": 0, + "id": 42, + "links": [], + "panels": [ + { + "collapsed": true, + "gridPos": { + "h": 1, + "w": 24, + "x": 0, + "y": 0 + }, + "id": 4, + "panels": [ + { + "datasource": { + "type": "prometheus", + "uid": "prom-001" + }, + "description": "", + "fieldConfig": { + "defaults": { + "color": { + "mode": "palette-classic" + }, + "custom": { + "axisBorderShow": false, + "axisCenteredZero": false, + "axisColorMode": "text", + "axisLabel": "", + "axisPlacement": "auto", + "barAlignment": 0, + "barWidthFactor": 0.6, + "drawStyle": "line", + "fillOpacity": 0, + "gradientMode": "none", + "hideFrom": { + "legend": false, + "tooltip": false, + "viz": false + }, + "insertNulls": false, + "lineInterpolation": "linear", + "lineWidth": 1, + "pointSize": 5, + "scaleDistribution": { + "type": "linear" + }, + "showPoints": "auto", + "showValues": false, + "spanNulls": false, + "stacking": { + "group": "A", + "mode": "none" + }, + "thresholdsStyle": { + "mode": "off" + } + }, + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": 0 + }, + { + "color": "red", + "value": 80 + } + ] + }, + "unit": "si:gas" + }, + "overrides": [] + }, + "gridPos": { + "h": 12, + "w": 24, + "x": 0, + "y": 1 + }, + "id": 7, + "options": { + "legend": { + "calcs": [ + "mean" + ], + "displayMode": "list", + "placement": "bottom", + "showLegend": true + }, + "tooltip": { + "hideZeros": false, + "mode": "single", + "sort": "none" + } + }, + "pluginVersion": "12.2.0", + "targets": [ + { + "datasource": { + "type": "prometheus", + "uid": "prom-001" + }, + "editorMode": "builder", + "expr": "reth_engine_rpc_new_payload_gas_per_second{instance=\"eth-mainnet-rpc:6060\", quantile=\"0.999\"}", + "hide": false, + "legendFormat": "reth mainnet p99.9", + "range": true, + "refId": "A" + }, + { + "datasource": { + "type": "prometheus", + "uid": "prom-001" + }, + "editorMode": "code", + "expr": "nethermind_mgas_per_sec{instance=\"eth-mainnet-rpc-1:6060\"} * 1000000", + "hide": false, + "instant": false, + "legendFormat": "nethermind mainnet", + "range": true, + "refId": "C" + }, + { + "datasource": { + "type": "prometheus", + "uid": "prom-001" + }, + "editorMode": "code", + "expr": "chain_mgasps{instance=\"eth-mainnet-rpc-2:6060\", job=\"geth\", quantile=\"0.999\"} * 1000000", + "hide": true, + "instant": false, + "legendFormat": "geth mainnet p99.9", + "range": true, + "refId": "D" + }, + { + "datasource": { + "type": "prometheus", + "uid": "prom-001" + }, + "editorMode": "code", + "expr": "gigagas{job=\"ethrex L1\",instance=~\"$instance(:\\\\d+)?$\"} * 1000000000", + "hide": false, + "instant": false, + "legendFormat": "{{ instance }}", + "range": true, + "refId": "B" + } + ], + "title": "Ggas/s vs other clients (MAINNET)", + "transformations": [ + { + "id": "renameByRegex", + "options": { + "regex": "^([^:]+):\\d+$", + "renamePattern": "$1" + } + } + ], + "type": "timeseries" + }, + { + "datasource": { + "type": "prometheus", + "uid": "prom-001" + }, + "description": "", + "fieldConfig": { + "defaults": { + "color": { + "mode": "palette-classic" + }, + "custom": { + "axisBorderShow": false, + "axisCenteredZero": false, + "axisColorMode": "text", + "axisLabel": "", + "axisPlacement": "auto", + "barAlignment": 0, + "barWidthFactor": 0.6, + "drawStyle": "line", + "fillOpacity": 0, + "gradientMode": "none", + "hideFrom": { + "legend": false, + "tooltip": false, + "viz": false + }, + "insertNulls": false, + "lineInterpolation": "linear", + "lineWidth": 1, + "pointSize": 5, + "scaleDistribution": { + "type": "linear" + }, + "showPoints": "auto", + "showValues": false, + "spanNulls": false, + "stacking": { + "group": "A", + "mode": "none" + }, + "thresholdsStyle": { + "mode": "off" + } + }, + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": 0 + }, + { + "color": "red", + "value": 80 + } + ] + }, + "unit": "si:gas" + }, + "overrides": [] + }, + "gridPos": { + "h": 13, + "w": 12, + "x": 0, + "y": 79 + }, + "id": 2, + "options": { + "legend": { + "calcs": [], + "displayMode": "list", + "placement": "bottom", + "showLegend": true + }, + "tooltip": { + "hideZeros": false, + "mode": "single", + "sort": "none" + } + }, + "pluginVersion": "12.2.0", + "targets": [ + { + "datasource": { + "type": "prometheus", + "uid": "prom-001" + }, + "editorMode": "builder", + "expr": "reth_engine_rpc_new_payload_gas_per_second{instance=\"eth-mainnet-rpc:6060\", quantile=\"0.999\"}", + "hide": false, + "legendFormat": "reth mainnet p99.9", + "range": true, + "refId": "A" + }, + { + "datasource": { + "type": "prometheus", + "uid": "prom-001" + }, + "editorMode": "code", + "expr": "chain_mgasps{instance=\"eth-mainnet-rpc-2:6060\", job=\"geth\", quantile=\"0.999\"} * 1000000", + "hide": false, + "instant": false, + "legendFormat": "geth mainnet p99.9", + "range": true, + "refId": "D" + }, + { + "datasource": { + "type": "prometheus", + "uid": "prom-001" + }, + "editorMode": "code", + "expr": "nethermind_mgas_per_sec{instance=\"eth-mainnet-rpc-1:6060\"} * 1000000", + "hide": false, + "instant": false, + "legendFormat": "nethermind mainnet", + "range": true, + "refId": "C" + }, + { + "datasource": { + "type": "prometheus", + "uid": "prom-001" + }, + "editorMode": "code", + "expr": "gigagas{job=\"ethrex L1\",instance=\"ethrex-mainnet-3-0-0:3701\"} * 1000000000", + "hide": false, + "instant": false, + "legendFormat": "{{ instance }}", + "range": true, + "refId": "B" + }, + { + "datasource": { + "name": "Expression", + "type": "__expr__", + "uid": "__expr__" + }, + "expression": "$A - $B", + "hide": false, + "refId": "E", + "type": "math" + }, + { + "datasource": { + "name": "Expression", + "type": "__expr__", + "uid": "__expr__" + }, + "expression": "$C - $B", + "hide": false, + "refId": "F", + "type": "math" + }, + { + "datasource": { + "name": "Expression", + "type": "__expr__", + "uid": "__expr__" + }, + "expression": "$D - $B", + "hide": true, + "refId": "G", + "type": "math" + } + ], + "title": "Ethrex mainnet 3.0.0 distance vs other clients", + "transformations": [ + { + "id": "renameByRegex", + "options": { + "regex": "^([^:]+):\\d+$", + "renamePattern": "$1" + } + }, + { + "id": "renameByRegex", + "options": { + "regex": "E", + "renamePattern": "reth mainnet p99.9 - ethrex mainnet 3.0.0" + } + }, + { + "id": "renameByRegex", + "options": { + "regex": "F", + "renamePattern": "nethermind mainnet - ethrex mainnet 3.0.0" + } + }, + { + "id": "renameByRegex", + "options": { + "regex": "G", + "renamePattern": "geth mainnet p99.9 - ethrex mainnet 3.0.0" + } + }, + { + "id": "filterFieldsByName", + "options": { + "include": { + "names": [ + "Time", + "reth mainnet p99.9 - ethrex mainnet 3.0.0", + "nethermind mainnet - ethrex mainnet 3.0.0", + "geth mainnet p99.9 - ethrex mainnet 3.0.0" + ] + } + } + } + ], + "type": "timeseries" + }, + { + "datasource": { + "type": "prometheus", + "uid": "prom-001" + }, + "description": "", + "fieldConfig": { + "defaults": { + "color": { + "mode": "palette-classic" + }, + "custom": { + "axisBorderShow": false, + "axisCenteredZero": false, + "axisColorMode": "text", + "axisLabel": "", + "axisPlacement": "auto", + "barAlignment": 0, + "barWidthFactor": 0.6, + "drawStyle": "line", + "fillOpacity": 0, + "gradientMode": "none", + "hideFrom": { + "legend": false, + "tooltip": false, + "viz": false + }, + "insertNulls": false, + "lineInterpolation": "linear", + "lineWidth": 1, + "pointSize": 5, + "scaleDistribution": { + "type": "linear" + }, + "showPoints": "auto", + "showValues": false, + "spanNulls": false, + "stacking": { + "group": "A", + "mode": "none" + }, + "thresholdsStyle": { + "mode": "off" + } + }, + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": 0 + }, + { + "color": "red", + "value": 80 + } + ] + }, + "unit": "si:gas" + }, + "overrides": [] + }, + "gridPos": { + "h": 13, + "w": 12, + "x": 12, + "y": 79 + }, + "id": 3, + "options": { + "legend": { + "calcs": [], + "displayMode": "list", + "placement": "bottom", + "showLegend": true + }, + "tooltip": { + "hideZeros": false, + "mode": "single", + "sort": "none" + } + }, + "pluginVersion": "12.2.0", + "targets": [ + { + "datasource": { + "type": "prometheus", + "uid": "prom-001" + }, + "editorMode": "builder", + "expr": "reth_engine_rpc_new_payload_gas_per_second{instance=\"eth-mainnet-rpc:6060\", quantile=\"0.999\"}", + "hide": false, + "legendFormat": "reth mainnet p99.9", + "range": true, + "refId": "A" + }, + { + "datasource": { + "type": "prometheus", + "uid": "prom-001" + }, + "editorMode": "code", + "expr": "chain_mgasps{instance=\"eth-mainnet-rpc-2:6060\", job=\"geth\", quantile=\"0.999\"} * 1000000", + "hide": false, + "instant": false, + "legendFormat": "geth mainnet p99.9", + "range": true, + "refId": "D" + }, + { + "datasource": { + "type": "prometheus", + "uid": "prom-001" + }, + "editorMode": "code", + "expr": "nethermind_mgas_per_sec{instance=\"eth-mainnet-rpc-1:6060\"} * 1000000", + "hide": false, + "instant": false, + "legendFormat": "nethermind mainnet", + "range": true, + "refId": "C" + }, + { + "datasource": { + "type": "prometheus", + "uid": "prom-001" + }, + "editorMode": "code", + "expr": "gigagas{job=\"ethrex L1\",instance=\"ethrex-mainnet-4-0-0-pathbased:3701\"} * 1000000000", + "hide": false, + "instant": false, + "legendFormat": "{{ instance }}", + "range": true, + "refId": "B" + }, + { + "datasource": { + "name": "Expression", + "type": "__expr__", + "uid": "__expr__" + }, + "expression": "$A - $B", + "hide": false, + "refId": "E", + "type": "math" + }, + { + "datasource": { + "name": "Expression", + "type": "__expr__", + "uid": "__expr__" + }, + "expression": "$C - $B", + "hide": false, + "refId": "F", + "type": "math" + }, + { + "datasource": { + "name": "Expression", + "type": "__expr__", + "uid": "__expr__" + }, + "expression": "$D - $B", + "hide": true, + "refId": "G", + "type": "math" + } + ], + "title": "Ethrex mainnet 4.0.0-pathbased distance vs other clients", + "transformations": [ + { + "id": "renameByRegex", + "options": { + "regex": "^([^:]+):\\d+$", + "renamePattern": "$1" + } + }, + { + "id": "renameByRegex", + "options": { + "regex": "E", + "renamePattern": "reth mainnet p99.9 - ethrex mainnet 3.0.0" + } + }, + { + "id": "renameByRegex", + "options": { + "regex": "F", + "renamePattern": "nethermind mainnet - ethrex mainnet 3.0.0" + } + }, + { + "id": "renameByRegex", + "options": { + "regex": "G", + "renamePattern": "geth mainnet p99.9 - ethrex mainnet 3.0.0" + } + }, + { + "id": "filterFieldsByName", + "options": { + "include": { + "names": [ + "Time", + "reth mainnet p99.9 - ethrex mainnet 3.0.0", + "nethermind mainnet - ethrex mainnet 3.0.0", + "geth mainnet p99.9 - ethrex mainnet 3.0.0" + ] + } + } + } + ], + "type": "timeseries" + } + ], + "title": "Ggas/s MAINNET", + "type": "row" + }, + { + "collapsed": true, + "gridPos": { + "h": 1, + "w": 24, + "x": 0, + "y": 1 + }, + "id": 5, + "panels": [ + { + "datasource": { + "type": "prometheus", + "uid": "prom-001" + }, + "description": "", + "fieldConfig": { + "defaults": { + "color": { + "mode": "palette-classic" + }, + "custom": { + "axisBorderShow": false, + "axisCenteredZero": false, + "axisColorMode": "text", + "axisLabel": "", + "axisPlacement": "auto", + "barAlignment": 0, + "barWidthFactor": 0.6, + "drawStyle": "line", + "fillOpacity": 0, + "gradientMode": "none", + "hideFrom": { + "legend": false, + "tooltip": false, + "viz": false + }, + "insertNulls": false, + "lineInterpolation": "linear", + "lineWidth": 1, + "pointSize": 5, + "scaleDistribution": { + "type": "linear" + }, + "showPoints": "auto", + "showValues": false, + "spanNulls": false, + "stacking": { + "group": "A", + "mode": "none" + }, + "thresholdsStyle": { + "mode": "off" + } + }, + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": 0 + }, + { + "color": "red", + "value": 80 + } + ] + }, + "unit": "bytes" + }, + "overrides": [] + }, + "gridPos": { + "h": 14, + "w": 24, + "x": 0, + "y": 2 + }, + "id": 6, + "options": { + "legend": { + "calcs": [ + "mean" + ], + "displayMode": "list", + "placement": "bottom", + "showLegend": true + }, + "tooltip": { + "hideZeros": false, + "mode": "single", + "sort": "none" + } + }, + "pluginVersion": "12.2.0", + "targets": [ + { + "datasource": { + "type": "prometheus", + "uid": "prom-001" + }, + "editorMode": "builder", + "expr": "reth_process_resident_memory_bytes{instance=\"eth-mainnet-rpc:6060\"}", + "hide": false, + "legendFormat": "reth mainnet resident memory", + "range": true, + "refId": "A" + }, + { + "datasource": { + "type": "prometheus", + "uid": "prom-001" + }, + "editorMode": "code", + "expr": "dotnet_total_memory_bytes{instance=\"eth-mainnet-rpc-1:6060\"} + nethermind_memory_used_by_cache{instance=\"eth-mainnet-rpc-1:6060\"}", + "hide": false, + "instant": false, + "legendFormat": "nethermind mainnet memory", + "range": true, + "refId": "C" + }, + { + "datasource": { + "type": "prometheus", + "uid": "prom-001" + }, + "editorMode": "code", + "expr": "system_memory_held{instance=\"eth-mainnet-rpc-2:6060\", job=\"geth\"} + eth_db_chaindata_memory_manualalloc{instance=\"eth-mainnet-rpc-2:6060\", job=\"geth\"}", + "hide": false, + "instant": false, + "legendFormat": "geth mainnet resident memory", + "range": true, + "refId": "D" + }, + { + "datasource": { + "type": "prometheus", + "uid": "prom-001" + }, + "editorMode": "builder", + "expr": "process_resident_memory_bytes{job=\"ethrex L1\", instance=~\"$instance(:\\\\d+)?$\"}", + "hide": false, + "instant": false, + "legendFormat": "{{ instance }}", + "range": true, + "refId": "B" + } + ], + "title": "Resident memory vs other clients", + "transformations": [ + { + "id": "renameByRegex", + "options": { + "regex": "^([^:]+):\\d+$", + "renamePattern": "$1" + } + } + ], + "type": "timeseries" + } + ], + "title": "Memory MAINNET", + "type": "row" + }, + { + "collapsed": true, + "gridPos": { + "h": 1, + "w": 24, + "x": 0, + "y": 2 + }, + "id": 8, + "panels": [ + { + "datasource": { + "type": "prometheus", + "uid": "prom-001" + }, + "description": "", + "fieldConfig": { + "defaults": { + "color": { + "mode": "palette-classic" + }, + "custom": { + "axisBorderShow": false, + "axisCenteredZero": false, + "axisColorMode": "text", + "axisLabel": "", + "axisPlacement": "auto", + "barAlignment": 0, + "barWidthFactor": 0.6, + "drawStyle": "line", + "fillOpacity": 0, + "gradientMode": "none", + "hideFrom": { + "legend": false, + "tooltip": false, + "viz": false + }, + "insertNulls": false, + "lineInterpolation": "linear", + "lineWidth": 1, + "pointSize": 5, + "scaleDistribution": { + "type": "linear" + }, + "showPoints": "auto", + "showValues": false, + "spanNulls": false, + "stacking": { + "group": "A", + "mode": "none" + }, + "thresholdsStyle": { + "mode": "off" + } + }, + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": 0 + }, + { + "color": "red", + "value": 80 + } + ] + }, + "unit": "si:gas" + }, + "overrides": [] + }, + "gridPos": { + "h": 13, + "w": 24, + "x": 0, + "y": 17 + }, + "id": 1, + "options": { + "legend": { + "calcs": [ + "mean" + ], + "displayMode": "list", + "placement": "bottom", + "showLegend": true + }, + "tooltip": { + "hideZeros": false, + "mode": "single", + "sort": "none" + } + }, + "pluginVersion": "12.2.0", + "targets": [ + { + "datasource": { + "type": "prometheus", + "uid": "prom-001" + }, + "editorMode": "code", + "expr": "reth_engine_rpc_new_payload_gas_per_second{instance=\"eth-hoodi-reth-lighthouse:6060\", quantile=\"0.999\"}", + "hide": false, + "legendFormat": "reth hoodi p99.9", + "range": true, + "refId": "A" + }, + { + "datasource": { + "type": "prometheus", + "uid": "prom-001" + }, + "editorMode": "code", + "expr": "nethermind_mgas_per_sec{instance=\"eth-hoodi-nethermind-lighthouse:6060\"} * 1000000", + "hide": false, + "instant": false, + "legendFormat": "nethermind hoodi", + "range": true, + "refId": "C" + }, + { + "datasource": { + "type": "prometheus", + "uid": "prom-001" + }, + "editorMode": "code", + "expr": "gigagas{job=\"ethrex L1\",instance=~\"$instance(:\\\\d+)?$\"} * 1000000000", + "hide": false, + "instant": false, + "legendFormat": "{{ instance }}", + "range": true, + "refId": "B" + } + ], + "title": "Ggas/s vs other clients (HOODI)", + "transformations": [ + { + "id": "renameByRegex", + "options": { + "regex": "^([^:]+):\\d+$", + "renamePattern": "$1" + } + } + ], + "type": "timeseries" + }, + { + "datasource": { + "type": "prometheus", + "uid": "prom-001" + }, + "description": "", + "fieldConfig": { + "defaults": { + "color": { + "mode": "palette-classic" + }, + "custom": { + "axisBorderShow": false, + "axisCenteredZero": false, + "axisColorMode": "text", + "axisLabel": "", + "axisPlacement": "auto", + "barAlignment": 0, + "barWidthFactor": 0.6, + "drawStyle": "line", + "fillOpacity": 0, + "gradientMode": "none", + "hideFrom": { + "legend": false, + "tooltip": false, + "viz": false + }, + "insertNulls": false, + "lineInterpolation": "linear", + "lineWidth": 1, + "pointSize": 5, + "scaleDistribution": { + "type": "linear" + }, + "showPoints": "auto", + "showValues": false, + "spanNulls": false, + "stacking": { + "group": "A", + "mode": "none" + }, + "thresholdsStyle": { + "mode": "off" + } + }, + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": 0 + }, + { + "color": "red", + "value": 80 + } + ] + }, + "unit": "si:gas" + }, + "overrides": [] + }, + "gridPos": { + "h": 13, + "w": 12, + "x": 0, + "y": 30 + }, + "id": 9, + "options": { + "legend": { + "calcs": [], + "displayMode": "list", + "placement": "bottom", + "showLegend": true + }, + "tooltip": { + "hideZeros": false, + "mode": "single", + "sort": "none" + } + }, + "pluginVersion": "12.2.0", + "targets": [ + { + "datasource": { + "type": "prometheus", + "uid": "prom-001" + }, + "editorMode": "code", + "expr": "reth_engine_rpc_new_payload_gas_per_second{instance=\"eth-hoodi-reth-lighthouse:6060\", quantile=\"0.999\"}", + "hide": false, + "legendFormat": "reth hoodi p99.9", + "range": true, + "refId": "A" + }, + { + "datasource": { + "type": "prometheus", + "uid": "prom-001" + }, + "editorMode": "code", + "expr": "nethermind_mgas_per_sec{instance=\"eth-hoodi-nethermind-lighthouse:6060\"} * 1000000", + "hide": false, + "instant": false, + "legendFormat": "nethermind hoodi", + "range": true, + "refId": "C" + }, + { + "datasource": { + "type": "prometheus", + "uid": "prom-001" + }, + "editorMode": "code", + "expr": "gigagas{job=\"ethrex L1\",instance=\"ethrex-hoodi-rpc:6063\"} * 1000000000", + "hide": false, + "instant": false, + "legendFormat": "{{ instance }}", + "range": true, + "refId": "B" + }, + { + "datasource": { + "name": "Expression", + "type": "__expr__", + "uid": "__expr__" + }, + "expression": "$A - $B", + "hide": false, + "refId": "E", + "type": "math" + }, + { + "datasource": { + "name": "Expression", + "type": "__expr__", + "uid": "__expr__" + }, + "expression": "$C - $B", + "hide": false, + "refId": "F", + "type": "math" + } + ], + "title": "Ethrex hoodi 1.0.0 distance vs other clients", + "transformations": [ + { + "id": "renameByRegex", + "options": { + "regex": "^([^:]+):\\d+$", + "renamePattern": "$1" + } + }, + { + "id": "renameByRegex", + "options": { + "regex": "E", + "renamePattern": "reth hoodi p99.9 - ethrex hoodi 1.0.0" + } + }, + { + "id": "renameByRegex", + "options": { + "regex": "F", + "renamePattern": "nethermind hoodi - ethrex hoodi 1.0.0" + } + }, + { + "id": "filterFieldsByName", + "options": { + "include": { + "names": [ + "reth hoodi p99.9 - ethrex hoodi 1.0.0", + "nethermind hoodi - ethrex hoodi 1.0.0", + "Time" + ] + } + } + } + ], + "type": "timeseries" + } + ], + "title": "Ggas/s HOODI", + "type": "row" + }, + { + "collapsed": true, + "gridPos": { + "h": 1, + "w": 24, + "x": 0, + "y": 3 + }, + "id": 10, + "panels": [ + { + "datasource": { + "type": "prometheus", + "uid": "prom-001" + }, + "description": "", + "fieldConfig": { + "defaults": { + "color": { + "mode": "palette-classic" + }, + "custom": { + "axisBorderShow": false, + "axisCenteredZero": false, + "axisColorMode": "text", + "axisLabel": "", + "axisPlacement": "auto", + "barAlignment": 0, + "barWidthFactor": 0.6, + "drawStyle": "line", + "fillOpacity": 0, + "gradientMode": "none", + "hideFrom": { + "legend": false, + "tooltip": false, + "viz": false + }, + "insertNulls": false, + "lineInterpolation": "linear", + "lineWidth": 1, + "pointSize": 5, + "scaleDistribution": { + "type": "linear" + }, + "showPoints": "auto", + "showValues": false, + "spanNulls": false, + "stacking": { + "group": "A", + "mode": "none" + }, + "thresholdsStyle": { + "mode": "off" + } + }, + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": 0 + }, + { + "color": "red", + "value": 80 + } + ] + }, + "unit": "si:gas" + }, + "overrides": [] + }, + "gridPos": { + "h": 13, + "w": 24, + "x": 0, + "y": 44 + }, + "id": 11, + "options": { + "legend": { + "calcs": [ + "mean" + ], + "displayMode": "list", + "placement": "bottom", + "showLegend": true + }, + "tooltip": { + "hideZeros": false, + "mode": "single", + "sort": "none" + } + }, + "pluginVersion": "12.2.0", + "targets": [ + { + "datasource": { + "type": "prometheus", + "uid": "prom-001" + }, + "editorMode": "code", + "expr": "reth_engine_rpc_new_payload_gas_per_second{instance=\"eth-sepolia-reth-lighthouse:6060\", quantile=\"0.999\"}", + "hide": false, + "legendFormat": "reth sepolia p99.9", + "range": true, + "refId": "A" + }, + { + "datasource": { + "type": "prometheus", + "uid": "prom-001" + }, + "editorMode": "code", + "expr": "nethermind_mgas_per_sec{instance=\"eth-sepolia-nethermind-lighthouse:6060\"} * 1000000", + "hide": false, + "instant": false, + "legendFormat": "nethermind sepolia", + "range": true, + "refId": "C" + }, + { + "datasource": { + "type": "prometheus", + "uid": "prom-001" + }, + "editorMode": "code", + "expr": "gigagas{job=\"ethrex L1\",instance=~\"$instance(:\\\\d+)?$\"} * 1000000000", + "hide": false, + "instant": false, + "legendFormat": "{{ instance }}", + "range": true, + "refId": "B" + } + ], + "title": "Ggas/s vs other clients (SEPOLIA)", + "transformations": [ + { + "id": "renameByRegex", + "options": { + "regex": "^([^:]+):\\d+$", + "renamePattern": "$1" + } + } + ], + "type": "timeseries" + }, + { + "datasource": { + "type": "prometheus", + "uid": "prom-001" + }, + "description": "", + "fieldConfig": { + "defaults": { + "color": { + "mode": "palette-classic" + }, + "custom": { + "axisBorderShow": false, + "axisCenteredZero": false, + "axisColorMode": "text", + "axisLabel": "", + "axisPlacement": "auto", + "barAlignment": 0, + "barWidthFactor": 0.6, + "drawStyle": "line", + "fillOpacity": 0, + "gradientMode": "none", + "hideFrom": { + "legend": false, + "tooltip": false, + "viz": false + }, + "insertNulls": false, + "lineInterpolation": "linear", + "lineWidth": 1, + "pointSize": 5, + "scaleDistribution": { + "type": "linear" + }, + "showPoints": "auto", + "showValues": false, + "spanNulls": false, + "stacking": { + "group": "A", + "mode": "none" + }, + "thresholdsStyle": { + "mode": "off" + } + }, + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": 0 + }, + { + "color": "red", + "value": 80 + } + ] + }, + "unit": "si:gas" + }, + "overrides": [] + }, + "gridPos": { + "h": 13, + "w": 12, + "x": 0, + "y": 57 + }, + "id": 12, + "options": { + "legend": { + "calcs": [], + "displayMode": "list", + "placement": "bottom", + "showLegend": true + }, + "tooltip": { + "hideZeros": false, + "mode": "single", + "sort": "none" + } + }, + "pluginVersion": "12.2.0", + "targets": [ + { + "datasource": { + "type": "prometheus", + "uid": "prom-001" + }, + "editorMode": "code", + "expr": "reth_engine_rpc_new_payload_gas_per_second{instance=\"eth-sepolia-reth-lighthouse:6060\", quantile=\"0.999\"}", + "hide": false, + "legendFormat": "reth sepolia p99.9", + "range": true, + "refId": "A" + }, + { + "datasource": { + "type": "prometheus", + "uid": "prom-001" + }, + "editorMode": "code", + "expr": "nethermind_mgas_per_sec{instance=\"eth-sepolia-nethermind-lighthouse:6060\"} * 1000000", + "hide": false, + "instant": false, + "legendFormat": "nethermind sepolia", + "range": true, + "refId": "C" + }, + { + "datasource": { + "type": "prometheus", + "uid": "prom-001" + }, + "editorMode": "code", + "expr": "gigagas{job=\"ethrex L1\",instance=\"ethrex-sepolia-rpc:6063\"} * 1000000000", + "hide": false, + "instant": false, + "legendFormat": "{{ instance }}", + "range": true, + "refId": "B" + }, + { + "datasource": { + "name": "Expression", + "type": "__expr__", + "uid": "__expr__" + }, + "expression": "$A - $B", + "hide": false, + "refId": "E", + "type": "math" + }, + { + "datasource": { + "name": "Expression", + "type": "__expr__", + "uid": "__expr__" + }, + "expression": "$C - $B", + "hide": false, + "refId": "F", + "type": "math" + } + ], + "title": "Ethrex sepolia 2.0.0 distance vs other clients", + "transformations": [ + { + "id": "renameByRegex", + "options": { + "regex": "^([^:]+):\\d+$", + "renamePattern": "$1" + } + }, + { + "id": "renameByRegex", + "options": { + "regex": "E", + "renamePattern": "reth sepolia p99.9 - ethrex sepolia 2.0.0" + } + }, + { + "id": "renameByRegex", + "options": { + "regex": "F", + "renamePattern": "nethermind sepolia - ethrex sepolia 2.0.0" + } + }, + { + "id": "filterFieldsByName", + "options": { + "include": { + "names": [ + "Time", + "reth sepolia p99.9 - ethrex sepolia 2.0.0", + "nethermind sepolia - ethrex sepolia 2.0.0" + ] + } + } + } + ], + "type": "timeseries" + } + ], + "title": "Ggas/s SEPOLIA", + "type": "row" + } + ], + "preload": false, + "schemaVersion": 42, + "tags": [], + "templating": { + "list": [ + { + "allowCustomValue": false, + "current": { + "text": [ + "ethrex-hoodi-rpc", + "ethrex-sepolia-rpc", + "ethrex-snapsync-1", + "ethrex-snapsync-2", + "ethrex-snapsync-big-13", + "ethrex-snapsync-big-14", + "ethrex-snapsync-big-15", + "ethrex-snapsync-big-1", + "ethrex-snapsync-big-2", + "ethrex-snapsync-big-6", + "ethrex-snapsync-big-7", + "ethrex-snapsync-big-9", + "ethrex-snapsync-notifications-10", + "ethrex-snapsync-notifications-12", + "ethrex-snapsync-notifications-1", + "ethrex-snapsync-notifications-2", + "ethrex-snapsync-notifications-3", + "ethrex-snapsync-notifications-4", + "ethrex-snapsync-notifications-9" + ], + "value": [ + "ethrex-hoodi-rpc", + "ethrex-sepolia-rpc", + "ethrex-snapsync-1", + "ethrex-snapsync-2", + "ethrex-snapsync-big-13", + "ethrex-snapsync-big-14", + "ethrex-snapsync-big-15", + "ethrex-snapsync-big-1", + "ethrex-snapsync-big-2", + "ethrex-snapsync-big-6", + "ethrex-snapsync-big-7", + "ethrex-snapsync-big-9", + "ethrex-snapsync-notifications-10", + "ethrex-snapsync-notifications-12", + "ethrex-snapsync-notifications-1", + "ethrex-snapsync-notifications-2", + "ethrex-snapsync-notifications-3", + "ethrex-snapsync-notifications-4", + "ethrex-snapsync-notifications-9" + ] + }, + "definition": "label_values(eth_con_beacon_slot,instance)", + "includeAll": true, + "multi": true, + "name": "instance", + "options": [], + "query": { + "qryType": 1, + "query": "label_values(eth_con_beacon_slot,instance)", + "refId": "PrometheusVariableQueryEditor-VariableQuery" + }, + "refresh": 1, + "regex": "/^(?[^:]+)(?::\\d+)?$/", + "type": "query" + } + ] + }, + "time": { + "from": "now-5m", + "to": "now" + }, + "timepicker": {}, + "timezone": "browser", + "title": "Ethrex Comparison", + "uid": "ads9rd7", + "version": 2 +} \ No newline at end of file diff --git a/metrics/provisioning/grafana/dashboards/common_dashboards/ethrex_l1_perf.json b/metrics/provisioning/grafana/dashboards/common_dashboards/ethrex_l1_perf.json index 44b05bfa1de..5bb02b5764c 100644 --- a/metrics/provisioning/grafana/dashboards/common_dashboards/ethrex_l1_perf.json +++ b/metrics/provisioning/grafana/dashboards/common_dashboards/ethrex_l1_perf.json @@ -18,7 +18,7 @@ "editable": true, "fiscalYearStartMonth": 0, "graphTooltip": 0, - "id": 8, + "id": 47, "links": [], "panels": [ { @@ -31,6 +31,17 @@ "color": { "mode": "thresholds" }, + "custom": { + "align": "left", + "cellOptions": { + "type": "auto" + }, + "filterable": true, + "footer": { + "reducers": [] + }, + "inspect": false + }, "mappings": [], "thresholds": { "mode": "absolute", @@ -49,28 +60,15 @@ "overrides": [] }, "gridPos": { - "h": 3, + "h": 5, "w": 9, "x": 0, "y": 0 }, "id": 13, "options": { - "colorMode": "value", - "graphMode": "none", - "justifyMode": "auto", - "orientation": "auto", - "percentChangeColorMode": "standard", - "reduceOptions": { - "calcs": [ - "lastNotNull" - ], - "fields": "", - "values": false - }, - "showPercentChange": false, - "textMode": "name", - "wideLayout": true + "cellHeight": "sm", + "showHeader": true }, "pluginVersion": "12.2.0", "targets": [ @@ -81,17 +79,37 @@ }, "disableTextWrap": false, "editorMode": "code", - "expr": "max by (version)(eth_exe_web3_client_version{instance=~\"$instance\"})", + "exemplar": false, + "expr": "max by (instance, client, version)(eth_exe_web3_client_version{instance=~\"$instance(:\\\\d+)?$\"})", + "format": "table", "fullMetaSearch": false, "includeNullMetadata": true, + "instant": true, "legendFormat": "__auto", - "range": true, + "range": false, "refId": "A", "useBackend": false } ], "title": "Execution Client", - "type": "stat" + "transformations": [ + { + "id": "organize", + "options": { + "excludeByName": { + "Time": true, + "Value": true + }, + "includeByName": {}, + "indexByName": {}, + "renameByName": { + "instance": "Instance", + "version": "Version" + } + } + } + ], + "type": "table" }, { "datasource": { @@ -103,6 +121,17 @@ "color": { "mode": "thresholds" }, + "custom": { + "align": "left", + "cellOptions": { + "type": "auto" + }, + "filterable": true, + "footer": { + "reducers": [] + }, + "inspect": false + }, "mappings": [], "thresholds": { "mode": "absolute", @@ -122,28 +151,15 @@ "overrides": [] }, "gridPos": { - "h": 3, + "h": 5, "w": 7, "x": 9, "y": 0 }, "id": 15, "options": { - "colorMode": "none", - "graphMode": "none", - "justifyMode": "auto", - "orientation": "auto", - "percentChangeColorMode": "standard", - "reduceOptions": { - "calcs": [ - "lastNotNull" - ], - "fields": "", - "values": false - }, - "showPercentChange": false, - "textMode": "name", - "wideLayout": true + "cellHeight": "sm", + "showHeader": true }, "pluginVersion": "12.2.0", "targets": [ @@ -153,14 +169,40 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "code", - "expr": "eth_con_spec_config_name{instance=~\"$instance\"}", + "exemplar": false, + "expr": "eth_con_spec_config_name{instance=~\"$instance(:\\\\d+)?$\"}", + "format": "table", + "instant": true, "legendFormat": "{{name}}", - "range": true, + "range": false, "refId": "A" } ], "title": "Consensus Config", - "type": "stat" + "transformations": [ + { + "id": "organize", + "options": { + "excludeByName": { + "Time": true, + "Value": true, + "__name__": true, + "instance": false, + "job": true, + "module": true, + "node": true + }, + "includeByName": {}, + "indexByName": {}, + "renameByName": { + "__name__": "", + "instance": "Instance", + "name": "Config" + } + } + } + ], + "type": "table" }, { "datasource": { @@ -172,6 +214,17 @@ "color": { "mode": "thresholds" }, + "custom": { + "align": "left", + "cellOptions": { + "type": "auto" + }, + "filterable": true, + "footer": { + "reducers": [] + }, + "inspect": false + }, "mappings": [], "thresholds": { "mode": "absolute", @@ -190,28 +243,15 @@ "overrides": [] }, "gridPos": { - "h": 3, + "h": 5, "w": 8, "x": 16, "y": 0 }, "id": 17, "options": { - "colorMode": "none", - "graphMode": "none", - "justifyMode": "auto", - "orientation": "auto", - "percentChangeColorMode": "standard", - "reduceOptions": { - "calcs": [ - "lastNotNull" - ], - "fields": "", - "values": false - }, - "showPercentChange": false, - "textMode": "name", - "wideLayout": true + "cellHeight": "sm", + "showHeader": true }, "pluginVersion": "12.2.0", "targets": [ @@ -221,14 +261,61 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "code", - "expr": "eth_con_fork_current{instance=~\"$instance\"}", + "exemplar": false, + "expr": "eth_con_fork_current{instance=~\"$instance(:\\\\d+)?$\"}", + "format": "table", + "instant": true, "legendFormat": "{{fork}}", - "range": true, + "range": false, "refId": "A" } ], "title": "Consensus Fork", - "type": "stat" + "transformations": [ + { + "id": "organize", + "options": { + "excludeByName": { + "Time": true, + "Value": true, + "__name__": true, + "fork": false, + "job": true, + "module": true, + "node": true + }, + "includeByName": {}, + "indexByName": { + "Time": 0, + "Value": 7, + "__name__": 1, + "fork": 3, + "instance": 2, + "job": 4, + "module": 5, + "node": 6 + }, + "renameByName": { + "fork": "Fork", + "instance": "Instance" + } + } + } + ], + "type": "table" + }, + { + "collapsed": false, + "gridPos": { + "h": 1, + "w": 24, + "x": 0, + "y": 5 + }, + "id": 50, + "panels": [], + "title": "Block Processing", + "type": "row" }, { "datasource": { @@ -294,7 +381,7 @@ { "matcher": { "id": "byName", - "options": "Gas Used %" + "options": "Value" }, "properties": [ { @@ -313,9 +400,10 @@ "h": 8, "w": 6, "x": 0, - "y": 3 + "y": 6 }, "id": 2, + "interval": "10s", "options": { "legend": { "calcs": [], @@ -336,65 +424,16 @@ "type": "prometheus", "uid": "${DS_PROMETHEUS}" }, - "disableTextWrap": false, - "editorMode": "builder", - "expr": "gas_used{job=\"$job\"}", - "fullMetaSearch": false, - "hide": false, - "includeNullMetadata": true, - "instant": false, - "legendFormat": "{{__name__}}", - "range": true, - "refId": "A", - "useBackend": false - }, - { - "datasource": { - "type": "prometheus", - "uid": "${DS_PROMETHEUS}" - }, - "disableTextWrap": false, - "editorMode": "builder", - "expr": "gas_limit{job=\"$job\"}", - "fullMetaSearch": false, + "editorMode": "code", + "expr": "sum by (instance)(\n gas_used{job=\"$job\", instance=~\"$instance(:\\\\d+)?$\"}\n)\n/\non(instance)\n sum by (instance)(\n gas_limit{job=\"$job\", instance=~\"$instance(:\\\\d+)?$\"} \n )", "hide": false, - "includeNullMetadata": true, "instant": false, - "legendFormat": "{{__name__}}", + "legendFormat": "{{ instance }}", "range": true, - "refId": "B", - "useBackend": false + "refId": "A" } ], "title": "Gas Used %", - "transformations": [ - { - "id": "calculateField", - "options": { - "alias": "Gas Used %", - "binary": { - "left": { - "matcher": { - "id": "byName", - "options": "gas_used" - } - }, - "operator": "/", - "right": { - "matcher": { - "id": "byName", - "options": "gas_limit" - } - } - }, - "mode": "binary", - "reduce": { - "reducer": "sum" - }, - "replaceFields": true - } - } - ], "type": "timeseries" }, { @@ -457,15 +496,32 @@ }, "unit": "Ggas/s" }, - "overrides": [] + "overrides": [ + { + "matcher": { + "id": "byName", + "options": "block_number" + }, + "properties": [ + { + "id": "custom.axisPlacement", + "value": "right" + }, + { + "id": "unit" + } + ] + } + ] }, "gridPos": { "h": 8, "w": 7, "x": 6, - "y": 3 + "y": 6 }, "id": 11, + "interval": "10s", "options": { "legend": { "calcs": [ @@ -491,13 +547,26 @@ }, "disableTextWrap": false, "editorMode": "code", - "expr": "gigagas{job=\"$job\"} - 0", + "expr": "gigagas{job=\"$job\", instance=~\"$instance(:\\\\d+)?$\"} - 0", "fullMetaSearch": false, "includeNullMetadata": true, - "legendFormat": "Gigagas/s", + "legendFormat": "{{ instance }} Gigagas/s", "range": true, "refId": "A", "useBackend": false + }, + { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, + "editorMode": "code", + "expr": "block_number{job=\"$job\", instance=~\"$instance(:\\\\d+)?$\"}", + "hide": true, + "instant": false, + "legendFormat": "{{instance}} Block Number", + "range": true, + "refId": "B" } ], "title": "Ggas/s", @@ -566,11 +635,12 @@ }, "gridPos": { "h": 8, - "w": 5, + "w": 11, "x": 13, - "y": 3 + "y": 6 }, "id": 1, + "interval": "10s", "options": { "legend": { "calcs": [], @@ -592,15 +662,15 @@ "uid": "${DS_PROMETHEUS}" }, "disableTextWrap": false, - "editorMode": "builder", - "expr": "head_height{job=\"$job\"}", + "editorMode": "code", + "expr": "head_height{job=\"$job\", instance=~\"$instance(:\\\\d+)?$\"}", "format": "time_series", "fullMetaSearch": false, "hide": false, "includeNullMetadata": true, "instant": false, "interval": "", - "legendFormat": "Current head height", + "legendFormat": "{{ instance }} Head height", "range": true, "refId": "A", "useBackend": false @@ -625,34 +695,28 @@ "axisColorMode": "text", "axisLabel": "", "axisPlacement": "auto", - "barAlignment": 0, - "barWidthFactor": 0.6, - "drawStyle": "line", - "fillOpacity": 0, - "gradientMode": "none", + "fillOpacity": 50, "hideFrom": { "legend": false, "tooltip": false, "viz": false }, - "insertNulls": false, - "lineInterpolation": "linear", - "lineWidth": 1, - "pointSize": 5, + "pointShape": "circle", + "pointSize": { + "fixed": 7 + }, + "pointStrokeWidth": 1, "scaleDistribution": { "type": "linear" }, - "showPoints": "auto", - "showValues": false, - "spanNulls": false, - "stacking": { - "group": "A", - "mode": "none" - }, - "thresholdsStyle": { - "mode": "off" - } + "show": "points+lines" }, + "links": [ + { + "title": "Show on Etherscan", + "url": "https://etherscan.io/block/${__data.fields[\"Block\"]}" + } + ], "mappings": [], "thresholds": { "mode": "absolute", @@ -663,31 +727,84 @@ }, { "color": "red", - "value": 400 + "value": 80 } ] - }, - "unit": "Gwei" + } }, - "overrides": [] + "overrides": [ + { + "matcher": { + "id": "byName", + "options": "gigagas" + }, + "properties": [ + { + "id": "unit", + "value": "si:Ggas/s" + } + ] + }, + { + "matcher": { + "id": "byRegexp", + "options": "/block.*/" + }, + "properties": [ + { + "id": "custom.hideFrom", + "value": { + "legend": false, + "tooltip": true, + "viz": false + } + } + ] + } + ] }, "gridPos": { - "h": 8, - "w": 6, - "x": 18, - "y": 3 + "h": 12, + "w": 12, + "x": 0, + "y": 14 }, - "id": 49, + "id": 47, + "interval": "5s", "options": { "legend": { "calcs": [ "mean", - "max" + "max", + "last" ], "displayMode": "list", "placement": "bottom", "showLegend": true }, + "mapping": "auto", + "series": [ + { + "frame": { + "matcher": { + "id": "byIndex", + "options": 0 + } + }, + "x": { + "matcher": { + "id": "byName", + "options": "Block" + } + }, + "y": { + "matcher": { + "id": "byName", + "options": "gigagas" + } + } + } + ], "tooltip": { "hideZeros": false, "mode": "single", @@ -701,232 +818,86 @@ "type": "prometheus", "uid": "${DS_PROMETHEUS}" }, - "disableTextWrap": false, "editorMode": "code", - "expr": "block_building_base_fee{job=\"$job\"} / 1000000000", - "fullMetaSearch": false, - "includeNullMetadata": true, - "legendFormat": "Base fee", + "expr": "gigagas{job=\"$job\", instance=~\"$instance(:\\\\d+)?$\"}", + "hide": false, + "instant": false, + "legendFormat": "ggas/s {{ instance }}", "range": true, - "refId": "A", - "useBackend": false - } - ], - "title": "Block building base_fee", - "type": "timeseries" - }, - { - "datasource": { - "type": "prometheus", - "uid": "${DS_PROMETHEUS}" - }, - "fieldConfig": { - "defaults": { - "color": { - "mode": "palette-classic" - }, - "custom": { - "axisBorderShow": false, - "axisCenteredZero": false, - "axisColorMode": "text", - "axisLabel": "", - "axisPlacement": "auto", - "barAlignment": 0, - "barWidthFactor": 0.6, - "drawStyle": "line", - "fillOpacity": 0, - "gradientMode": "none", - "hideFrom": { - "legend": false, - "tooltip": false, - "viz": false - }, - "insertNulls": false, - "lineInterpolation": "linear", - "lineWidth": 1, - "pointSize": 5, - "scaleDistribution": { - "type": "linear" - }, - "showPoints": "auto", - "showValues": false, - "spanNulls": false, - "stacking": { - "group": "A", - "mode": "none" - }, - "thresholdsStyle": { - "mode": "off" - } - }, - "mappings": [], - "thresholds": { - "mode": "absolute", - "steps": [ - { - "color": "green", - "value": 0 - }, - { - "color": "red", - "value": 80 - } - ] - }, - "unit": "Ggas/s" + "refId": "Ggas/s" }, - "overrides": [] - }, - "gridPos": { - "h": 8, - "w": 12, - "x": 0, - "y": 11 - }, - "id": 47, - "options": { - "legend": { - "calcs": [ - "mean", - "max" - ], - "displayMode": "list", - "placement": "bottom", - "showLegend": true - }, - "tooltip": { - "hideZeros": false, - "mode": "single", - "sort": "none" - } - }, - "pluginVersion": "12.2.0", - "targets": [ { "datasource": { "type": "prometheus", "uid": "${DS_PROMETHEUS}" }, - "disableTextWrap": false, "editorMode": "code", - "expr": "gigagas_block_building{job=\"$job\"} - 0", - "fullMetaSearch": false, - "includeNullMetadata": true, - "legendFormat": "Gigagas/s", + "expr": "max without(instance) (last_over_time(block_number{job=\"$job\", instance=~\"$instance(:\\\\d+)?$\"}[$__rate_interval]))", + "hide": false, + "instant": false, + "legendFormat": "Block", "range": true, - "refId": "A", - "useBackend": false - } - ], - "title": "Blockbuilding Ggas/s", - "type": "timeseries" - }, - { - "datasource": { - "type": "prometheus", - "uid": "${DS_PROMETHEUS}" - }, - "fieldConfig": { - "defaults": { - "color": { - "mode": "palette-classic" - }, - "custom": { - "axisBorderShow": false, - "axisCenteredZero": false, - "axisColorMode": "text", - "axisLabel": "", - "axisPlacement": "auto", - "barAlignment": 0, - "barWidthFactor": 0.6, - "drawStyle": "line", - "fillOpacity": 0, - "gradientMode": "none", - "hideFrom": { - "legend": false, - "tooltip": false, - "viz": false - }, - "insertNulls": false, - "lineInterpolation": "linear", - "lineWidth": 1, - "pointSize": 5, - "scaleDistribution": { - "type": "linear" - }, - "showPoints": "auto", - "showValues": false, - "spanNulls": false, - "stacking": { - "group": "A", - "mode": "none" - }, - "thresholdsStyle": { - "mode": "off" - } - }, - "mappings": [], - "min": 0, - "thresholds": { - "mode": "absolute", - "steps": [ - { - "color": "green", - "value": 0 - }, - { - "color": "red", - "value": 400 - } - ] - }, - "unit": "ms" - }, - "overrides": [] - }, - "gridPos": { - "h": 8, - "w": 12, - "x": 12, - "y": 11 - }, - "id": 48, - "options": { - "legend": { - "calcs": [ - "mean", - "max" - ], - "displayMode": "list", - "placement": "bottom", - "showLegend": true + "refId": "Block" }, - "tooltip": { - "hideZeros": false, - "mode": "single", - "sort": "none" - } - }, - "pluginVersion": "12.2.0", - "targets": [ { "datasource": { "type": "prometheus", "uid": "${DS_PROMETHEUS}" }, - "disableTextWrap": false, "editorMode": "code", - "expr": "block_building_ms{job=\"$job\"}", - "fullMetaSearch": false, - "includeNullMetadata": true, - "legendFormat": "Build time", + "expr": "scalar(\n max(\n ( max without(instance) (\n last_over_time(block_number{job=\"$job\", instance=~\"$instance(:\\\\d+)?$\"}[$__rate_interval])\n )\n == bool\n min without(instance) (\n last_over_time(block_number{job=\"$job\", instance=~\"$instance(:\\\\d+)?$\"}[$__rate_interval])\n )\n ))\n)", + "hide": false, + "instant": false, + "legendFormat": "all_same_block", "range": true, - "refId": "A", - "useBackend": false + "refId": "all_same_block" } ], - "title": "Block building time taken in ms", - "type": "timeseries" + "title": "Ggas/s by Block", + "transformations": [ + { + "id": "joinByField", + "options": { + "mode": "inner" + } + }, + { + "id": "filterByValue", + "options": { + "filters": [ + { + "config": { + "id": "equal", + "options": { + "value": "0" + } + }, + "fieldName": "all_same_block" + } + ], + "match": "any", + "type": "exclude" + } + }, + { + "id": "groupBy", + "options": { + "fields": { + "Time": { + "aggregations": [ + "lastNotNull" + ], + "operation": "aggregate" + }, + "Value": { + "aggregations": [], + "operation": "groupby" + } + } + } + } + ], + "type": "xychart" }, { "datasource": { @@ -953,7 +924,7 @@ "lineWidth": 2, "pointShape": "circle", "pointSize": { - "fixed": 11 + "fixed": 7 }, "pointStrokeWidth": 1, "scaleDistribution": { @@ -988,42 +959,31 @@ { "matcher": { "id": "byName", - "options": "Gas Used %" + "options": "Value" }, "properties": [ { "id": "unit", - "value": "percentunit" + "value": "s" }, { "id": "custom.axisPlacement", - "value": "right" - }, - { - "id": "custom.axisSoftMin", - "value": 0 - }, - { - "id": "custom.axisSoftMax", - "value": 0.7 - }, - { - "id": "color", - "value": { - "fixedColor": "semi-dark-blue", - "mode": "fixed" - } - }, - { - "id": "custom.axisLabel", - "value": "Gas Used %" - }, + "value": "left" + } + ] + }, + { + "matcher": { + "id": "byRegexp", + "options": "/block.*/" + }, + "properties": [ { "id": "custom.hideFrom", "value": { - "legend": true, - "tooltip": false, - "viz": false + "legend": false, + "tooltip": true, + "viz": true } } ] @@ -1031,16 +991,12 @@ { "matcher": { "id": "byName", - "options": "Block Time" + "options": "Block" }, "properties": [ { "id": "unit", - "value": "s" - }, - { - "id": "custom.axisLabel", - "value": "Block time" + "value": "none" } ] } @@ -1048,11 +1004,12 @@ }, "gridPos": { "h": 12, - "w": 24, - "x": 0, - "y": 19 + "w": 12, + "x": 12, + "y": 14 }, "id": 12, + "interval": "5s", "options": { "legend": { "calcs": [ @@ -1063,7 +1020,7 @@ "placement": "bottom", "showLegend": true }, - "mapping": "manual", + "mapping": "auto", "series": [ { "frame": { @@ -1075,33 +1032,13 @@ "x": { "matcher": { "id": "byName", - "options": "Block Number" - } - }, - "y": { - "matcher": { - "id": "byName", - "options": "Gas Used %" - } - } - }, - { - "frame": { - "matcher": { - "id": "byIndex", - "options": 0 - } - }, - "x": { - "matcher": { - "id": "byName", - "options": "Block Number" + "options": "Block" } }, "y": { "matcher": { "id": "byName", - "options": "Block Time" + "options": "Value" } } } @@ -1119,154 +1056,224 @@ "type": "prometheus", "uid": "${DS_PROMETHEUS}" }, - "disableTextWrap": false, - "editorMode": "builder", - "expr": "block_number{job=\"$job\"}", - "fullMetaSearch": false, - "includeNullMetadata": true, - "legendFormat": "Block Number", + "editorMode": "code", + "exemplar": false, + "expr": "sum by (instance)(\n gas_used{job=\"$job\", instance=~\"$instance(:\\\\d+)?$\"}\n)\n/\non(instance) ( \n sum by (instance)(\n gigagas{job=\"$job\", instance=~\"$instance(:\\\\d+)?$\"} \n ) * 1000000000\n)", + "format": "time_series", + "hide": false, + "instant": false, + "legendFormat": "Block time {{ instance }}", "range": true, - "refId": "A", - "useBackend": false + "refId": "block_time" }, { "datasource": { "type": "prometheus", "uid": "${DS_PROMETHEUS}" }, - "disableTextWrap": false, - "editorMode": "builder", - "expr": "gigagas{job=\"$job\"}", - "fullMetaSearch": false, + "editorMode": "code", + "expr": "max without(instance) (last_over_time(block_number{job=\"$job\", instance=~\"$instance(:\\\\d+)?$\"}[$__rate_interval]))", "hide": false, - "includeNullMetadata": true, "instant": false, - "legendFormat": "Gigagas/s", + "legendFormat": "Block", "range": true, - "refId": "B", - "useBackend": false + "refId": "block" }, { "datasource": { "type": "prometheus", "uid": "${DS_PROMETHEUS}" }, - "disableTextWrap": false, - "editorMode": "builder", - "expr": "gas_used{job=\"$job\"}", - "fullMetaSearch": false, + "editorMode": "code", + "expr": "scalar(\n max(\n ( max without(instance) (\n last_over_time(block_number{job=\"$job\", instance=~\"$instance(:\\\\d+)?$\"}[$__rate_interval])\n )\n == bool\n min without(instance) (\n last_over_time(block_number{job=\"$job\", instance=~\"$instance(:\\\\d+)?$\"}[$__rate_interval])\n )\n ))\n)", "hide": false, - "includeNullMetadata": true, "instant": false, - "legendFormat": "Gas Used", + "legendFormat": "all_same_block", "range": true, - "refId": "C", - "useBackend": false + "refId": "all_same_block" }, { "datasource": { "type": "prometheus", "uid": "${DS_PROMETHEUS}" }, - "disableTextWrap": false, - "editorMode": "builder", - "expr": "gas_limit{job=\"$job\"}", - "fullMetaSearch": false, - "hide": false, - "includeNullMetadata": true, + "editorMode": "code", + "expr": "max without(instance) (\nsum by (instance)(\n gas_used{job=\"$job\", instance=~\"$instance(:\\\\d+)?$\"}\n)\n/\non(instance)\n sum by (instance)(\n gas_limit{job=\"$job\", instance=~\"$instance(:\\\\d+)?$\"} \n )\n)", + "hide": true, "instant": false, - "legendFormat": "Gas Limit", + "legendFormat": "Gas Used %", "range": true, - "refId": "D", - "useBackend": false + "refId": "gas_used" } ], - "title": "Block time & Gas Used ", + "title": "Block Time", "transformations": [ { - "id": "calculateField", + "id": "joinByField", "options": { - "alias": "Gas Used %", - "binary": { - "left": { - "matcher": { - "id": "byName", - "options": "Gas Used" - } - }, - "operator": "/", - "right": { - "matcher": { - "id": "byName", - "options": "Gas Limit" - } - } - }, - "mode": "binary", - "reduce": { - "reducer": "sum" - } + "byField": "Time", + "mode": "inner" } }, { - "id": "calculateField", + "id": "filterByValue", "options": { - "alias": "Gas/s", - "binary": { - "left": { - "matcher": { - "id": "byName", - "options": "Gigagas/s" - } - }, - "operator": "*", - "right": { - "fixed": "1000000000" + "filters": [ + { + "config": { + "id": "equal", + "options": { + "value": "0" + } + }, + "fieldName": "all_same_block" } - }, - "mode": "binary", - "reduce": { - "include": [ - "Gigagas/s" - ], - "reducer": "sum" - }, - "window": { - "reducer": "mean", - "windowAlignment": "trailing", - "windowSize": 0.1, - "windowSizeMode": "percentage" + ], + "match": "any", + "type": "exclude" + } + }, + { + "id": "filterFieldsByName", + "options": { + "byVariable": false, + "include": { + "pattern": "^(?!.*all_same_block).*$" } } }, { - "id": "calculateField", + "id": "groupBy", "options": { - "alias": "Block Time", - "binary": { - "left": { - "matcher": { - "id": "byName", - "options": "Gas Used" - } + "fields": { + "Block": { + "aggregations": [] }, - "operator": "/", - "right": { - "matcher": { - "id": "byName", - "options": "Gas/s" - } + "Block time ethrex-mainnet-3-0-0:3701": { + "aggregations": [] + }, + "Block time ethrex-mainnet-4-0-0-pathbased:3701": { + "aggregations": [] + }, + "Time": { + "aggregations": [ + "lastNotNull" + ], + "operation": "aggregate" + }, + "Value": { + "aggregations": [], + "operation": "groupby" + }, + "all_same_block": { + "aggregations": [] + }, + "remove_duplicate_blocks": { + "aggregations": [] } - }, - "mode": "binary", - "reduce": { - "reducer": "sum" } } } ], "type": "xychart" }, + { + "collapsed": false, + "gridPos": { + "h": 1, + "w": 24, + "x": 0, + "y": 26 + }, + "id": 49, + "panels": [], + "title": "Block Execution Breakdown", + "type": "row" + }, + { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, + "fieldConfig": { + "defaults": { + "color": { + "mode": "palette-classic" + }, + "custom": { + "hideFrom": { + "legend": false, + "tooltip": false, + "viz": false + } + }, + "mappings": [] + }, + "overrides": [] + }, + "gridPos": { + "h": 8, + "w": 24, + "x": 0, + "y": 27 + }, + "id": 18, + "options": { + "legend": { + "displayMode": "list", + "placement": "bottom", + "showLegend": true, + "values": [ + "percent" + ] + }, + "pieType": "pie", + "reduceOptions": { + "calcs": [ + "lastNotNull" + ], + "fields": "", + "values": false + }, + "sort": "desc", + "tooltip": { + "hideZeros": false, + "mode": "single", + "sort": "none" + } + }, + "pluginVersion": "12.2.0", + "repeat": "instance", + "repeatDirection": "h", + "targets": [ + { + "disableTextWrap": false, + "editorMode": "code", + "expr": "(\n sum by (function_name) (\n increase(function_duration_seconds_sum{job=\"$job\", instance=~\"$instance(:\\\\d+)?$\", function_name!=\"Block execution\"}[$__range])\n )\n)\nor\nlabel_replace(\n sum( increase(function_duration_seconds_sum{job=\"$job\", instance=~\"$instance(:\\\\d+)?$\", function_name=\"Block execution\"}[$__range]) )\n - sum( increase(function_duration_seconds_sum{job=\"$job\", instance=~\"$instance(:\\\\d+)?$\", function_name=~\"Storage read|Account read|Account Read\"}[$__range]) ),\n \"function_name\",\"Block execution (without db)\",\"__name__\",\".*\"\n)", + "fullMetaSearch": false, + "includeNullMetadata": false, + "legendFormat": "__auto", + "range": true, + "refId": "A", + "useBackend": false + } + ], + "title": "Block Execution Breakdown - $instance", + "type": "piechart" + }, + { + "collapsed": false, + "gridPos": { + "h": 1, + "w": 24, + "x": 0, + "y": 35 + }, + "id": 48, + "panels": [], + "title": "Process & Server Info", + "type": "row" + }, { "datasource": { "type": "prometheus", @@ -1299,7 +1306,7 @@ "h": 3, "w": 5, "x": 0, - "y": 31 + "y": 36 }, "id": 34, "options": { @@ -1327,7 +1334,7 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "code", - "expr": "time() - process_start_time_seconds{job=\"$job\"}", + "expr": "time() - process_start_time_seconds{job=\"$job\", instance=~\"$instance(:\\\\d+)?$\"}", "legendFormat": "uptime_s", "range": true, "refId": "A" @@ -1368,7 +1375,7 @@ "h": 3, "w": 2, "x": 5, - "y": 31 + "y": 36 }, "id": 33, "options": { @@ -1396,7 +1403,7 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "code", - "expr": "process_threads{job=\"$job\"}", + "expr": "process_threads{job=\"$job\", instance=~\"$instance(:\\\\d+)?$\"}", "legendFormat": "threads", "range": true, "refId": "A" @@ -1436,7 +1443,7 @@ "h": 3, "w": 5, "x": 7, - "y": 31 + "y": 36 }, "id": 43, "options": { @@ -1464,7 +1471,7 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "code", - "expr": "process_open_fds{job=\"$job\"}", + "expr": "process_open_fds{job=\"$job\", instance=~\"$instance(:\\\\d+)?$\"}", "legendFormat": "Open FDs", "range": true, "refId": "A" @@ -1478,76 +1485,7 @@ "type": "prometheus", "uid": "${DS_PROMETHEUS}" }, - "fieldConfig": { - "defaults": { - "color": { - "mode": "palette-classic" - }, - "custom": { - "hideFrom": { - "legend": false, - "tooltip": false, - "viz": false - } - }, - "mappings": [] - }, - "overrides": [] - }, - "gridPos": { - "h": 8, - "w": 12, - "x": 12, - "y": 31 - }, - "id": 18, - "options": { - "legend": { - "displayMode": "list", - "placement": "bottom", - "showLegend": true, - "values": [ - "percent" - ] - }, - "pieType": "pie", - "reduceOptions": { - "calcs": [ - "lastNotNull" - ], - "fields": "", - "values": false - }, - "sort": "desc", - "tooltip": { - "hideZeros": false, - "mode": "single", - "sort": "none" - } - }, - "pluginVersion": "12.2.0", - "targets": [ - { - "disableTextWrap": false, - "editorMode": "code", - "expr": "(\n sum by (function_name) (\n increase(function_duration_seconds_sum{job=\"$job\", function_name!=\"Block execution\"}[$__range])\n )\n)\nor\nlabel_replace(\n sum( increase(function_duration_seconds_sum{job=\"$job\", function_name=\"Block execution\"}[$__range]) )\n - sum( increase(function_duration_seconds_sum{job=\"$job\", function_name=~\"Storage read|Account read|Account Read\"}[$__range]) ),\n \"function_name\",\"Block execution (without db)\",\"__name__\",\".*\"\n)", - "fullMetaSearch": false, - "includeNullMetadata": false, - "legendFormat": "__auto", - "range": true, - "refId": "A", - "useBackend": false - } - ], - "title": "Block Execution Breakdown", - "type": "piechart" - }, - { - "datasource": { - "type": "prometheus", - "uid": "${DS_PROMETHEUS}" - }, - "description": "", + "description": "This calculates the size in bytes of the datadir path where the DB is stored.", "fieldConfig": { "defaults": { "color": { @@ -1595,31 +1533,29 @@ "color": "green", "value": 0 }, - { - "color": "yellow", - "value": 60 - }, { "color": "red", - "value": 85 + "value": 80 } ] - } + }, + "unit": "decbytes" }, "overrides": [] }, "gridPos": { - "h": 5, + "h": 8, "w": 12, - "x": 0, - "y": 34 + "x": 12, + "y": 36 }, - "id": 32, + "id": 46, "options": { "legend": { "calcs": [ + "max", "mean", - "max" + "last" ], "displayMode": "list", "placement": "bottom", @@ -1634,18 +1570,18 @@ "pluginVersion": "12.2.0", "targets": [ { - "datasource": { - "type": "prometheus", - "uid": "${DS_PROMETHEUS}" - }, - "editorMode": "code", - "expr": "process_open_fds{job=\"$job\"}", - "legendFormat": "FDs used %", + "disableTextWrap": false, + "editorMode": "builder", + "expr": "datadir_size_bytes{job=\"$job\", instance=~\"$instance(:\\\\d+)?$\"}", + "fullMetaSearch": false, + "includeNullMetadata": true, + "legendFormat": "{{ instance }} Datadir Size (GB)", "range": true, - "refId": "A" + "refId": "A", + "useBackend": false } ], - "title": "Open FDs Historic", + "title": "Datadir Size", "type": "timeseries" }, { @@ -1653,7 +1589,7 @@ "type": "prometheus", "uid": "${DS_PROMETHEUS}" }, - "description": "This calculates the size in bytes of the datadir path where the DB is stored.", + "description": "", "fieldConfig": { "defaults": { "color": { @@ -1701,29 +1637,31 @@ "color": "green", "value": 0 }, + { + "color": "yellow", + "value": 60 + }, { "color": "red", - "value": 80 + "value": 85 } ] - }, - "unit": "decbytes" + } }, "overrides": [] }, "gridPos": { - "h": 6, - "w": 24, + "h": 5, + "w": 12, "x": 0, "y": 39 }, - "id": 46, + "id": 32, "options": { "legend": { "calcs": [ - "max", "mean", - "last" + "max" ], "displayMode": "list", "placement": "bottom", @@ -1736,20 +1674,20 @@ } }, "pluginVersion": "12.2.0", - "targets": [ - { - "disableTextWrap": false, - "editorMode": "builder", - "expr": "datadir_size_bytes{job=\"$job\"}", - "fullMetaSearch": false, - "includeNullMetadata": true, - "legendFormat": "Datadir Size (GB)", + "targets": [ + { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, + "editorMode": "code", + "expr": "process_open_fds{job=\"$job\", instance=~\"$instance(:\\\\d+)?$\"}", + "legendFormat": "{{ instance }} FDs used", "range": true, - "refId": "A", - "useBackend": false + "refId": "A" } ], - "title": "Datadir Size", + "title": "Open FDs Historic", "type": "timeseries" }, { @@ -1757,7 +1695,7 @@ "type": "prometheus", "uid": "${DS_PROMETHEUS}" }, - "description": "This is the CPU utilization % of the host machine where the node is running. This was extracted from node_exporter.", + "description": "This calculates the average numbers of cores used by the ethrex node during the last minute.", "fieldConfig": { "defaults": { "color": { @@ -1767,12 +1705,12 @@ "axisBorderShow": false, "axisCenteredZero": false, "axisColorMode": "text", - "axisLabel": "% Utilization", + "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, "barWidthFactor": 0.6, "drawStyle": "line", - "fillOpacity": 20, + "fillOpacity": 0, "gradientMode": "none", "hideFrom": { "legend": false, @@ -1788,7 +1726,7 @@ }, "showPoints": "auto", "showValues": false, - "spanNulls": true, + "spanNulls": false, "stacking": { "group": "A", "mode": "none" @@ -1797,7 +1735,6 @@ "mode": "off" } }, - "decimals": 1, "mappings": [], "thresholds": { "mode": "absolute", @@ -1812,17 +1749,17 @@ } ] }, - "unit": "percent" + "unit": "short" }, "overrides": [] }, "gridPos": { - "h": 8, + "h": 6, "w": 12, "x": 0, - "y": 45 + "y": 44 }, - "id": 45, + "id": 30, "options": { "legend": { "calcs": [ @@ -1842,14 +1779,18 @@ "pluginVersion": "12.2.0", "targets": [ { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, "editorMode": "code", - "expr": "100 * sum by (instance) (rate(node_cpu_seconds_total{mode!=\"idle\"}[1m])) / sum by (instance) (rate(node_cpu_seconds_total[1m]))", - "legendFormat": "CPU Utilization %", + "expr": "rate(process_cpu_seconds_total{job=\"$job\", instance=~\"$instance(:\\\\d+)?$\"}[1m])", + "legendFormat": "{{ instance }} CPU cores used", "range": true, "refId": "A" } ], - "title": "Host CPU Utilization (%)", + "title": "Node CPU (avg. cores used)", "type": "timeseries" }, { @@ -1857,7 +1798,7 @@ "type": "prometheus", "uid": "${DS_PROMETHEUS}" }, - "description": "This is the RAM (used vs Total) of the host machine where the node is running. This was extracted from node_exporter and converted from bytes to GiB", + "description": "This calculates the RSS memory for the ethrex node.", "fieldConfig": { "defaults": { "color": { @@ -1868,12 +1809,12 @@ "axisCenteredZero": false, "axisColorMode": "text", "axisLabel": "", - "axisPlacement": "right", + "axisPlacement": "auto", "barAlignment": 0, "barWidthFactor": 0.6, "drawStyle": "line", - "fillOpacity": 20, - "gradientMode": "opacity", + "fillOpacity": 15, + "gradientMode": "none", "hideFrom": { "legend": false, "tooltip": false, @@ -1881,14 +1822,14 @@ }, "insertNulls": false, "lineInterpolation": "linear", - "lineWidth": 3, - "pointSize": 5, + "lineWidth": 2, + "pointSize": 4, "scaleDistribution": { "type": "linear" }, "showPoints": "auto", "showValues": false, - "spanNulls": true, + "spanNulls": false, "stacking": { "group": "A", "mode": "none" @@ -1897,7 +1838,6 @@ "mode": "off" } }, - "decimals": 2, "mappings": [], "thresholds": { "mode": "absolute", @@ -1912,62 +1852,47 @@ } ] }, - "unit": "gbytes" + "unit": "bytes" }, "overrides": [ { "matcher": { "id": "byName", - "options": "Memory Used" + "options": "VSZ" }, "properties": [ { - "id": "color", - "value": { - "mode": "continuous-BlYlRd", - "seriesBy": "last" - } + "id": "custom.axisPlacement", + "value": "left" } ] }, { "matcher": { "id": "byName", - "options": "Memory Total" + "options": "RSS" }, "properties": [ { - "id": "color", - "value": { - "mode": "continuous-greens", - "seriesBy": "last" - } - }, - { - "id": "custom.hideFrom", - "value": { - "legend": true, - "tooltip": false, - "viz": false - } + "id": "custom.axisPlacement", + "value": "right" } ] } ] }, "gridPos": { - "h": 8, + "h": 6, "w": 12, "x": 12, - "y": 45 + "y": 44 }, - "id": 42, + "id": 31, "options": { "legend": { "calcs": [ "mean", - "max", - "last" + "max" ], "displayMode": "list", "placement": "bottom", @@ -1982,24 +1907,18 @@ "pluginVersion": "12.2.0", "targets": [ { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, "editorMode": "code", - "expr": "(node_memory_MemTotal_bytes - node_memory_MemAvailable_bytes) / (1024*1024*1024)", - "legendFormat": "Memory Used", + "expr": "process_resident_memory_bytes{job=\"$job\", instance=~\"$instance(:\\\\d+)?$\"}", + "legendFormat": "{{ instance }} RSS", "range": true, "refId": "A" - }, - { - "editorMode": "code", - "exemplar": false, - "expr": "node_memory_MemTotal_bytes / (1024*1024*1024)", - "format": "time_series", - "instant": false, - "legendFormat": "Memory Total", - "range": true, - "refId": "B" } ], - "title": "Host Ram (GiB) — Used vs Total", + "title": "Node Memory (RSS)", "type": "timeseries" }, { @@ -2007,7 +1926,7 @@ "type": "prometheus", "uid": "${DS_PROMETHEUS}" }, - "description": "This calculates the average numbers of cores used by the ethrex node during the last minute.", + "description": "This is the CPU utilization % of the host machine where the node is running. This was extracted from node_exporter.", "fieldConfig": { "defaults": { "color": { @@ -2017,12 +1936,12 @@ "axisBorderShow": false, "axisCenteredZero": false, "axisColorMode": "text", - "axisLabel": "", + "axisLabel": "% Utilization", "axisPlacement": "auto", "barAlignment": 0, "barWidthFactor": 0.6, "drawStyle": "line", - "fillOpacity": 0, + "fillOpacity": 20, "gradientMode": "none", "hideFrom": { "legend": false, @@ -2038,7 +1957,7 @@ }, "showPoints": "auto", "showValues": false, - "spanNulls": false, + "spanNulls": true, "stacking": { "group": "A", "mode": "none" @@ -2047,6 +1966,7 @@ "mode": "off" } }, + "decimals": 1, "mappings": [], "thresholds": { "mode": "absolute", @@ -2061,17 +1981,17 @@ } ] }, - "unit": "short" + "unit": "percent" }, "overrides": [] }, "gridPos": { - "h": 6, + "h": 8, "w": 12, "x": 0, - "y": 53 + "y": 50 }, - "id": 30, + "id": 45, "options": { "legend": { "calcs": [ @@ -2091,18 +2011,14 @@ "pluginVersion": "12.2.0", "targets": [ { - "datasource": { - "type": "prometheus", - "uid": "${DS_PROMETHEUS}" - }, "editorMode": "code", - "expr": "rate(process_cpu_seconds_total{job=\"$job\"}[1m])", - "legendFormat": "CPU cores used", + "expr": "100 * sum by (instance) (rate(node_cpu_seconds_total{mode!=\"idle\", instance=~\"$instance(:\\\\d+)?$\"}[1m])) / sum by (instance) (rate(node_cpu_seconds_total{instance=~\"$instance(:\\\\d+)?$\"}[1m]))", + "legendFormat": "{{ instance }} CPU Utilization", "range": true, "refId": "A" } ], - "title": "Node CPU (avg. cores used)", + "title": "Host CPU Utilization (%)", "type": "timeseries" }, { @@ -2110,7 +2026,7 @@ "type": "prometheus", "uid": "${DS_PROMETHEUS}" }, - "description": "This calculates the RSS memory for the ethrex node.", + "description": "This is the RAM (used vs Total) of the host machine where the node is running. This was extracted from node_exporter and converted from bytes to GiB", "fieldConfig": { "defaults": { "color": { @@ -2121,12 +2037,12 @@ "axisCenteredZero": false, "axisColorMode": "text", "axisLabel": "", - "axisPlacement": "auto", + "axisPlacement": "right", "barAlignment": 0, "barWidthFactor": 0.6, "drawStyle": "line", - "fillOpacity": 15, - "gradientMode": "none", + "fillOpacity": 20, + "gradientMode": "opacity", "hideFrom": { "legend": false, "tooltip": false, @@ -2134,14 +2050,14 @@ }, "insertNulls": false, "lineInterpolation": "linear", - "lineWidth": 2, - "pointSize": 4, + "lineWidth": 3, + "pointSize": 5, "scaleDistribution": { "type": "linear" }, "showPoints": "auto", "showValues": false, - "spanNulls": false, + "spanNulls": true, "stacking": { "group": "A", "mode": "none" @@ -2150,6 +2066,7 @@ "mode": "off" } }, + "decimals": 2, "mappings": [], "thresholds": { "mode": "absolute", @@ -2164,47 +2081,62 @@ } ] }, - "unit": "bytes" + "unit": "gbytes" }, "overrides": [ { "matcher": { "id": "byName", - "options": "VSZ" + "options": "Memory Used" }, "properties": [ { - "id": "custom.axisPlacement", - "value": "left" + "id": "color", + "value": { + "mode": "continuous-BlYlRd", + "seriesBy": "last" + } } ] }, { "matcher": { "id": "byName", - "options": "RSS" + "options": "Memory Total" }, "properties": [ { - "id": "custom.axisPlacement", - "value": "right" + "id": "color", + "value": { + "mode": "continuous-greens", + "seriesBy": "last" + } + }, + { + "id": "custom.hideFrom", + "value": { + "legend": true, + "tooltip": false, + "viz": false + } } ] } ] }, "gridPos": { - "h": 6, + "h": 8, "w": 12, "x": 12, - "y": 53 + "y": 50 }, - "id": 31, + "id": 42, "options": { "legend": { "calcs": [ "mean", - "max" + "max", + "last" ], "displayMode": "list", "placement": "bottom", @@ -2219,19 +2151,338 @@ "pluginVersion": "12.2.0", "targets": [ { - "datasource": { - "type": "prometheus", - "uid": "${DS_PROMETHEUS}" - }, "editorMode": "code", - "expr": "process_resident_memory_bytes{job=\"$job\"}", - "legendFormat": "RSS", + "expr": "(node_memory_MemTotal_bytes{instance=~\"$instance(:\\\\d+)?$\"} - node_memory_MemAvailable_bytes{instance=~\"$instance(:\\\\d+)?$\"}) / (1024*1024*1024)", + "legendFormat": "{{ instance }} Memory Used", "range": true, "refId": "A" + }, + { + "editorMode": "code", + "exemplar": false, + "expr": "node_memory_MemTotal_bytes{instance=~\"$instance(:\\\\d+)?$\"} / (1024*1024*1024)", + "format": "time_series", + "hide": true, + "instant": false, + "legendFormat": "{{ instance }} Memory Total", + "range": true, + "refId": "B" } ], - "title": "Node Memory (RSS)", + "title": "Host Ram (GiB) — Used vs Total", "type": "timeseries" + }, + { + "collapsed": true, + "gridPos": { + "h": 1, + "w": 24, + "x": 0, + "y": 58 + }, + "id": 55, + "panels": [ + { + "datasource": { + "type": "prometheus", + "uid": "prom-001" + }, + "fieldConfig": { + "defaults": { + "color": { + "mode": "palette-classic" + }, + "custom": { + "axisBorderShow": false, + "axisCenteredZero": false, + "axisColorMode": "text", + "axisLabel": "", + "axisPlacement": "auto", + "barAlignment": 0, + "barWidthFactor": 0.6, + "drawStyle": "line", + "fillOpacity": 0, + "gradientMode": "none", + "hideFrom": { + "legend": false, + "tooltip": false, + "viz": false + }, + "insertNulls": false, + "lineInterpolation": "linear", + "lineWidth": 1, + "pointSize": 5, + "scaleDistribution": { + "type": "linear" + }, + "showPoints": "auto", + "showValues": false, + "spanNulls": false, + "stacking": { + "group": "A", + "mode": "none" + }, + "thresholdsStyle": { + "mode": "off" + } + }, + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": 0 + }, + { + "color": "red", + "value": 400 + } + ] + }, + "unit": "Gwei" + }, + "overrides": [] + }, + "gridPos": { + "h": 8, + "w": 6, + "x": 0, + "y": 59 + }, + "id": 56, + "options": { + "legend": { + "calcs": [ + "mean", + "max", + "last" + ], + "displayMode": "list", + "placement": "bottom", + "showLegend": true + }, + "tooltip": { + "hideZeros": false, + "mode": "single", + "sort": "none" + } + }, + "pluginVersion": "12.2.0", + "targets": [ + { + "editorMode": "code", + "expr": "block_building_base_fee{job=\"$job\", instance=~\"$instance(:\\\\d+)?$\"} / 1000000000", + "legendFormat": "{{ instance }}", + "range": true, + "refId": "A" + } + ], + "title": "Block building base_fee", + "type": "timeseries" + }, + { + "datasource": { + "type": "prometheus", + "uid": "prom-001" + }, + "fieldConfig": { + "defaults": { + "color": { + "mode": "palette-classic" + }, + "custom": { + "axisBorderShow": false, + "axisCenteredZero": false, + "axisColorMode": "text", + "axisLabel": "", + "axisPlacement": "auto", + "barAlignment": 0, + "barWidthFactor": 0.6, + "drawStyle": "line", + "fillOpacity": 0, + "gradientMode": "none", + "hideFrom": { + "legend": false, + "tooltip": false, + "viz": false + }, + "insertNulls": false, + "lineInterpolation": "linear", + "lineWidth": 1, + "pointSize": 5, + "scaleDistribution": { + "type": "linear" + }, + "showPoints": "auto", + "showValues": false, + "spanNulls": false, + "stacking": { + "group": "A", + "mode": "none" + }, + "thresholdsStyle": { + "mode": "off" + } + }, + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": 0 + }, + { + "color": "red", + "value": 80 + } + ] + }, + "unit": "si:Ggas/s" + }, + "overrides": [] + }, + "gridPos": { + "h": 8, + "w": 9, + "x": 6, + "y": 59 + }, + "id": 57, + "options": { + "legend": { + "calcs": [ + "mean", + "max", + "last" + ], + "displayMode": "list", + "placement": "bottom", + "showLegend": true + }, + "tooltip": { + "hideZeros": false, + "mode": "single", + "sort": "none" + } + }, + "pluginVersion": "12.2.0", + "targets": [ + { + "editorMode": "code", + "expr": "gigagas_block_building{job=\"$job\", instance=~\"$instance(:\\\\d+)?$\"} - 0", + "legendFormat": "{{instance}}", + "range": true, + "refId": "A" + } + ], + "title": "Blockbuilding Ggas/s", + "type": "timeseries" + }, + { + "datasource": { + "type": "prometheus", + "uid": "prom-001" + }, + "fieldConfig": { + "defaults": { + "color": { + "mode": "palette-classic" + }, + "custom": { + "axisBorderShow": false, + "axisCenteredZero": false, + "axisColorMode": "text", + "axisLabel": "", + "axisPlacement": "auto", + "barAlignment": 0, + "barWidthFactor": 0.6, + "drawStyle": "line", + "fillOpacity": 0, + "gradientMode": "none", + "hideFrom": { + "legend": false, + "tooltip": false, + "viz": false + }, + "insertNulls": false, + "lineInterpolation": "linear", + "lineWidth": 1, + "pointSize": 5, + "scaleDistribution": { + "type": "linear" + }, + "showPoints": "auto", + "showValues": false, + "spanNulls": false, + "stacking": { + "group": "A", + "mode": "none" + }, + "thresholdsStyle": { + "mode": "off" + } + }, + "mappings": [], + "min": 0, + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": 0 + }, + { + "color": "red", + "value": 400 + } + ] + }, + "unit": "ms" + }, + "overrides": [] + }, + "gridPos": { + "h": 8, + "w": 9, + "x": 15, + "y": 59 + }, + "id": 58, + "options": { + "legend": { + "calcs": [ + "mean", + "max", + "last" + ], + "displayMode": "list", + "placement": "bottom", + "showLegend": true + }, + "tooltip": { + "hideZeros": false, + "mode": "single", + "sort": "none" + } + }, + "pluginVersion": "12.2.0", + "targets": [ + { + "editorMode": "code", + "expr": "block_building_ms{job=\"$job\", instance=~\"$instance(:\\\\d+)?$\"}", + "legendFormat": "{{instance}}", + "range": true, + "refId": "A" + } + ], + "title": "Block building time taken in ms", + "type": "timeseries" + } + ], + "title": "Block Building (WIP)", + "type": "row" } ], "preload": false, @@ -2245,16 +2496,18 @@ "text": "", "value": "" }, - "definition": "label_values(eth_con_beacon_slot,instance)", + "definition": "label_values({__name__=~\"(gigagas|eth_con_beacon_slot)\"},instance)", + "includeAll": true, + "multi": true, "name": "instance", "options": [], "query": { "qryType": 1, - "query": "label_values(eth_con_beacon_slot,instance)", + "query": "label_values({__name__=~\"(gigagas|eth_con_beacon_slot)\"},instance)", "refId": "PrometheusVariableQueryEditor-VariableQuery" }, "refresh": 1, - "regex": "", + "regex": "/^(?[^:]+)(?::\\d+)?$/", "type": "query" }, { @@ -2311,8 +2564,8 @@ "to": "now" }, "timepicker": {}, - "timezone": "browser", + "timezone": "utc", "title": "Ethrex L1 - Perf Dashboard", "uid": "beoru4vp59yiof", - "version": 1 -} + "version": 29 +} \ No newline at end of file