fix: return back averages metrics

lidofinance · Jan 16, 2023 · a0b1141 · a0b1141
1 parent f4b1121
commit a0b1141
Show file tree

Hide file tree

Showing 4 changed files with 128 additions and 31 deletions.
diff --git a/grafana/dashboards/performance.json b/grafana/dashboards/performance.json
@@ -1295,7 +1295,7 @@
               "type": "linear"
             },
             "showPoints": "never",
-            "spanNulls": false,
+            "spanNulls": true,
             "stacking": {
               "group": "A",
               "mode": "none"
@@ -1351,6 +1351,13 @@
               {
                 "id": "custom.fillOpacity",
                 "value": 15
+              },
+              {
+                "id": "color",
+                "value": {
+                  "fixedColor": "red",
+                  "mode": "fixed"
+                }
               }
             ]
           },
@@ -1393,30 +1400,34 @@
           },
           {
             "matcher": {
-              "id": "byFrameRefID",
-              "options": "A"
+              "id": "byName",
+              "options": "TOP"
             },
             "properties": [
               {
-                "id": "mappings",
-                "value": [
-                  {
-                    "options": {
-                      "54": {
-                        "index": 0,
-                        "text": "Shard Labs"
-                      }
-                    },
-                    "type": "value"
-                  }
-                ]
+                "id": "displayName",
+                "value": "AVG over top 10"
+              },
+              {
+                "id": "custom.lineStyle",
+                "value": {
+                  "dash": [
+                    10,
+                    10
+                  ],
+                  "fill": "dash"
+                }
+              },
+              {
+                "id": "custom.lineWidth",
+                "value": 2
               }
             ]
           }
         ]
       },
       "gridPos": {
-        "h": 8,
+        "h": 12,
         "w": 24,
         "x": 0,
         "y": 16
@@ -1448,8 +1459,70 @@
           "group": [],
           "metricColumn": "label",
           "rawQuery": true,
-          "rawSql": "SELECT\n  \"blockTimestamp\" AS \"time\",\n  labels ->> 'moniker' AS metric,\n  value\nFROM metrics\nWHERE\n  $__unixEpochFilter(\"blockTimestamp\") AND\n  name = 'vals_perf_idx'\nORDER BY 1,2;",
-          "refId": "A",
+          "rawSql": "SELECT\n  $__unixEpochGroup(\"blockTimestamp\", $__interval) as \"time\",\n  labels ->> 'moniker' AS metric,\n  value\nFROM metrics\nWHERE\n  $__unixEpochFilter(\"blockTimestamp\") AND\n  name = 'vals_perf_idx'\nORDER BY 1,2;",
+          "refId": "Tracked validators perf rates",
+          "select": [
+            [
+              {
+                "params": [
+                  "value"
+                ],
+                "type": "column"
+              }
+            ]
+          ],
+          "timeColumn": "time",
+          "where": [
+            {
+              "name": "$__timeFilter",
+              "params": [],
+              "type": "macro"
+            }
+          ]
+        },
+        {
+          "datasource": {
+            "type": "postgres",
+            "uid": "LOn97bynk"
+          },
+          "format": "time_series",
+          "group": [],
+          "hide": false,
+          "metricColumn": "label",
+          "rawQuery": true,
+          "rawSql": "SELECT\n  $__unixEpochGroup(\"blockTimestamp\", $__interval) as \"time\",\n  'PB' AS metric,\n  value\nFROM metrics\nWHERE\n  $__unixEpochFilter(\"blockTimestamp\") AND\n  name = 'vals_perf_benchmark'\nORDER BY 1;",
+          "refId": "Performance benchmark",
+          "select": [
+            [
+              {
+                "params": [
+                  "value"
+                ],
+                "type": "column"
+              }
+            ]
+          ],
+          "timeColumn": "time",
+          "where": [
+            {
+              "name": "$__timeFilter",
+              "params": [],
+              "type": "macro"
+            }
+          ]
+        },
+        {
+          "datasource": {
+            "type": "postgres",
+            "uid": "LOn97bynk"
+          },
+          "format": "time_series",
+          "group": [],
+          "hide": false,
+          "metricColumn": "label",
+          "rawQuery": true,
+          "rawSql": "SELECT\n  $__unixEpochGroup(\"blockTimestamp\", $__interval) as \"time\",\n  'AVG' AS metric,\n  value\nFROM metrics\nWHERE\n  $__unixEpochFilter(\"blockTimestamp\") AND\n  name = 'vals_perf_avg_rate'\nORDER BY 1;",
+          "refId": "Average percent",
           "select": [
             [
               {
@@ -1479,8 +1552,8 @@
           "hide": false,
           "metricColumn": "label",
           "rawQuery": true,
-          "rawSql": "SELECT\n  \"blockTimestamp\" AS \"time\",\n  'PB' AS metric,\n  value\nFROM metrics\nWHERE\n  $__unixEpochFilter(\"blockTimestamp\") AND\n  name = 'vals_perf_benchmark'\nORDER BY 1;",
-          "refId": "C",
+          "rawSql": "SELECT\n  $__unixEpochGroup(\"blockTimestamp\", $__interval) as \"time\",\n  'TOP' AS metric,\n  value\nFROM metrics\nWHERE\n  $__unixEpochFilter(\"blockTimestamp\") AND\n  name = 'vals_perf_top_rate'\nORDER BY 1;",
+          "refId": "Average over top 10",
           "select": [
             [
               {
@@ -1561,7 +1634,7 @@
         "h": 8,
         "w": 18,
         "x": 0,
-        "y": 24
+        "y": 28
       },
       "id": 22,
       "maxDataPoints": 30,
@@ -1676,7 +1749,7 @@
         "h": 8,
         "w": 6,
         "x": 18,
-        "y": 24
+        "y": 28
       },
       "id": 24,
       "maxDataPoints": 30,
@@ -1798,7 +1871,7 @@
         "h": 8,
         "w": 18,
         "x": 0,
-        "y": 32
+        "y": 36
       },
       "id": 23,
       "maxDataPoints": 30,

diff --git a/src/common/helpers/funcs.ts b/src/common/helpers/funcs.ts
@@ -15,6 +15,10 @@ export function median(numArray: number[]): number {
   }
 }
 
+export function mean(...nums: number[]): number {
+  return nums.reduce((a, b) => a + b, 0) / nums.length;
+}
+
 function isEven(num: number): boolean {
   return num % 2 == 0;
 }
@@ -23,10 +27,6 @@ function toInt(num: number): number {
   return num | 0;
 }
 
-function mean(...nums: number[]): number {
-  return nums.reduce((a, b) => a + b, 0) / nums.length;
-}
-
 // TODO: type for predicate p
 export function takeWhile(iterable: Iterable<any>, p: any): any[] {
   const c = [];

diff --git a/src/metrics/metrics.consts.ts b/src/metrics/metrics.consts.ts
@@ -1,4 +1,6 @@
 export const VALIDATORS_PERF_BENCHMARK = 'vals_perf_benchmark';
+export const VALIDATORS_PERF_AVG_RATE = 'vals_perf_avg_rate';
+export const VALIDATORS_PERF_TOP_RATE = 'vals_perf_top_rate';
 export const VALIDATORS_PERF_INDEX = 'vals_perf_idx';
 export const VALIDATORS_PERF_CMP = 'vals_perf_cmp';
 

diff --git a/src/metrics/metrics.service.ts b/src/metrics/metrics.service.ts
@@ -3,14 +3,16 @@ import { Inject, Injectable, LoggerService } from '@nestjs/common';
 import { DataSource } from 'typeorm';
 
 import { CheckpointsService } from 'checkpoints';
-import { median } from 'common/helpers';
+import { mean, median } from 'common/helpers';
 import { Checkpoint, Metric } from 'storage/entities';
 
 import {
   MONITORING_PERIOD,
+  VALIDATORS_PERF_AVG_RATE,
   VALIDATORS_PERF_BENCHMARK,
   VALIDATORS_PERF_CMP,
   VALIDATORS_PERF_INDEX,
+  VALIDATORS_PERF_TOP_RATE,
 } from './metrics.consts';
 import {
   AggrValsPerfRate,
@@ -73,11 +75,29 @@ export class MetricsService {
 
     const perfBench = this.computePB(rows, checkpoint.number);
 
+    const perfBenchMetric = new Metric() as AggrValsPerfRate;
+    perfBenchMetric.name = VALIDATORS_PERF_BENCHMARK;
+    perfBenchMetric.blockTimestamp = checkpoint.blockTimestamp;
+    perfBenchMetric.labels = {};
+    perfBenchMetric.value = perfBench;
+
     const avgPerfMetric = new Metric() as AggrValsPerfRate;
-    avgPerfMetric.name = VALIDATORS_PERF_BENCHMARK;
+    avgPerfMetric.name = VALIDATORS_PERF_AVG_RATE;
     avgPerfMetric.blockTimestamp = checkpoint.blockTimestamp;
     avgPerfMetric.labels = {};
-    avgPerfMetric.value = perfBench;
+    avgPerfMetric.value = mean(...rows.map((r) => this.perfPercent(r)));
+
+    const top10Ids = checkpoint.duties.filter((d) => d.isTop).map((d) => d.vId);
+
+    const topPerfMetric = new Metric() as AggrValsPerfRate;
+    topPerfMetric.name = VALIDATORS_PERF_TOP_RATE;
+    topPerfMetric.blockTimestamp = checkpoint.blockTimestamp;
+    topPerfMetric.labels = {};
+    topPerfMetric.value = mean(
+      ...rows
+        .filter((r) => top10Ids.includes(r.vId))
+        .map((r) => this.perfPercent(r)),
+    );
 
     const cmpPerfIdxs = ratesOfTracked.map((o) => {
       const m = new Metric() as CmpValsPerfRate;
@@ -89,9 +109,11 @@ export class MetricsService {
     });
 
     await this.dataSource.manager.save([
+      perfBenchMetric,
+      avgPerfMetric,
+      topPerfMetric,
       ...ratesOfTracked,
       ...cmpPerfIdxs,
-      avgPerfMetric,
     ]);
   }