From f11c300ea8b504a8ca29931b96b42ddd0ed960a9 Mon Sep 17 00:00:00 2001 From: AntiD2ta Date: Tue, 26 Sep 2023 15:45:47 +0000 Subject: [PATCH] feat: Update Grafana Dashboards --- .../common-metrics/common-metrics-global.json | 763 +++++++++--------- .../common-metrics/common-metrics.json | 64 +- 2 files changed, 419 insertions(+), 408 deletions(-) diff --git a/pkg/monitoring/services/grafana/dashboards/common-metrics/common-metrics-global.json b/pkg/monitoring/services/grafana/dashboards/common-metrics/common-metrics-global.json index 398e81e4..0a52ceef 100644 --- a/pkg/monitoring/services/grafana/dashboards/common-metrics/common-metrics-global.json +++ b/pkg/monitoring/services/grafana/dashboards/common-metrics/common-metrics-global.json @@ -1,412 +1,411 @@ { - "annotations": { - "list": [ - { - "builtIn": 1, - "datasource": { - "type": "grafana", - "uid": "-- Grafana --" - }, - "enable": true, - "hide": true, - "iconColor": "rgba(0, 211, 255, 1)", - "name": "Annotations & Alerts", - "target": { - "limit": 100, - "matchAny": false, - "tags": [], - "type": "dashboard" - }, - "type": "dashboard" - } - ] - }, - "description": "Global AVS Specification Metrics for each instance", - "editable": true, - "fiscalYearStartMonth": 0, - "graphTooltip": 0, - "id": 7, - "links": [], - "liveNow": false, - "panels": [ - { - "collapsed": false, - "gridPos": { - "h": 1, - "w": 24, - "x": 0, - "y": 0 - }, - "id": 12, - "panels": [], - "title": "Misc", - "type": "row" - }, + "annotations": { + "list": [ { + "builtIn": 1, "datasource": { - "type": "prometheus", - "uid": "egn-prom" - }, - "description": "The performance metric is a score between 0 and 100 and each developer can define their own way of calculating the score. The score is calculated based on the performance of the Node and the performance of the backing services.", - "fieldConfig": { - "defaults": { - "color": { - "mode": "thresholds" - }, - "mappings": [], - "max": 100, - "min": 0, - "thresholds": { - "mode": "absolute", - "steps": [ - { - "color": "red", - "value": null - }, - { - "color": "orange", - "value": 30 - }, - { - "color": "yellow", - "value": 60 - }, - { - "color": "green", - "value": 90 - } - ] - } - }, - "overrides": [] + "type": "grafana", + "uid": "-- Grafana --" }, - "gridPos": { - "h": 9, - "w": 24, - "x": 0, - "y": 1 - }, - "id": 8, - "options": { - "orientation": "auto", - "reduceOptions": { - "calcs": [ - "lastNotNull" - ], - "fields": "", - "values": false - }, - "showThresholdLabels": false, - "showThresholdMarkers": true + "enable": true, + "hide": true, + "iconColor": "rgba(0, 211, 255, 1)", + "name": "Annotations & Alerts", + "target": { + "limit": 100, + "matchAny": false, + "tags": [], + "type": "dashboard" }, - "pluginVersion": "9.4.3", - "targets": [ - { - "datasource": { - "type": "prometheus", - "uid": "egn-prom" - }, - "editorMode": "builder", - "expr": "eigen_performance_score", - "legendFormat": "{{instanceID}}", - "range": true, - "refId": "A" - } - ], - "title": "Performance Score", - "type": "gauge" + "type": "dashboard" + } + ] + }, + "description": "Global AVS Specification Metrics for each instance", + "editable": true, + "fiscalYearStartMonth": 0, + "graphTooltip": 0, + "links": [], + "liveNow": false, + "panels": [ + { + "collapsed": false, + "gridPos": { + "h": 1, + "w": 24, + "x": 0, + "y": 0 }, - { - "collapsed": false, - "gridPos": { - "h": 1, - "w": 24, - "x": 0, - "y": 10 - }, - "id": 18, - "panels": [], - "title": "RPC Requests", - "type": "row" + "id": 12, + "panels": [], + "title": "Misc", + "type": "row" + }, + { + "datasource": { + "type": "prometheus", + "uid": "egn-prom" }, - { - "datasource": { - "type": "prometheus", - "uid": "egn-prom" - }, - "description": "Average Response Time per method in seconds over time.", - "fieldConfig": { - "defaults": { - "color": { - "mode": "palette-classic" - }, - "custom": { - "axisCenteredZero": false, - "axisColorMode": "text", - "axisLabel": "", - "axisPlacement": "auto", - "barAlignment": 0, - "drawStyle": "line", - "fillOpacity": 0, - "gradientMode": "none", - "hideFrom": { - "legend": false, - "tooltip": false, - "viz": false + "description": "The performance metric is a score between 0 and 100 and each developer can define their own way of calculating the score. The score is calculated based on the performance of the Node and the performance of the backing services.", + "fieldConfig": { + "defaults": { + "color": { + "mode": "thresholds" + }, + "mappings": [], + "max": 100, + "min": 0, + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "red", + "value": null }, - "lineInterpolation": "linear", - "lineWidth": 1, - "pointSize": 5, - "scaleDistribution": { - "type": "linear" + { + "color": "orange", + "value": 30 }, - "showPoints": "auto", - "spanNulls": false, - "stacking": { - "group": "A", - "mode": "none" + { + "color": "yellow", + "value": 60 }, - "thresholdsStyle": { - "mode": "off" + { + "color": "green", + "value": 90 } - }, - "mappings": [], - "thresholds": { - "mode": "absolute", - "steps": [ - { - "color": "green", - "value": null - }, - { - "color": "red", - "value": 80 - } - ] - } - }, - "overrides": [] - }, - "gridPos": { - "h": 8, - "w": 12, - "x": 0, - "y": 11 - }, - "id": 26, - "options": { - "legend": { - "calcs": [], - "displayMode": "list", - "placement": "bottom", - "showLegend": true - }, - "tooltip": { - "mode": "single", - "sort": "none" + ] } }, - "targets": [ - { - "datasource": { - "type": "prometheus", - "uid": "egn-prom" - }, - "editorMode": "code", - "expr": "rate(eigen_rpc_request_duration_seconds_sum{method=~\".*\"}[5m])", - "legendFormat": "{{instanceID}} -> {{method}}", - "range": true, - "refId": "A" - } - ], - "title": "Average Response Time", - "type": "timeseries" + "overrides": [] }, - { - "datasource": { - "type": "prometheus", - "uid": "egn-prom" + "gridPos": { + "h": 9, + "w": 24, + "x": 0, + "y": 1 + }, + "id": 8, + "options": { + "orientation": "auto", + "reduceOptions": { + "calcs": [ + "lastNotNull" + ], + "fields": "", + "values": false }, - "description": "Total of JSON-RPC requests per method.", - "fieldConfig": { - "defaults": { - "color": { - "mode": "palette-classic" + "showThresholdLabels": false, + "showThresholdMarkers": true + }, + "pluginVersion": "9.4.3", + "targets": [ + { + "datasource": { + "type": "prometheus", + "uid": "egn-prom" + }, + "editorMode": "builder", + "expr": "eigen_performance_score", + "legendFormat": "{{instanceID}}", + "range": true, + "refId": "A" + } + ], + "title": "Performance Score", + "type": "gauge" + }, + { + "collapsed": false, + "gridPos": { + "h": 1, + "w": 24, + "x": 0, + "y": 10 + }, + "id": 18, + "panels": [], + "title": "RPC Requests", + "type": "row" + }, + { + "datasource": { + "type": "prometheus", + "uid": "egn-prom" + }, + "description": "Average Response Time per method in seconds over time.", + "fieldConfig": { + "defaults": { + "color": { + "mode": "palette-classic" + }, + "custom": { + "axisCenteredZero": false, + "axisColorMode": "text", + "axisLabel": "", + "axisPlacement": "auto", + "barAlignment": 0, + "drawStyle": "line", + "fillOpacity": 0, + "gradientMode": "none", + "hideFrom": { + "legend": false, + "tooltip": false, + "viz": false }, - "custom": { - "axisCenteredZero": false, - "axisColorMode": "text", - "axisLabel": "", - "axisPlacement": "auto", - "barAlignment": 0, - "drawStyle": "line", - "fillOpacity": 0, - "gradientMode": "none", - "hideFrom": { - "legend": false, - "tooltip": false, - "viz": false - }, - "lineInterpolation": "linear", - "lineWidth": 1, - "pointSize": 5, - "scaleDistribution": { - "type": "linear" - }, - "showPoints": "auto", - "spanNulls": false, - "stacking": { - "group": "A", - "mode": "none" - }, - "thresholdsStyle": { - "mode": "off" - } + "lineInterpolation": "linear", + "lineWidth": 1, + "pointSize": 5, + "scaleDistribution": { + "type": "linear" + }, + "showPoints": "auto", + "spanNulls": false, + "stacking": { + "group": "A", + "mode": "none" }, - "mappings": [], - "thresholds": { - "mode": "absolute", - "steps": [ - { - "color": "green", - "value": null - } - ] + "thresholdsStyle": { + "mode": "off" } }, - "overrides": [] - }, - "gridPos": { - "h": 16, - "w": 12, - "x": 12, - "y": 11 - }, - "id": 14, - "options": { - "legend": { - "calcs": [], - "displayMode": "list", - "placement": "bottom", - "showLegend": true - }, - "tooltip": { - "mode": "single", - "sort": "none" + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + }, + { + "color": "red", + "value": 80 + } + ] } }, - "targets": [ - { - "datasource": { - "type": "prometheus", - "uid": "egn-prom" - }, - "editorMode": "builder", - "expr": "eigen_rpc_request_total", - "legendFormat": "${{token}} -> {{instanceID}}", - "range": true, - "refId": "A" - } - ], - "title": "Total RPC Requests", - "type": "timeseries" + "overrides": [] }, - { - "datasource": { - "type": "prometheus", - "uid": "egn-prom" + "gridPos": { + "h": 8, + "w": 12, + "x": 0, + "y": 11 + }, + "id": 26, + "options": { + "legend": { + "calcs": [], + "displayMode": "list", + "placement": "bottom", + "showLegend": true }, - "description": "Request duration distribution in seconds per method.", - "fieldConfig": { - "defaults": { - "color": { - "mode": "thresholds" + "tooltip": { + "mode": "single", + "sort": "none" + } + }, + "targets": [ + { + "datasource": { + "type": "prometheus", + "uid": "egn-prom" + }, + "editorMode": "code", + "expr": "rate(eigen_rpc_request_duration_seconds_sum{method=~\".*\"}[5m])", + "legendFormat": "{{instance_id}} -> {{method}}", + "range": true, + "refId": "A" + } + ], + "title": "Average Response Time", + "type": "timeseries" + }, + { + "datasource": { + "type": "prometheus", + "uid": "egn-prom" + }, + "description": "Total of JSON-RPC requests per method.", + "fieldConfig": { + "defaults": { + "color": { + "mode": "palette-classic" + }, + "custom": { + "axisCenteredZero": false, + "axisColorMode": "text", + "axisLabel": "", + "axisPlacement": "auto", + "barAlignment": 0, + "drawStyle": "line", + "fillOpacity": 0, + "gradientMode": "none", + "hideFrom": { + "legend": false, + "tooltip": false, + "viz": false }, - "custom": { - "fillOpacity": 80, - "gradientMode": "none", - "hideFrom": { - "legend": false, - "tooltip": false, - "viz": false - }, - "lineWidth": 1 + "lineInterpolation": "linear", + "lineWidth": 1, + "pointSize": 5, + "scaleDistribution": { + "type": "linear" }, - "mappings": [], - "thresholds": { - "mode": "absolute", - "steps": [ - { - "color": "green", - "value": null - }, - { - "color": "red", - "value": 80 - } - ] + "showPoints": "auto", + "spanNulls": false, + "stacking": { + "group": "A", + "mode": "none" }, - "unit": "none" + "thresholdsStyle": { + "mode": "off" + } }, - "overrides": [] - }, - "gridPos": { - "h": 8, - "w": 12, - "x": 0, - "y": 19 - }, - "id": 16, - "options": { - "bucketOffset": 0, - "combine": false, - "legend": { - "calcs": [ - "mean", - "stdDev" - ], - "displayMode": "list", - "placement": "bottom", - "showLegend": true + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + } + ] } }, - "pluginVersion": "9.4.3", - "targets": [ - { - "datasource": { - "type": "prometheus", - "uid": "egn-prom" - }, - "editorMode": "builder", - "exemplar": false, - "expr": "rate(eigen_rpc_request_duration_seconds_count[$__rate_interval])", - "format": "time_series", - "instant": false, - "legendFormat": "{{instanceID}} -> {{method}}", - "range": true, - "refId": "A" - } - ], - "title": "Request duration distribution", - "type": "histogram" - } - ], - "refresh": "", - "revision": 1, - "schemaVersion": 38, - "style": "dark", - "tags": [], - "templating": { - "list": [] - }, - "time": { - "from": "now-15m", - "to": "now" + "overrides": [] + }, + "gridPos": { + "h": 16, + "w": 12, + "x": 12, + "y": 11 + }, + "id": 14, + "options": { + "legend": { + "calcs": [], + "displayMode": "list", + "placement": "bottom", + "showLegend": true + }, + "tooltip": { + "mode": "single", + "sort": "none" + } + }, + "targets": [ + { + "datasource": { + "type": "prometheus", + "uid": "egn-prom" + }, + "editorMode": "builder", + "expr": "eigen_rpc_request_total", + "legendFormat": "{{instance_id}} -> {{method}}", + "range": true, + "refId": "A" + } + ], + "title": "Total RPC Requests", + "type": "timeseries" }, - "timepicker": {}, - "timezone": "", - "title": "Global AVS Specification Metrics", - "uid": "EGNMTP88z", - "version": 1, - "weekStart": "" - } \ No newline at end of file + { + "datasource": { + "type": "prometheus", + "uid": "egn-prom" + }, + "description": "Request duration distribution in seconds per method.", + "fieldConfig": { + "defaults": { + "color": { + "mode": "thresholds" + }, + "custom": { + "fillOpacity": 80, + "gradientMode": "none", + "hideFrom": { + "legend": false, + "tooltip": false, + "viz": false + }, + "lineWidth": 1 + }, + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + }, + { + "color": "red", + "value": 80 + } + ] + }, + "unit": "none" + }, + "overrides": [] + }, + "gridPos": { + "h": 8, + "w": 12, + "x": 0, + "y": 19 + }, + "id": 16, + "options": { + "bucketOffset": 0, + "combine": false, + "legend": { + "calcs": [ + "mean", + "stdDev" + ], + "displayMode": "list", + "placement": "bottom", + "showLegend": true + } + }, + "pluginVersion": "9.4.3", + "targets": [ + { + "datasource": { + "type": "prometheus", + "uid": "egn-prom" + }, + "editorMode": "builder", + "exemplar": false, + "expr": "rate(eigen_rpc_request_duration_seconds_count[$__rate_interval])", + "format": "time_series", + "instant": false, + "legendFormat": "{{instance_id}} -> {{method}}", + "range": true, + "refId": "A" + } + ], + "title": "Request duration distribution", + "type": "histogram" + } + ], + "refresh": "", + "revision": 1, + "schemaVersion": 38, + "style": "dark", + "tags": [], + "templating": { + "list": [] + }, + "time": { + "from": "now-15m", + "to": "now" + }, + "timepicker": {}, + "timezone": "", + "title": "Global AVS Specification Metrics", + "uid": "EGNMTP88z", + "version": 1, + "weekStart": "" +} \ No newline at end of file diff --git a/pkg/monitoring/services/grafana/dashboards/common-metrics/common-metrics.json b/pkg/monitoring/services/grafana/dashboards/common-metrics/common-metrics.json index 464b0de0..6a9ec438 100644 --- a/pkg/monitoring/services/grafana/dashboards/common-metrics/common-metrics.json +++ b/pkg/monitoring/services/grafana/dashboards/common-metrics/common-metrics.json @@ -99,7 +99,7 @@ }, "editorMode": "builder", "exemplar": false, - "expr": "eigen_performance_score", + "expr": "eigen_performance_score{instance_id=\"$InstanceID\"}", "format": "table", "instant": true, "legendFormat": "__auto", @@ -175,7 +175,7 @@ "uid": "egn-prom" }, "editorMode": "builder", - "expr": "eigen_performance_score{instanceID=\"$InstanceID\"}", + "expr": "eigen_performance_score{instance_id=\"$InstanceID\"}", "legendFormat": "__auto", "range": true, "refId": "A" @@ -242,7 +242,7 @@ }, "editorMode": "code", "exemplar": false, - "expr": "label_replace(eigen_performance_score, \"short_commit_hash\", \"$1\", \"instance_commit_hash\", \"(.{12}).*\")", + "expr": "label_replace(eigen_performance_score{instance_id=\"$InstanceID\"}, \"short_commit_hash\", \"$1\", \"instance_commit_hash\", \"(.{12}).*\")", "format": "table", "instant": true, "legendFormat": "__auto", @@ -311,7 +311,7 @@ }, "editorMode": "builder", "exemplar": false, - "expr": "eigen_performance_score", + "expr": "eigen_performance_score{instance_id=\"$InstanceID\"}", "format": "table", "instant": true, "legendFormat": "__auto", @@ -380,7 +380,7 @@ }, "editorMode": "builder", "exemplar": false, - "expr": "eigen_performance_score", + "expr": "eigen_performance_score{instance_id=\"$InstanceID\"}", "format": "table", "instant": true, "legendFormat": "__auto", @@ -409,7 +409,7 @@ "type": "prometheus", "uid": "egn-prom" }, - "description": "The total balance in AVS Node per used token.", + "description": "The total stakes in AVS Node per used token.", "fieldConfig": { "defaults": { "color": { @@ -458,13 +458,17 @@ }, "editorMode": "builder", "exemplar": false, - "expr": "eigen_balance_total{instanceID=\"$InstanceID\"}", - "legendFormat": "${{token}}", + "expr": "eigen_registered_stakes{instance_id=\"$InstanceID\"}", + "format": "time_series", + "hide": false, + "instant": false, + "interval": "", + "legendFormat": "{{token}} in {{unit}} ", "range": true, - "refId": "A" + "refId": "B" } ], - "title": "Balance Total", + "title": "Stakes Total", "type": "stat" }, { @@ -472,7 +476,7 @@ "type": "prometheus", "uid": "egn-prom" }, - "description": "The total slashing incurred per token.", + "description": "1 if the operator has been slashed.", "fieldConfig": { "defaults": { "color": { @@ -483,8 +487,12 @@ "mode": "absolute", "steps": [ { - "color": "red", + "color": "green", "value": null + }, + { + "color": "dark-red", + "value": 1 } ] } @@ -500,7 +508,7 @@ "id": 6, "options": { "colorMode": "value", - "graphMode": "area", + "graphMode": "none", "justifyMode": "auto", "orientation": "auto", "reduceOptions": { @@ -510,7 +518,7 @@ "fields": "", "values": false }, - "textMode": "auto" + "textMode": "value" }, "pluginVersion": "9.4.3", "targets": [ @@ -520,13 +528,17 @@ "uid": "egn-prom" }, "editorMode": "builder", - "expr": "eigen_slashing_incurred_total{instanceID=\"$InstanceID\"}", - "legendFormat": "${{token}}", + "exemplar": false, + "expr": "eigen_slashing_status{instance_id=\"$InstanceID\"}", + "format": "time_series", + "hide": false, + "instant": false, + "legendFormat": "__auto", "range": true, - "refId": "A" + "refId": "B" } ], - "title": "Slashing incurred", + "title": "Slashing status", "type": "stat" }, { @@ -582,8 +594,8 @@ "uid": "egn-prom" }, "editorMode": "builder", - "expr": "eigen_fees_earned_total{instanceID=\"$InstanceID\"}", - "legendFormat": "${{token}}", + "expr": "eigen_fees_earned_total{instance_id=\"$InstanceID\"}", + "legendFormat": "{{token}} in {{unit}} ", "range": true, "refId": "A" } @@ -687,9 +699,9 @@ "type": "prometheus", "uid": "egn-prom" }, - "editorMode": "code", - "expr": "rate(eigen_rpc_request_duration_seconds_sum{method=~\".*\", instanceID=\"$InstanceID\"}[5m])", - "legendFormat": "__auto", + "editorMode": "builder", + "expr": "rate(eigen_rpc_request_duration_seconds_sum{method=~\".*\", instance_id=\"$InstanceID\"}[5m])", + "legendFormat": "AVS: {{avs_name}}, Instance: {{instance_id}}, Method: {{method}}, Client Version: {{client_version}}", "range": true, "refId": "A" } @@ -777,7 +789,7 @@ "uid": "egn-prom" }, "editorMode": "builder", - "expr": "eigen_rpc_request_total{instanceID=\"$InstanceID\"}", + "expr": "eigen_rpc_request_total{instance_id=\"$InstanceID\"}", "legendFormat": "{{method}}", "range": true, "refId": "A" @@ -854,7 +866,7 @@ }, "editorMode": "builder", "exemplar": false, - "expr": "rate(eigen_rpc_request_duration_seconds_count{instanceID=\"$InstanceID\"}[$__rate_interval])", + "expr": "rate(eigen_rpc_request_duration_seconds_count{instance_id=\"$InstanceID\"}[$__rate_interval])", "format": "time_series", "instant": false, "legendFormat": "{{method}}", @@ -912,6 +924,6 @@ "timezone": "", "title": "AVS Specification Metrics", "uid": "l8RpPN94z", - "version": 3, + "version": 1, "weekStart": "" } \ No newline at end of file