From 104cb8b916e5197da95ce5addc3ab7ddec94a8f3 Mon Sep 17 00:00:00 2001
From: ltitanb <lorenzo@gattaca.com>
Date: Fri, 2 Aug 2024 20:16:57 +0100
Subject: [PATCH] fixes

---
 grafana/dashboards/dashboard.json   | 32 ++++++++++++++---------------
 grafana/dashboards/dashboards.yml   |  7 ++++---
 grafana/datasources/datasources.yml |  1 +
 3 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/grafana/dashboards/dashboard.json b/grafana/dashboards/dashboard.json
index 591e72f..f903aff 100644
--- a/grafana/dashboards/dashboard.json
+++ b/grafana/dashboards/dashboard.json
@@ -39,7 +39,7 @@
     {
       "datasource": {
         "type": "prometheus",
-        "uid": "PF1584C945D1A144E"
+        "uid": "cb_prometheus"
       },
       "fieldConfig": {
         "defaults": {
@@ -122,7 +122,7 @@
         {
           "datasource": {
             "type": "prometheus",
-            "uid": "PF1584C945D1A144E"
+            "uid": "cb_prometheus"
           },
           "editorMode": "code",
           "expr": "sum(increase(cb_pbs_relay_status_code_total{http_status_code=~\"2..\", endpoint=\"$endpoint\"}[1h])) by (relay_id)",
@@ -138,7 +138,7 @@
     {
       "datasource": {
         "type": "prometheus",
-        "uid": "PF1584C945D1A144E"
+        "uid": "cb_prometheus"
       },
       "fieldConfig": {
         "defaults": {
@@ -221,7 +221,7 @@
         {
           "datasource": {
             "type": "prometheus",
-            "uid": "PF1584C945D1A144E"
+            "uid": "cb_prometheus"
           },
           "editorMode": "code",
           "expr": "sum(increase(cb_pbs_relay_status_code_total{http_status_code=~\"4..|5..\", endpoint=\"$endpoint\"}[1h])) by (relay_id)",
@@ -237,7 +237,7 @@
     {
       "datasource": {
         "type": "prometheus",
-        "uid": "PF1584C945D1A144E"
+        "uid": "cb_prometheus"
       },
       "fieldConfig": {
         "defaults": {
@@ -320,7 +320,7 @@
         {
           "datasource": {
             "type": "prometheus",
-            "uid": "PF1584C945D1A144E"
+            "uid": "cb_prometheus"
           },
           "editorMode": "code",
           "expr": "sum(increase(cb_pbs_beacon_node_status_code_total{http_status_code=~\"2..\", endpoint=\"$endpoint\"}[1h]))",
@@ -336,7 +336,7 @@
     {
       "datasource": {
         "type": "prometheus",
-        "uid": "PF1584C945D1A144E"
+        "uid": "cb_prometheus"
       },
       "fieldConfig": {
         "defaults": {
@@ -419,7 +419,7 @@
         {
           "datasource": {
             "type": "prometheus",
-            "uid": "PF1584C945D1A144E"
+            "uid": "cb_prometheus"
           },
           "editorMode": "code",
           "expr": "sum(increase(cb_pbs_beacon_node_status_code_total{http_status_code=~\"4..|5..\", endpoint=\"$endpoint\"}[1h]))",
@@ -435,7 +435,7 @@
     {
       "datasource": {
         "type": "prometheus",
-        "uid": "PF1584C945D1A144E"
+        "uid": "cb_prometheus"
       },
       "fieldConfig": {
         "defaults": {
@@ -519,7 +519,7 @@
         {
           "datasource": {
             "type": "prometheus",
-            "uid": "PF1584C945D1A144E"
+            "uid": "cb_prometheus"
           },
           "disableTextWrap": false,
           "editorMode": "code",
@@ -539,7 +539,7 @@
     {
       "datasource": {
         "type": "prometheus",
-        "uid": "PF1584C945D1A144E"
+        "uid": "cb_prometheus"
       },
       "fieldConfig": {
         "defaults": {
@@ -623,7 +623,7 @@
         {
           "datasource": {
             "type": "prometheus",
-            "uid": "PF1584C945D1A144E"
+            "uid": "cb_prometheus"
           },
           "disableTextWrap": false,
           "editorMode": "code",
@@ -643,7 +643,7 @@
     {
       "datasource": {
         "type": "prometheus",
-        "uid": "PF1584C945D1A144E"
+        "uid": "cb_prometheus"
       },
       "fieldConfig": {
         "defaults": {
@@ -727,7 +727,7 @@
         {
           "datasource": {
             "type": "prometheus",
-            "uid": "PF1584C945D1A144E"
+            "uid": "cb_prometheus"
           },
           "disableTextWrap": false,
           "editorMode": "code",
@@ -783,7 +783,7 @@
             "value": "register_validator"
           }
         ],
-        "query": "get_header, submit_blinded_block, register_validator",
+        "query": "register_validator, get_header, submit_blinded_block",
         "queryValue": "",
         "skipUrlSync": false,
         "type": "custom"
@@ -797,7 +797,7 @@
   "timepicker": {},
   "timezone": "browser",
   "title": "PBS Metrics",
-  "uid": "PF1584C945D1A144E",
+  "uid": "cb_prometheus",
   "version": 1,
   "weekStart": ""
 }
\ No newline at end of file
diff --git a/grafana/dashboards/dashboards.yml b/grafana/dashboards/dashboards.yml
index f9f90c6..db50699 100644
--- a/grafana/dashboards/dashboards.yml
+++ b/grafana/dashboards/dashboards.yml
@@ -1,12 +1,13 @@
 apiVersion: 1
 
 providers:
-  - name: 'default'
+  - name: "default"
     orgId: 1
-    folder: ''
-    folderUid: ''
+    folder: ""
+    folderUid: ""
     type: file
     disableDeletion: false
     editable: true
+    allowUiUpdates: true
     options:
       path: /etc/grafana/provisioning/dashboards
diff --git a/grafana/datasources/datasources.yml b/grafana/datasources/datasources.yml
index de15442..6d29d61 100644
--- a/grafana/datasources/datasources.yml
+++ b/grafana/datasources/datasources.yml
@@ -3,6 +3,7 @@ apiVersion: 1
 datasources:
   - name: cb-prometheus
     type: prometheus
+    uid: cb_prometheus
     access: proxy
     orgId: 1
     url: http://cb_prometheus:9090