Use updated Nethermind dashboard (eth-educators#1463)

* Use updated Nethermind dashboard * Start on Prysm changes * Update Prysm dashboards * Fix Grafana CI
yorickdowne · Aug 3, 2023 · 045385b · 045385b
1 parent c7afdc8
commit 045385b
Show file tree

Hide file tree

Showing 7 changed files with 50 additions and 6,038 deletions.
diff --git a/.github/workflows/test-grafana.yml b/.github/workflows/test-grafana.yml
@@ -37,12 +37,6 @@ jobs:
       - name: Test node exporter
         run: |
           ./.github/check-service.sh node-exporter
-      - name: Test blackbox exporter
-        run: |
-          ./.github/check-service.sh blackbox-exporter
-      - name: Test json exporter
-        run: |
-          ./.github/check-service.sh json-exporter
       - name: Test cryptowat exporter
         run: |
           ./.github/check-service.sh cryptowat-exporter

diff --git a/grafana-cloud.yml b/grafana-cloud.yml
@@ -70,26 +70,26 @@ services:
       - /etc/localtime:/etc/localtime:ro
     <<: *logging
 
-  blackbox-exporter:
-    restart: "unless-stopped"
-    image: prom/blackbox-exporter:master
-    volumes:
-      - ./prometheus/blackbox.yml:/config/blackbox.yml
-      - /etc/localtime:/etc/localtime:ro
-    <<: *logging
-    command:
-      - --config.file=/config/blackbox.yml
+#  blackbox-exporter:
+#    restart: "unless-stopped"
+#    image: prom/blackbox-exporter:master
+#    volumes:
+#      - ./prometheus/blackbox.yml:/config/blackbox.yml
+#      - /etc/localtime:/etc/localtime:ro
+#    <<: *logging
+#    command:
+#      - --config.file=/config/blackbox.yml
 
-  json-exporter:
-    restart: "unless-stopped"
-    image: prometheuscommunity/json-exporter:latest
-    volumes:
-      - ./prometheus/json.yml:/config/json.yml
-      - /etc/localtime:/etc/localtime:ro
-    <<: *logging
-    command:
-      - --config.file
-      - /config/json.yml
+#  json-exporter:
+#    restart: "unless-stopped"
+#    image: prometheuscommunity/json-exporter:latest
+#    volumes:
+#      - ./prometheus/json.yml:/config/json.yml
+#      - /etc/localtime:/etc/localtime:ro
+#    <<: *logging
+#    command:
+#      - --config.file
+#      - /config/json.yml
 
   cryptowat-exporter:
     restart: "unless-stopped"
@@ -98,7 +98,7 @@ services:
       - /etc/localtime:/etc/localtime:ro
     environment:
       - CRYPTOWAT_EXCHANGES=kraken
-      - CRYPTOWAT_PAIRS=ethusd,ethchf
+      - CRYPTOWAT_PAIRS=etheur,ethusd,ethgbp,ethcad,ethchf,ethjpy,ethbtc
       - CRYPTOWAT_CACHESECONDS=300
       - TZ=Europe/Zurich
     <<: *logging

diff --git a/grafana.yml b/grafana.yml
@@ -53,26 +53,26 @@ services:
       - /etc/localtime:/etc/localtime:ro
     <<: *logging
 
-  blackbox-exporter:
-    restart: "unless-stopped"
-    image: prom/blackbox-exporter:master
-    volumes:
-      - ./prometheus/blackbox.yml:/config/blackbox.yml
-      - /etc/localtime:/etc/localtime:ro
-    <<: *logging
-    command:
-      - --config.file=/config/blackbox.yml
+#  blackbox-exporter:
+#    restart: "unless-stopped"
+#    image: prom/blackbox-exporter:master
+#    volumes:
+#      - ./prometheus/blackbox.yml:/config/blackbox.yml
+#      - /etc/localtime:/etc/localtime:ro
+#    <<: *logging
+#    command:
+#      - --config.file=/config/blackbox.yml
 
-  json-exporter:
-    restart: "unless-stopped"
-    image: prometheuscommunity/json-exporter:latest
-    volumes:
-      - ./prometheus/json.yml:/config/json.yml
-      - /etc/localtime:/etc/localtime:ro
-    <<: *logging
-    command:
-      - --config.file
-      - /config/json.yml
+#  json-exporter:
+#    restart: "unless-stopped"
+#    image: prometheuscommunity/json-exporter:latest
+#    volumes:
+#      - ./prometheus/json.yml:/config/json.yml
+#      - /etc/localtime:/etc/localtime:ro
+#    <<: *logging
+#    command:
+#      - --config.file
+#      - /config/json.yml
 
   cryptowat-exporter:
     restart: "unless-stopped"
@@ -81,7 +81,7 @@ services:
       - /etc/localtime:/etc/localtime:ro
     environment:
       - CRYPTOWAT_EXCHANGES=kraken
-      - CRYPTOWAT_PAIRS=ethusd,ethchf
+      - CRYPTOWAT_PAIRS=etheur,ethusd,ethgbp,ethcad,ethchf,ethjpy,ethbtc
       - CRYPTOWAT_CACHESECONDS=300
       - TZ=Europe/Zurich
     <<: *logging

diff --git a/grafana/Dockerfile b/grafana/Dockerfile
@@ -9,7 +9,6 @@ RUN chown -R grafana:root /etc/grafana/
 COPY --chown=grafana:root ./dashboard.yml /etc/grafana/provisioning/dashboards/
 COPY --chown=grafana:root ./datasource.yml /etc/grafana/provisioning/datasources/
 COPY --chown=grafana:root ./provision-dashboards.sh /usr/local/bin/
-COPY --chown=grafana:root ./nethermind_dashboard.json /tmp/
 # Belt and suspenders
 RUN chmod -R 755 /usr/local/bin/*