From eccaed042a8e1c78e48d77e53631c54e03073661 Mon Sep 17 00:00:00 2001 From: Piers Powlesland Date: Mon, 9 Dec 2024 10:42:14 +0000 Subject: [PATCH] Remove DTL references The dtl was an old service that was removed in commit 8fb102bf7cf1243830a8e89677a02ac66b799380 of the optimism repo. --- docker-compose.yml | 1 - .../dashboards/simple_node_dashboard.json | 102 +----------------- docker/prometheus/prometheus.yml | 4 - scripts/start-dtl.sh | 11 -- 4 files changed, 5 insertions(+), 113 deletions(-) delete mode 100755 scripts/start-dtl.sh diff --git a/docker-compose.yml b/docker-compose.yml index 1aa4091..b73a70f 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -117,7 +117,6 @@ services: - ${PORT__INFLUXDB:-8086}:8086 volumes: - dtl: geth: prometheus_data: grafana_data: diff --git a/docker/grafana/dashboards/simple_node_dashboard.json b/docker/grafana/dashboards/simple_node_dashboard.json index ad8a600..a3a1862 100644 --- a/docker/grafana/dashboards/simple_node_dashboard.json +++ b/docker/grafana/dashboards/simple_node_dashboard.json @@ -24,6 +24,7 @@ "editable": true, "fiscalYearStartMonth": 0, "graphTooltip": 0, + "id": 1, "links": [], "liveNow": false, "panels": [ @@ -1122,99 +1123,6 @@ "title": "Legacy System Overview (pre-Bedrock)", "type": "row" }, - { - "datasource": { - "type": "prometheus", - "uid": "6R74VAnVz" - }, - "fieldConfig": { - "defaults": { - "color": { - "mode": "palette-classic" - }, - "custom": { - "axisCenteredZero": false, - "axisColorMode": "text", - "axisLabel": "", - "axisPlacement": "auto", - "barAlignment": 0, - "drawStyle": "line", - "fillOpacity": 0, - "gradientMode": "none", - "hideFrom": { - "graph": false, - "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" - } - }, - "mappings": [], - "thresholds": { - "mode": "absolute", - "steps": [ - { - "color": "green", - "value": null - }, - { - "color": "red", - "value": 80 - } - ] - } - }, - "overrides": [] - }, - "gridPos": { - "h": 8, - "w": 12, - "x": 0, - "y": 17 - }, - "id": 8, - "options": { - "legend": { - "calcs": [], - "displayMode": "list", - "placement": "bottom", - "showLegend": true - }, - "tooltip": { - "mode": "single", - "sort": "none" - } - }, - "targets": [ - { - "datasource": { - "type": "prometheus", - "uid": "6R74VAnVz" - }, - "editorMode": "code", - "expr": "data_transport_layer_highest_synced_l1_block{}", - "legendFormat": "DTL Height", - "range": true, - "refId": "A" - } - ], - "title": "DTL Height", - "type": "timeseries" - }, { "datasource": { "type": "influxdb", @@ -1277,8 +1185,8 @@ }, "gridPos": { "h": 8, - "w": 12, - "x": 12, + "w": 24, + "x": 0, "y": 17 }, "id": 27, @@ -1907,6 +1815,6 @@ "timezone": "", "title": "Simple Node Dashboard", "uid": "fNH7uZ97k", - "version": 1, + "version": 3, "weekStart": "" -} \ No newline at end of file +} diff --git a/docker/prometheus/prometheus.yml b/docker/prometheus/prometheus.yml index 3511e57..f0ba19b 100644 --- a/docker/prometheus/prometheus.yml +++ b/docker/prometheus/prometheus.yml @@ -3,10 +3,6 @@ global: evaluation_interval: 15s scrape_configs: - - job_name: 'dtl' - static_configs: - - targets: ['dtl:7878'] - - job_name: 'healthcheck' static_configs: - targets: ['healthcheck:7300'] diff --git a/scripts/start-dtl.sh b/scripts/start-dtl.sh deleted file mode 100755 index bfa810a..0000000 --- a/scripts/start-dtl.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh -set -e - -# Setting both endpoints doesn't hurt. -export DATA_TRANSPORT_LAYER__L1_RPC_ENDPOINT=$DATA_TRANSPORT_LAYER__RPC_ENDPOINT -export DATA_TRANSPORT_LAYER__L2_RPC_ENDPOINT=$DATA_TRANSPORT_LAYER__RPC_ENDPOINT - -# Start the DTL. -exec node \ - dist/src/services/run.js \ - $@