diff --git a/compose.devnet.setup.yml b/compose.devnet.setup.yml index 37cf9e4c2..3ea3d3309 100644 --- a/compose.devnet.setup.yml +++ b/compose.devnet.setup.yml @@ -76,6 +76,18 @@ services: - CFG_API_PORT=${NODE3_API_PORT} entrypoint: /etc/logos-blockchain/scripts/setup_cfgsync_client.sh + nginx: + container_name: nginx + image: ghcr.io/logos-blockchain/logos-blockchain:devnet + ports: + - "18080:18080" + depends_on: + - cfgsync + volumes: + - ./testnet/nginx-setup.conf:/etc/nginx/nginx.conf:ro + - ./testnet/static:/usr/share/nginx/html:ro + entrypoint: [ "nginx", "-g", "daemon off;" ] + volumes: node-data: name: logos-node-data diff --git a/testnet/cfgsync.yaml b/testnet/cfgsync.yaml index a87d22f23..f5bc945b2 100644 --- a/testnet/cfgsync.yaml +++ b/testnet/cfgsync.yaml @@ -15,7 +15,7 @@ mode: Run tracing_settings: logger: otlp: - endpoint: "http://devnet.blockchain.logos.co:3100" + endpoint: "http://otel:4317" service_name: "init_node" stdout: true stderr: false diff --git a/testnet/compose.tracing.yml b/testnet/compose.tracing.yml index 785890dc5..6d37d7e4e 100644 --- a/testnet/compose.tracing.yml +++ b/testnet/compose.tracing.yml @@ -9,12 +9,12 @@ services: - GF_AUTH_DISABLE_LOGIN_FORM=true - GF_FEATURE_TOGGLES_ENABLE=traceqlEditor traceQLStreaming metricsSummary env_file: - - ./testnet/tracing/grafana/plugins.env + - ./tracing/grafana/plugins.env volumes: - - ./testnet/tracing/grafana/grafana.ini:/etc/grafana/grafana.ini:z - - ./testnet/tracing/grafana/datasources.yaml:/etc/grafana/provisioning/datasources/datasources.yaml:z - - ./testnet/tracing/grafana/dashboards.yml:/etc/grafana/provisioning/dashboards/dashboards.yml:z - - ./testnet/tracing/grafana/dashboards:/var/lib/grafana/dashboards/:z + - ./tracing/grafana/grafana.ini:/etc/grafana/grafana.ini:z + - ./tracing/grafana/datasources.yaml:/etc/grafana/provisioning/datasources/datasources.yaml:z + - ./tracing/grafana/dashboards.yml:/etc/grafana/provisioning/dashboards/dashboards.yml:z + - ./tracing/grafana/dashboards:/var/lib/grafana/dashboards/:z ports: - 9091:3000 restart: on-failure @@ -26,7 +26,7 @@ services: image: otel/opentelemetry-collector-contrib:latest command: ["--config=/etc/otel-collector-config.yaml"] volumes: - - ./testnet/tracing/otel.yaml:/etc/otel-collector-config.yaml + - ./tracing/otel.yaml:/etc/otel-collector-config.yaml ports: - "0.0.0.0:3100:4317" - "14318:4318" @@ -38,14 +38,14 @@ services: - "24317:4317" - "24318:4318" volumes: - - ./testnet/tracing/loki.yaml:/etc/loki/local-config.yaml + - ./tracing/loki.yaml:/etc/loki/local-config.yaml command: -config.file=/etc/loki/local-config.yaml prometheus: container_name: prometheus image: docker.io/prom/prometheus:v3.0.1 volumes: - - ./testnet/tracing/prometheus.yaml:/etc/prometheus/prometheus.yml:z + - ./tracing/prometheus.yaml:/etc/prometheus/prometheus.yml:z command: - --config.file=/etc/prometheus/prometheus.yml - --storage.tsdb.retention.time=7d @@ -53,15 +53,3 @@ services: ports: - "0.0.0.0:9090:9090" restart: on-failure - - tempo: - image: grafana/tempo:latest - container_name: tempo - command: [ "-config.file=/etc/tempo.yaml" ] - volumes: - - ./testnet/tracing/tempo.yaml:/etc/tempo.yaml:z - - ./tempo-data:/var/tempo - ports: - - "34317:4317" - depends_on: - - tempo-init diff --git a/testnet/nginx-setup.conf b/testnet/nginx-setup.conf new file mode 100644 index 000000000..6e00e6928 --- /dev/null +++ b/testnet/nginx-setup.conf @@ -0,0 +1,24 @@ +events { + worker_connections 1024; +} + +http { + include /etc/nginx/mime.types; + default_type application/octet-stream; + + sendfile on; + keepalive_timeout 65; + + server { + listen 18080; + server_name _; + + # CFGSYNC API (Proxy to the internal Docker service). + location /cfgsync/ { + proxy_pass http://cfgsync:4400/; + proxy_http_version 1.1; + proxy_set_header Host $host; + proxy_set_header X-Real-IP $remote_addr; + } + } +} diff --git a/testnet/scripts/run_cfgsync_server.sh b/testnet/scripts/run_cfgsync_server.sh index 77a42772a..4b3e5ee00 100755 --- a/testnet/scripts/run_cfgsync_server.sh +++ b/testnet/scripts/run_cfgsync_server.sh @@ -3,6 +3,6 @@ set -e export CFG_SERVER_MODE="run" \ - CFG_SERVER_STORAGE_PATH="/node-data/cfgsync/deploymen-settings.yaml" + CFG_SERVER_STORAGE_PATH="/node-data/cfgsync/deployment-settings.yaml" exec /usr/bin/logos-blockchain-cfgsync-server /etc/logos-blockchain/cfgsync.yaml