update inter-rp repo sync metrics

monitor/grafana/dashboards/ours-rp-inter-rp.json

@@ -11,7 +11,7 @@
   "panels": [
     {
       "id": 1,
-      "title": "Metrics Reload OK",
+      "title": "Ours Only Repo Count",
       "type": "stat",
       "datasource": {
         "type": "prometheus",
@@ -25,7 +25,7 @@
       },
       "fieldConfig": {
         "defaults": {
-          "unit": "none",
+          "unit": "short",
           "decimals": 0
         },
         "overrides": []
@@ -47,8 +47,8 @@
       },
       "targets": [
         {
-          "expr": "max(inter_rp_service_last_reload_success{exported_instance=\"remote200-inter-rp\"})",
-          "legendFormat": "reload",
+          "expr": "max(inter_rp_repo_sync_overlap_total{exported_instance=\"remote200-inter-rp\",left=\"ours-rp\",right=\"routinator\",class=\"only_ours\"})",
+          "legendFormat": "only ours",
           "refId": "A",
           "instant": true
         }
@@ -56,7 +56,7 @@
     },
     {
       "id": 2,
-      "title": "231 Sync Age",
+      "title": "Routinator Only Repo Count",
       "type": "stat",
       "datasource": {
         "type": "prometheus",
@@ -70,7 +70,7 @@
       },
       "fieldConfig": {
         "defaults": {
-          "unit": "s",
+          "unit": "short",
           "decimals": 0
         },
         "overrides": []
@@ -92,8 +92,8 @@
       },
       "targets": [
         {
-          "expr": "max(inter_rp_sync_age_seconds{exported_instance=\"remote200-inter-rp\"})",
-          "legendFormat": "sync age",
+          "expr": "max(inter_rp_repo_sync_overlap_total{exported_instance=\"remote200-inter-rp\",left=\"ours-rp\",right=\"routinator\",class=\"only_routinator\"})",
+          "legendFormat": "only routinator",
           "refId": "A",
           "instant": true
         }
@@ -101,7 +101,7 @@
     },
     {
       "id": 3,
-      "title": "Parse Errors",
+      "title": "Ours vs Routinator VAP Diff",
       "type": "stat",
       "datasource": {
         "type": "prometheus",
@@ -137,8 +137,8 @@
       },
       "targets": [
         {
-          "expr": "max(inter_rp_parse_errors{exported_instance=\"remote200-inter-rp\"})",
-          "legendFormat": "errors",
+          "expr": "max(inter_rp_vaps_diff{exported_instance=\"remote200-inter-rp\",left=\"ours-rp\",right=\"routinator\"})",
+          "legendFormat": "vap diff",
           "refId": "A",
           "instant": true
         }
@@ -592,7 +592,7 @@
         "uid": "Prometheus"
       },
       "gridPos": {
-        "h": 8,
+        "h": 9,
         "w": 24,
         "x": 0,
         "y": 44
@@ -602,7 +602,48 @@
           "unit": "none",
           "decimals": 0
         },
-        "overrides": []
+        "overrides": [
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "uri"
+            },
+            "properties": [
+              {
+                "id": "custom.width",
+                "value": 760
+              }
+            ]
+          },
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "class"
+            },
+            "properties": [
+              {
+                "id": "custom.width",
+                "value": 140
+              }
+            ]
+          },
+          {
+            "matcher": {
+              "id": "byRegexp",
+              "options": "^(mft|crl|crt|roa|aspa)$"
+            },
+            "properties": [
+              {
+                "id": "custom.align",
+                "value": "right"
+              },
+              {
+                "id": "custom.width",
+                "value": 80
+              }
+            ]
+          }
+        ]
       },
       "options": {
         "showHeader": true,
@@ -616,50 +657,42 @@
           "legendFormat": "{{class}} #{{rank}}",
           "refId": "A"
         }
-      ]
-    },
-    {
-      "id": 15,
-      "title": "Only-Ours Repo Count",
-      "type": "stat",
-      "datasource": {
-        "type": "prometheus",
-        "uid": "Prometheus"
-      },
-      "gridPos": {
-        "h": 4,
-        "w": 6,
-        "x": 18,
-        "y": 32
-      },
-      "fieldConfig": {
-        "defaults": {
-          "unit": "short",
-          "decimals": 0
-        },
-        "overrides": []
-      },
-      "options": {
-        "colorMode": "value",
-        "graphMode": "area",
-        "justifyMode": "auto",
-        "orientation": "auto",
-        "reduceOptions": {
-          "calcs": [
-            "lastNotNull"
-          ],
-          "fields": "",
-          "values": false
-        },
-        "textMode": "auto",
-        "wideLayout": true
-      },
-      "targets": [
+      ],
+      "transformations": [
         {
-          "expr": "max(inter_rp_repo_sync_overlap_total{exported_instance=\"remote200-inter-rp\",left=\"ours-rp\",right=\"routinator\",class=\"only_ours\"})",
-          "legendFormat": "only ours",
-          "refId": "A",
-          "instant": true
+          "id": "organize",
+          "options": {
+            "excludeByName": {
+              "Time": true,
+              "Value": true,
+              "__name__": true,
+              "exported_instance": true,
+              "instance": true,
+              "job": true,
+              "left": true,
+              "right": true,
+              "rank": true,
+              "routinator_duration": true
+            },
+            "indexByName": {
+              "class": 0,
+              "uri": 1,
+              "mft": 2,
+              "crl": 3,
+              "crt": 4,
+              "roa": 5,
+              "aspa": 6
+            },
+            "renameByName": {
+              "class": "class",
+              "uri": "uri",
+              "mft": "mft",
+              "crl": "crl",
+              "crt": "crt",
+              "roa": "roa",
+              "aspa": "aspa"
+            }
+          }
         }
       ]
     }
@@ -681,5 +714,5 @@
   "timezone": "browser",
   "title": "Ours RP vs Routinator",
   "uid": "ours-rp-inter-rp",
-  "version": 3
+  "version": 4
 }