diff --git a/docs/hardware/index.md b/docs/hardware/index.md index 5579dbb..c63cbf7 100644 --- a/docs/hardware/index.md +++ b/docs/hardware/index.md @@ -41,6 +41,7 @@ _Auto-generated from `docs/hardware/*.md` — do not edit by hand. Run `make doc | [shf02](shf02.md) | | | | | | in-use | | [shf03](shf03.md) | | | | | | in-use | | [shf04](shf04.md) | | | | | | in-use | +| [shf05](shf05.md) | | | | | | in-use | ## Switches @@ -51,6 +52,8 @@ _Auto-generated from `docs/hardware/*.md` — do not edit by hand. Run `make doc | [sw03](sw03.md) | | | | | | staging | | [sw04](sw04.md) | | | | | | staging | | [sw05](sw05.md) | | | | | | staging | +| [sw06](sw06.md) | | | | | | in-use | +| [sw07](sw07.md) | | | | | | in-use | ## UPS diff --git a/docs/hardware/pp01.md b/docs/hardware/pp01.md index 3080481..5442067 100644 --- a/docs/hardware/pp01.md +++ b/docs/hardware/pp01.md @@ -9,12 +9,14 @@ rack_face: front ports: 9 links: - { local: "1", peer: wan01, peer_port: 1 } + - { local: "4", peer: sw06, peer_port: 3 } --- ## Notes - Port 1 → wan01 (WAN line 1, active). Fed from pp02:1 (srv01 eth0). - Port 2 → wan02 (WAN line 2), set up but non-active. -- Port 3 → working table (white cable), non-active. -- Port 4 ← sw01:8 (switch management), patched out to the working table - (black cable), non-active. +- Port 3 ← sw01:8 (switch management), patched out to the working table + (white cable), non-active. +- Port 4 → sw06:3 (aggregation switch on shf03), patched out to the working + table (black cable). diff --git a/docs/hardware/pp02.md b/docs/hardware/pp02.md index fbc3455..647c9b4 100644 --- a/docs/hardware/pp02.md +++ b/docs/hardware/pp02.md @@ -15,12 +15,14 @@ links: - { local: "5", peer: sw01, peer_port: 4 } - { local: "6", peer: sw01, peer_port: 5 } - { local: "7", peer: sw01, peer_port: 6 } - - { local: "8", peer: sw01, peer_port: 7 } --- ## Notes -- 24-port patch panel; ports 1–8 are the live feeds. +- 24-port patch panel; ports 1–7 are the live LAN feeds. - Port 1 → pp01:1 → wan01 (srv01 eth0, WAN). -- Ports 2–8 → sw01:1–7 (LAN): srv01 eth1 (p2), srv02 (p3), srv03 (p4), - srv04 (p5), srv05 (p6), srv06 (p7), srv07 (p8). +- Ports 2–7 → sw01:1–6 (LAN): srv01 eth1 (p2), srv02 (p3), srv03 (p4), + srv04 (p5), srv05 (p6), srv06 (p7). +- Port 8 still carries srv07 eth0, but its rear patch to sw01:7 was removed + when sw01:7 was repurposed as the uplink to sw06 — so srv07 (staging) has + no active LAN path today. diff --git a/docs/hardware/shf03.md b/docs/hardware/shf03.md index 2b46f01..1a21932 100644 --- a/docs/hardware/shf03.md +++ b/docs/hardware/shf03.md @@ -3,12 +3,13 @@ hostname: shf03 kind: shelf status: in-use rack: rack01 -rack_u: 21 +rack_u: 22 u_height: 1 rack_face: front --- ## Notes -- Half-depth shelf at U21 (front), currently empty. -- Paired with shf04 (rear half-depth at the same U). +- Half-depth shelf at U22 (front). +- Holds two unmanaged switches standing on it: sw07 (slot 1, left) and + sw06 (slot 2, right). diff --git a/docs/hardware/shf04.md b/docs/hardware/shf04.md index d533e07..78789d6 100644 --- a/docs/hardware/shf04.md +++ b/docs/hardware/shf04.md @@ -11,4 +11,4 @@ rack_face: rear ## Notes - Half-depth shelf at U21 (rear), currently empty. -- Paired with shf03 (front half-depth at the same U). +- Was the rear pair of shf03; shf03 has since moved up to U22. diff --git a/docs/hardware/shf05.md b/docs/hardware/shf05.md new file mode 100644 index 0000000..dff9d68 --- /dev/null +++ b/docs/hardware/shf05.md @@ -0,0 +1,13 @@ +--- +hostname: shf05 +kind: shelf +status: in-use +rack: rack01 +rack_u: 19 +u_height: 1 +rack_face: front +--- + +## Notes + +- Shelf at U19 (front), currently empty. diff --git a/docs/hardware/sw01.md b/docs/hardware/sw01.md index 4e22ff0..0ac5345 100644 --- a/docs/hardware/sw01.md +++ b/docs/hardware/sw01.md @@ -7,11 +7,16 @@ rack_u: 23 u_height: 1 rack_face: front ports: 10 +links: + - { local: "7", peer: sw06, peer_port: 1, speed_gbps: 1 } + - { local: "8", peer: pp01, peer_port: 3 } --- ## Notes - 10 ports: p1–p8 are 1 GbE; sfp1–sfp2 are 2.5 GbE SFP+ (unused today). -- p1–p7 carry server uplinks via pp02 (pp02:2–8 → sw01:1–7). -- p8 is the management port, patched out via pp01:4 to the working table - (black cable) — non-active. +- p1–p6 carry server uplinks via pp02 (pp02:2–7 → sw01:1–6). +- p7 uplinks to sw06:1 (aggregation switch on shf03) — repurposed from the + former srv07 uplink. +- p8 is the management port, patched out via pp01:3 to the working table + (white cable) — non-active. diff --git a/docs/hardware/sw06.md b/docs/hardware/sw06.md new file mode 100644 index 0000000..783fb34 --- /dev/null +++ b/docs/hardware/sw06.md @@ -0,0 +1,20 @@ +--- +hostname: sw06 +kind: switch +status: in-use +rack: rack01 +mounted_on: shf03 +shelf_face: front +shelf_slot: 2 +chassis_u: 1 +ports: 9 +--- + +## Notes + +- 9-port unmanaged switch. Stands on shf03, right side (slot 2). +- Ports 1–8 are 2.5 GbE; port 9 is 10 GbE. +- Port 1 ← sw01:7 (LAN uplink from the rack switch, negotiates at 1 GbE). +- Port 2 ← sw07:1 (1 GbE). +- Port 3 ← pp01:4 (patched out to the working table). +- Port 9 (10 GbE) unused today. diff --git a/docs/hardware/sw07.md b/docs/hardware/sw07.md new file mode 100644 index 0000000..2374cd0 --- /dev/null +++ b/docs/hardware/sw07.md @@ -0,0 +1,18 @@ +--- +hostname: sw07 +kind: switch +status: in-use +rack: rack01 +mounted_on: shf03 +shelf_face: front +shelf_slot: 1 +chassis_u: 1 +ports: 4 +links: + - { local: "1", peer: sw06, peer_port: 2, speed_gbps: 1 } +--- + +## Notes + +- 4-port unmanaged 1 GbE switch. Stands on shf03, left side (slot 1). +- Uplink: port 1 → sw06:2 (a 2.5 GbE port, negotiates at 1 GbE). diff --git a/docs/infrastructure/racks/rack01-elevation.svg b/docs/infrastructure/racks/rack01-elevation.svg index e31b143..976f676 100644 --- a/docs/infrastructure/racks/rack01-elevation.svg +++ b/docs/infrastructure/racks/rack01-elevation.svg @@ -244,11 +244,21 @@ shf02 + +sw07 · switch · in-use · cluster: — · shf03/front/slot 1 + +sw07 + + +sw06 · switch · in-use · cluster: — · shf03/front/slot 2 + +sw06 + -shf03 · shelf · in-use · cluster: — · U21 - - -shf03 +shf03 · shelf · in-use · cluster: — · U22 + + +shf03 shf04 · shelf · in-use · cluster: — · U21 @@ -256,6 +266,12 @@ shf04 + +shf05 · shelf · in-use · cluster: — · U19 + + +shf05 + pdu01 · pdu · in-use · cluster: — · U1 diff --git a/docs/infrastructure/racks/rack01.md b/docs/infrastructure/racks/rack01.md index 73e81c6..fd2de55 100644 --- a/docs/infrastructure/racks/rack01.md +++ b/docs/infrastructure/racks/rack01.md @@ -251,11 +251,21 @@ _Auto-generated from `docs/hardware/*.md` (items with `rack: rack01`) — do not shf02 + +sw07 · switch · in-use · cluster: — · shf03/front/slot 1 + +sw07 + + +sw06 · switch · in-use · cluster: — · shf03/front/slot 2 + +sw06 + -shf03 · shelf · in-use · cluster: — · U21 - - -shf03 +shf03 · shelf · in-use · cluster: — · U22 + + +shf03 shf04 · shelf · in-use · cluster: — · U21 @@ -263,6 +273,12 @@ _Auto-generated from `docs/hardware/*.md` (items with `rack: rack01`) — do not shf04 + +shf05 · shelf · in-use · cluster: — · U19 + + +shf05 + pdu01 · pdu · in-use · cluster: — · U1 @@ -436,8 +452,11 @@ flowchart LR srv06["srv06"] srv07["srv07"] sw01["sw01
switch"] + sw06["sw06
switch"] + sw07["sw07
switch"] wan01["wan01"] pp01 -->|1 → p1| wan01 + pp01 -->|4 → p3| sw06 pp02 -->|1 → p1| pp01 pp02 -->|2 → p1| sw01 pp02 -->|3 → p2| sw01 @@ -445,7 +464,6 @@ flowchart LR pp02 -->|5 → p4| sw01 pp02 -->|6 → p5| sw01 pp02 -->|7 → p6| sw01 - pp02 -->|8 → p7| sw01 srv01 -->|eth0 → p1 · 1G| pp02 srv01 -->|eth1 → p2 · 1G| pp02 srv02 -->|eth0 → p3 · 1G| pp02 @@ -454,6 +472,9 @@ flowchart LR srv05 -->|eth0 → p6 · 1G| pp02 srv06 -->|eth0 → p7 · 1G| pp02 srv07 -->|eth0 → p8 · 1G| pp02 + sw01 -->|7 → p1 · 1G| sw06 + sw01 -->|8 → p3| pp01 + sw07 -->|1 → p2 · 1G| sw06 style pp01 fill:#9c755f,stroke:#333,color:#ffffff click pp01 "/hardware/pp01/" style pp02 fill:#9c755f,stroke:#333,color:#ffffff @@ -474,6 +495,10 @@ flowchart LR click srv07 "/hardware/srv07/" style sw01 fill:#59a14f,stroke:#333,color:#ffffff click sw01 "/hardware/sw01/" + style sw06 fill:#59a14f,stroke:#333,color:#ffffff + click sw06 "/hardware/sw06/" + style sw07 fill:#59a14f,stroke:#333,color:#ffffff + click sw07 "/hardware/sw07/" style wan01 fill:#888888,stroke:#333,color:#ffffff ``` @@ -492,8 +517,11 @@ flowchart LR | U10 | [sw03](../../hardware/sw03.md) | switch | front | staging | | U12 | [pdu02](../../hardware/pdu02.md) | pdu | rear | in-use | | U12 | [pdu04](../../hardware/pdu04.md) | pdu | front | in-use | -| U21 | [shf03](../../hardware/shf03.md) | shelf | front | in-use | +| U19 | [shf05](../../hardware/shf05.md) | shelf | front | in-use | | U21 | [shf04](../../hardware/shf04.md) | shelf | rear | in-use | +| U22 | [shf03](../../hardware/shf03.md) | shelf | front | in-use | +| U22 | [sw07](../../hardware/sw07.md) | switch | front · shf03/1 | in-use | +| U22 | [sw06](../../hardware/sw06.md) | switch | front · shf03/2 | in-use | | U23 | [sw01](../../hardware/sw01.md) | switch | front | in-use | | U24 | [pp01](../../hardware/pp01.md) | patch-panel | front | in-use | | U25 | [pp02](../../hardware/pp02.md) | patch-panel | front | in-use |