Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(zk init): --run-observability flag #2092

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

fix(zk init): --run-observability flag #2092

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9c60069
fix(zk init): --run-observability flag
fborello-lambda May 29, 2024
c6d216e
Merge branch 'main' into fix_observability
ilitteri Jun 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 27 additions & 2 deletions infrastructure/zk/src/init.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,12 @@ import * as server from './server';
import { createVolumes, up } from './up';

// Checks if all required tools are installed with the correct versions
const checkEnv = async (): Promise<void> => {
const checkEnv = async (runObservability: boolean): Promise<void> => {
const tools = ['node', 'yarn', 'docker', 'cargo'];
if (runObservability) {
tools.push('yq');
}

for (const tool of tools) {
await utils.exec(`which ${tool}`);
}
Expand All @@ -37,6 +41,23 @@ const submoduleUpdate = async (): Promise<void> => {
await utils.exec('git submodule update');
};

// clone dockprom and zksync-era dashboards
const setupObservability = async (): Promise<void> => {
// clone dockprom, era-observability repos and export era dashboards to dockprom
await utils.spawn(
`rm -rf ./target/dockprom && git clone git@github.com:stefanprodan/dockprom.git ./target/dockprom \
&& rm -rf ./target/era-observability && git clone git@github.com:matter-labs/era-observability.git ./target/era-observability \
&& cp ./target/era-observability/dashboards/* ./target/dockprom/grafana/provisioning/dashboards
`
);
// add scrape configuration to prometheus
await utils.spawn(
`yq eval '.scrape_configs += [{"job_name": "zksync", "scrape_interval": "5s", "honor_labels": true, "static_configs": [{"targets": ["host.docker.internal:3312"]}]}]' \
-i ./target/dockprom/prometheus/prometheus.yml
`
);
};

// Sets up docker environment and compiles contracts
type InitSetupOptions = {
skipEnvSetup: boolean;
Expand All @@ -50,6 +71,10 @@ const initSetup = async ({
runObservability,
deploymentMode
}: InitSetupOptions): Promise<void> => {
if (runObservability) {
await announced('Pulling observability repos', setupObservability());
}

await announced(
`Initializing in ${deploymentMode == contract.DeploymentMode.Validium ? 'Validium mode' : 'Roll-up mode'}`
);
Expand All @@ -58,7 +83,7 @@ const initSetup = async ({
}
if (!process.env.CI && !skipEnvSetup) {
await announced('Pulling images', docker.pull());
await announced('Checking environment', checkEnv());
await announced('Checking environment', checkEnv(runObservability));
await announced('Checking git hooks', env.gitHooks());
await announced('Create volumes', createVolumes());
await announced('Setting up containers', up(runObservability));
Expand Down
Loading