Compare commits
4
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
e0f5e4f74e | ||
|
|
de9adb13cf | ||
|
|
c380196fab | ||
|
|
b17c60f997 |
@@ -1,391 +0,0 @@
|
|||||||
# CHECKPOINT — Alpaca Trading System Remediation Plan
|
|
||||||
**Status:** GATE 0 COMPLETE · **Created:** 2026-07-01 · **Resumed:** 2026-07-01T14:35Z
|
|
||||||
**Pick-up instruction for a new session:** Read this file top-to-bottom. Gate 0 is done; resume at Gate 1.
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## ✅ GATE 0 — COMPLETE (2026-07-01T14:46Z)
|
|
||||||
|
|
||||||
### OSS Before/After
|
|
||||||
|
|
||||||
| Metric | Before (broken) | After (fixed) | Delta |
|
|
||||||
|--------|-----------------|---------------|-------|
|
|
||||||
| `oss` | 1.094 (above target!) | **-0.605** (below floor) | −1.699 |
|
|
||||||
| `oss_trend` | "improving" | **"degrading"** | ✓ fixed |
|
|
||||||
| `calmar` | 2.174 (sign destroyed) | **-2.174** | sign restored |
|
|
||||||
| `spy_30d_return` | 0.58 (hardcoded) | **-1.44** (live) | real benchmark |
|
|
||||||
| `rolling_alpha` | -1.01 (wrong) | **1.01** (portfolio beat SPY) | flipped |
|
|
||||||
| `portfolio_beta` | -0.74 (wrong) | **0.30** (correct) | sign fixed |
|
|
||||||
| `win_rate_adaptations` | 0.5 (dead code) | **removed** | dead code excised|
|
|
||||||
| `benchmark_error` | — | **null** | fetch succeeded |
|
|
||||||
|
|
||||||
### Changes Made
|
|
||||||
|
|
||||||
| Gate | File | Changes |
|
|
||||||
|------|------|---------|
|
|
||||||
| 0.1 | `scripts/compute_oss.py:65-66` | `abs(cagr)` → `cagr`; floor `0.0` → `-5.0` |
|
|
||||||
| 0.2 | `scripts/compute_oss.py:344-362` | Removed dead `_compute_adapt_win_rate()` + call site |
|
|
||||||
| 0.3 | `scripts/compute_oss.py:45-61` | Added `_fetch_spy_30d_return()` (yfinance via ^GSPC) |
|
|
||||||
| 0.3 | `scripts/compute_oss.py:293-301` | Replaced hardcoded 0.58 with live fetch; alpha=None on failure |
|
|
||||||
| 0.3 | `scripts/compute_oss.py:334` | `_compute_beta` now accepts live spy_return param |
|
|
||||||
| 0.3 | `scripts/compute_oss.py:328-329` | JSON output now includes `spy_30d_return` + `benchmark_error` |
|
|
||||||
| 0.4 | `tests/test_oss_monotonicity.py` | NEW — 3 property tests (Calmar sign, monotonicity, known values) |
|
|
||||||
| 0.4 | `tests/test_benchmark_integrity.py` | NEW — 3 tests (no 0.58 literal, fetch signature, alpha sign mock) |
|
|
||||||
| 0.4 | `~/.hermes/scripts/contract_invariant_watchdog.py` | Added 2 new test files to TEST_FILES list (now 7 files) |
|
|
||||||
|
|
||||||
### Verification
|
|
||||||
|
|
||||||
- `compute_oss.py` runs clean: OSS=-0.605, trend=degrading, live SPY=-1.44%
|
|
||||||
- `tests/`: 36 passed (30 original + 6 new)
|
|
||||||
- Watchdog: "✅ All contract invariants hold (7 test files passed)"
|
|
||||||
|
|
||||||
### Next: Gate 1 — Make the optimization loop load-bearing
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## ✅ GATE 1 — COMPLETE (2026-07-01T15:00Z)
|
|
||||||
|
|
||||||
### Changes Made
|
|
||||||
|
|
||||||
| Sub-gate | File | Changes |
|
|
||||||
|----------|------|---------|
|
|
||||||
| 1.1 | `scripts/migrate_gate1_schema.py` | NEW — creates `adaptations` + `parameter_state` tables, seeds 5 params |
|
|
||||||
| 1.1 | `trade_journal.db` | `parameter_state` (5 params) + `adaptations` (0 rows, clean) |
|
|
||||||
| 1.2 | `scripts/apply_adaptations.py` | NEW — reads OSS+regime, proposes bounded changes, writes DB |
|
|
||||||
| 1.3 | `scripts/apply_adaptations.py:auto_unwind()` | Auto-reverts params after 3 consecutive non-positive forward_oss_delta |
|
|
||||||
| 1.4 | `scripts/compute_oss.py:W_ADAPT=0.10` | Re-weighted: W_CALMAR=0.35, W_WIN_RATE=0.10, W_ADAPT=0.10 |
|
|
||||||
| 1.4 | `scripts/compute_oss.py:_compute_adapt_win_rate()` | Queries `adaptations.result='improved'` (not dead `analysis_runs`) |
|
|
||||||
| 1.5 | `tests/test_adaptation_persistence.py` | NEW — 3 tests (seeded params, write+unwind, migration idempotent) |
|
|
||||||
| 1.5 | `~/.hermes/scripts/contract_invariant_watchdog.py` | Added test_adaptation_persistence.py (now 8 test files) |
|
|
||||||
|
|
||||||
### Adaptation Logic
|
|
||||||
|
|
||||||
| OSS Range | Trend | Regime | Action |
|
|
||||||
|-----------|-------|--------|--------|
|
|
||||||
| < 0.5 | degrading | bearish | **Tighten**: lower STOP_LOSS_PCT, raise CONFIDENCE_FLOOR, lower HEDGE_CAP |
|
|
||||||
| > 0.8 | improving | bullish | **Loosen**: raise STOP_LOSS_PCT, lower CONFIDENCE_FLOOR, raise HEDGE_CAP |
|
|
||||||
| Any | — | neutral | **Hold** — no change needed |
|
|
||||||
|
|
||||||
- Step size: 10% of (max−min) range
|
|
||||||
- Bounds enforced from `parameter_state`
|
|
||||||
- Auto-unwind after 3 consecutive non-positive forward_oss_delta
|
|
||||||
|
|
||||||
### Verification
|
|
||||||
|
|
||||||
- `apply_adaptations.py` runs clean: proposes STOP_LOSS_PCT adaptation in bearish regime
|
|
||||||
- Auto-unwind test: 3 failed adaptations → reversion to original value
|
|
||||||
- `compute_oss.py` shows `AdaptWR=0.5` (neutral default, wired to real data)
|
|
||||||
- **39 tests pass** (30 original + 6 Gate 0 + 3 Gate 1)
|
|
||||||
- **Watchdog: "✅ All contract invariants hold (8 test files passed)"**
|
|
||||||
- LLM cron `2ca03134ea62` is now reporter, not actor — calls `apply_adaptations.py`
|
|
||||||
|
|
||||||
### Next: Gate 2 — Make hedging capable
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## 0. ORIENTATION (read first)
|
|
||||||
|
|
||||||
**Repo:** `/opt/alpaca-trading-agent` · **venv:** `.venv/bin/python`
|
|
||||||
**Contract (source of truth):** `/opt/openprose-contracts/cron-contracts/alpaca-trading-system.prose.md`
|
|
||||||
**Full audit narrative:** `/opt/openprose-contracts/cron-contracts/alpaca-adversarial-audit-2026-07-01.md`
|
|
||||||
**Watchdog:** `~/.hermes/scripts/contract_invariant_watchdog.py` (cron job `85522a081e55`, daily 08:00, no_agent, silent on pass)
|
|
||||||
**Adaptation cron (LLM-mode):** job `2ca03134ea62` (DeepSeek-v4-pro, pinned)
|
|
||||||
|
|
||||||
**DBs:**
|
|
||||||
- `trade_journal.db` — perf, orders, trades, `analysis_runs`, `config_store`. **This is the DB `compute_oss.py` reads** (`DB_PATH`, line 18).
|
|
||||||
- `consensus/signals.db` — `signals`, `consensus`.
|
|
||||||
|
|
||||||
**Governing design principle (Theo, non-negotiable):** the contract must be **declarative** — declare desired *outcome states* + expose *levers* + define *feedback signals*, IaC-style. NOT prescriptive step lists. Every fix below converts a frozen constant into a tuned lever or adds a missing feedback signal. Wherever you must hardcode, justify it as an irreducible exception.
|
|
||||||
|
|
||||||
**[fv] discipline for this work:** internal claims (code lines, DB columns) are verified by direct inspection (stronger than search — it's ground truth). External claims (financial definitions, SOTA findings) require independent `web_search` per claim. Label every assertion CONFIRMED / DISPUTED / UNVERIFIED. Add a property test that would have caught each defect before shipping the fix.
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## 1. VERIFIED CURRENT STATE (the evidence base)
|
|
||||||
|
|
||||||
### Live OSS output (2026-07-01T14:19Z) — the smoking gun
|
|
||||||
```
|
|
||||||
oss=1.094 (target 1.0, floor 0.5) oss_trend="improving"
|
|
||||||
calmar=2.174 profit_factor=0.679 win_rate=0.5
|
|
||||||
total_return_pct=-0.43% sharpe=-1.38 realized_pnl_30d=-$1.67 over 24 trades
|
|
||||||
```
|
|
||||||
A losing, negative-Sharpe, PF<1 portfolio scores ABOVE its aspirational target and reads "improving."
|
|
||||||
**VERIFY:** `cd /opt/alpaca-trading-agent && .venv/bin/python scripts/compute_oss.py | python3 -m json.tool`
|
|
||||||
|
|
||||||
### Confirmed defects (all [fv] CONFIRMED by direct inspection)
|
|
||||||
|
|
||||||
| ID | Defect | Exact location | Evidence |
|
|
||||||
|----|--------|---------------|----------|
|
|
||||||
| D1 | Calmar uses `abs(cagr)` — sign destroyed | `scripts/compute_oss.py:65` | `compute_calmar(-2.35,-0.43,30)=2.174` vs `(+0.43)=2.28` |
|
|
||||||
| D1b | Calmar clamp floor `max(calmar,0.0)` erases negatives even if sign fixed | `scripts/compute_oss.py:66` | `return round(min(max(calmar,0.0),5.0),3)` |
|
|
||||||
| D2 | Benchmark hardcoded | `scripts/compute_oss.py:274` (`portfolio_return - 0.58`), `:319` (`spy_30d_return = 0.58`) | never fetched; alpha+beta are self-referential |
|
|
||||||
| D3 | Win-rate query references 2 non-existent columns | `scripts/compute_oss.py:352` (`analysis_type`), `:349` (`result`) | `PRAGMA table_info(analysis_runs)` has NEITHER → bare `except:pass` at :360 → returns 0.5 forever |
|
|
||||||
| D4 | Hedge structurally incapable | `.env.prod` + `consensus/ross/config.py:84-86` | `MAX_HEDGE_POSITIONS=1`, `HEDGE_POSITION_SIZE_PCT=0.01` → max ~1% of equity; contract Rule 8 assumes 25% (`PARKER_HEDGE_CAP_PCT=0.25`, config.py:113) |
|
|
||||||
| D5 | P-004/005/006 unimplemented | grep entire tree | `hedge_strategy`, `discovery_lens`, `source_provenance` = 0 hits in *.py, 0 DB columns |
|
|
||||||
| D6 | No adaptation persistence | DB introspection | tables `parameter_state`/`adaptations`/`regime_state` do not exist; `config_store` untouched since 2026-05-25 |
|
|
||||||
| D7 | Discovery is static | `config_store.tickers` | 7 fixed symbols, last write 2026-05-22; frank=1, janet=1 distinct tickers ever |
|
|
||||||
| D8 | Position size flat, `POSITION_SIZE_PCT` dead | `consensus/ross/sizing.py:7`, `config.py:138` | `calculate_position_size` returns `cfg.MAX_POSITION_NOTIONAL` which `= MIN_NOTIONAL` ($5); the 0.025 pct is never used |
|
|
||||||
| D9 | Watchdog covers only P-002/P-003 | `contract_invariant_watchdog.py:19-25` | 5 test files = dust filter + equity source + pipeline; P-004/5/6 never tested |
|
|
||||||
| D10 | "Consensus" is single-track | `consensus/sophie.py` + signals.db | all executed decisions score=1; universes disjoint by design |
|
|
||||||
|
|
||||||
### Confirmed ASSETS (things that already exist — reuse, don't rebuild)
|
|
||||||
|
|
||||||
| Asset | Location | Use for |
|
|
||||||
|-------|----------|---------|
|
|
||||||
| Live market fetch (VIX/SPX/NDX/BTC via yfinance) | `consensus/track_parker.py:76-101` (`_fetch_market_data`) | D2 fix — reuse `spx.history(period="1mo")` for real SPY 30d return |
|
|
||||||
| Bounded tunable levers (already documented w/ min-max) | `config.py:99-113`: STOP_LOSS_PCT[-0.03,-0.07], PROFIT_TAKE_PCT[0.03,0.10], STALE_EXIT_DAYS[3,7], CONFIDENCE_FLOOR[0.65,0.85], PARKER_HEDGE_CAP_PCT[0.10,0.30] | D6 — levers EXIST; they need a *writer*, not a redesign |
|
|
||||||
| Property-test harness (hypothesis, temp-DB, module-reload) | `tests/test_perf_equity_property_invariants.py` | template for all new invariant tests |
|
|
||||||
| Regime detection (VIX-trend + SPX-vs-SMA20) | `track_parker.py:152+` (`_detect_regime`) | D4 — regime signal exists to drive dynamic hedge sizing |
|
|
||||||
| slippage_bps / intended_price columns | broker_orders schema | P-008 cost-aware gate (data already captured, unused) |
|
|
||||||
| Risk-gate framework (Gates 0-7) | `consensus/ross/gates.py:14` (`check_risk_gates`) | insert cost-aware gate here |
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## 2. EXTERNAL EVIDENCE (July 2026 SOTA) — [fv] CONFIRMED against sources
|
|
||||||
|
|
||||||
- **Calmar = signed CAGR ÷ |maxDD|** — negative return MUST yield negative Calmar. (Investopedia, Wikipedia, QuantifiedStrategies — CONFIRMED, ≥3 sources.) → D1/D1b are unambiguous bugs.
|
|
||||||
- **FINSABER (arXiv:2505.07078v5, KDD'26):** LLM edge deteriorates over long horizons/broad universe; agents "overly conservative in bull, overly aggressive in bear." Prescription: **prioritize trend detection + regime-aware risk controls over framework complexity.** CONFIRMED (abstract).
|
|
||||||
- **StockBench (arXiv:2510.02209):** most LLM agents don't beat buy&hold over 4mo, but ALL limit drawdown (-11/-14% vs -15.2%). → realistic capturable edge = **drawdown control, not alpha.** CONFIRMED.
|
|
||||||
- **Agent Market Arena (arXiv:2510.11695):** performance driven by **architecture (memory/risk/sizing), not LLM choice.** CONFIRMED.
|
|
||||||
- **CLQT (arXiv:2606.29771):** return leaderboards mislead; apparent alpha dissolves once look-ahead controlled → "mostly passive factor exposure." Evaluate capability, not single score. CONFIRMED. → OSS is exactly the single-number leaderboard being warned against.
|
|
||||||
- **Signal half-life/capacity (OpenAlgo):** turnover set by half-life; every trade pays half-spread+impact; net-of-cost is the only honest test. CONFIRMED.
|
|
||||||
- **Leveraged inverse decay (StockTitan 2026):** daily-reset -3x (SQQQ/SPXU) decays even when directionally right → prefer 1x inverse (SH/PSQ) for multi-day holds. CONFIRMED. Contract Rule 18 already says this; `MAX_HEDGE_HOLD_DAYS=3` + HEDGE_TICKERS still lists SQQQ/SPXU fight it.
|
|
||||||
|
|
||||||
**Synthesis implication:** the honest declared outcome state is **"match benchmark net of costs while bounding drawdown,"** NOT "maximize growth." Re-weight the objective accordingly (P-011).
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## 3. THE PLAN (dependency-ordered gates; LLM-paced, no human timelines)
|
|
||||||
|
|
||||||
> Each task: **DO** (exact edit) → **VERIFY** (command + expected result) → **TEST** (property/regression test to add). No task is "done" until its VERIFY passes and its TEST is committed.
|
|
||||||
|
|
||||||
### GATE 0 — Restore metric truth (BLOCKING; everything downstream is meaningless until this lands)
|
|
||||||
|
|
||||||
**0.1 — Fix Calmar sign + clamp**
|
|
||||||
- DO: `scripts/compute_oss.py:65` → `calmar = cagr / (abs(max_drawdown_pct) / 100.0)` (drop `abs(` on cagr).
|
|
||||||
- DO: `:66` → allow negatives: `return round(min(max(calmar, -5.0), 5.0), 3)` (floor -5.0, not 0.0).
|
|
||||||
- CONSIDER: the OSS aggregate weight math (`:278-280`) assumes non-negative components — after this, re-derive so a negative Calmar drags OSS below floor. Verify OSS can now go below 0.5 on a losing month.
|
|
||||||
- VERIFY: `.venv/bin/python -c "import sys;sys.path.insert(0,'scripts');from compute_oss import compute_calmar as c;print(c(-2.35,-0.43,30), c(-2.35,0.43,30))"` → first value must be **negative**, second positive.
|
|
||||||
- VERIFY: `.venv/bin/python scripts/compute_oss.py` → with current -0.43% return, `oss` must now be **< 0.5** and `oss_trend` must NOT be "improving".
|
|
||||||
- TEST: add `tests/test_oss_monotonicity.py` (hypothesis): `∀ dd, days, r1<0<r2 ⇒ compute_calmar(dd,r1,days) < compute_calmar(dd,r2,days)` AND `compute_calmar(dd, r<0, days) < 0`.
|
|
||||||
|
|
||||||
**0.2 — Fix or remove adaptation win-rate**
|
|
||||||
- Root cause: query needs `analysis_type` AND `result` columns that don't exist in `analysis_runs`.
|
|
||||||
- OPTION A (preferred, aligns with Gate 1): create the `adaptations` table (Gate 1.1) and repoint this query at it.
|
|
||||||
- OPTION B (interim): remove the `W_ADAPT * 0.5` term from OSS and renormalize weights, so OSS isn't diluted by a frozen constant. Document as temporary.
|
|
||||||
- VERIFY: grep confirms no silent `except: pass` returns a magic 0.5 that feeds OSS.
|
|
||||||
- TEST: assert `_compute_adapt_win_rate` raises or returns None (not 0.5) when the backing table/columns are absent — no silent defaults.
|
|
||||||
|
|
||||||
**0.3 — Live benchmark (kill the 0.58 literal)**
|
|
||||||
- DO: add `_fetch_spy_30d_return()` reusing Parker's pattern (`import yfinance as yf; yf.Ticker("^GSPC").history(period="1mo")`; 30d pct change). Thread into `:274` (alpha) and `:319` (beta).
|
|
||||||
- DO: on fetch failure, FAIL LOUD (return error dict / mark UNVERIFIED) — never silently default to a constant.
|
|
||||||
- VERIFY: `.venv/bin/python scripts/compute_oss.py` shows a `spy_30d_return` that changes day-to-day and ≠ 0.58; `rolling_alpha` flips sign when portfolio crosses SPY.
|
|
||||||
- TEST: `tests/test_benchmark_integrity.py` — alpha sign must equal sign(portfolio_return − live_spy_return); mock the fetcher.
|
|
||||||
|
|
||||||
**0.4 — Gate 0 acceptance**
|
|
||||||
- Re-run `compute_oss.py`; confirm it now reflects reality (the -$1.67 loss).
|
|
||||||
- Add 0.1/0.2/0.3 tests to the watchdog TEST_FILES list; run watchdog → must now FAIL if any regression reintroduces the bugs.
|
|
||||||
|
|
||||||
### GATE 1 — Make the optimization loop load-bearing (depends on Gate 0)
|
|
||||||
|
|
||||||
**1.1 — Persistence schema.** Create tables in `trade_journal.db`:
|
|
||||||
- `adaptations(id, fired_at, param_name, old_value, new_value, regime, trigger_reason, oss_before, oss_after, forward_oss_delta, result TEXT, unwound INTEGER DEFAULT 0)`
|
|
||||||
- `parameter_state(param_name PRIMARY KEY, current_value, min_bound, max_bound, updated_at, last_adaptation_id)`
|
|
||||||
- seed `parameter_state` from `config.py:99-113` bounds (STOP_LOSS_PCT, PROFIT_TAKE_PCT, STALE_EXIT_DAYS, CONFIDENCE_FLOOR, PARKER_HEDGE_CAP_PCT).
|
|
||||||
|
|
||||||
**1.2 — Move adaptation from LLM prompt to code.** Create `scripts/apply_adaptations.py`: reads OSS + regime, proposes bounded param change, writes `adaptations` + `parameter_state` rows, and config now READS from `parameter_state` (falls back to env). LLM cron `2ca03134ea62` becomes reporter, not actor.
|
|
||||||
- Declarative framing: contract declares target OSS ≥ 1.0 and the bounded levers; this code is the controller that tunes toward it.
|
|
||||||
|
|
||||||
**1.3 — Auto-unwind (Rule 8-14 guardrail).** After N evaluations (contract says 3), if `forward_oss_delta ≤ 0`, revert param from `parameter_state` and mark `unwound=1, result='reverted'`.
|
|
||||||
- TEST: property test — any adaptation with non-positive forward delta over N evals is reverted; reversibility holds (state returns to pre-adaptation value).
|
|
||||||
|
|
||||||
**1.4 — Wire win-rate.** Repoint `_compute_adapt_win_rate` at `adaptations.result='improved'`. Now OSS weight 0.15 is real.
|
|
||||||
|
|
||||||
**1.5 — Watchdog.** Add P-009 (monotonicity) + P-010 (persistence/reversibility) tests. Watchdog fails if loop goes inert.
|
|
||||||
|
|
||||||
### Next: Gate 2 — Make hedging capable (depends on Gate 0 regime truth)
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## ✅ GATE 2 — COMPLETE (2026-07-01T15:15Z)
|
|
||||||
|
|
||||||
### Changes Made
|
|
||||||
|
|
||||||
| Sub-gate | File | Changes |
|
|
||||||
|----------|------|---------|
|
|
||||||
| 2.1 | `consensus/ross/hedge.py` | **NEW** — regime-driven hedge sizing buckets, cap enforcement, hold-day tiers |
|
|
||||||
| 2.1 | `consensus/ross/sizing.py` | Hedge-aware: routes hedge tickers through dynamic sizing, non-hedge unchanged |
|
|
||||||
| 2.1 | `consensus/ross/gates.py` | **Gate 8 (Hedge Gate)**: enforces per-ticker count + total notional cap from regime |
|
|
||||||
| 2.1 | `consensus/ross/executor.py` | Extracts `bearish_score` from signal metadata, passes to sizing + gates |
|
|
||||||
| 2.2 | `trade_journal.db:broker_orders` | Added `hedge_strategy TEXT` column |
|
|
||||||
| 2.2 | `scripts/compute_hedge_attribution.py` | **NEW** — per-strategy profit factor, auto-retire PF < 0.5 for 30+ days |
|
|
||||||
| 2.3 | `consensus/ross/gates.py` | **Gate 2.3 (Cost-Aware)**: advisory warning when avg slippage > 50 bps + filled < intended×0.995 |
|
|
||||||
| test | `tests/test_hedge_sizing.py` | **NEW** — 6 tests (monotonicity, leverage tiers, bucket bounds, non-hedge passthrough) |
|
|
||||||
| wdog | `contract_invariant_watchdog.py` | Added `test_hedge_sizing.py` (now 9 test files) |
|
|
||||||
|
|
||||||
### Hedge Sizing Buckets
|
|
||||||
|
|
||||||
| Bearish Score | Bucket | Max Positions | Size/Position | 1x Hold Days | 3x Hold Days |
|
|
||||||
|--------------|--------|--------------|---------------|-------------|-------------|
|
|
||||||
| < 0.20 | no hedge | 0 | 0% | — | — |
|
|
||||||
| 0.20–0.39 | moderate | 1 | 1.0% | 5 | 2 |
|
|
||||||
| 0.40–0.69 | heavy | 2 | 1.5% | 5 | 2 |
|
|
||||||
| ≥ 0.70 | extreme | 3 | 2.0% | 5 | 2 |
|
|
||||||
|
|
||||||
- Capped at `PARKER_HEDGE_CAP_PCT` from `parameter_state` (current: 0.25)
|
|
||||||
- 1x inverses (SH, BITI, PSQ): 5-day max hold (Rule 18 + StockTitan evidence)
|
|
||||||
- 3x inverses (SQQQ, SPXU): 2-day max hold (crisis-only, high decay)
|
|
||||||
|
|
||||||
### New Gates
|
|
||||||
|
|
||||||
| Gate | Scope | Enforcement |
|
|
||||||
|------|-------|------------|
|
|
||||||
| **Gate 8** | Hedge position count + notional cap | Hard block: returns False if at limit |
|
|
||||||
| **Gate 2.3** | Cost-aware execution (slippage_bps) | Advisory warning (non-blocking — data is retrospective) |
|
|
||||||
|
|
||||||
### Verification
|
|
||||||
|
|
||||||
- Sizing: SH (hedge, bearish=0.8) → $4 on $200 equity; SH (bearish=0.3) → $2; AAPL → $5 flat
|
|
||||||
- Hold days: SH (1x) → 5 days, SQQQ (3x) → 2 days ✓
|
|
||||||
- **45 tests pass** (30 + 6 Gate 0 + 3 Gate 1 + 6 Gate 2)
|
|
||||||
- **Watchdog: "✅ All contract invariants hold (9 test files passed)"**
|
|
||||||
- OSS = −0.475 (unchanged — Gate 2 doesn't affect OSS computation)
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## ✅ GATE 3 — COMPLETE (2026-07-01T15:40Z)
|
|
||||||
|
|
||||||
### Changes Made
|
|
||||||
|
|
||||||
| Sub-gate | File | Changes |
|
|
||||||
|----------|------|---------|
|
|
||||||
| 3.1a | `consensus/ross/discovery.py` | **NEW** — DiscoveryLens framework: 3 built-in lenses (ParkerTrend, VolumeSurge, SectorRotation), registry, Source Health Score, correlation-admission gate, probationary sizing |
|
|
||||||
| 3.1b | `consensus/signals.db:signals` | Added `discovery_lens TEXT` + `source_provenance TEXT` columns |
|
|
||||||
| 3.1b | `trade_journal.db:broker_orders` | Added `discovery_lens TEXT` + `source_provenance TEXT` columns |
|
|
||||||
| 3.1c | `consensus/ross/sizing.py` | Probationary sizing: 50% notional for tickers with <3 trades or PF < 1.0 |
|
|
||||||
| 3.1c | `consensus/ross/executor.py` | Passes `db_path` to sizing for probationary check |
|
|
||||||
| 3.2 | `scripts/update_ticker_universe.py` | **NEW** — Replaces static config_store.tickers with lens-proposed, correlation-gated, aggregated universe (≥2 lenses → priority) |
|
|
||||||
| 3.3 | `scripts/update_ticker_universe.py` | Coverage-gap streaks + auto-broaden lens criteria after 3 consecutive gaps (Rule 19) |
|
|
||||||
| test | `tests/test_discovery_lens.py` | **NEW** — 9 tests (≥3 lens invariant, SHS empty-DB, correlation gate edge cases, probationary sizing, script idempotency, gap tracking) |
|
|
||||||
| wdog | `contract_invariant_watchdog.py` | Added `test_discovery_lens.py` (now 10 test files) |
|
|
||||||
|
|
||||||
### Lens Architecture
|
|
||||||
|
|
||||||
| Lens | Source | Max Tickers | Criteria |
|
|
||||||
|------|--------|-------------|----------|
|
|
||||||
| `parker_trend` | Parker macro regime signals (signals.db) | 10 | min 3 active tickers |
|
|
||||||
| `volume_surge` | Volume anomaly detection | 15 | min 3 active tickers |
|
|
||||||
| `sector_rotation` | Maya gold miners / critical minerals | 12 | min 3 active tickers |
|
|
||||||
|
|
||||||
- **Source Health Score**: yield_rate × avg_PF × 100 × decay (0.85^months) — per lens, 90-day lookback
|
|
||||||
- **Correlation gate**: rejects proposed tickers with r ≥ 0.80 vs existing positions (20-day min history)
|
|
||||||
- **Probationary sizing**: 50% notional for tickers with <3 trades or PF < 1.0
|
|
||||||
- **≥3 lens invariant**: universe update aborts if <3 lenses active
|
|
||||||
- **Rule 19 hindsight**: coverage-gap streaks tracked; criteria auto-broaden (1.3× factor) after ≥3 gaps
|
|
||||||
|
|
||||||
### Dynamic Universe Pipeline
|
|
||||||
|
|
||||||
```
|
|
||||||
Active Lenses → propose_candidates() → correlation-gate → aggregate votes
|
|
||||||
(≥2 lenses = priority) → merge with existing proven tickers → write config_store
|
|
||||||
```
|
|
||||||
|
|
||||||
### Verification
|
|
||||||
|
|
||||||
- Lens registry: 3 active lenses (`parker_trend`, `volume_surge`, `sector_rotation`) ✓
|
|
||||||
- SHS on empty DB: 0.0 (no crash) ✓
|
|
||||||
- Pearson: 1.0 perfect, -1.0 perfect negative ✓
|
|
||||||
- Probationary: SH/untraded tickers → True ✓
|
|
||||||
- Dynamic universe script: idempotent, preserves existing tickers ✓
|
|
||||||
- Gap tracking: streaks initialized ✓
|
|
||||||
- **54 tests pass** (30 + 6 Gate 0 + 3 Gate 1 + 6 Gate 2 + 9 Gate 3)
|
|
||||||
- **Watchdog: "✅ All contract invariants hold (10 test files passed)"**
|
|
||||||
- OSS = −0.477 (unchanged — Gate 3 doesn't affect OSS computation)
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## ✅ GATE 4 — COMPLETE (2026-07-01T15:50Z)
|
|
||||||
|
|
||||||
### Contract Edits (human-approved)
|
|
||||||
|
|
||||||
| Section | Change |
|
|
||||||
|---------|--------|
|
|
||||||
| §Goal "Return Maximization" → "Return Optimization" | Primary outcome = match benchmark net of costs, bound drawdown ≤25%; outperformance is secondary |
|
|
||||||
| OSS weights | Calmar 35→**40%**, Alpha 20→**15%**, Win Rate 10%, Adapt WR 10% (unchanged) |
|
|
||||||
| `parameter-state` | Added `oss_target` (0.5), `oss_floor` (0.3), `oss_weights` (per-weight bounds), `hedge_regime_buckets` (3 tiers) |
|
|
||||||
| Invariant list | Added **P-007** (benchmark integrity), **P-008** (cost-aware execution), **P-009** (metric monotonicity), **P-010** (adaptation reversibility), **P-011** (drawdown-first objective) |
|
|
||||||
|
|
||||||
### Code Changes
|
|
||||||
|
|
||||||
| File | Change |
|
|
||||||
|------|--------|
|
|
||||||
| `scripts/compute_oss.py` | W_CALMAR 0.35→**0.40**, W_ALPHA 0.20→**0.15** |
|
|
||||||
| `alpaca-trading-system.prose.md` | Full contract update: 3 sections edited + 5 invariants added |
|
|
||||||
|
|
||||||
### OSS Impact
|
|
||||||
|
|
||||||
| Metric | Before (Gate 3) | After (Gate 4) |
|
|
||||||
|--------|----------------|----------------|
|
|
||||||
| OSS | −0.477 | **−0.590** |
|
|
||||||
| Trend | degrading | degrading |
|
|
||||||
| Calmar weight | 35% | **40%** |
|
|
||||||
| Alpha weight | 20% | **15%** |
|
|
||||||
|
|
||||||
The shift to drawdown-first weighting amplifies the honest signal: Calmar at −2.174 now drives the composite more heavily, producing a truer picture.
|
|
||||||
|
|
||||||
### Verification
|
|
||||||
|
|
||||||
- Contract updated per Theo's approval ✓
|
|
||||||
- **54 tests pass** (unchanged — contract edits don't affect test count)
|
|
||||||
- **Watchdog: "✅ All contract invariants hold (10 test files passed)"**
|
|
||||||
- OSS −0.590 | Calmar −2.174 | SPY −1.1% | Beta 0.39
|
|
||||||
|
|
||||||
### Next: Gate 5 — Wire the loop end-to-end (cron + adaptation pipeline integration)
|
|
||||||
|
|
||||||
|
|
||||||
### GATE 3 — Real field of view (parallelizable with Gate 2)
|
|
||||||
|
|
||||||
**2.1 — Dynamic hedge sizing.** Replace frozen `MAX_HEDGE_POSITIONS=1`/`HEDGE_POSITION_SIZE_PCT=0.01` with regime-driven sizing bounded by `PARKER_HEDGE_CAP_PCT` (up to the 0.25 already authorized). Sizing reads `parameter_state`. Reconcile `MAX_HEDGE_HOLD_DAYS=3` with Rule 18 (allow longer 1x-inverse holds).
|
|
||||||
**2.2 — P-004 hedge attribution.** Add `hedge_strategy` column to orders/trades + tagging; compute per-strategy profit factor; retire strategies <0.5. Demote SQQQ/SPXU (decay) to crisis-only; default SH/PSQ (1x) per Rule 18 + StockTitan evidence.
|
|
||||||
**2.3 — P-008 cost-aware gate.** New gate in `gates.py` using existing `slippage_bps`/`intended_price`: reject trades where expected edge < modeled round-trip cost (half-spread+commission+slippage). Directly addresses small-account cost drag.
|
|
||||||
- TEST: hedge sizing scales with regime severity; cost gate blocks a sub-cost-edge trade; P-004 attribution sums correctly.
|
|
||||||
|
|
||||||
### GATE 3 — Real field of view (parallelizable with Gate 2)
|
|
||||||
|
|
||||||
**3.1 — P-005/P-006.** Add `discovery_lens` + `source_provenance` columns + tagging; per-lens yield + Source Health Score; correlation-admission gate; probationary sizing for new tickers.
|
|
||||||
**3.2 — Dynamic universe.** Replace static `config_store.tickers` with lens-proposed candidates each cycle (declare: "≥3 active lenses, correlation-gated"; expose lens criteria as lever).
|
|
||||||
**3.3 — Rule 19 hindsight.** Write coverage-gap counts; broaden lens criteria when gaps detected.
|
|
||||||
- TEST: universe changes across cycles; correlation gate rejects a highly-correlated add; ≥3 lenses active invariant (P-005).
|
|
||||||
|
|
||||||
### GATE 4 — Re-baseline objective to evidence (contract edit; depends on Gates 0-2)
|
|
||||||
|
|
||||||
**4.1 — Rewrite objective declaratively (P-011).** Primary outcome = **match benchmark net of costs + bounded drawdown** (per StockBench/FINSABER), not "maximize growth." Re-weight OSS toward downside/drawdown metrics. Make hedge cap a regime-driven lever.
|
|
||||||
**4.2 — Convert remaining prescriptive constants** in the contract to `#### parameter-state` blocks: each = declared target + lever + bounds + feedback signal. The system tunes them; the contract stops fixing them.
|
|
||||||
**4.3 — Add P-007/008/009/010/011** to the invariant set + watchdog.
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## 4. NEW CONTRACT PROVISIONS (declarative form — to add in Gate 4)
|
|
||||||
|
|
||||||
- **P-007 Benchmark integrity:** every alpha/beta computed vs a live point-in-time benchmark fetched this cycle; alpha sign flips when portfolio crosses benchmark. (Kills 0.58 literal.)
|
|
||||||
- **P-008 Cost-aware execution:** no trade admitted whose expected edge < modeled round-trip cost; feedback = realized slippage_bps vs intended_price.
|
|
||||||
- **P-009 Metric monotonicity:** OSS and every sub-metric sign-correct; a losing period can never score ≥ a winning one. (Property-tested.)
|
|
||||||
- **P-010 Adaptation persistence & reversibility:** every param change writes before/after + regime; auto-reverts if forward OSS doesn't improve over N evals.
|
|
||||||
- **P-011 Drawdown-first objective:** declared outcome = benchmark-match net of costs with bounded drawdown; hedge capacity sized to actually bound it.
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## 5. EXECUTION ORDER & GUARDRAILS
|
|
||||||
1. **Gate 0 first, always.** Until OSS sees losses, every adaptation optimizes against a lie.
|
|
||||||
2. Human gate before contract edits (Gate 4) per Theo's 2-agent + 1-human policy. Contract source of truth is Gitea `SyslogSolution/prose-contracts` — mirror any contract edit there, not just `/opt/openprose-contracts/`.
|
|
||||||
3. Every code change ships with a property/regression test that would have caught the defect it fixes.
|
|
||||||
4. Pin any new cron jobs (unpinned LLM crons break on provider switch).
|
|
||||||
5. After each gate: run `compute_oss.py` + watchdog; record OSS before/after as evidence.
|
|
||||||
6. [fv] label every claim in progress reports: CONFIRMED / DISPUTED / UNVERIFIED.
|
|
||||||
|
|
||||||
## 6. OPEN ITEMS TO RE-VERIFY AT PICK-UP (state may drift)
|
|
||||||
- Re-run the live OSS command — confirm it still shows the inverted "improving" before you fix it (proves you're fixing a live bug, not a stale one).
|
|
||||||
- Confirm `PRAGMA table_info(analysis_runs)` still lacks `analysis_type` + `result`.
|
|
||||||
- Confirm `.env.prod` hedge caps unchanged (`MAX_HEDGE_POSITIONS`, `HEDGE_POSITION_SIZE_PCT`).
|
|
||||||
- Re-grep `hedge_strategy|discovery_lens|source_provenance` — confirm still 0 hits before building P-004/5/6.
|
|
||||||
- Skill hygiene: `verification-protocol` has TWO colliding copies (`productivity/` + `ra-h-os-sync/`) causing `skill_view` ambiguity errors. Load by full path or dedupe.
|
|
||||||
File diff suppressed because it is too large
Load Diff
@@ -253,7 +253,7 @@ EnvironmentFile=/etc/environment # sources LITELLM_API_KEY
|
|||||||
|
|
||||||
Run the consolidated health check:
|
Run the consolidated health check:
|
||||||
```bash
|
```bash
|
||||||
python3 /root/scripts/agent-health-check.py
|
python3 /root/scripts/agent-health-check.py # v2: now checks all 5 agents including Koby/Koonimo SSH, CT liveness, config YAML, wrapper integrity, vault non-emptiness
|
||||||
```
|
```
|
||||||
This validates all 4 LiteLLM keys, detects GPU port conflicts (ghost processes),
|
This validates all 4 LiteLLM keys, detects GPU port conflicts (ghost processes),
|
||||||
verifies gateway liveness, confirms Zulip streaming (`edit_message` present),
|
verifies gateway liveness, confirms Zulip streaming (`edit_message` present),
|
||||||
|
|||||||
@@ -3,7 +3,7 @@ kind: pattern
|
|||||||
name: infrastructure-control
|
name: infrastructure-control
|
||||||
description: >
|
description: >
|
||||||
Full infrastructure monitoring and control pattern covering the
|
Full infrastructure monitoring and control pattern covering the
|
||||||
5-node Proxmox cluster, 3 Docker ecosystems (22 containers),
|
6-node Proxmox cluster, 3 Docker ecosystems (22 containers),
|
||||||
NFS storage, and network services. Defines monitors, remediations,
|
NFS storage, and network services. Defines monitors, remediations,
|
||||||
and the access matrix for all environments.
|
and the access matrix for all environments.
|
||||||
|
|
||||||
@@ -12,6 +12,12 @@ description: >
|
|||||||
never mutate infrastructure based on them without first confirming
|
never mutate infrastructure based on them without first confirming
|
||||||
against the live system. Policy fields are authoritative. See the
|
against the live system. Policy fields are authoritative. See the
|
||||||
`verify-before-mutate` skill.
|
`verify-before-mutate` skill.
|
||||||
|
|
||||||
|
**Last verified:** 2026-07-26 — verification protocol run. CT 118 set to
|
||||||
|
static IP .20 (was DHCP .131). llama-server on RTX 5070 (.110) was down,
|
||||||
|
restarted and verified gemma-4-12b responding through LiteLLM. All 6 PVE
|
||||||
|
nodes confirmed. All CT hostnames/IPs confirmed except jdownloader (now
|
||||||
|
static). All public endpoints responding. See data/learnings.md.
|
||||||
---
|
---
|
||||||
|
|
||||||
# Infrastructure Control Pattern
|
# Infrastructure Control Pattern
|
||||||
@@ -42,8 +48,8 @@ description: >
|
|||||||
│ │ │ │ │
|
│ │ │ │ │
|
||||||
┌────┘ ┌────┘ ┌────┘ ┌────┘ ┌────┘
|
┌────┘ ┌────┘ ┌────┘ ┌────┘ ┌────┘
|
||||||
▼ ▼ ▼ ▼ ▼
|
▼ ▼ ▼ ▼ ▼
|
||||||
minipve amdpve storepve acerpve ocupve
|
minipve amdpve storepve acerpve ocupve hwepve
|
||||||
(.12) (.15) (.6) (.9) (.5)
|
(.12) (.15) (.6) (.9) (.5) (.4)
|
||||||
|
|
||||||
▼
|
▼
|
||||||
┌─────────────────────────────────────────────┐
|
┌─────────────────────────────────────────────┐
|
||||||
@@ -95,15 +101,21 @@ description: >
|
|||||||
|
|
||||||
## Section 2: Proxmox Cluster — Monitoring
|
## Section 2: Proxmox Cluster — Monitoring
|
||||||
|
|
||||||
### Nodes (5)
|
### Nodes (6)
|
||||||
|
|
||||||
| Node | IP | CPU | RAM | VMs/CTs | Role |
|
| Node | IP | CPU | RAM | VMs/CTs | Role |
|
||||||
|------|----|-----|-----|---------|------|
|
|------|----|-----|-----|---------|------|
|
||||||
| minipve | .12 | 16C | 30GB | authentik, gitea, mumuni, syslog-api, jitsi | Auth, git, messaging |
|
| minipve | .12 | 16C | 30GB | authentik, gitea, syslog-api, infisical-vault, jitsi | Auth, git, messaging |
|
||||||
| amdpve | .15 | 32C | 62GB | abiba, kagentz, tanko, tdunna, baggy, scottdenya | Agents, compute |
|
| amdpve | .15 | 32C | 62GB | tanko, tdunna, baggy, scottdenya | Agents, compute |
|
||||||
| storepve | .6 | 28C | 31GB | docker-vm, ra-h-os, PBS, media, zulip | Docker, storage, chat |
|
| storepve | .6 | 28C | 31GB | docker-vm, ra-h-os, PBS, media, jdownloader, zulip | Docker, storage, chat |
|
||||||
| acerpve | .9 | 28C | 31GB | llm-gpu, adguard | GPU VMs |
|
| acerpve | .9 | 28C | 31GB | llm-gpu | GPU VMs |
|
||||||
| ocupve | .5 | 12C | 14GB | ocu-llm | GPU VMs |
|
| ocupve | .5 | 12C | 14GB | ocu-llm | GPU VMs |
|
||||||
|
| hwepve | .4 | ? | ? | abiba, (mumuni CT 114 stopped) | Agents (new node) |
|
||||||
|
|
||||||
|
> **Note:** CTs on storepve include jdownloader (CT 118). AdGuard (CT 102) is on
|
||||||
|
> minipve at .10, not acerpve. Abiba (CT 100) is on hwepve, not amdpve. Mumuni
|
||||||
|
> (CT 114) is on hwepve (currently stopped), not minipve. Mumuni also has a
|
||||||
|
> second instance on minipve at .123 — distinguish by CT ID, not hostname.
|
||||||
|
|
||||||
### Checks (every 5 min)
|
### Checks (every 5 min)
|
||||||
|
|
||||||
@@ -355,15 +367,17 @@ fine. Services that resolve directly to a LAN IP are NetBird-independent.
|
|||||||
| Proxmox API | minipve.sysloggh.net:8006 | 192.168.68.12 | LAN IP | No | ✅ |
|
| Proxmox API | minipve.sysloggh.net:8006 | 192.168.68.12 | LAN IP | No | ✅ |
|
||||||
| LiteLLM | litellm.sysloggh.net | 192.168.68.116 | LAN IP | No | ✅ |
|
| LiteLLM | litellm.sysloggh.net | 192.168.68.116 | LAN IP | No | ✅ |
|
||||||
| Authentik | auth.sysloggh.net:443 | 192.168.68.11 | CNAME → netbird | **Yes** | ⚠️ |
|
| Authentik | auth.sysloggh.net:443 | 192.168.68.11 | CNAME → netbird | **Yes** | ⚠️ |
|
||||||
| Gitea | git.sysloggh.net:443 | 192.168.68.110 | CNAME → netbird | **Yes** | ⚠️ |
|
| Gitea | git.sysloggh.net:443 | 192.168.68.17:3000 | CNAME → netbird | **Yes** | ⚠️ |
|
||||||
| Zulip | chat.sysloggh.net:443 | 192.168.68.19 | CNAME → netbird | **Yes** | ⚠️ VERIFY-BEFORE-USE |
|
| Zulip | chat.sysloggh.net:443 | 192.168.68.19 | CNAME → netbird | **Yes** | ⚠️ VERIFY-BEFORE-USE |
|
||||||
| Pulse | pulse.sysloggh.net:443 | 192.168.68.7 | CNAME → netbird | **Yes** | ⚠️ |
|
| Pulse | pulse.sysloggh.net:443 | 192.168.68.7 | CNAME → netbird | **Yes** | ⚠️ |
|
||||||
| DNS UI | dns.sysloggh.net:443 | 192.168.68.102 | CNAME → netbird | **Yes** | ⚠️ |
|
| DNS UI | dns.sysloggh.net:443 | 192.168.68.10:80 | CNAME → netbird | **Yes** | ⚠️ |
|
||||||
| SearXNG | searxng.sysloggh.net:8888 | 192.168.68.7:8888 | LAN IP | No | ✅ |
|
| SearXNG | searxng.sysloggh.net:8888 | 192.168.68.7:8888 | LAN IP | No | ✅ |
|
||||||
| Firecrawl | firecrawl.sysloggh.net:3002 | 192.168.68.7:3002 | LAN IP | No | ✅ |
|
| Firecrawl | firecrawl.sysloggh.net:3002 | 192.168.68.7:3002 | LAN IP | No | ✅ |
|
||||||
|
|
||||||
**Verified 2026-07-02:** NetBird VPS rebooted after a hang; all CNAME'd
|
**Verified 2026-07-24:** NetBird VPS rebooted after a hang; all CNAME'd
|
||||||
services recovered. LAN-IP-direct paths stayed up throughout the outage.
|
services recovered. LAN-IP-direct paths stayed up throughout the outage.
|
||||||
|
Also added `dns.sysloggh.net` route (was missing entirely).
|
||||||
|
See `scripts/netbird-add-domain.sh` for adding new proxy routes.
|
||||||
|
|
||||||
### 5.2 Checks (every 2 min)
|
### 5.2 Checks (every 2 min)
|
||||||
|
|
||||||
@@ -511,8 +525,8 @@ enforced by the `routing-regression.config_url_violations` check in Section
|
|||||||
| LiteLLM API | `http://192.168.68.116:4000` | `https://litellm.sysloggh.net` |
|
| LiteLLM API | `http://192.168.68.116:4000` | `https://litellm.sysloggh.net` |
|
||||||
| LiteLLM (nginx) | `http://192.168.68.116` | — |
|
| LiteLLM (nginx) | `http://192.168.68.116` | — |
|
||||||
| Grafana | `http://192.168.68.116:3001` | — |
|
| Grafana | `http://192.168.68.116:3001` | — |
|
||||||
| Authentik | `https://192.168.68.11` | `https://auth.sysloggh.net` |
|
| Authentik | `https://192.168.68.11:9000` | `https://auth.sysloggh.net` |
|
||||||
| Gitea | `http://192.168.68.110:3000` | `https://git.sysloggh.net` |
|
| Gitea | `http://192.168.68.17:3000` | `https://git.sysloggh.net` |
|
||||||
| Zulip API | `http://192.168.68.19` | `https://chat.sysloggh.net` |
|
| Zulip API | `http://192.168.68.19` | `https://chat.sysloggh.net` |
|
||||||
| SearXNG | `http://192.168.68.7:8888` | — |
|
| SearXNG | `http://192.168.68.7:8888` | — |
|
||||||
| Firecrawl | `http://192.168.68.7:3002` | — |
|
| Firecrawl | `http://192.168.68.7:3002` | — |
|
||||||
@@ -575,25 +589,28 @@ ssh root@192.168.68.110 "systemctl restart llama-server"
|
|||||||
|
|
||||||
| CT | Name | Node | IP | Role | Agent |
|
| CT | Name | Node | IP | Role | Agent |
|
||||||
|----|------|------|----|------|-------|
|
|----|------|------|----|------|-------|
|
||||||
| 100 | abiba | amdpve | .24 | Pi agent (this host) | ✅ pi |
|
| CT | Name | Node | IP | Role | Agent |
|
||||||
|
|----|------|------|----|------|-------|
|
||||||
|
| 100 | abiba | **hwepve** | .24 | Pi agent | ✅ pi |
|
||||||
| 101 | llm-gpu | acerpve | .8 | GPU RTX 3090 | ❌ |
|
| 101 | llm-gpu | acerpve | .8 | GPU RTX 3090 | ❌ |
|
||||||
| 102 | adguard | acerpve | — | DNS | ❌ |
|
| 102 | adguard | **minipve** | **.10** | DNS | ❌ |
|
||||||
| 103 | ocu-llm | ocupve | .110 | GPU RTX 5070 | ❌ |
|
| 103 | ocu-llm | ocupve | .110 | GPU RTX 5070 | ❌ |
|
||||||
| 104 | authentik | minipve | .11 | OIDC | ❌ |
|
| 104 | authentik | minipve | .11 | OIDC | ❌ |
|
||||||
| 105 | kagentz | amdpve | — | Agent Zero | ✅ |
|
| 105 | kagentz | **hwepve** | — | Agent Zero | ✅ |
|
||||||
| 106 | ra-h-os | storepve | .65 | KG bridge | ✅ MCP |
|
| 106 | ra-h-os | storepve | .65 | KG bridge | ✅ MCP |
|
||||||
| 107 | pbs | storepve | — | Backups | ❌ |
|
| 107 | pbs | storepve | — | Backups | ❌ |
|
||||||
| 108 | media | storepve | — | Media | ❌ |
|
| 108 | media | storepve | — | Media | ❌ |
|
||||||
| 109 | docker-vm | storepve | .7 | Docker host | ❌ |
|
| 109 | docker-vm | storepve | .7 | Docker host | ❌ |
|
||||||
| 110 | gitea | minipve | — | Git | ❌ |
|
| 110 | gitea | minipve | **.17** | Git | ❌ |
|
||||||
| 111 | tdunna | amdpve | .129 | Hermes agent | ✅ |
|
| 111 | tdunna | amdpve | .129 | Hermes agent | ✅ |
|
||||||
| 112 | tanko | amdpve | .122 | Hermes agent | ✅ |
|
| 112 | tanko | amdpve | .122 | Hermes agent | ✅ |
|
||||||
| 113 | baggy | amdpve | ? | Hermes agent | ✅ |
|
| 113 | baggy | amdpve | .114 | Hermes agent | ✅ |
|
||||||
| 114 | mumuni | minipve | .123 | Hermes agent | ✅ |
|
| 114 | mumuni | **hwepve** | .123 | Hermes agent (stopped) | ✅ |
|
||||||
| 115 | scottdenya | amdpve | — | ? | ❌ |
|
| 115 | scottdenya | amdpve | .75 | Denya OneCare | ❌ |
|
||||||
| 116 | syslog-api | minipve | .116 | LiteLLM + Grafana | ❌ |
|
| 116 | syslog-api | minipve | .116 | LiteLLM + Grafana | ❌ |
|
||||||
| 117 | zulip | storepve | — | Chat | ❌ |
|
| 117 | zulip | storepve | .19 | Chat | ❌ |
|
||||||
| 118 | jitsi | minipve | — | Video | ❌ |
|
| 118 | jdownloader | storepve | — | JDownloader container | ❌ |
|
||||||
|
| 119 | infisical-vault | minipve | — | Vault | ❌ |
|
||||||
|
|
||||||
## Appendix C: Docker Compose Files Location
|
## Appendix C: Docker Compose Files Location
|
||||||
|
|
||||||
@@ -613,47 +630,56 @@ Source of truth: `/root/scripts/pct-run.sh` or `prose-contracts/scripts/pct-run.
|
|||||||
|
|
||||||
| CT | Name | Node | pct-run |
|
| CT | Name | Node | pct-run |
|
||||||
|-----|------|------|---------|
|
|-----|------|------|---------|
|
||||||
| 100 | abiba | amdpve | `pct-run 100` |
|
| 100 | abiba | hwepve | `pct-run 100` |
|
||||||
| 105 | kagentz | amdpve | `pct-run 105` |
|
| 105 | kagentz | **hwepve** | `pct-run 105` |
|
||||||
| 111 | tdunna | amdpve | `pct-run 111` |
|
| 111 | tdunna | amdpve | `pct-run 111` |
|
||||||
| 112 | tanko | amdpve | `pct-run 112` |
|
| 112 | tanko | amdpve | `pct-run 112` |
|
||||||
| 113 | baggy | amdpve | `pct-run 113` |
|
| 113 | baggy | amdpve | `pct-run 113` |
|
||||||
| 115 | scottdenya | amdpve | `pct-run 115` |
|
| 115 | scottdenya | amdpve | `pct-run 115` |
|
||||||
| 104 | authentik | minipve | `pct-run 104` |
|
| 104 | authentik | minipve | `pct-run 104` |
|
||||||
| 110 | gitea | minipve | `pct-run 110` |
|
| 110 | gitea | minipve | `pct-run 110` |
|
||||||
| 114 | mumuni | minipve | `pct-run 114` |
|
| 114 | mumuni | **hwepve** | `pct-run 114` |
|
||||||
| 116 | syslog-api | minipve | `pct-run 116` |
|
| 116 | syslog-api | minipve | `pct-run 116` |
|
||||||
| 106 | ra-h-os | storepve | `pct-run 106` |
|
| 106 | ra-h-os | storepve | `pct-run 106` |
|
||||||
| 107 | proxmox-backup | storepve | `pct-run 107` |
|
| 107 | proxmox-backup | storepve | `pct-run 107` |
|
||||||
| 108 | media | storepve | `pct-run 108` |
|
| 108 | media | storepve | `pct-run 108` |
|
||||||
| 117 | zulip | storepve | `pct-run 117` |
|
| 117 | zulip | storepve | `pct-run 117` |
|
||||||
| 102 | adguard | acerpve | `pct-run 102` |
|
| 102 | adguard | **minipve** | `pct-run 102` |
|
||||||
|
|
||||||
GPU bare-metal hosts (.8 acerpve, .110 ocupve, .15 amdpve) are NOT CTs — use SSH directly:
|
GPU bare-metal hosts (.8 acerpve, .110 ocupve, .15 amdpve) are NOT CTs — use SSH directly:
|
||||||
```bash
|
```bash
|
||||||
ssh root@192.168.68.8 # RTX 3090
|
ssh root@192.168.68.8 # RTX 3090
|
||||||
ssh root@192.168.68.110 # RTX 5070
|
ssh root@192.168.68.110 # RTX 5070
|
||||||
ssh root@192.168.68.15 # Strix Halo
|
ssh root@192.168.68.15 # Strix Halo
|
||||||
|
ssh root@192.168.68.4 # hwepve (abiba, kagentz, mumuni)
|
||||||
```
|
```
|
||||||
|
|
||||||
## Section 7: Agent Health Check (consolidated — 2026-07-05)
|
## Section 7: Agent Health Check v2 (2026-07-26)
|
||||||
|
|
||||||
Replaces 7 scattered Zulip health scripts with a single non-disruptive check
|
Single non-disruptive check running every 10 minutes via cron
|
||||||
running every 10 minutes via cron (`/root/scripts/agent-health-check.py`).
|
(`/root/scripts/agent-health-check.py`). v2 fixes critical gaps:
|
||||||
|
- Koby (.129) and Koonimo (.114) now have SSH hosts — no longer skipped
|
||||||
|
- Agent-specific vault keys (`{NAME}_LITELLM_API_KEY`) not shared master key
|
||||||
|
- CT liveness check via `pct status` on PVE nodes
|
||||||
|
- Config YAML integrity check
|
||||||
|
- Wrapper/CLI integrity check
|
||||||
|
- Vault secret non-emptiness check
|
||||||
|
|
||||||
The script is **read-only** — it never restarts, kills, or modifies anything.
|
The script is **read-only** — it never restarts, kills, or modifies anything.
|
||||||
Disruptive cron-based gateways restarts (like Mumuni's zulip-watchdog.sh,
|
|
||||||
which was kill+nohup outside systemd) are banned by policy.
|
|
||||||
|
|
||||||
### Checks Performed
|
### Checks Performed
|
||||||
|
|
||||||
| Check | Frequency | What It Detects |
|
| Check | Frequency | What It Detects |
|
||||||
|-------|-----------|-----------------|
|
|-------|-----------|-----------------|
|
||||||
| LiteLLM key validation | 10 min | All 4 agent keys authenticate and return models |
|
| LiteLLM key validation | 10 min | All 5 agent-specific keys authenticate (not shared master key) |
|
||||||
| GPU port conflict | 10 min | Ghost processes squatting port 8080 (ss vs systemd MainPID) |
|
| GPU port conflict | 10 min | Ghost processes squatting port 8080 (ss vs systemd MainPID) |
|
||||||
| Gateway liveness | 10 min | Gateway process running, state file readable |
|
| Gateway liveness | 10 min | Gateway process running, state file readable (all 5 agents) |
|
||||||
| Zulip streaming | 10 min | `edit_message` present in adapter (streaming supported) |
|
| Zulip streaming | 10 min | `edit_message` present in adapter (streaming supported) |
|
||||||
| Recent errors | 10 min | Error count in journald for last 10 min |
|
| Recent errors | 10 min | Error count in journald for last 10 min |
|
||||||
|
| CT liveness | 10 min | `pct status` on PVE nodes — catches stopped CTs |
|
||||||
|
| Config YAML integrity | 10 min | Python `yaml.safe_load()` — catches syntax errors |
|
||||||
|
| Wrapper/CLI integrity | 10 min | hermes wrapper exists, infisical path correct, hermes-real reachable |
|
||||||
|
| Vault secrets | 10 min | Agent-specific vault keys are non-empty and start with `sk-` |
|
||||||
|
|
||||||
### Disabled Scripts
|
### Disabled Scripts
|
||||||
|
|
||||||
|
|||||||
@@ -91,17 +91,52 @@ Before ANY update wave:
|
|||||||
- Firecrawl test: `curl :3002/`
|
- Firecrawl test: `curl :3002/`
|
||||||
- SearXNG test: `curl :8888`
|
- SearXNG test: `curl :8888`
|
||||||
|
|
||||||
## Wave 4: Proxmox Kernel Reboot (if needed)
|
## Wave 4: Proxmox Kernel Reboot
|
||||||
|
|
||||||
Only if `[ -f /var/run/reboot-required ]` on any node.
|
Only if `[ -f /var/run/reboot-required ]` on any node.
|
||||||
|
|
||||||
| Target | Action |
|
| Target | Action |
|
||||||
|--------|--------|
|
|--------|--------|
|
||||||
| Affected PVE node | Verify all CTs/VMs migrated or stopped |
|
| Affected PVE node | Verify all CTs/VMs migrated or stopped |
|
||||||
| | `reboot` via PVE API |
|
| | `reboot` via PVE API (or `systemctl reboot -f` if dbus fails) |
|
||||||
| | Wait 120s for node to come back |
|
| | Wait 120s for node to come back |
|
||||||
| | Start any stopped CTs |
|
| | Start any stopped CTs |
|
||||||
|
|
||||||
|
### Post-reboot sweep (known gaps)
|
||||||
|
|
||||||
|
After every node reboot, run these checks:
|
||||||
|
|
||||||
|
1. **CT auto-start sweep** — LXC containers sometimes don't start despite
|
||||||
|
`onboot: 1`. Check every CT on the rebooted node and start any left stopped:
|
||||||
|
```bash
|
||||||
|
pct list | awk '/stopped/{print $1}' | xargs -I{} pct start {}
|
||||||
|
```
|
||||||
|
Known cases: scottdenya (CT 115 on amdpve), authentik (CT 104 on minipve).
|
||||||
|
|
||||||
|
2. **Zulip recovery** — When docker-vm or storepve reboots, the Zulip main
|
||||||
|
container loses its Docker network assignment (SIGKILL during storage
|
||||||
|
outage detaches it from `zulip_default` network). Run:
|
||||||
|
```bash
|
||||||
|
ssh root@192.168.68.19 'docker rm -f zulip-zulip-1 && cd /opt/zulip && docker compose up -d'
|
||||||
|
```
|
||||||
|
The compose restart recreates the container on the correct network.
|
||||||
|
|
||||||
|
3. **docker-vm Docker daemon** — After reboot, Docker can take 3-4 minutes
|
||||||
|
to become `active`. The docker-proxy for Pulse (port 7655) starts early,
|
||||||
|
so Pulse is accessible before `docker ps` reports ready. Wait for Docker
|
||||||
|
before checking other stacks.
|
||||||
|
|
||||||
|
### VPS ↔ docker-vm tunnel
|
||||||
|
|
||||||
|
After any VPS or docker-vm reboot, verify the dedicated WireGuard tunnel:
|
||||||
|
```bash
|
||||||
|
ssh root@72.61.0.17 'wg show wg1' | grep "latest handshake"
|
||||||
|
# If no handshake in >60s:
|
||||||
|
ssh root@72.61.0.17 'wg-quick up wg1'
|
||||||
|
```
|
||||||
|
The tunnel uses PersistentKeepalive=25 and is systemd-enabled, but should
|
||||||
|
be verified after a reboot.
|
||||||
|
|
||||||
## Rollback Protocol
|
## Rollback Protocol
|
||||||
|
|
||||||
If ANY verification fails:
|
If ANY verification fails:
|
||||||
|
|||||||
@@ -102,7 +102,7 @@ Request → nginx:80 → LiteLLM:4000 → GPU(llama-server, parallel 2)
|
|||||||
|
|
||||||
- **Health-check script** (`/opt/inference-harness/scripts/litellm-health-check.sh` on CT 116): `gpu-fleet` check fails only on **critical** alerts (warnings are informational). Tests `strix-moe` (not `ornith-1.0-35b`).
|
- **Health-check script** (`/opt/inference-harness/scripts/litellm-health-check.sh` on CT 116): `gpu-fleet` check fails only on **critical** alerts (warnings are informational). Tests `strix-moe` (not `ornith-1.0-35b`).
|
||||||
- **GPU monitor** (`/root/scripts/gpu-monitor-server.py` on pi .24): runs as **systemd unit `gpu-monitor.service`** (was bare `&` process). `gpu_count` includes Strix Halo (was 2, now 3). VRAM alert thresholds: warning 93%, critical 97% (raised from 90/95 — 128K context steady-state is ~70% on RTX 3090, not a fault).
|
- **GPU monitor** (`/root/scripts/gpu-monitor-server.py` on pi .24): runs as **systemd unit `gpu-monitor.service`** (was bare `&` process). `gpu_count` includes Strix Halo (was 2, now 3). VRAM alert thresholds: warning 93%, critical 97% (raised from 90/95 — 128K context steady-state is ~70% on RTX 3090, not a fault).
|
||||||
- **Agent key monitor** (`/root/scripts/agent-health-check.py` on pi .24, cron `*/10`): reads each agent's **live** `LITELLM_API_KEY` from its gateway process env via SSH — never hardcodes keys (hardcoded keys rot on rotation and caused 9×401/30min). Fleet roster: abiba, tanko, mumuni, koby, koonimo (legacy `tdunna`/`baggy` removed — never existed).
|
- **Agent key monitor** (`/root/scripts/agent-health-check.py` on pi .24, cron `*/10`): v2 (2026-07-26) — reads each agent's **agent-specific** `{NAME}_LITELLM_API_KEY` from Infisical vault (not the shared master key). Covers: LiteLLM keys, GPU ports, agent gateways (all 5 agents now SSHa ble), CT liveness (pct status on PVE nodes), config.yaml YAML integrity, wrapper/CLI integrity, vault secret non-emptiness checks. Fleet roster: tanko (.122), mumuni (.123), koby (.129), koonimo (.114), abiba (.24). Legacy `tdunna`/`baggy` replaced with canonical agent hostnames.
|
||||||
- **Stale keys cleaned**: `daily-infra-report.py` SYNTHETIC_API_KEY was stale (`sk-U_ydi3B` → 401); now reads `LITELLM_MASTER_KEY` from env. Deprecated scripts (`router-original.py`, `router-phase0-backup.py`, `apply-fixes.py`) still reference `sk-syslog-local-master-key` but do not actively poll LiteLLM.
|
- **Stale keys cleaned**: `daily-infra-report.py` SYNTHETIC_API_KEY was stale (`sk-U_ydi3B` → 401); now reads `LITELLM_MASTER_KEY` from env. Deprecated scripts (`router-original.py`, `router-phase0-backup.py`, `apply-fixes.py`) still reference `sk-syslog-local-master-key` but do not actively poll LiteLLM.
|
||||||
|
|
||||||
## Maintains
|
## Maintains
|
||||||
|
|||||||
+301
-58
@@ -1,10 +1,10 @@
|
|||||||
#!/usr/bin/env python3
|
#!/usr/bin/env python3
|
||||||
"""
|
"""
|
||||||
/root/scripts/agent-health-check.py — Consolidated Agent Health Verification
|
/root/scripts/agent-health-check.py — Consolidated Agent Health Verification v2
|
||||||
|
|
||||||
Single non-disruptive health check replacing 7 scattered scripts.
|
Verifies: LiteLLM keys (agent-specific), GPU port conflicts, agent Zulip streaming,
|
||||||
Verifies: LiteLLM keys, GPU port conflicts, agent Zulip streaming,
|
gateway liveness, gateway log health, CT liveness, config YAML integrity,
|
||||||
gateway liveness, and gateway log health. NEVER restarts anything.
|
wrapper/CLI integrity, vault secret non-emptiness. NEVER restarts anything.
|
||||||
|
|
||||||
Usage:
|
Usage:
|
||||||
python3 /root/scripts/agent-health-check.py # Full check
|
python3 /root/scripts/agent-health-check.py # Full check
|
||||||
@@ -12,59 +12,40 @@ Usage:
|
|||||||
python3 /root/scripts/agent-health-check.py --quiet # Only output on failure
|
python3 /root/scripts/agent-health-check.py --quiet # Only output on failure
|
||||||
|
|
||||||
Cron: */10 * * * * python3 /root/scripts/agent-health-check.py --quiet
|
Cron: */10 * * * * python3 /root/scripts/agent-health-check.py --quiet
|
||||||
|
|
||||||
|
Changelog:
|
||||||
|
v2 (2026-07-26): Added CT liveness, config validation, wrapper integrity,
|
||||||
|
vault secret emptiness check. Fixed Koby/Koonimo SSH hosts and agent key
|
||||||
|
name format ({NAME}_LITELLM_API_KEY not LITELLM_API_KEY_{NAME}).
|
||||||
|
Fleet roster: tanko (.122), mumuni (.123), koby (.129), koonimo (.114),
|
||||||
|
abiba (.24).
|
||||||
"""
|
"""
|
||||||
|
|
||||||
import subprocess, json, sys, os, time
|
import subprocess, json, sys, os, time
|
||||||
from datetime import datetime
|
from datetime import datetime
|
||||||
|
|
||||||
LITELLM = "http://192.168.68.116:80"
|
LITELLM = "http://192.168.68.116:80"
|
||||||
|
INFISICAL_PROJECT = "322fceab-39da-4854-a55a-568e76c0f13f"
|
||||||
|
INFISICAL_ENV = "prod"
|
||||||
|
|
||||||
def _get_agent_key(agent_name):
|
# PVE node IPs for CT liveness checks
|
||||||
"""Retrieve agent key from Infisical vault."""
|
PVE_NODES = {
|
||||||
try:
|
"hwepve": "192.168.68.4",
|
||||||
result = subprocess.run(
|
"amdpve": "192.168.68.15",
|
||||||
["infisical", "secrets", "get", "LITELLM_API_KEY",
|
"minipve": "192.168.68.12",
|
||||||
"--project=agents", "--env=production", "--plain"],
|
"storepve": "192.168.68.6",
|
||||||
capture_output=True, text=True, timeout=10
|
"acerpve": "192.168.68.9",
|
||||||
)
|
"ocupve": "192.168.68.5",
|
||||||
if result.returncode == 0:
|
|
||||||
return result.stdout.strip()
|
|
||||||
except Exception:
|
|
||||||
pass
|
|
||||||
|
|
||||||
# Fallback: try exporting all secrets
|
|
||||||
try:
|
|
||||||
result = subprocess.run(
|
|
||||||
["infisical", "export", "--project=agents", "--env=production",
|
|
||||||
"--format=dotenv"],
|
|
||||||
capture_output=True, text=True, timeout=10
|
|
||||||
)
|
|
||||||
if result.returncode == 0:
|
|
||||||
for line in result.stdout.splitlines():
|
|
||||||
if line.startswith(f"LITELLM_API_KEY_{agent_name.upper()}") or \
|
|
||||||
(line.startswith("LITELLM_API_KEY=") and agent_name == os.uname().nodename):
|
|
||||||
return line.split("=", 1)[1].strip().strip('"').strip("'")
|
|
||||||
except Exception:
|
|
||||||
pass
|
|
||||||
|
|
||||||
return None
|
|
||||||
|
|
||||||
# Agent keys are pulled from Infisical vault at runtime.
|
|
||||||
# The 'key' field is populated dynamically below.
|
|
||||||
AGENTS = {
|
|
||||||
"tanko": {"ct": 112, "host": "192.168.68.122", "user": "jerome"},
|
|
||||||
"mumuni": {"ct": 114, "host": "192.168.68.123", "user": "root"},
|
|
||||||
"koby": {"ct": 111, "host": None, "user": None},
|
|
||||||
"koonimo": {"ct": 113, "host": None, "user": None},
|
|
||||||
}
|
}
|
||||||
|
|
||||||
# Inject keys from vault
|
# Agent definitions: ct, host, user, pve_node, vault_key_name
|
||||||
for agent_name in AGENTS:
|
AGENTS = {
|
||||||
key = _get_agent_key(agent_name)
|
"tanko": {"ct": 112, "host": "192.168.68.122", "user": "jerome", "pve": "amdpve", "vault_key": "TANKO_LITELLM_API_KEY"},
|
||||||
if key:
|
"mumuni": {"ct": 114, "host": "192.168.68.123", "user": "root", "pve": "hwepve", "vault_key": "MUMUNI_LITELLM_API_KEY"},
|
||||||
AGENTS[agent_name]["key"] = key
|
"koby": {"ct": 111, "host": "192.168.68.129", "user": "root", "pve": "amdpve", "vault_key": "KOBY_LITELLM_API_KEY"},
|
||||||
else:
|
"koonimo": {"ct": 113, "host": "192.168.68.114", "user": "root", "pve": "amdpve", "vault_key": "KOONIMO_LITELLM_API_KEY"},
|
||||||
AGENTS[agent_name]["key"] = None
|
"abiba": {"ct": 100, "host": "192.168.68.24", "user": "root", "pve": "hwepve", "vault_key": None}, # Pi agent, no vault key
|
||||||
|
}
|
||||||
|
|
||||||
GPU_HOSTS = {
|
GPU_HOSTS = {
|
||||||
"gpu-rtx3090 (.8)": {"host": "192.168.68.8", "port": 8080, "service": "llama-server"},
|
"gpu-rtx3090 (.8)": {"host": "192.168.68.8", "port": 8080, "service": "llama-server"},
|
||||||
@@ -74,6 +55,11 @@ GPU_HOSTS = {
|
|||||||
|
|
||||||
FAIL = []
|
FAIL = []
|
||||||
|
|
||||||
|
INFISICAL_TOKEN = os.environ.get("INFISICAL_TOKEN")
|
||||||
|
INFISICAL_API_URL = os.environ.get("INFISICAL_API_URL", "https://vault.sysloggh.net")
|
||||||
|
|
||||||
|
# ── Helpers ──────────────────────────────────────────────────────────
|
||||||
|
|
||||||
def ssh(host, cmd, user="root"):
|
def ssh(host, cmd, user="root"):
|
||||||
"""Execute a command on a remote host, return stdout or None."""
|
"""Execute a command on a remote host, return stdout or None."""
|
||||||
try:
|
try:
|
||||||
@@ -112,15 +98,81 @@ def http_json(url, headers=None, timeout=5):
|
|||||||
except:
|
except:
|
||||||
return None
|
return None
|
||||||
|
|
||||||
|
def run_infisical(args, quiet=True):
|
||||||
|
"""Run infisical CLI with env-based auth, return stdout or None."""
|
||||||
|
env = os.environ.copy()
|
||||||
|
env["INFISICAL_API_URL"] = INFISICAL_API_URL
|
||||||
|
if INFISICAL_TOKEN:
|
||||||
|
env["INFISICAL_TOKEN"] = INFISICAL_TOKEN
|
||||||
|
try:
|
||||||
|
result = subprocess.run(
|
||||||
|
["/usr/bin/infisical"] + args,
|
||||||
|
capture_output=True, text=True, timeout=15, env=env
|
||||||
|
)
|
||||||
|
return result.stdout.strip() if result.returncode == 0 else None
|
||||||
|
except:
|
||||||
|
return None
|
||||||
|
|
||||||
|
# ── KEY LOOKUP FIX ───────────────────────────────────────────────────
|
||||||
|
|
||||||
|
def _get_agent_key(agent_name, vault_key_name):
|
||||||
|
"""Retrieve agent-specific key from Infisical vault.
|
||||||
|
|
||||||
|
Uses {NAME}_LITELLM_API_KEY format (e.g., TANKO_LITELLM_API_KEY,
|
||||||
|
KOONIMO_LITELLM_API_KEY) which matches actual vault key names.
|
||||||
|
"""
|
||||||
|
if not vault_key_name:
|
||||||
|
return None
|
||||||
|
|
||||||
|
# Primary: get the agent-specific key by name
|
||||||
|
key = run_infisical([
|
||||||
|
"secrets", "get", vault_key_name,
|
||||||
|
"--projectId=" + INFISICAL_PROJECT,
|
||||||
|
"--env=" + INFISICAL_ENV,
|
||||||
|
"--plain",
|
||||||
|
])
|
||||||
|
if key and key.startswith("sk-"):
|
||||||
|
return key
|
||||||
|
|
||||||
|
# Fallback: export all and search for the key name
|
||||||
|
try:
|
||||||
|
export = run_infisical([
|
||||||
|
"export",
|
||||||
|
"--projectId=" + INFISICAL_PROJECT,
|
||||||
|
"--env=" + INFISICAL_ENV,
|
||||||
|
"--format=dotenv",
|
||||||
|
])
|
||||||
|
if export:
|
||||||
|
for line in export.splitlines():
|
||||||
|
if line.startswith(vault_key_name + "="):
|
||||||
|
value = line.split("=", 1)[1].strip().strip('"').strip("'")
|
||||||
|
if value.startswith("sk-"):
|
||||||
|
return value
|
||||||
|
except:
|
||||||
|
pass
|
||||||
|
|
||||||
|
return None
|
||||||
|
|
||||||
|
# Inject keys from vault for each agent
|
||||||
|
for agent_name in AGENTS:
|
||||||
|
info = AGENTS[agent_name]
|
||||||
|
key = _get_agent_key(agent_name, info.get("vault_key"))
|
||||||
|
AGENTS[agent_name]["key"] = key
|
||||||
|
|
||||||
|
|
||||||
# ═══════════════════════════════════════════════════════════════════
|
# ═══════════════════════════════════════════════════════════════════
|
||||||
# CHECK 1: LiteLLM Key Validation
|
# CHECK 1: LiteLLM Key Validation (agent-specific keys)
|
||||||
# ═══════════════════════════════════════════════════════════════════
|
# ═══════════════════════════════════════════════════════════════════
|
||||||
|
|
||||||
def check_keys():
|
def check_keys():
|
||||||
for name, agent in AGENTS.items():
|
for name, agent in AGENTS.items():
|
||||||
|
key = agent.get("key")
|
||||||
|
if not key:
|
||||||
|
print(f" ❌ {name}: NO KEY FOUND (vault empty or unreachable)")
|
||||||
|
FAIL.append(f"key:{name}:no-key")
|
||||||
|
continue
|
||||||
data = http_json(f"{LITELLM}/v1/models",
|
data = http_json(f"{LITELLM}/v1/models",
|
||||||
headers={"Authorization": f"Bearer {agent['key']}"})
|
headers={"Authorization": f"Bearer {key}"})
|
||||||
if data and data.get("data"):
|
if data and data.get("data"):
|
||||||
model = data["data"][0].get("id", "?")
|
model = data["data"][0].get("id", "?")
|
||||||
print(f" ✅ {name}: key valid → {model}")
|
print(f" ✅ {name}: key valid → {model}")
|
||||||
@@ -130,7 +182,7 @@ def check_keys():
|
|||||||
|
|
||||||
|
|
||||||
# ═══════════════════════════════════════════════════════════════════
|
# ═══════════════════════════════════════════════════════════════════
|
||||||
# CHECK 2: GPU Port Conflict Detection
|
# CHECK 2: GPU Port Conflict Detection (unchanged)
|
||||||
# ═══════════════════════════════════════════════════════════════════
|
# ═══════════════════════════════════════════════════════════════════
|
||||||
|
|
||||||
def check_gpu_ports():
|
def check_gpu_ports():
|
||||||
@@ -158,7 +210,6 @@ def check_gpu_ports():
|
|||||||
else:
|
else:
|
||||||
print(f" ⚠️ {label}: svc={svc_status}, port owned by {port_owner}")
|
print(f" ⚠️ {label}: svc={svc_status}, port owned by {port_owner}")
|
||||||
else:
|
else:
|
||||||
# Verify health endpoint
|
|
||||||
health = ssh(host, f"curl -s --max-time 5 http://localhost:{port}/health")
|
health = ssh(host, f"curl -s --max-time 5 http://localhost:{port}/health")
|
||||||
if health and '"status":"ok"' in health:
|
if health and '"status":"ok"' in health:
|
||||||
print(f" ✅ {label}: healthy (pid={port_owner})")
|
print(f" ✅ {label}: healthy (pid={port_owner})")
|
||||||
@@ -171,7 +222,7 @@ def check_gpu_ports():
|
|||||||
|
|
||||||
|
|
||||||
# ═══════════════════════════════════════════════════════════════════
|
# ═══════════════════════════════════════════════════════════════════
|
||||||
# CHECK 3: Agent Gateway Liveness + Streaming
|
# CHECK 3: Agent Gateway Liveness + Streaming (now covers all agents)
|
||||||
# ═══════════════════════════════════════════════════════════════════
|
# ═══════════════════════════════════════════════════════════════════
|
||||||
|
|
||||||
def check_agents():
|
def check_agents():
|
||||||
@@ -184,8 +235,11 @@ def check_agents():
|
|||||||
print(f" ⬜ {name} (CT {ct}): cannot SSH — skip liveness check")
|
print(f" ⬜ {name} (CT {ct}): cannot SSH — skip liveness check")
|
||||||
continue
|
continue
|
||||||
|
|
||||||
# Gateway process (exclude the infisical bash wrapper that contains the same string)
|
# Gateway process
|
||||||
pid = ssh(host, "pgrep -f 'hermes_cli.main gateway run' | grep -v infisical | head -1", user=user)
|
pid = ssh(host, "pgrep -f 'hermes_cli.main gateway run' | grep -v infisical | head -1", user=user)
|
||||||
|
if not pid:
|
||||||
|
# Try alternate binary name
|
||||||
|
pid = ssh(host, "pgrep -f 'hermes.*gateway' | grep -v infisical | grep -v bash | head -1", user=user)
|
||||||
if not pid:
|
if not pid:
|
||||||
print(f" ❌ {name}: GATEWAY NOT RUNNING")
|
print(f" ❌ {name}: GATEWAY NOT RUNNING")
|
||||||
FAIL.append(f"gateway-down:{name}")
|
FAIL.append(f"gateway-down:{name}")
|
||||||
@@ -203,7 +257,7 @@ def check_agents():
|
|||||||
else:
|
else:
|
||||||
gw_state, zulip = "no-state-file", "?"
|
gw_state, zulip = "no-state-file", "?"
|
||||||
|
|
||||||
# Zulip streaming: does adapter have edit_message?
|
# Zulip streaming check
|
||||||
adapter_paths = [
|
adapter_paths = [
|
||||||
"~/.hermes/plugins/zulip-platform/adapter.py",
|
"~/.hermes/plugins/zulip-platform/adapter.py",
|
||||||
"~/.hermes/plugins/platforms/zulip/adapter.py",
|
"~/.hermes/plugins/platforms/zulip/adapter.py",
|
||||||
@@ -220,13 +274,183 @@ def check_agents():
|
|||||||
r"journalctl --user -u hermes-gateway --since '10 min ago' -o cat --no-pager 2>/dev/null "
|
r"journalctl --user -u hermes-gateway --since '10 min ago' -o cat --no-pager 2>/dev/null "
|
||||||
r"| grep -ci 'error\|traceback\|exception\|401\|403\|500' || echo 0",
|
r"| grep -ci 'error\|traceback\|exception\|401\|403\|500' || echo 0",
|
||||||
user=user)
|
user=user)
|
||||||
recent_errors = (recent_errors or "0").strip().split("\n")[-1] # take last line
|
recent_errors = (recent_errors or "0").strip().split("\n")[-1]
|
||||||
|
|
||||||
print(f" {'✅' if gw_state == 'running' and zulip == 'connected' else '⚠️'} "
|
print(f" {'✅' if gw_state == 'running' and zulip == 'connected' else '⚠️'} "
|
||||||
f"{name}: gw={gw_state} zulip={zulip} streaming={streaming} "
|
f"{name}: gw={gw_state} zulip={zulip} streaming={streaming} "
|
||||||
f"errors_10m={recent_errors.strip() or '0'} pid={pid}")
|
f"errors_10m={recent_errors.strip() or '0'} pid={pid}")
|
||||||
|
|
||||||
|
|
||||||
|
# ═══════════════════════════════════════════════════════════════════
|
||||||
|
# CHECK 4: CT Liveness (NEW)
|
||||||
|
# ═══════════════════════════════════════════════════════════════════
|
||||||
|
|
||||||
|
def check_ct_liveness():
|
||||||
|
"""Check that all agent CTs are running on their PVE nodes."""
|
||||||
|
for name, agent in AGENTS.items():
|
||||||
|
ct = agent["ct"]
|
||||||
|
pve_node = agent.get("pve")
|
||||||
|
if not pve_node:
|
||||||
|
print(f" ⬜ {name} (CT {ct}): no PVE node mapped — skip")
|
||||||
|
continue
|
||||||
|
|
||||||
|
pve_ip = PVE_NODES.get(pve_node)
|
||||||
|
if not pve_ip:
|
||||||
|
print(f" ⬜ {name}: unknown PVE node '{pve_node}' — skip")
|
||||||
|
continue
|
||||||
|
|
||||||
|
status = ssh(pve_ip, f"pct status {ct} 2>/dev/null", user="root")
|
||||||
|
if not status:
|
||||||
|
print(f" ❌ {name} (CT {ct} on {pve_node}): PVE UNREACHABLE")
|
||||||
|
FAIL.append(f"ct-unreachable:{name}:{pve_ip}")
|
||||||
|
elif "running" in status:
|
||||||
|
print(f" ✅ {name} (CT {ct} on {pve_node}): running")
|
||||||
|
elif "stopped" in status:
|
||||||
|
print(f" ❌ {name} (CT {ct} on {pve_node}): STOPPED")
|
||||||
|
FAIL.append(f"ct-stopped:{name}")
|
||||||
|
else:
|
||||||
|
print(f" ⚠️ {name} (CT {ct} on {pve_node}): {status.strip()}")
|
||||||
|
|
||||||
|
|
||||||
|
# ═══════════════════════════════════════════════════════════════════
|
||||||
|
# CHECK 5: Config YAML Integrity (NEW)
|
||||||
|
# ═══════════════════════════════════════════════════════════════════
|
||||||
|
|
||||||
|
def check_config_integrity():
|
||||||
|
"""Verify agent config.yaml parses as valid YAML."""
|
||||||
|
for name, agent in AGENTS.items():
|
||||||
|
host = agent.get("host")
|
||||||
|
user = agent.get("user")
|
||||||
|
if not host or not user:
|
||||||
|
print(f" ⬜ {name}: cannot SSH — skip config check")
|
||||||
|
continue
|
||||||
|
|
||||||
|
# Check YAML parses
|
||||||
|
yaml_ok = ssh(host,
|
||||||
|
"python3 -c "
|
||||||
|
'"import yaml; yaml.safe_load(open(\'/root/.hermes/config.yaml\')); print(\'OK\')" '
|
||||||
|
"2>&1 || echo 'FAIL'",
|
||||||
|
user=user)
|
||||||
|
if not yaml_ok:
|
||||||
|
print(f" ❌ {name}: SSH UNREACHABLE (config check skipped)")
|
||||||
|
FAIL.append(f"config-unreachable:{name}")
|
||||||
|
elif "OK" in yaml_ok:
|
||||||
|
print(f" ✅ {name}: config.yaml valid YAML")
|
||||||
|
else:
|
||||||
|
print(f" ❌ {name}: config.yaml YAML ERROR — {yaml_ok[:120]}")
|
||||||
|
FAIL.append(f"config-yaml-error:{name}")
|
||||||
|
|
||||||
|
|
||||||
|
# ═══════════════════════════════════════════════════════════════════
|
||||||
|
# CHECK 6: Wrapper/CLI Integrity (NEW)
|
||||||
|
# ═══════════════════════════════════════════════════════════════════
|
||||||
|
|
||||||
|
def check_wrapper_integrity():
|
||||||
|
"""Verify the hermes CLI wrapper exists and can reach hermes-real."""
|
||||||
|
for name, agent in AGENTS.items():
|
||||||
|
host = agent.get("host")
|
||||||
|
user = agent.get("user")
|
||||||
|
if not host or not user:
|
||||||
|
print(f" ⬜ {name}: cannot SSH — skip wrapper check")
|
||||||
|
continue
|
||||||
|
|
||||||
|
# Check wrapper exists
|
||||||
|
wrapper = ssh(host, "ls -la /root/.local/bin/hermes 2>/dev/null", user=user)
|
||||||
|
if not wrapper:
|
||||||
|
# Check alternate wrapper locations
|
||||||
|
wrapper = ssh(host, "which hermes 2>/dev/null; command -v hermes 2>/dev/null", user=user)
|
||||||
|
if not wrapper:
|
||||||
|
print(f" ❌ {name}: NO HERMES CLI WRAPPER FOUND")
|
||||||
|
FAIL.append(f"wrapper-missing:{name}")
|
||||||
|
continue
|
||||||
|
else:
|
||||||
|
print(f" ⚠️ {name}: hermes at {wrapper.strip()} (not ~/.local/bin/hermes)")
|
||||||
|
|
||||||
|
# Check wrapper has correct infisical path
|
||||||
|
infisical_path_valid = ssh(host,
|
||||||
|
"head -20 /root/.local/bin/hermes 2>/dev/null | grep -q '/usr/bin/infisical' && echo OK || echo MISS",
|
||||||
|
user=user)
|
||||||
|
if infisical_path_valid == "MISS":
|
||||||
|
# Check if infisical exists on path
|
||||||
|
inf_actual = ssh(host, "command -v infisical 2>/dev/null", user=user)
|
||||||
|
if not inf_actual:
|
||||||
|
print(f" ❌ {name}: INFISICAL NOT INSTALLED (wrapper broken)")
|
||||||
|
FAIL.append(f"wrapper-no-infisical:{name}")
|
||||||
|
else:
|
||||||
|
print(f" ⚠️ {name}: wrapper infisical path may be wrong (infisical at {inf_actual})")
|
||||||
|
FAIL.append(f"wrapper-infisical-path:{name}")
|
||||||
|
|
||||||
|
# Check hermes-real exists
|
||||||
|
hermes_real = ssh(host,
|
||||||
|
"ls -la /root/.local/bin/hermes-real 2>/dev/null || echo MISS",
|
||||||
|
user=user)
|
||||||
|
if not hermes_real or hermes_real.strip() == "MISS":
|
||||||
|
# Check venv path
|
||||||
|
hermes_real = ssh(host,
|
||||||
|
"ls -la /usr/local/lib/hermes-agent/venv/bin/hermes 2>/dev/null || echo MISS",
|
||||||
|
user=user)
|
||||||
|
if not hermes_real or hermes_real.strip() == "MISS":
|
||||||
|
print(f" ❌ {name}: hermes-real NOT FOUND (wrapper broken)")
|
||||||
|
FAIL.append(f"wrapper-no-hermes-real:{name}")
|
||||||
|
else:
|
||||||
|
print(f" ✅ {name}: hermes-real at alt path")
|
||||||
|
|
||||||
|
# Check the .env file has the key
|
||||||
|
env_has_key = ssh(host,
|
||||||
|
"grep -c 'LITELLM_API_KEY' /root/.hermes/.env 2>/dev/null || echo 0",
|
||||||
|
user=user)
|
||||||
|
if env_has_key and env_has_key.strip() not in ("", "0"):
|
||||||
|
print(f" ✅ {name}: wrapper + .env key present")
|
||||||
|
else:
|
||||||
|
print(f" ⚠️ {name}: .env may be missing LITELLM_API_KEY entry")
|
||||||
|
|
||||||
|
|
||||||
|
# ═══════════════════════════════════════════════════════════════════
|
||||||
|
# CHECK 7: Vault Secret Non-Emptiness (NEW)
|
||||||
|
# ═══════════════════════════════════════════════════════════════════
|
||||||
|
|
||||||
|
def check_vault_secrets():
|
||||||
|
"""Verify agent-specific vault secrets are non-empty and start with sk-."""
|
||||||
|
for name, agent in AGENTS.items():
|
||||||
|
vault_key_name = agent.get("vault_key")
|
||||||
|
if not vault_key_name:
|
||||||
|
continue
|
||||||
|
|
||||||
|
key = agent.get("key")
|
||||||
|
if not key:
|
||||||
|
print(f" ❌ {name}: vault secret {vault_key_name} MISSING or EMPTY")
|
||||||
|
FAIL.append(f"vault-empty:{name}:{vault_key_name}")
|
||||||
|
elif not key.startswith("sk-"):
|
||||||
|
print(f" ❌ {name}: vault secret {vault_key_name} WRONG FORMAT (starts '{key[:8]}...')")
|
||||||
|
FAIL.append(f"vault-bad-format:{name}:{vault_key_name}")
|
||||||
|
else:
|
||||||
|
print(f" ✅ {name}: vault {vault_key_name}=sk-...{key[-4:]}")
|
||||||
|
|
||||||
|
|
||||||
|
# ═══════════════════════════════════════════════════════════════════
|
||||||
|
# DEPLOY: copy updated script to /root/scripts/ on local host
|
||||||
|
# ═══════════════════════════════════════════════════════════════════
|
||||||
|
|
||||||
|
def deploy_self():
|
||||||
|
"""Copy this script to /root/scripts/agent-health-check.py if out of date."""
|
||||||
|
dest = "/root/scripts/agent-health-check.py"
|
||||||
|
try:
|
||||||
|
with open(__file__, "r") as f:
|
||||||
|
current = f.read()
|
||||||
|
if os.path.isfile(dest):
|
||||||
|
with open(dest, "r") as f:
|
||||||
|
existing = f.read()
|
||||||
|
if current == existing:
|
||||||
|
return # Already deployed
|
||||||
|
# Write new version
|
||||||
|
with open(dest, "w") as f:
|
||||||
|
f.write(current)
|
||||||
|
os.chmod(dest, 0o755)
|
||||||
|
print(f" 📦 Deployed updated script to {dest}")
|
||||||
|
except:
|
||||||
|
pass # Not fatal if deploy fails
|
||||||
|
|
||||||
|
|
||||||
# ═══════════════════════════════════════════════════════════════════
|
# ═══════════════════════════════════════════════════════════════════
|
||||||
# MAIN
|
# MAIN
|
||||||
# ═══════════════════════════════════════════════════════════════════
|
# ═══════════════════════════════════════════════════════════════════
|
||||||
@@ -235,8 +459,12 @@ def main():
|
|||||||
quiet = "--quiet" in sys.argv
|
quiet = "--quiet" in sys.argv
|
||||||
as_json = "--json" in sys.argv
|
as_json = "--json" in sys.argv
|
||||||
|
|
||||||
|
# Self-deploy to canonical location
|
||||||
|
if not quiet and "--no-deploy" not in sys.argv:
|
||||||
|
deploy_self()
|
||||||
|
|
||||||
if not quiet:
|
if not quiet:
|
||||||
print(f"🏥 Agent Health Check — {datetime.now().strftime('%Y-%m-%d %H:%M UTC')}")
|
print(f"🏥 Agent Health Check v2 — {datetime.now().strftime('%Y-%m-%d %H:%M UTC')}")
|
||||||
print()
|
print()
|
||||||
|
|
||||||
print("🔑 LiteLLM Keys:")
|
print("🔑 LiteLLM Keys:")
|
||||||
@@ -249,11 +477,26 @@ def main():
|
|||||||
|
|
||||||
print("🤖 Agent Gateways:")
|
print("🤖 Agent Gateways:")
|
||||||
check_agents()
|
check_agents()
|
||||||
|
print()
|
||||||
|
|
||||||
|
print("🖥️ CT Liveness:")
|
||||||
|
check_ct_liveness()
|
||||||
|
print()
|
||||||
|
|
||||||
|
print("📝 Config Integrity:")
|
||||||
|
check_config_integrity()
|
||||||
|
print()
|
||||||
|
|
||||||
|
print("🔌 Wrapper/CLI Integrity:")
|
||||||
|
check_wrapper_integrity()
|
||||||
|
print()
|
||||||
|
|
||||||
|
print("🔐 Vault Secrets:")
|
||||||
|
check_vault_secrets()
|
||||||
|
|
||||||
if FAIL:
|
if FAIL:
|
||||||
print(f"\n❌ {len(FAIL)} FAILURE(S): {' | '.join(FAIL)}")
|
print(f"\n❌ {len(FAIL)} FAILURE(S): {' | '.join(FAIL)}")
|
||||||
if quiet:
|
if quiet:
|
||||||
# In quiet mode, only print failures as a single alert line
|
|
||||||
print(f"ALERT agent-health:{','.join(FAIL)}")
|
print(f"ALERT agent-health:{','.join(FAIL)}")
|
||||||
elif not quiet:
|
elif not quiet:
|
||||||
print("\n✅ All checks passed")
|
print("\n✅ All checks passed")
|
||||||
|
|||||||
@@ -0,0 +1,65 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
# Netbird Reverse Proxy — Add a new domain route
|
||||||
|
#
|
||||||
|
# Usage: netbird-add-domain.sh <domain> <backend_ip> [port] [protocol]
|
||||||
|
#
|
||||||
|
# Example:
|
||||||
|
# netbird-add-domain.sh dns.sysloggh.net 192.168.68.10 80
|
||||||
|
#
|
||||||
|
# This script adds a domain to the Netbird proxy by inserting records
|
||||||
|
# directly into the management server's SQLite database, then restarting
|
||||||
|
# the proxy stack.
|
||||||
|
#
|
||||||
|
# Prerequisites: SSH root access to 72.61.0.17
|
||||||
|
# sqlite3 available on VPS
|
||||||
|
#
|
||||||
|
# Requires: The domain must already have a DNS CNAME to netbird.sysloggh.net
|
||||||
|
# pointing to 72.61.0.17.
|
||||||
|
|
||||||
|
set -euo pipefail
|
||||||
|
|
||||||
|
DOMAIN="${1:?Usage: netbird-add-domain.sh <domain> <backend_ip> [port] [protocol]}"
|
||||||
|
BACKEND_IP="${2:?Usage: netbird-add-domain.sh <domain> <backend_ip> [port] [protocol]}"
|
||||||
|
PORT="${3:-80}"
|
||||||
|
PROTOCOL="${4:-http}"
|
||||||
|
|
||||||
|
VPS="root@72.61.0.17"
|
||||||
|
DB_VOLUME="/var/lib/docker/volumes/root_netbird_data/_data"
|
||||||
|
DB="$DB_VOLUME/store.db"
|
||||||
|
|
||||||
|
echo "=== Adding Netbird proxy route ==="
|
||||||
|
echo "Domain: $DOMAIN"
|
||||||
|
echo "Backend: $BACKEND_IP:$PORT ($PROTOCOL)"
|
||||||
|
echo ""
|
||||||
|
|
||||||
|
ssh "$VPS" bash << REMOTESCRIPT
|
||||||
|
set -euo pipefail
|
||||||
|
|
||||||
|
# Generate unique ID using timestamp hash (Netbird format)
|
||||||
|
ID_SUFFIX=\$(date +%s | md5sum | head -c 16)
|
||||||
|
SVC_ID="d9\${ID_SUFFIX}ptsnc73\$(date +%s | md5sum | head -c 10)"
|
||||||
|
TGT_ID=\$(sqlite3 "$DB" "SELECT COALESCE(MAX(id), 100) + 1 FROM targets;")
|
||||||
|
ACCOUNT_ID="d88av3aptsnc73clmogg"
|
||||||
|
ZONE_ID="d8adqjaptsnc73fro5g0"
|
||||||
|
|
||||||
|
echo "Service ID: \$SVC_ID"
|
||||||
|
echo "Target ID: \$TGT_ID"
|
||||||
|
|
||||||
|
# Insert service
|
||||||
|
sqlite3 "$DB" "INSERT INTO services (id, account_id, name, domain, proxy_cluster, enabled, terminated, pass_host_header, rewrite_redirects, mode, source, port_auto_assigned, private) VALUES (\"\$SVC_ID\", \"\$ACCOUNT_ID\", \"$DOMAIN\", \"$DOMAIN\", \"netbird.sysloggh.net\", 1, 0, 1, 0, \"http\", \"permanent\", 0, 0);"
|
||||||
|
echo "Service: OK"
|
||||||
|
|
||||||
|
# Insert target
|
||||||
|
sqlite3 "$DB" "INSERT INTO targets (id, account_id, service_id, host, port, protocol, target_id, target_type, enabled, skip_tls_verify, request_timeout, session_idle_timeout, agent_network, disable_access_log) VALUES (\$TGT_ID, \"\$ACCOUNT_ID\", \"\$SVC_ID\", \"$BACKEND_IP\", $PORT, \"$PROTOCOL\", \"\$ZONE_ID\", \"subnet\", 1, 0, 0, 0, 0, 0);"
|
||||||
|
echo "Target: OK"
|
||||||
|
|
||||||
|
# Verify
|
||||||
|
sqlite3 -column "$DB" "SELECT s.name, t.host, t.port, t.protocol FROM services s JOIN targets t ON s.id=t.service_id WHERE s.name=\"$DOMAIN\";"
|
||||||
|
|
||||||
|
echo ""
|
||||||
|
echo "Restarting proxy stack..."
|
||||||
|
cd /root && docker compose restart netbird-server 2>/dev/null
|
||||||
|
sleep 15
|
||||||
|
docker compose restart proxy 2>/dev/null
|
||||||
|
echo "Done. Verify with: curl -sI https://$DOMAIN"
|
||||||
|
REMOTESCRIPT
|
||||||
Reference in New Issue
Block a user