From 112961cd9c9276e2cd95b41b6de31d27bb43bb41 Mon Sep 17 00:00:00 2001 From: PhilWindle <60546371+PhilWindle@users.noreply.github.com> Date: Thu, 25 Jul 2024 19:08:42 +0200 Subject: [PATCH] chore: Merge Devnet back to Master (#7611) This PR simply brings devnet back into master --------- Co-authored-by: Alex Gherghisan Co-authored-by: Aztec Bot <49558828+AztecBot@users.noreply.github.com> Co-authored-by: sirasistant Co-authored-by: Maxim Vezenov Co-authored-by: Facundo Co-authored-by: AztecBot Co-authored-by: Alex Gherghisan --- .github/workflows/devnet-deploys.yml | 34 +- .github/workflows/metrics-deploys.yml | 127 +++ barretenberg/.gitrepo | 12 +- metrics/grafana/Dockerfile | 4 + metrics/grafana/grafana.ini | 847 ++++++++++++++++++ metrics/grafana/replace_secrets.sh | 11 + metrics/grafana/terraform/main.tf | 235 +++++ metrics/grafana/terraform/variables.tf | 16 + metrics/otel/Dockerfile | 3 + metrics/otel/otel.yml | 29 + metrics/otel/terraform/main.tf | 129 +++ metrics/otel/terraform/variables.tf | 8 + metrics/prometheus/Dockerfile | 4 + metrics/prometheus/prometheus.yml | 15 + metrics/prometheus/terraform/main.tf | 184 ++++ metrics/prometheus/terraform/variables.tf | 8 + noir-projects/aztec-nr/.gitrepo | 12 +- yarn-project/aztec/terraform/node/main.tf | 20 +- .../aztec/terraform/node/variables.tf | 22 +- yarn-project/aztec/terraform/prover/main.tf | 4 +- .../aztec/terraform/prover/variables.tf | 4 + yarn-project/aztec/terraform/pxe/main.tf | 4 +- yarn-project/aztec/terraform/pxe/variables.tf | 4 + .../{node => }/servicediscovery-drain.sh | 0 .../cli/src/cmds/devnet/bootstrap_devnet.ts | 22 +- .../deploy_protocol_contract.ts | 16 +- .../cli/src/cmds/l1/deploy_l1_contracts.ts | 8 +- .../src/prover-agent/prover-agent.ts | 12 +- yarn-project/telemetry-client/src/otel.ts | 16 +- yarn-project/telemetry-client/src/start.ts | 7 +- 30 files changed, 1755 insertions(+), 62 deletions(-) create mode 100644 .github/workflows/metrics-deploys.yml create mode 100644 metrics/grafana/Dockerfile create mode 100644 metrics/grafana/grafana.ini create mode 100755 metrics/grafana/replace_secrets.sh create mode 100644 metrics/grafana/terraform/main.tf create mode 100644 metrics/grafana/terraform/variables.tf create mode 100644 metrics/otel/Dockerfile create mode 100644 metrics/otel/otel.yml create mode 100644 metrics/otel/terraform/main.tf create mode 100644 metrics/otel/terraform/variables.tf create mode 100644 metrics/prometheus/Dockerfile create mode 100644 metrics/prometheus/prometheus.yml create mode 100644 metrics/prometheus/terraform/main.tf create mode 100644 metrics/prometheus/terraform/variables.tf rename yarn-project/aztec/terraform/{node => }/servicediscovery-drain.sh (100%) diff --git a/.github/workflows/devnet-deploys.yml b/.github/workflows/devnet-deploys.yml index c4ed5e3a810..14347cddb15 100644 --- a/.github/workflows/devnet-deploys.yml +++ b/.github/workflows/devnet-deploys.yml @@ -19,14 +19,15 @@ env: TF_VAR_L1_CHAIN_ID: 677692 TF_VAR_BOOTNODE_1_PRIVATE_KEY: ${{ secrets.BOOTNODE_1_PRIVATE_KEY }} TF_VAR_BOOTNODE_2_PRIVATE_KEY: ${{ secrets.BOOTNODE_2_PRIVATE_KEY }} - TF_VAR_SEQ_1_PUBLISHER_PRIVATE_KEY: ${{ secrets.SEQ_1_PUBLISHER_PRIVATE_KEY }} - TF_VAR_SEQ_2_PUBLISHER_PRIVATE_KEY: ${{ secrets.SEQ_2_PUBLISHER_PRIVATE_KEY }} + TF_VAR_SEQUENCER_PRIVATE_KEYS: '["${{ secrets.SEQ_1_PUBLISHER_PRIVATE_KEY }}"]' + TF_VAR_NODE_P2P_PRIVATE_KEYS: '[""]' TF_VAR_DEPLOY_TAG: devnet + TF_VAR_IMAGE_TAG: ${{ github.sha }} TF_VAR_API_KEY: ${{ secrets.FORK_API_KEY }} TF_VAR_FORK_MNEMONIC: ${{ secrets.FORK_MNEMONIC }} TF_VAR_INFURA_API_KEY: ${{ secrets.INFURA_API_KEY }} TF_VAR_FAUCET_ACCOUNT_INDEX: 5 - CONTRACT_S3_BUCKET: s3://aztec-${{ env.DEPLOY_TAG }}-deployments + CONTRACT_S3_BUCKET: s3://aztec-devnet-deployments jobs: setup: @@ -47,11 +48,28 @@ jobs: with: concurrency_key: build-release-artifacts-${{ github.actor }} dockerhub_password: "${{ secrets.DOCKERHUB_PASSWORD }}" + - name: Check if only workflow flows have changed + id: check_only_workflow_changes + uses: actions/github-script@v7 + with: + script: | + const { execSync } = require('child_process'); + const changedFiles = execSync('git diff --name-only ${{ github.event.before }} ${{ github.sha }}') + .toString() + .split('\n') + .filter(line => line); + const prefixesToIgnore = ['.github', 'iac']; + const suffixesToIgnore = ['.tf']; + return changedFiles.every(file => ( + prefixesToIgnore.some(prefix => file.startsWith(prefix)) || + suffixesToIgnore.some(suffix => file.endsWith(suffix)) + )); - name: "Build & Push aztec images" timeout-minutes: 40 + if: steps.check_only_workflow_changes.outputs.result == 'false' run: | - earthly-ci \ - --no-output --push ./yarn-project+export-aztec-arch --DIST_TAG=${{ env.DEPLOY_TAG }} + earthly-ci --no-output --push ./yarn-project+export-aztec-arch --DIST_TAG=${{ env.DEPLOY_TAG }} + earthly-ci --no-output --push ./yarn-project+export-aztec-arch --DIST_TAG=${{ github.sha }} - name: Check if mainnet fork needs deployment id: check_fork_changes @@ -166,6 +184,7 @@ jobs: - uses: actions/checkout@v4 with: ref: "${{ env.GIT_COMMIT }}" + fetch-depth: 0 - uses: ./.github/ci-setup-action @@ -182,6 +201,7 @@ jobs: - name: Deploy protocol contracts run: | + set -e docker pull aztecprotocol/aztec:${{ env.DEPLOY_TAG }} docker run aztecprotocol/aztec:${{ env.DEPLOY_TAG }} deploy-protocol-contracts \ --rpc-url https://api.aztec.network/${{ env.DEPLOY_TAG }}/aztec-pxe/${{ secrets.FORK_API_KEY }} \ @@ -193,6 +213,7 @@ jobs: - name: Bootstrap devnet run: | + set -e docker run aztecprotocol/aztec:${{ env.DEPLOY_TAG }} bootstrap-devnet \ --rpc-url https://api.aztec.network/${{ env.DEPLOY_TAG }}/aztec-pxe/${{ secrets.FORK_API_KEY }} \ --l1-rpc-url https://${{ env.DEPLOY_TAG }}-mainnet-fork.aztec.network:8545/${{ secrets.FORK_API_KEY }} \ @@ -225,6 +246,7 @@ jobs: - name: Retrieve contract addresses run: | + set -e aws s3 cp ${{ env.CONTRACT_S3_BUCKET }}/l1_contract_addresses.json ./l1-contract_addresses.json aws s3 cp ${{ env.CONTRACT_S3_BUCKET }}/devnet-contracts.json ./devnet-contracts.json @@ -232,7 +254,7 @@ jobs: echo "TF_VAR_DEV_COIN_CONTRACT_ADDRESS=$(jq -r '.devCoinL1' ./devnet-contracts.json)" >>$GITHUB_ENV - name: Deploy Faucet - working-directory: ./yarn-project/aztec/aztec-faucet + working-directory: ./yarn-project/aztec-faucet run: | terraform init -input=false -backend-config="key=${{ env.DEPLOY_TAG }}/aztec-faucet" terraform apply -input=false -auto-approve diff --git a/.github/workflows/metrics-deploys.yml b/.github/workflows/metrics-deploys.yml new file mode 100644 index 00000000000..c187f403597 --- /dev/null +++ b/.github/workflows/metrics-deploys.yml @@ -0,0 +1,127 @@ +name: Deploy metrics +on: + push: + branches: [devnet] + +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: true + +env: + DOCKERHUB_PASSWORD: ${{ secrets.DOCKERHUB_PASSWORD }} + GIT_COMMIT: ${{ github.sha }} + AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }} + AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }} + # TF Vars + TF_VAR_DOCKERHUB_ACCOUNT: aztecprotocol + TF_VAR_GRAFANA_CLIENT_ID: ${{ secrets.GRAFANA_CLIENT_ID }} + TF_VAR_GRAFANA_CLIENT_SECRET: ${{ secrets.GRAFANA_CLIENT_SECRET }} + TF_VAR_IMAGE_TAG: ${{ github.sha }} + +jobs: + setup: + uses: ./.github/workflows/setup-runner.yml + with: + username: master + runner_type: builder-x86 + secrets: inherit + build: + needs: setup + runs-on: ${{ github.actor }}-x86 + steps: + - uses: actions/checkout@v4 + with: + ref: "${{ env.GIT_COMMIT }}" + fetch-depth: 0 + - uses: ./.github/ci-setup-action + with: + concurrency_key: build-metrics-${{ github.actor }} + dockerhub_password: "${{ secrets.DOCKERHUB_PASSWORD }}" + + - name: Check if metrics have changed + id: check_metrics_changes + uses: actions/github-script@v7 + with: + script: | + const { execSync } = require('child_process'); + const changedFiles = execSync('git diff --name-only ${{ github.event.before }} ${{ github.sha }}').toString().split('\n'); + const fileChanged = changedFiles.some(file => file.startsWith('metrics')); + return fileChanged + + - name: Build & push prometheus + working-directory: ./metrics/prometheus + if: steps.check_metrics_changes.outputs.result == 'true' + run: | + docker build -t aztecprotocol/aztec-prometheus . + docker tag aztecprotocol/aztec-prometheus aztecprotocol/aztec-prometheus:$GIT_COMMIT + docker push aztecprotocol/aztec-prometheus + docker push aztecprotocol/aztec-prometheus:$GIT_COMMIT + + - name: Build & push grafana + working-directory: ./metrics/grafana + if: steps.check_metrics_changes.outputs.result == 'true' + run: | + docker build -t aztecprotocol/aztec-grafana . + docker tag aztecprotocol/aztec-grafana aztecprotocol/aztec-grafana:$GIT_COMMIT + docker push aztecprotocol/aztec-grafana + docker push aztecprotocol/aztec-grafana:$GIT_COMMIT + + - name: Build & push open telemetry + working-directory: ./metrics/otel + if: steps.check_metrics_changes.outputs.result == 'true' + run: | + docker build -t aztecprotocol/aztec-otel . + docker tag aztecprotocol/aztec-otel aztecprotocol/aztec-otel:$GIT_COMMIT + docker push aztecprotocol/aztec-otel + docker push aztecprotocol/aztec-otel:$GIT_COMMIT + + terraform_deploy: + runs-on: ubuntu-latest + needs: build + steps: + - uses: actions/checkout@v4 + with: + ref: "${{ env.GIT_COMMIT }}" + fetch-depth: 0 + - uses: ./.github/ci-setup-action + - uses: hashicorp/setup-terraform@v3 + with: + terraform_version: 1.7.5 + + - name: Configure AWS credentials + uses: aws-actions/configure-aws-credentials@v1 + with: + aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }} + aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }} + aws-region: eu-west-2 + + - name: Check if metrics have changed + id: check_metrics_changes + uses: actions/github-script@v7 + with: + script: | + const { execSync } = require('child_process'); + const changedFiles = execSync('git diff --name-only ${{ github.event.before }} ${{ github.sha }}').toString().split('\n'); + const fileChanged = changedFiles.some(file => file.startsWith('metrics')); + return fileChanged + + - name: Deploy prometheus + working-directory: ./metrics/prometheus/terraform + if: steps.check_metrics_changes.outputs.result == 'true' + run: | + terraform init -input=false -backend-config="key=aztec-prometheus" + terraform apply -input=false -auto-approve + + - name: Deploy grafana + working-directory: ./metrics/grafana/terraform + if: steps.check_metrics_changes.outputs.result == 'true' + run: | + terraform init -input=false -backend-config="key=aztec-grafana" + terraform apply -input=false -auto-approve + + - name: Deploy open telemetry + working-directory: ./metrics/otel/terraform + if: steps.check_metrics_changes.outputs.result == 'true' + run: | + terraform init -input=false -backend-config="key=aztec-otel" + terraform apply -input=false -auto-approve diff --git a/barretenberg/.gitrepo b/barretenberg/.gitrepo index f27f313f245..e2e2878b012 100644 --- a/barretenberg/.gitrepo +++ b/barretenberg/.gitrepo @@ -4,9 +4,9 @@ ; git-subrepo command. See https://github.com/ingydotnet/git-subrepo#readme ; [subrepo] - remote = https://github.com/AztecProtocol/barretenberg - branch = master - commit = f5b9be0eb29d7d1a7f202cb075f892552ab151c5 - parent = 840486e5ce6b41d6c873239de108b3731dd81101 - method = merge - cmdver = 0.4.6 +remote = https://github.com/AztecProtocol/barretenberg +branch = master +commit = f5b9be0eb29d7d1a7f202cb075f892552ab151c5 +parent = 840486e5ce6b41d6c873239de108b3731dd81101 +method = merge +cmdver = 0.4.6 diff --git a/metrics/grafana/Dockerfile b/metrics/grafana/Dockerfile new file mode 100644 index 00000000000..22d366f9af1 --- /dev/null +++ b/metrics/grafana/Dockerfile @@ -0,0 +1,4 @@ +FROM grafana/grafana:9.3.2 +COPY grafana.ini /etc/grafana/grafana.ini +USER root +EXPOSE 80 \ No newline at end of file diff --git a/metrics/grafana/grafana.ini b/metrics/grafana/grafana.ini new file mode 100644 index 00000000000..13d068f145a --- /dev/null +++ b/metrics/grafana/grafana.ini @@ -0,0 +1,847 @@ +##################### Grafana Configuration Example ##################### +# +# Everything has defaults so you only need to uncomment things you want to +# change + +# possible values : production, development +;app_mode = production + +# instance name, defaults to HOSTNAME environment variable value or hostname if HOSTNAME var is empty +;instance_name = ${HOSTNAME} + +#################################### Paths #################################### +[paths] +# Path to where grafana can store temp files, sessions, and the sqlite3 db (if that is used) +;data = /var/lib/grafana + +# Temporary files in `data` directory older than given duration will be removed +;temp_data_lifetime = 24h + +# Directory where grafana can store logs +;logs = /var/log/grafana + +# Directory where grafana will automatically scan and look for plugins +;plugins = /var/lib/grafana/plugins + +# folder that contains provisioning config files that grafana will apply on startup and while running. +;provisioning = conf/provisioning + +#################################### Server #################################### +[server] +# Protocol (http, https, h2, socket) +;protocol = http + +# The ip address to bind to, empty will bind to all interfaces +;http_addr = + +# The http port to use +http_port = 80 + +# The public facing domain name used to access grafana from a browser +;domain = localhost + +# Redirect to correct domain if host header does not match domain +# Prevents DNS rebinding attacks +;enforce_domain = false + +# The full public facing url you use in browser, used for redirects and emails +# If you use reverse proxy and sub path specify full url (with sub path) +root_url = https://grafana.aztec.network/ + +# Serve Grafana from subpath specified in `root_url` setting. By default it is set to `false` for compatibility reasons. +;serve_from_sub_path = false + +# Log web requests +;router_logging = false + +# the path relative working path +;static_root_path = public + +# enable gzip +;enable_gzip = false + +# https certs & key file +;cert_file = +;cert_key = + +# Unix socket path +;socket = + +#################################### Database #################################### +[database] +# You can configure the database connection by specifying type, host, name, user and password +# as separate properties or as on string using the url properties. + +# Either "mysql", "postgres" or "sqlite3", it's your choice +;type = sqlite3 +;host = 127.0.0.1:3306 +;name = grafana +;user = root +# If the password contains # or ; you have to wrap it with triple quotes. Ex """#password;""" +;password = + +# Use either URL or the previous fields to configure the database +# Example: mysql://user:secret@host:port/database +;url = + +# For "postgres" only, either "disable", "require" or "verify-full" +;ssl_mode = disable + +;ca_cert_path = +;client_key_path = +;client_cert_path = +;server_cert_name = + +# For "sqlite3" only, path relative to data_path setting +;path = grafana.db + +# Max idle conn setting default is 2 +;max_idle_conn = 2 + +# Max conn setting default is 0 (mean not set) +;max_open_conn = + +# Connection Max Lifetime default is 14400 (means 14400 seconds or 4 hours) +;conn_max_lifetime = 14400 + +# Set to true to log the sql calls and execution times. +;log_queries = + +# For "sqlite3" only. cache mode setting used for connecting to the database. (private, shared) +;cache_mode = private + +#################################### Cache server ############################# +[remote_cache] +# Either "redis", "memcached" or "database" default is "database" +;type = database + +# cache connectionstring options +# database: will use Grafana primary database. +# redis: config like redis server e.g. `addr=127.0.0.1:6379,pool_size=100,db=0,ssl=false`. Only addr is required. ssl may be 'true', 'false', or 'insecure'. +# memcache: 127.0.0.1:11211 +;connstr = + +#################################### Data proxy ########################### +[dataproxy] + +# This enables data proxy logging, default is false +;logging = false + +# How long the data proxy waits before timing out, default is 30 seconds. +# This setting also applies to core backend HTTP data sources where query requests use an HTTP client with timeout set. +;timeout = 30 + +# How many seconds the data proxy waits before sending a keepalive probe request. +;keep_alive_seconds = 30 + +# How many seconds the data proxy waits for a successful TLS Handshake before timing out. +;tls_handshake_timeout_seconds = 10 + +# How many seconds the data proxy will wait for a server's first response headers after +# fully writing the request headers if the request has an "Expect: 100-continue" +# header. A value of 0 will result in the body being sent immediately, without +# waiting for the server to approve. +;expect_continue_timeout_seconds = 1 + +# The maximum number of idle connections that Grafana will keep alive. +;max_idle_connections = 100 + +# How many seconds the data proxy keeps an idle connection open before timing out. +;idle_conn_timeout_seconds = 90 + +# If enabled and user is not anonymous, data proxy will add X-Grafana-User header with username into the request, default is false. +;send_user_header = false + +#################################### Analytics #################################### +[analytics] +# Server reporting, sends usage counters to stats.grafana.org every 24 hours. +# No ip addresses are being tracked, only simple counters to track +# running instances, dashboard and error counts. It is very helpful to us. +# Change this option to false to disable reporting. +;reporting_enabled = true + +# Set to false to disable all checks to https://grafana.net +# for new versions (grafana itself and plugins), check is used +# in some UI views to notify that grafana or plugin update exists +# This option does not cause any auto updates, nor send any information +# only a GET request to http://grafana.com to get latest versions +;check_for_updates = true + +# Google Analytics universal tracking code, only enabled if you specify an id here +;google_analytics_ua_id = + +# Google Tag Manager ID, only enabled if you specify an id here +;google_tag_manager_id = + +#################################### Security #################################### +[security] +# disable creation of admin user on first start of grafana +;disable_initial_admin_creation = false + +# default admin user, created on startup +;admin_user = admin + +# default admin password, can be changed before first start of grafana, or in profile settings +;admin_password = admin + +# used for signing +;secret_key = SW2YcwTIb9zpOOhoPsMm + +# disable gravatar profile images +;disable_gravatar = false + +# data source proxy whitelist (ip_or_domain:port separated by spaces) +;data_source_proxy_whitelist = + +# disable protection against brute force login attempts +;disable_brute_force_login_protection = false + +# set to true if you host Grafana behind HTTPS. default is false. +;cookie_secure = false + +# set cookie SameSite attribute. defaults to `lax`. can be set to "lax", "strict", "none" and "disabled" +;cookie_samesite = lax + +# set to true if you want to allow browsers to render Grafana in a ,