Fix network map inconsistencies, add detailed topology diagram, document NetBox plugins
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
- Fix ZX1-3 port reference (PP2-2, XU2) - Fix CSS1-2 connection to KVM1 - Fix CSS326 PP1 port references (19-24) - Fix CSS1-SFP1 to show ZX1 connection - Fix CSS1-18 status (remove double check) - Fix PP2 section title (U8) - Add ZX1 to IP allocation table - Regenerate topology diagram with backbone ports marked - Add NetBox plugins documentation to current state
This commit is contained in:
@@ -289,3 +289,18 @@ The following services were removed as redundant (AdGuard Home provides DoH/DoT
|
||||
| Remote Access | rustdesk-hbbs, rustdesk-hbbr |
|
||||
| Management | portainer, unimus |
|
||||
| Network Inventory | netbox, netbox-worker, netbox-redis-cache, diode-*, netdisco-* |
|
||||
|
||||
---
|
||||
|
||||
## NetBox Plugins (2026-01-25)
|
||||
|
||||
| Plugin | Purpose | Status |
|
||||
|--------|---------|--------|
|
||||
| netbox_diode_plugin | Diode network discovery integration | ✅ Active |
|
||||
| nextbox_ui_plugin | Network topology visualization | ✅ Active |
|
||||
| netbox_dns | DNS zone and record management | ✅ Active |
|
||||
| netbox_inventory | Asset/inventory management | ✅ Active |
|
||||
| netbox_interface_synchronization | Interface sync between devices | ✅ Active |
|
||||
| netbox_routing | Routing protocol management (BGP, OSPF) | ✅ Active |
|
||||
|
||||
**Topology View:** https://netbox.xtrm-lab.org/plugins/nextbox-ui/topology/
|
||||
|
||||
@@ -174,7 +174,7 @@ block-beta
|
||||
|
||||
<div style="page-break-after: always;"></div>
|
||||
|
||||
### [PP2] Patch Panel 2 - 10" 1U 12-Port (U5)
|
||||
### [PP2] Patch Panel 2 - 10" 1U 12-Port (U8)
|
||||
|
||||
```mermaid
|
||||
block-beta
|
||||
@@ -234,7 +234,7 @@ block-beta
|
||||
|------|-------|--------|-------------|------|-------|--------|
|
||||
| ZX1-1 | 2.5G | HAP | H-4 | | hAP ax³| ☑ Up ☐ Down |
|
||||
| ZX1-2 | 2.5G | PP2 | PP2-1 | | XTRM-U XU1| ☑ Up ☐ Down |
|
||||
| ZX1-3 | 2.5G | PP2 | PP2-1 | | XTRM-U XU1| ☑ Up ☐ Down |
|
||||
| ZX1-3 | 2.5G | PP2 | PP2-2 | | XTRM-U XU2| ☑ Up ☐ Down |
|
||||
| ZX1-4 | 2.5G | | | | | ☐ Up ☐ Down |
|
||||
| ZX1-5 | 2.5G | | | | | ☐ Up ☐ Down |
|
||||
| ZX1-6 | 2.5G | | | | | ☐ Up ☐ Down |
|
||||
@@ -279,7 +279,7 @@ block-beta
|
||||
Port | Speed | Device | Device Port | VLAN | Notes | Status |
|
||||
|------|-------|--------|-------------|------|-------|--------|
|
||||
| CSS1-1 | 1G | HAP | H-3 | | hAP ax³| ☑ Up ☐ Down |
|
||||
| CSS1-2 | 100M | PP2 | PP2-1 | | XTRM-U XU1| ☑ Up ☐ Down |
|
||||
| CSS1-2 | 100M | KVM1 | KVM1-1 | | KVM Switch| ☑ Up ☐ Down |
|
||||
| CSS1-3 | 1G | | | | | ☐ Up ☑ Down |
|
||||
| CSS1-4 | 1G | | | | | ☐ Up ☑ Down |
|
||||
| CSS1-5 | 1G | | | | | ☐ Up ☑ Down |
|
||||
@@ -295,16 +295,16 @@ block-beta
|
||||
| CSS1-15 | 1G | | | | | ☐ Up ☑ Down |
|
||||
| CSS1-16 | 1G |PP1| PP1-16| | G1| ☐ Up ☑ Down |
|
||||
| CSS1-17 | 1G | PP1| PP1-17| | B2| ☑ Up ☐ Down |
|
||||
| CSS1-18 | 1G | PP1| PP1-18 | | B1| ☑ Up ☑ Down |
|
||||
| CSS1-19 | 1G | PP1| PP1-17| | M1| ☑ Up ☐ Down |
|
||||
| CSS1-20 | 1G | PP1| PP1-18 | | M2| ☑ Up ☑ Down |
|
||||
| CSS1-21 | 1G | PP1| PP1-17| | M3| ☑ Up ☐ Down |
|
||||
| CSS1-22 | 1G | PP1| PP1-18 | | L1| ☑ Up ☑ Down |
|
||||
| CSS1-23 | 1G | PP1| PP1-17| | L2| ☑ Up ☐ Down |
|
||||
| CSS1-24 | 1G | PP1| PP1-18 | | L3| ☑ Up ☑ Down |
|
||||
| CSS1-18 | 1G | PP1| PP1-18 | | B1| ☑ Up ☐ Down |
|
||||
| CSS1-19 | 1G | PP1| PP1-19| | M1| ☑ Up ☐ Down |
|
||||
| CSS1-20 | 1G | PP1| PP1-20 | | M2| ☑ Up ☐ Down |
|
||||
| CSS1-21 | 1G | PP1| PP1-21| | M3| ☑ Up ☐ Down |
|
||||
| CSS1-22 | 1G | PP1| PP1-22 | | L1| ☑ Up ☐ Down |
|
||||
| CSS1-23 | 1G | PP1| PP1-23| | L2| ☑ Up ☐ Down |
|
||||
| CSS1-24 | 1G | PP1| PP1-24 | | L3| ☑ Up ☐ Down |
|
||||
|
||||
| CSS1-SFP1 | 10G |CSS1 |CSS1-SFP1 | | CSS326 Uplink | ☑ Up ☐ Down |
|
||||
| CSS1-SFP2 | 10G |CSS1 |CSS1-SFP1 | | CSS326 Uplink | ☐ Up ☑ Down |
|
||||
| CSS1-SFP1 | 10G | ZX1 | ZX1-SFP1 | | 10G Backbone | ☑ Up ☐ Down |
|
||||
| CSS1-SFP2 | 10G | | | | Unused | ☐ Up ☑ Down |
|
||||
|
||||
---
|
||||
<div style="page-break-after: always;"></div>
|
||||
@@ -367,46 +367,93 @@ block-beta
|
||||
|
||||
```mermaid
|
||||
flowchart TB
|
||||
subgraph Internet
|
||||
ISP[ISP Gateway\nVivacom Fiber]
|
||||
end
|
||||
|
||||
subgraph Rack10["10" Rack (9U)"]
|
||||
SW25[2.5GbE Switch\n8x2.5G + 2x10G]
|
||||
UNRAID[XTRM-Unraid\n192.168.31.2]
|
||||
PP2[Patch Panel 2\n12-port]
|
||||
subgraph Internet["Internet"]
|
||||
ISP["ISP Gateway<br/>Vivacom Fiber<br/>62.73.120.x"]
|
||||
end
|
||||
|
||||
subgraph Rack19["19" Rack (3U)"]
|
||||
HAP[hAP ax³ Router\n192.168.31.1]
|
||||
CSS[CSS326-24G-2S+\n192.168.31.9]
|
||||
PP1[Patch Panel 1\n24-port]
|
||||
HAP["hAP ax³ Router<br/>192.168.31.1"]
|
||||
PP1["PP1 (24-port)"]
|
||||
CSS["CSS326-24G-2S+<br/>192.168.31.9"]
|
||||
end
|
||||
|
||||
subgraph Wireless
|
||||
CAP[cAP ac\n192.168.31.6]
|
||||
subgraph Rack10["10" Rack (9U)"]
|
||||
ZX1["ZX1 2.5GbE Switch<br/>192.168.31.7"]
|
||||
PP2["PP2 (12-port)"]
|
||||
UNRAID["XTRM-Unraid<br/>192.168.31.2"]
|
||||
end
|
||||
|
||||
subgraph Rooms
|
||||
LR[Living Room\n3 ports]
|
||||
MB[Main Bedroom\n3 ports]
|
||||
GR[Girls Room\n1 port]
|
||||
BR[Boys Room\n2 ports]
|
||||
subgraph AccessPoint["Corridor"]
|
||||
POE["POE Adapter"]
|
||||
CAP["cAP ac<br/>192.168.31.6"]
|
||||
end
|
||||
|
||||
ISP -->|WAN| HAP
|
||||
HAP -->|2.5G| SW25
|
||||
SW25 -->|10G SFP+| CSS
|
||||
SW25 -->|2.5G| UNRAID
|
||||
CSS --> PP1
|
||||
PP1 --> LR
|
||||
PP1 --> MB
|
||||
PP1 --> GR
|
||||
PP1 --> BR
|
||||
HAP -.->|WiFi| CAP
|
||||
PP2 -.-> Rooms
|
||||
subgraph Rooms["Room Outlets"]
|
||||
LR["Living Room<br/>L1, L2, L3"]
|
||||
MB["Main Bedroom<br/>M1, M2, M3"]
|
||||
GR["Girls Room<br/>G1"]
|
||||
BR["Boys Room<br/>B1, B2"]
|
||||
end
|
||||
|
||||
subgraph EndDevices["Connected Devices"]
|
||||
LGTV["LG TV"]
|
||||
NOBARA["XTRM-Nobara"]
|
||||
DELL["Dell Display"]
|
||||
DANCHO["Dancho PC"]
|
||||
KVM["KVM Switch"]
|
||||
end
|
||||
|
||||
%% WAN Connection
|
||||
ISP -->|"H-1 (2.5G WAN)"| HAP
|
||||
|
||||
%% Backbone Links (marked)
|
||||
HAP -->|"H-4 → ZX1-1<br/>1G Uplink"| ZX1
|
||||
HAP -->|"H-3 → CSS1-1<br/>1G Backup"| CSS
|
||||
ZX1 <-->|"ZX1-SFP1 ↔ CSS1-SFP1<br/>⚡ 10G BACKBONE ⚡"| CSS
|
||||
|
||||
%% Server Connection via PP2
|
||||
ZX1 -->|"ZX1-2 → PP2-1"| PP2
|
||||
ZX1 -->|"ZX1-3 → PP2-2"| PP2
|
||||
PP2 -->|"PP2-1 → XU-1<br/>PP2-2 → XU-2<br/>2.5G Bond"| UNRAID
|
||||
|
||||
%% CAP Path (wired POE)
|
||||
HAP -->|"H-2 → PP1-3"| PP1
|
||||
PP1 -->|"PP1-3 rear"| POE
|
||||
POE -->|"PP1-12 rear"| PP1
|
||||
PP1 -->|"PP1-12 → CP-1"| CAP
|
||||
|
||||
%% Room Distribution
|
||||
CSS -->|"CSS1-16..24"| PP1
|
||||
PP1 -->|"PP1-22..24"| LR
|
||||
PP1 -->|"PP1-19..21"| MB
|
||||
PP1 -->|"PP1-16"| GR
|
||||
PP1 -->|"PP1-17..18"| BR
|
||||
|
||||
%% End Devices
|
||||
LR -.-> LGTV
|
||||
MB -.-> NOBARA
|
||||
MB -.-> DELL
|
||||
BR -.-> DANCHO
|
||||
CSS -->|"CSS1-2"| KVM
|
||||
|
||||
%% Styling
|
||||
style ZX1 fill:#bfb,stroke:#333,stroke-width:2px
|
||||
style CSS fill:#bfb,stroke:#333,stroke-width:2px
|
||||
style HAP fill:#f9f,stroke:#333,stroke-width:2px
|
||||
style UNRAID fill:#fbb,stroke:#333,stroke-width:2px
|
||||
style ISP fill:#ff9,stroke:#333
|
||||
style CAP fill:#9ff,stroke:#333
|
||||
```
|
||||
|
||||
### Backbone Links Summary
|
||||
|
||||
| Link | From | To | Speed | Type |
|
||||
|------|------|----|-------|------|
|
||||
| **Primary Backbone** | ZX1-SFP1 | CSS1-SFP1 | 10G | SFP+ DAC |
|
||||
| Router → Core | HAP H-4 | ZX1-1 | 1G | Cat6a |
|
||||
| Router → Distribution | HAP H-3 | CSS1-1 | 1G | Cat6a (backup) |
|
||||
| Server Bond | ZX1-2/3 | XU-1/2 via PP2 | 2x 2.5G | Cat6a |
|
||||
|
||||
---
|
||||
|
||||
## IP Address Allocation
|
||||
@@ -419,6 +466,7 @@ flowchart TB
|
||||
| 192.168.31.2 | XTRM-Unraid | Server | Static |
|
||||
| 192.168.31.4 | AdGuard-Unraid | Container | Static |
|
||||
| 192.168.31.6 | CAP-XL-ac | Access Point | Static |
|
||||
| 192.168.31.7 | ZX1 | 2.5GbE Switch | Static |
|
||||
| 192.168.31.9 | CSS326 | Switch | Static |
|
||||
| 192.168.31.10-99 | - | Reserved | - |
|
||||
| 192.168.31.100-200 | - | DHCP Pool | DHCP |
|
||||
|
||||
Reference in New Issue
Block a user