Merge Release v2.2.0

Release

.circleci/continue_config.yml

@@ -114,16 +114,12 @@ workflows:
       # Always build monitor if there's a change in the server
       - build-push-monitor:
           run-build: << pipeline.parameters.run-build-server >>
-          requires:
-          - tests-node-v16
       - build-push-repository:
           run-build: << pipeline.parameters.run-build-repository >>
       - build-push-s3:
           run-build: << pipeline.parameters.run-build-s3 >>
       - build-push-server:
           run-build: << pipeline.parameters.run-build-server >>
-          requires:
-          - tests-node-v16
       - build-push-ui:
           run-build: << pipeline.parameters.run-build-ui >>
       - deploy:

environments/.env.dev

@@ -79,7 +79,7 @@ MOONSCAN_MOONBEAM_API_KEY=
 MOONSCAN_MOONRIVER_API_KEY=
 BOBASCAN_API_KEY=
 GNOSISSCAN_API_KEY=
-OPTIMISTIC_ETHERSCAN_API_KEY=
+OPTIMISMSCAN_API_KEY=
 
 # Needed to call create2 APIs, format is: TOKEN1,TOKEN2,...
 CREATE2_CLIENT_TOKENS=
@@ -89,5 +89,6 @@ GRAFANA_HTTP_USER=xxx
 GRAFANA_HTTP_PASS=xxx
 GRAFANA_EXTERNAL_PORT=3000
 GRAFANA_LOKI_EXTERNAL_PORT=3100
+GRAFANA_PROMETHEUS_EXTERNAL_PORT=9090
 # Use if you'll have a running Loki instance, otherwise leave blank
 # GRAFANA_LOKI_URL=http://localhost:3100

environments/.env.latest

@@ -78,7 +78,7 @@ MOONSCAN_MOONBEAM_API_KEY=xxx
 MOONSCAN_MOONRIVER_API_KEY=xxx
 BOBASCAN_API_KEY=xxx
 GNOSISSCAN_API_KEY=xxx
-OPTIMISTIC_ETHERSCAN_API_KEY=xxx
+OPTIMISMSCAN_API_KEY=xxx
 
 CREATE2_CLIENT_TOKENS=xxx
 
@@ -87,4 +87,5 @@ GRAFANA_HTTP_USER=xxx
 GRAFANA_HTTP_PASS=xxx
 GRAFANA_EXTERNAL_PORT=13000
 GRAFANA_LOKI_EXTERNAL_PORT=13100
+GRAFANA_PROMETHEUS_EXTERNAL_PORT=9090
 GRAFANA_LOKI_URL=http://grafana-loki-latest:3100

environments/.env.stable

@@ -76,7 +76,7 @@ MOONSCAN_MOONBEAM_API_KEY=xxx
 MOONSCAN_MOONRIVER_API_KEY=xxx
 BOBASCAN_API_KEY=xxx
 GNOSISSCAN_API_KEY=xxx
-OPTIMISTIC_ETHERSCAN_API_KEY=xxx
+OPTIMISMSCAN_API_KEY=xxx
 
 CREATE2_CLIENT_TOKENS=xxx
 
@@ -85,4 +85,5 @@ GRAFANA_HTTP_USER=xxx
 GRAFANA_HTTP_PASS=xxx
 GRAFANA_EXTERNAL_PORT=13000
 GRAFANA_LOKI_EXTERNAL_PORT=13100
+GRAFANA_PROMETHEUS_EXTERNAL_PORT=9090
 GRAFANA_LOKI_URL=http://grafana-loki-stable:3100

environments/grafana.yaml

@@ -10,6 +10,10 @@ x-project-base: &project-base
 networks:
   source-verify:
 
+volumes:
+  prometheus-data:
+    driver: local
+
 services:
   loki:
     container_name: grafana-loki-${TAG}
@@ -46,3 +50,55 @@ services:
       - HTTP_USER="${GRAFANA_HTTP_USER}"
       - HTTP_PASS="${GRAFANA_HTTP_PASS}"
     restart: always
+
+  prometheus:
+    image: prom/prometheus:latest
+    container_name: grafana-prometheus-${TAG}
+    ports:
+      - "${GRAFANA_PROMETHEUS_EXTERNAL_PORT}:9090"
+    volumes:
+      - /etc/prometheus:/etc/prometheus
+      - prometheus-data:/prometheus
+    restart: unless-stopped
+    command:
+      - "--config.file=/etc/prometheus/prometheus.yml"
+    networks:
+      - source-verify
+
+  cadvisor:
+    image: gcr.io/cadvisor/cadvisor:v0.47.0
+    container_name: grafana-cadvisor-${TAG}
+    volumes:
+      - /:/rootfs:ro
+      - /var/run:/var/run:ro
+      - /sys:/sys:ro
+      - /var/lib/docker/:/var/lib/docker:ro
+      - /dev/disk/:/dev/disk:ro
+    devices:
+      - /dev/kmsg
+    restart: unless-stopped
+    privileged: true
+    networks:
+      - source-verify
+
+  node_exporter:
+    image: quay.io/prometheus/node-exporter:latest
+    container_name: grafana-node_exporter-${TAG}
+    command:
+      - "--path.rootfs=/host"
+    pid: host
+    restart: unless-stopped
+    volumes:
+      - "/:/host:ro,rslave"
+    networks:
+      - source-verify
+
+  nginx_exporter:
+    image: nginx/nginx-prometheus-exporter:0.10.0
+    container_name: grafana-nginx_exporter-${TAG}
+    command:
+      - -nginx.scrape-uri
+      - https://sourcify.dev/nginx_status
+    restart: unless-stopped
+    networks:
+      - source-verify