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

Release/pectra #399

Open
wants to merge 17 commits into
base: master
Choose a base branch
from
Open

Release/pectra #399

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
d667e3a
feat: Add nginx server configuration for clickhouse
samcm Sep 26, 2024
8b75f71
Initial electra
samcm Sep 26, 2024
af2b04e
feat: Add support for Electra block in beacon block processing
samcm Sep 26, 2024
295e9fc
Merge master
samcm Oct 15, 2024
9afbe17
chore: Remove xatu-cannon service from docker-compose.yml
samcm Oct 15, 2024
4bd59c4
Merge branch 'master' into release/pectra
samcm Oct 15, 2024
c68f8fd
feat: Add CANNON_NETWORK_NAME to docker-compose.yml
samcm Oct 15, 2024
18d6c6e
feat: Enhance logging for network name override
samcm Oct 15, 2024
4e9f305
Merge branch 'master' into release/pectra
samcm Oct 15, 2024
8ea761f
feat: Add support for Electra beacon block message
samcm Oct 15, 2024
df67f77
Merge branch 'master' into release/pectra
samcm Oct 17, 2024
e118e82
style: Add resolver configuration for nginx servers
samcm Oct 17, 2024
23a6a56
feat: Add password configuration for ClickHouse users
samcm Oct 21, 2024
1c8ee72
feat: Add access control improvements and constraints
samcm Oct 21, 2024
feafca8
refactor: Update version of go-eth2-client to v0.21.12
samcm Oct 23, 2024
631f2d2
Merge branch 'master' into release/pectra
samcm Oct 31, 2024
3c176e1
fix: Update version of go-eth2-client to v0.21.12-0.20241014214053-75…
samcm Oct 31, 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
3 changes: 3 additions & 0 deletions ...y/local/docker-compose/clickhouse/clickhouse-01/etc/clickhouse-server/config.d/config.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,4 +55,7 @@
<shard>01</shard>
<replica>01</replica>
</macros>
<access_control_improvements>
<settings_constraints_replace_previous>true</settings_constraints_replace_previous>
</access_control_improvements>
</clickhouse>
10 changes: 9 additions & 1 deletion deploy/local/docker-compose/clickhouse/clickhouse-01/etc/clickhouse-server/users.d/users.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,15 @@
<max_memory_usage>10000000000</max_memory_usage>
<use_uncompressed_cache>0</use_uncompressed_cache>
<load_balancing>in_order</load_balancing>
<readonly>1</readonly>
<readonly>2</readonly>
<log_queries>1</log_queries>
<constraints>
<max_execution_time>
<changeable_in_readonly/>
<min>0</min>
<max>180</max>
</max_execution_time>
</constraints>
</readonly>
</profiles>
<users>
Expand All @@ -24,6 +31,7 @@
</networks>
<quota>default</quota>
<access_management>1</access_management>
<password from_env="CLICKHOUSE_PASSWORD" replace="replace"></password>
<named_collection_control>1</named_collection_control>
<show_named_collections>1</show_named_collections>
<show_named_collections_secrets>1</show_named_collections_secrets>
Expand Down
3 changes: 3 additions & 0 deletions ...y/local/docker-compose/clickhouse/clickhouse-02/etc/clickhouse-server/config.d/config.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,4 +55,7 @@
<shard>02</shard>
<replica>01</replica>
</macros>
<access_control_improvements>
<settings_constraints_replace_previous>true</settings_constraints_replace_previous>
</access_control_improvements>
</clickhouse>
10 changes: 9 additions & 1 deletion deploy/local/docker-compose/clickhouse/clickhouse-02/etc/clickhouse-server/users.d/users.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,15 @@
<max_memory_usage>10000000000</max_memory_usage>
<use_uncompressed_cache>0</use_uncompressed_cache>
<load_balancing>in_order</load_balancing>
<readonly>1</readonly>
<readonly>2</readonly>
<log_queries>1</log_queries>
<constraints>
<max_execution_time>
<changeable_in_readonly/>
<min>0</min>
<max>180</max>
</max_execution_time>
</constraints>
</readonly>
</profiles>
<users>
Expand All @@ -22,6 +29,7 @@
<networks>
<ip>::/0</ip>
</networks>
<password from_env="CLICKHOUSE_PASSWORD" replace="replace"></password>
<quota>default</quota>
<access_management>1</access_management>
<named_collection_control>1</named_collection_control>
Expand Down
20 changes: 18 additions & 2 deletions deploy/local/docker-compose/nginx/nginx.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,8 @@ http {
server {
listen 80;
server_name grafana.$HOSTNAME;

resolver 127.0.0.11 valid=10s;
resolver_timeout 5s;
location / {
proxy_pass http://xatu-grafana:3000;
proxy_set_header Host $host;
Expand All @@ -43,7 +44,8 @@ http {
server {
listen 80 http2;
server_name server.$HOSTNAME;

resolver 127.0.0.11 valid=10s;
resolver_timeout 5s;
location / {
grpc_pass grpc://xatu-server:8080;
proxy_set_header Host $host;
Expand All @@ -52,4 +54,18 @@ http {
proxy_set_header X-Forwarded-Proto $scheme;
}
}

server {
listen 80;
server_name clickhouse.$HOSTNAME;
resolver 127.0.0.11 valid=10s;
resolver_timeout 5s;
location / {
proxy_pass http://xatu-clickhouse-01:8123;
proxy_set_header Host $host;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header X-Forwarded-Proto $scheme;
}
}
}
3 changes: 2 additions & 1 deletion docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -374,7 +374,7 @@ services:
environment:
KAFKA_BROKERS: "xatu-kafka:29092"
ports:
- "${VECTOR_HTTP_KAFKA_ADDRESS:-127.0.0.1}:${VECTOR_HTTP_KAFKA_PORT:-9005}:9005"
- "${VECTOR_HTTP_KAFKA_ADDRESS:-127.0.0.1}:${VECTOR_HTTP_KAFKA_PORT:-9055}:9005"
networks:
- xatu-net
healthcheck:
Expand Down Expand Up @@ -561,6 +561,7 @@ services:
CANNON_XATU_OUTPUT_AUTHORIZATION: ${CANNON_XATU_OUTPUT_AUTHORIZATION:-Basic eGF0dTpleGFtcGxl}
# Default of http://localhost:5052
CANNON_BEACON_NODE_URL: ${CANNON_BEACON_NODE_URL:-http://localhost:5052}
CANNON_NETWORK_NAME: ${CANNON_NETWORK_NAME}
volumes:
- ./deploy/local/docker-compose/xatu-cannon.yaml:/etc/cannon/config.yaml
networks:
Expand Down
23 changes: 12 additions & 11 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ toolchain go1.22.1

replace github.com/probe-lab/hermes => github.com/ethpandaops/hermes v0.0.0-20240919054858-186de8ab9894

replace github.com/attestantio/go-eth2-client => github.com/attestantio/go-eth2-client v0.21.12-0.20241014214053-759b0ace2e43

require (
github.com/IBM/sarama v1.43.0
github.com/attestantio/go-eth2-client v0.21.9
Expand Down Expand Up @@ -86,7 +88,7 @@ require (
github.com/cpuguy83/go-md2man/v2 v2.0.3 // indirect
github.com/crate-crypto/go-ipa v0.0.0-20240223125850-b1e8a79f509c // indirect
github.com/crate-crypto/go-kzg-4844 v1.0.0 // indirect
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/davidlazar/go-crypto v0.0.0-20200604182044-b73af7476f6c // indirect
github.com/deckarep/golang-set/v2 v2.6.0 // indirect
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.3.0 // indirect
Expand All @@ -104,13 +106,13 @@ require (
github.com/fatih/color v1.16.0 // indirect
github.com/flynn/noise v1.1.0 // indirect
github.com/francoispqt/gojay v1.2.13 // indirect
github.com/fsnotify/fsnotify v1.7.0 // indirect
github.com/fsnotify/fsnotify v1.6.0 // indirect
github.com/getsentry/sentry-go v0.27.0 // indirect
github.com/go-logr/logr v1.4.2 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
github.com/go-ole/go-ole v1.3.0 // indirect
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
github.com/goccy/go-yaml v1.9.8 // indirect
github.com/goccy/go-yaml v1.9.5 // indirect
github.com/godbus/dbus/v5 v5.1.0 // indirect
github.com/gofrs/flock v0.8.1 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
Expand All @@ -122,7 +124,7 @@ require (
github.com/google/pprof v0.0.0-20240727154555-813a5fbdbec8 // indirect
github.com/gorilla/websocket v1.5.3 // indirect
github.com/grpc-ecosystem/grpc-gateway/v2 v2.19.0 // indirect
github.com/hashicorp/errwrap v1.1.0 // indirect
github.com/hashicorp/errwrap v1.0.0 // indirect
github.com/hashicorp/go-multierror v1.1.1 // indirect
github.com/hashicorp/go-uuid v1.0.3 // indirect
github.com/hashicorp/golang-lru v0.5.5-0.20210104140557-80c98217689d // indirect
Expand All @@ -131,7 +133,7 @@ require (
github.com/holiman/bloomfilter/v2 v2.0.3 // indirect
github.com/holiman/uint256 v1.3.1 // indirect
github.com/huandu/go-clone v1.6.0 // indirect
github.com/huandu/xstrings v1.4.0 // indirect
github.com/huandu/xstrings v1.3.2 // indirect
github.com/huin/goupnp v1.3.0 // indirect
github.com/inconshreveable/mousetrap v1.1.0 // indirect
github.com/ipfs/go-cid v0.4.1 // indirect
Expand Down Expand Up @@ -210,8 +212,8 @@ require (
github.com/pion/transport/v2 v2.2.10 // indirect
github.com/pion/turn/v2 v2.1.6 // indirect
github.com/pion/webrtc/v3 v3.3.0 // indirect
github.com/pk910/dynamic-ssz v0.0.3 // indirect
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
github.com/pk910/dynamic-ssz v0.0.4 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/prometheus/common v0.55.0 // indirect
github.com/prometheus/procfs v0.15.1 // indirect
github.com/prysmaticlabs/fastssz v0.0.0-20240620202422-a981b8ef89d3 // indirect
Expand All @@ -232,8 +234,7 @@ require (
github.com/schollz/progressbar/v3 v3.3.4 // indirect
github.com/shirou/gopsutil v3.21.11+incompatible // indirect
github.com/spaolacci/murmur3 v1.1.0 // indirect
github.com/spf13/afero v1.11.0 // indirect
github.com/spf13/cast v1.6.0 // indirect
github.com/spf13/cast v1.5.0 // indirect
github.com/spf13/pflag v1.0.5 // indirect
github.com/supranational/blst v0.3.13 // indirect
github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 // indirect
Expand All @@ -253,7 +254,7 @@ require (
go.opentelemetry.io/otel/metric v1.24.0 // indirect
go.opentelemetry.io/otel/sdk/metric v1.24.0 // indirect
go.opentelemetry.io/proto/otlp v1.1.0 // indirect
go.uber.org/atomic v1.11.0 // indirect
go.uber.org/atomic v1.9.0 // indirect
go.uber.org/dig v1.17.1 // indirect
go.uber.org/fx v1.22.1 // indirect
go.uber.org/mock v0.4.0 // indirect
Expand All @@ -270,7 +271,7 @@ require (
golang.org/x/time v0.5.0 // indirect
golang.org/x/tools v0.23.0 // indirect
golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 // indirect
google.golang.org/api v0.171.0 // indirect
google.golang.org/api v0.44.0 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20240814211410-ddb44dafa142 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240814211410-ddb44dafa142 // indirect
gopkg.in/Knetic/govaluate.v3 v3.0.0 // indirect
Expand Down
Loading
Loading