From 38dad64aaea9f9c23f6f5ca7955339ab46d87f94 Mon Sep 17 00:00:00 2001 From: Gusto Date: Fri, 20 Dec 2024 12:54:04 +0200 Subject: [PATCH] Pin prometheus version for otlp functionality --- compose.debug.yml | 6 ++++-- compose.static.yml | 6 ++++-- nomos-services/cryptarchia-consensus/src/lib.rs | 1 + testnet/Dockerfile | 2 +- testnet/monitoring/prometheus.yml | 1 - tests/src/tests/da.rs | 1 - 6 files changed, 10 insertions(+), 7 deletions(-) diff --git a/compose.debug.yml b/compose.debug.yml index 3d8eceac..99a2937b 100644 --- a/compose.debug.yml +++ b/compose.debug.yml @@ -4,13 +4,13 @@ services: prometheus: container_name: prometheus - image: prom/prometheus:latest + image: prom/prometheus:v3.0.1 volumes: - ./testnet/monitoring/prometheus.yml:/etc/prometheus/prometheus.yml:z command: - --config.file=/etc/prometheus/prometheus.yml - --storage.tsdb.retention.time=7d - - --enable-feature=otlp-write-receiver + - --web.enable-otlp-receiver ports: - 127.0.0.1:9090:9090 restart: on-failure @@ -28,6 +28,8 @@ services: volumes: - ./testnet/monitoring/grafana/grafana.ini:/etc/grafana/grafana.ini:z - ./testnet/monitoring/grafana/datasources.yaml:/etc/grafana/provisioning/datasources/datasources.yaml:z + - ./testnet/monitoring/grafana/dashboards.yml:/etc/grafana/provisioning/dashboards/dashboards.yml:z + - ./testnet/monitoring/grafana/dashboards:/var/lib/grafana/dashboards/:z ports: - 9091:3000 restart: on-failure diff --git a/compose.static.yml b/compose.static.yml index 779210ba..92f2daf8 100644 --- a/compose.static.yml +++ b/compose.static.yml @@ -78,13 +78,13 @@ services: prometheus: container_name: prometheus - image: prom/prometheus:latest + image: prom/prometheus:v3.0.1 volumes: - ./testnet/monitoring/prometheus.yml:/etc/prometheus/prometheus.yml:z command: - --config.file=/etc/prometheus/prometheus.yml - --storage.tsdb.retention.time=7d - - --enable-feature=otlp-write-receiver + - --web.enable-otlp-receiver ports: - 127.0.0.1:9090:9090 restart: on-failure @@ -102,6 +102,8 @@ services: volumes: - ./testnet/monitoring/grafana/grafana.ini:/etc/grafana/grafana.ini:z - ./testnet/monitoring/grafana/datasources.yaml:/etc/grafana/provisioning/datasources/datasources.yaml:z + - ./testnet/monitoring/grafana/dashboards.yml:/etc/grafana/provisioning/dashboards/dashboards.yml:z + - ./testnet/monitoring/grafana/dashboards:/var/lib/grafana/dashboards/:z ports: - 9091:3000 restart: on-failure diff --git a/nomos-services/cryptarchia-consensus/src/lib.rs b/nomos-services/cryptarchia-consensus/src/lib.rs index fd8404e7..0031e64b 100644 --- a/nomos-services/cryptarchia-consensus/src/lib.rs +++ b/nomos-services/cryptarchia-consensus/src/lib.rs @@ -456,6 +456,7 @@ where &mut self.block_subscription_sender ) .await; + tracing::info!(counter.consensus_processed_blocks = 1); } _ = slot_timer.next() => { diff --git a/testnet/Dockerfile b/testnet/Dockerfile index 87dd3aa3..6706e85e 100644 --- a/testnet/Dockerfile +++ b/testnet/Dockerfile @@ -14,7 +14,7 @@ RUN cargo install cargo-binstall RUN cargo binstall -y cargo-risczero RUN cargo risczero install -RUN cargo build --release --all --features metrics +RUN cargo build --release # NODE IMAGE ---------------------------------------------------------- diff --git a/testnet/monitoring/prometheus.yml b/testnet/monitoring/prometheus.yml index ee039b07..7f91b55f 100644 --- a/testnet/monitoring/prometheus.yml +++ b/testnet/monitoring/prometheus.yml @@ -1,5 +1,4 @@ global: - scrape_interval: 15s evaluation_interval: 15s external_labels: monitor: "Monitoring" diff --git a/tests/src/tests/da.rs b/tests/src/tests/da.rs index af86d045..4d0da864 100644 --- a/tests/src/tests/da.rs +++ b/tests/src/tests/da.rs @@ -146,4 +146,3 @@ fn create_metadata(app_id: &[u8], index: u64) -> kzgrs_backend::dispersal::Metad index.into(), ) } -