fix merge conflicts

yago-123 · Jan 21, 2025 · 8c131d0 · 8c131d0
2 parents f17c81b + 4b41d80
commit 8c131d0
Show file tree

Hide file tree

Showing 13 changed files with 1,453 additions and 252 deletions.
diff --git a/ansible/playbooks/roles/monitoring/files/dashboard-libp2p.json b/ansible/playbooks/roles/monitoring/files/dashboard-libp2p.json
diff --git a/ansible/playbooks/roles/monitoring/files/dashboard-mempool.json b/ansible/playbooks/roles/monitoring/files/dashboard-mempool.json
@@ -17,7 +17,7 @@
   },
   "editable": true,
   "fiscalYearStartMonth": 0,
-  "graphTooltip": 0,
+  "graphTooltip": 1,
   "id": 3,
   "links": [],
   "panels": [
@@ -166,10 +166,6 @@
               {
                 "color": "green",
                 "value": null
-              },
-              {
-                "color": "red",
-                "value": 80
               }
             ]
           }
@@ -1001,13 +997,13 @@
     "list": []
   },
   "time": {
-    "from": "now-15m",
+    "from": "now-3h",
     "to": "now"
   },
   "timepicker": {},
   "timezone": "browser",
   "title": "Mempool",
   "uid": "cea9wamj3ad4wf",
-  "version": 43,
+  "version": 45,
   "weekStart": ""
-}
+}