From 4d383563554efb6517c8774e698e7cb33cfd1b9a Mon Sep 17 00:00:00 2001 From: Danil Date: Thu, 1 Aug 2024 17:49:51 +0200 Subject: [PATCH] chore(zk_toolbox): Small observability fixes (#2566) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## What ❔ ## Why ❔ ## Checklist - [ ] PR title corresponds to the body of PR (we generate changelog entries from PRs). - [ ] Tests for the changes have been added / updated. - [ ] Documentation comments have been added / updated. - [ ] Code has been formatted via `zk fmt` and `zk lint`. --------- Signed-off-by: Danil --- .gitignore | 2 ++ zk_toolbox/crates/zk_inception/README.md | 16 +++++++++++++++- .../zk_inception/src/config_manipulations.rs | 0 zk_toolbox/crates/zk_inception/src/defaults.rs | 2 +- 4 files changed, 18 insertions(+), 2 deletions(-) delete mode 100644 zk_toolbox/crates/zk_inception/src/config_manipulations.rs diff --git a/.gitignore b/.gitignore index 7b626c310d4b..66d7d00b263a 100644 --- a/.gitignore +++ b/.gitignore @@ -114,3 +114,5 @@ prover/crates/bin/vk_setup_data_generator_server_fri/data/setup_* # Zk Toolbox chains/era/configs/* configs/* +era-observability/ +core/tests/ts-integration/deployments-zk diff --git a/zk_toolbox/crates/zk_inception/README.md b/zk_toolbox/crates/zk_inception/README.md index 00223851d8d9..61fd9ec2e36e 100644 --- a/zk_toolbox/crates/zk_inception/README.md +++ b/zk_toolbox/crates/zk_inception/README.md @@ -9,6 +9,7 @@ This document contains the help content for the `zk_inception` command-line prog - [`zk_inception ecosystem create`↴](#zk_inception-ecosystem-create) - [`zk_inception ecosystem init`↴](#zk_inception-ecosystem-init) - [`zk_inception ecosystem change-default-chain`↴](#zk_inception-ecosystem-change-default-chain) +- [`zk_inception ecosystem setup-observability`↴](#zk_inception-ecosystem-setup-observability) - [`zk_inception chain`↴](#zk_inception-chain) - [`zk_inception chain create`↴](#zk_inception-chain-create) - [`zk_inception chain init`↴](#zk_inception-chain-init) @@ -67,6 +68,8 @@ Ecosystem related commands - `create` — Create a new ecosystem and chain, setting necessary configurations for later initialization - `init` — Initialize ecosystem and chain, deploying necessary contracts and performing on-chain operations - `change-default-chain` — Change the default chain +- `setup-observability` — Setup observability for the ecosystem, downloading Grafana dashboards from the + era-observability repo ## `zk_inception ecosystem create` @@ -162,6 +165,7 @@ Initialize ecosystem and chain, deploying necessary contracts and performing on- - `-u`, `--use-default` — Use default database urls and names - `-d`, `--dont-drop` - `--dev` — Deploy ecosystem using all defaults. Suitable for local development +- `-o`, `--observability` — Enable Grafana ## `zk_inception ecosystem change-default-chain` @@ -173,6 +177,12 @@ Change the default chain - `` +## `zk_inception ecosystem setup-observability` + +Setup observability for the ecosystem, downloading Grafana dashboards from the era-observability repo + +**Usage:** `zk_inception ecosystem setup-observability` + ## `zk_inception chain` Chain related commands @@ -520,7 +530,11 @@ Run external node Run containers for local development -**Usage:** `zk_inception containers` +**Usage:** `zk_inception containers [OPTIONS]` + +###### **Options:** + +- `-o`, `--observability` — Enable Grafana ## `zk_inception contract-verifier` diff --git a/zk_toolbox/crates/zk_inception/src/config_manipulations.rs b/zk_toolbox/crates/zk_inception/src/config_manipulations.rs deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/zk_toolbox/crates/zk_inception/src/defaults.rs b/zk_toolbox/crates/zk_inception/src/defaults.rs index 40be1293614b..fcbde71b012a 100644 --- a/zk_toolbox/crates/zk_inception/src/defaults.rs +++ b/zk_toolbox/crates/zk_inception/src/defaults.rs @@ -17,7 +17,7 @@ pub const MAIN_ROCKS_DB_PREFIX: &str = "main"; pub const L2_CHAIN_ID: u32 = 271; /// Path to base chain configuration inside zksync-era /// Local RPC url -pub(super) const LOCAL_RPC_URL: &str = "http://localhost:8545"; +pub(super) const LOCAL_RPC_URL: &str = "http://127.0.0.1:8545"; pub struct DBNames { pub server_name: String,