Skip to content

Commit 3b65c0e

Browse files
fix(genesis): resolve clean-build blockers - port conflict, Dockerfile AS casing, docs alignment
- docker-compose.monitoring.yml: Grafana 3000->3001, pin image tags (prometheus v2.48, grafana 10.2, alertmanager v0.26), prevents port conflict with frontend - Dockerfile/Dockerfile.backend.optimized/Dockerfile.frontend.optimized: AS -> AS (uppercase per BuildKit spec) - GENESIS_QUICK_START/LAUNCH_GUIDE/CHECKLIST/INTEGRATION_COMPLETE: Grafana port 3000->3001 throughout
1 parent b2d5553 commit 3b65c0e

8 files changed

Lines changed: 29 additions & 29 deletions

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Multi-stage Dockerfile for Sovereign Maps Backend
22

33
# Stage 1: Builder
4-
FROM python:3.11-slim as builder
4+
FROM python:3.11-slim AS builder
55

66
WORKDIR /build
77

Dockerfile.backend.optimized

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Multi-stage Dockerfile for Sovereign Map Backend (Optimized)
22

33
# Stage 1: Builder
4-
FROM python:3.11-slim as builder
4+
FROM python:3.11-slim AS builder
55

66
WORKDIR /build
77

Dockerfile.frontend.optimized

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
# Multi-stage Dockerfile for Sovereign Map Frontend (Optimized)
22

33
# Stage 1: Dependencies
4-
FROM node:20-alpine as deps
4+
FROM node:20-alpine AS deps
55
WORKDIR /app
66
COPY frontend/package*.json ./
77
RUN npm install --no-audit --no-fund && npm cache clean --force
88

99
# Stage 2: Build
10-
FROM node:20-alpine as build
10+
FROM node:20-alpine AS build
1111
WORKDIR /app
1212
COPY --from=deps /app/node_modules ./node_modules
1313
COPY frontend/ .

GENESIS_INTEGRATION_COMPLETE.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
#### 1. Genesis Launch Overview Dashboard
1515
**File**: `grafana/dashboards/genesis-launch-overview.json`
16-
**URL**: http://localhost:3000/d/genesis-launch-overview
16+
**URL**: http://localhost:3001/d/genesis-launch-overview
1717

1818
**11 Comprehensive Panels:**
1919
- 🚀 Genesis Block Round (current FL round counter)
@@ -30,7 +30,7 @@
3030

3131
#### 2. Network Performance & Health Dashboard
3232
**File**: `grafana/dashboards/network-performance-health.json`
33-
**URL**: http://localhost:3000/d/network-performance-health
33+
**URL**: http://localhost:3001/d/network-performance-health
3434

3535
**10 Network Monitoring Panels:**
3636
- 🟢 Online/Offline Nodes Summary
@@ -46,7 +46,7 @@
4646

4747
#### 3. Consensus & Trust Monitoring Dashboard
4848
**File**: `grafana/dashboards/consensus-trust-monitoring.json`
49-
**URL**: http://localhost:3000/d/consensus-trust-monitoring
49+
**URL**: http://localhost:3001/d/consensus-trust-monitoring
5050

5151
**8 Trust & Security Panels:**
5252
- 📊 Federated Learning Metrics (accuracy, loss, convergence)
@@ -239,7 +239,7 @@
239239
./genesis-launch.sh
240240

241241
# 3. Access Grafana dashboards
242-
open http://localhost:3000
242+
open http://localhost:3001
243243
# Login: admin / admin
244244

245245
# 4. Monitor progress
@@ -250,9 +250,9 @@ open http://localhost:3000
250250

251251
| Dashboard | URL |
252252
|-----------|-----|
253-
| **Genesis Launch Overview** | http://localhost:3000/d/genesis-launch-overview |
254-
| **Network Performance** | http://localhost:3000/d/network-performance-health |
255-
| **Consensus & Trust** | http://localhost:3000/d/consensus-trust-monitoring |
253+
| **Genesis Launch Overview** | http://localhost:3001/d/genesis-launch-overview |
254+
| **Network Performance** | http://localhost:3001/d/network-performance-health |
255+
| **Consensus & Trust** | http://localhost:3001/d/consensus-trust-monitoring |
256256

257257
---
258258

@@ -355,7 +355,7 @@ Fix ESLint configuration for ESLint 9.x
355355
### Next Steps:
356356
1. Run validation: `./validate-genesis-launch.sh`
357357
2. Execute launch: `./genesis-launch.sh`
358-
3. Access dashboards: http://localhost:3000
358+
3. Access dashboards: http://localhost:3001
359359
4. Monitor progress for 30 minutes
360360
5. Verify success criteria in [GENESIS_LAUNCH_GUIDE.md](GENESIS_LAUNCH_GUIDE.md)
361361

GENESIS_LAUNCH_CHECKLIST.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
- [ ] 30-day retention policy set
4242

4343
### Grafana
44-
- [ ] Grafana container running on port 3000
44+
- [ ] Grafana container running on port 3001
4545
- [ ] Admin credentials working (admin/admin)
4646
- [ ] Dashboards provisioned automatically
4747
- [ ] Three Genesis dashboards visible:
@@ -305,7 +305,7 @@
305305
2. Review dashboards for anomalies
306306
3. Consult troubleshooting guide: [GENESIS_LAUNCH_GUIDE.md](GENESIS_LAUNCH_GUIDE.md)
307307
4. Contact technical team if unresolved
308-
5. Emergency shutdown if critical: `docker compose -f docker-compose.production.yml -f docker-compose.monitoring.yml down --remove-orphans`
308+
5. Emergency shutdown if critical: `docker compose -f docker-compose.production.yml down --remove-orphans`
309309

310310
---
311311

GENESIS_LAUNCH_GUIDE.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ The **Genesis Block Launch** marks the official production deployment of Soverei
4949
│ │
5050
│ 📊 Monitoring Stack │
5151
│ ├─ Prometheus (Port 9090) │
52-
│ ├─ Grafana (Port 3000) │
52+
│ ├─ Grafana (Port 3001) │
5353
│ └─ Alertmanager (Port 9093) │
5454
│ │
5555
└─────────────────────────────────────────────────┘
@@ -143,7 +143,7 @@ docker compose -f docker-compose.monitoring.yml up -d
143143

144144
**Verification:**
145145
- Prometheus: http://localhost:9090
146-
- Grafana: http://localhost:3000 (admin/admin)
146+
- Grafana: http://localhost:3001 (admin/admin)
147147
- Alertmanager: http://localhost:9093
148148

149149
### Step 3: Genesis Block Creation
@@ -193,7 +193,7 @@ Monitor system health:
193193

194194
### Genesis Launch Overview Dashboard
195195

196-
**URL**: http://localhost:3000/d/genesis-launch-overview
196+
**URL**: http://localhost:3001/d/genesis-launch-overview
197197

198198
**Key Metrics:**
199199
- 🚀 Genesis Block Round (current training round)
@@ -211,7 +211,7 @@ Monitor system health:
211211

212212
### Network Performance & Health
213213

214-
**URL**: http://localhost:3000/d/network-performance-health
214+
**URL**: http://localhost:3001/d/network-performance-health
215215

216216
**Key Metrics:**
217217
- 🟢 Online/Offline Nodes
@@ -229,7 +229,7 @@ Monitor system health:
229229

230230
### Consensus & Trust Monitoring
231231

232-
**URL**: http://localhost:3000/d/consensus-trust-monitoring
232+
**URL**: http://localhost:3001/d/consensus-trust-monitoring
233233

234234
**Key Metrics:**
235235
- 📊 Federated Learning Metrics
@@ -249,7 +249,7 @@ Monitor system health:
249249
### Dashboard Navigation
250250

251251
```
252-
http://localhost:3000
252+
http://localhost:3001
253253
├─ Genesis Launch Overview (Main launch dashboard)
254254
├─ Network Performance (Network health & metrics)
255255
├─ Consensus & Trust (Security & trust monitoring)
@@ -336,7 +336,7 @@ docker run --rm -v grafana_data:/data -v $(pwd):/backup \
336336
**Restore from Backup:**
337337
```bash
338338
# Stop services
339-
docker compose -f docker-compose.production.yml -f docker-compose.monitoring.yml down --remove-orphans
339+
- docker compose -f docker-compose.production.yml down --remove-orphans
340340

341341
# Restore data
342342
tar xzf prometheus-backup-YYYYMMDD.tar.gz -C /var/lib/docker/volumes/prometheus_data/_data

GENESIS_QUICK_START.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ ls genesis-launch.sh # Must exist
3636

3737
| Service | URL | Credentials |
3838
|---------|-----|-------------|
39-
| **Grafana** | http://localhost:3000 | admin / admin |
39+
| **Grafana** | http://localhost:3001 | admin / admin |
4040
| **Prometheus** | http://localhost:9090 | - |
4141
| **Backend API** | http://localhost:8000 | - |
4242
| **Alertmanager** | http://localhost:9093 | - |
@@ -47,19 +47,19 @@ ls genesis-launch.sh # Must exist
4747

4848
### 🎯 Genesis Launch Overview
4949
```
50-
http://localhost:3000/d/genesis-launch-overview
50+
http://localhost:3001/d/genesis-launch-overview
5151
```
5252
**Primary launch dashboard** - Training progress, node-agent count, accuracy
5353

5454
### 🌐 Network Performance
5555
```
56-
http://localhost:3000/d/network-performance-health
56+
http://localhost:3001/d/network-performance-health
5757
```
5858
**Network health** - Latency, throughput, connections
5959

6060
### 🔒 Consensus & Trust
6161
```
62-
http://localhost:3000/d/consensus-trust-monitoring
62+
http://localhost:3001/d/consensus-trust-monitoring
6363
```
6464
**Security monitoring** - Trust scores, TPM verification
6565

docker-compose.monitoring.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
services:
22
prometheus:
3-
image: prom/prometheus:latest
3+
image: prom/prometheus:v2.48.0-alpine
44
ports:
55
- "9090:9090"
66
volumes:
@@ -16,9 +16,9 @@ services:
1616
restart: unless-stopped
1717

1818
grafana:
19-
image: grafana/grafana:latest
19+
image: grafana/grafana:10.2-alpine
2020
ports:
21-
- "3000:3000"
21+
- "3001:3000"
2222
volumes:
2323
- grafana_data:/var/lib/grafana
2424
- ./grafana/provisioning/datasources:/etc/grafana/provisioning/datasources
@@ -40,7 +40,7 @@ services:
4040
restart: unless-stopped
4141

4242
alertmanager:
43-
image: prom/alertmanager:latest
43+
image: prom/alertmanager:v0.26.0-alpine
4444
ports:
4545
- "9093:9093"
4646
volumes:

0 commit comments

Comments
 (0)