diff --git a/docs/hardware/index.md b/docs/hardware/index.md index 38f2910..201e07d 100644 --- a/docs/hardware/index.md +++ b/docs/hardware/index.md @@ -7,6 +7,7 @@ _Auto-generated from `docs/hardware/*.md` — do not edit by hand. Run `make doc | Hostname | Location | CPU | RAM | Storage | NIC | Status | |---|---|---|---|---|---|---| | [pp01](pp01.md) | | | | | | in-use | +| [pp02](pp02.md) | | | | | | in-use | ## PDUs @@ -22,11 +23,15 @@ _Auto-generated from `docs/hardware/*.md` — do not edit by hand. Run `make doc | Hostname | Location | CPU | RAM | Storage | NIC | Status | |---|---|---|---|---|---|---| | [makerfloss.eu](makerfloss.eu.md) | Hetzner HEL1 (cloud) | AMD EPYC (shared vCPU) · 2c | 4 GB | 40 GB NVME | 1 GbE | in-use | +| [nas01](nas01.md) | The pile | ? | ? | ? | ? | staging | +| [nas02](nas02.md) | The pile | ? | ? | ? | ? | staging | | [srv01](srv01.md) | The pile | ? | ? | ? | ? | staging | | [srv02](srv02.md) | The pile | Intel Core i5-8500 @ 3.00GHz · 6c | 8 GB | 40 GB NVME | 1 GbE | staging | | [srv03](srv03.md) | The pile | Intel Core i5-8500 @ 3.00GHz · 6c | 16 GB | 40 GB NVME | 1 GbE | staging | | [srv04](srv04.md) | The pile | Intel Core i5-3570K @ 3.40GHz · 4c | 8 GB | 500 GB HDD | 1 GbE | staging | | [srv05](srv05.md) | The pile | Intel Core i5-3570K @ 3.40GHz · 4c | 8 GB | 500 GB HDD | 1 GbE | staging | +| [srv06](srv06.md) | The pile | ? | ? | ? | ? | staging | +| [srv07](srv07.md) | The pile | ? | ? | ? | ? | staging | ## Shelves @@ -39,3 +44,7 @@ _Auto-generated from `docs/hardware/*.md` — do not edit by hand. Run `make doc | Hostname | Location | CPU | RAM | Storage | NIC | Status | |---|---|---|---|---|---|---| | [sw01](sw01.md) | | | | | | in-use | +| [sw02](sw02.md) | | | | | | in-use | +| [sw03](sw03.md) | | | | | | in-use | +| [sw04](sw04.md) | | | | | | in-use | +| [sw05](sw05.md) | | | | | | in-use | diff --git a/docs/hardware/pp01.md b/docs/hardware/pp01.md index fe697eb..0aeddc5 100644 --- a/docs/hardware/pp01.md +++ b/docs/hardware/pp01.md @@ -3,14 +3,14 @@ hostname: pp01 kind: patch-panel status: in-use rack: rack01 -rack_u: 24 +rack_u: 25 u_height: 1 rack_face: front -ports: 24 +ports: 16 links: - { local: uplink, peer: sw01, peer_port: 24, speed_gbps: 1 } --- ## Notes -- Provisional placeholder patch panel. Devices patch in here; rear uplink to sw01. +- Link are placeholder values diff --git a/docs/hardware/sw01.md b/docs/hardware/sw01.md index 8c54af7..aa6a6ca 100644 --- a/docs/hardware/sw01.md +++ b/docs/hardware/sw01.md @@ -3,10 +3,10 @@ hostname: sw01 kind: switch status: in-use rack: rack01 -rack_u: 10 +rack_u: 8 u_height: 1 rack_face: front -ports: 24 +ports: 32 --- ## Notes diff --git a/docs/infrastructure/racks/rack01-elevation.svg b/docs/infrastructure/racks/rack01-elevation.svg index 66c0c0d..cc338d9 100644 --- a/docs/infrastructure/racks/rack01-elevation.svg +++ b/docs/infrastructure/racks/rack01-elevation.svg @@ -213,9 +213,19 @@ srv05 (U5–U6) -sw01 · switch · in-use · cluster: — · U10 +sw01 · switch · in-use · cluster: — · U8 + +sw01 (U8) + + +sw02 · switch · in-use · cluster: — · U9 + +sw02 (U9) + + +sw03 · switch · in-use · cluster: — · U10 -sw01 (U10) +sw03 (U10) pdu04 · pdu · in-use · cluster: — · U11 @@ -228,24 +238,59 @@ pdu02 (U12) -pp01 · patch-panel · in-use · cluster: — · U24 - -pp01 (U24) +pp01 · patch-panel · in-use · cluster: — · U25 + +pp01 (U25) + + +pp02 · patch-panel · in-use · cluster: — · U26 + +pp02 (U26) + + +sw04 · switch · in-use · cluster: — · U32 + +sw04 (U32) pdu03 · pdu · in-use · cluster: — · U33 pdu03 (U33) + +sw05 · switch · in-use · cluster: — · U36 + +sw05 (U36) + srv01 · server · staging · cluster: tappaas · shf01/front/slot 1 - -srv01 + +srv01 srv02 · server · staging · cluster: tappaas · shf01/front/slot 2 - -srv02 + +srv02 + + +srv06 · server · staging · cluster: tappaas · shf01/front/slot 6 + +srv06 + + +srv07 · server · staging · cluster: tappaas · shf01/front/slot 7 + +srv07 + + +nas01 · server · staging · cluster: tappaas · shf01/front/slot 8 + +nas01 + + +nas02 · server · staging · cluster: tappaas · shf01/front/slot 9 + +nas02 srv03 · server · staging · cluster: tappaas · shf01/rear/slot 1 diff --git a/docs/infrastructure/racks/rack01.md b/docs/infrastructure/racks/rack01.md index dc10ec8..6acce9a 100644 --- a/docs/infrastructure/racks/rack01.md +++ b/docs/infrastructure/racks/rack01.md @@ -220,9 +220,19 @@ _Auto-generated from `docs/hardware/*.md` (items with `rack: rack01`) — do not srv05 (U5–U6) -sw01 · switch · in-use · cluster: — · U10 +sw01 · switch · in-use · cluster: — · U8 + +sw01 (U8) + + +sw02 · switch · in-use · cluster: — · U9 + +sw02 (U9) + + +sw03 · switch · in-use · cluster: — · U10 -sw01 (U10) +sw03 (U10) pdu04 · pdu · in-use · cluster: — · U11 @@ -235,24 +245,59 @@ _Auto-generated from `docs/hardware/*.md` (items with `rack: rack01`) — do not pdu02 (U12) -pp01 · patch-panel · in-use · cluster: — · U24 - -pp01 (U24) +pp01 · patch-panel · in-use · cluster: — · U25 + +pp01 (U25) + + +pp02 · patch-panel · in-use · cluster: — · U26 + +pp02 (U26) + + +sw04 · switch · in-use · cluster: — · U32 + +sw04 (U32) pdu03 · pdu · in-use · cluster: — · U33 pdu03 (U33) + +sw05 · switch · in-use · cluster: — · U36 + +sw05 (U36) + srv01 · server · staging · cluster: tappaas · shf01/front/slot 1 - -srv01 + +srv01 srv02 · server · staging · cluster: tappaas · shf01/front/slot 2 - -srv02 + +srv02 + + +srv06 · server · staging · cluster: tappaas · shf01/front/slot 6 + +srv06 + + +srv07 · server · staging · cluster: tappaas · shf01/front/slot 7 + +srv07 + + +nas01 · server · staging · cluster: tappaas · shf01/front/slot 8 + +nas01 + + +nas02 · server · staging · cluster: tappaas · shf01/front/slot 9 + +nas02 srv03 · server · staging · cluster: tappaas · shf01/rear/slot 1 @@ -297,17 +342,33 @@ flowchart LR pdu02["pdu02
8 outlets"] pdu03["pdu03
12 outlets"] pdu04["pdu04
5 outlets"] + nas01["nas01"] + nas02["nas02"] srv01["srv01"] srv02["srv02"] srv03["srv03"] + srv06["srv06"] + srv07["srv07"] srv04["srv04"] srv05["srv05"] + pdu01 -->|outlet 1| nas01 + pdu01 -->|outlet 1| nas02 pdu01 -->|outlet 1| srv01 + pdu01 -->|outlet 1| srv06 + pdu01 -->|outlet 1| srv07 pdu01 -->|outlet 2| srv02 pdu01 -->|outlet 3| srv03 pdu01 -->|outlet 4| srv04 pdu01 -->|outlet 5| srv05 + pdu02 -->|outlet 1| nas01 + pdu02 -->|outlet 1| nas02 pdu02 -->|outlet 1| srv01 + pdu02 -->|outlet 1| srv06 + pdu02 -->|outlet 1| srv07 + style nas01 fill:#4c78a8,stroke:#333,color:#ffffff + click nas01 "/hardware/nas01/" + style nas02 fill:#4c78a8,stroke:#333,color:#ffffff + click nas02 "/hardware/nas02/" style pdu01 fill:#e15759,stroke:#333,color:#ffffff click pdu01 "/hardware/pdu01/" style pdu02 fill:#e15759,stroke:#333,color:#ffffff @@ -326,27 +387,47 @@ flowchart LR click srv04 "/hardware/srv04/" style srv05 fill:#4c78a8,stroke:#333,color:#ffffff click srv05 "/hardware/srv05/" + style srv06 fill:#4c78a8,stroke:#333,color:#ffffff + click srv06 "/hardware/srv06/" + style srv07 fill:#4c78a8,stroke:#333,color:#ffffff + click srv07 "/hardware/srv07/" ``` ## Network ```mermaid flowchart LR + nas01["nas01"] + nas02["nas02"] pp01["pp01
patch-panel"] + pp02["pp02
patch-panel"] srv01["srv01"] srv02["srv02"] srv03["srv03"] srv04["srv04"] srv05["srv05"] + srv06["srv06"] + srv07["srv07"] sw01["sw01
switch"] + nas01 -->|eth0 → p1 · 1G| sw01 + nas02 -->|eth0 → p1 · 1G| sw01 pp01 -->|uplink → p24 · 1G| sw01 + pp02 -->|uplink → p24 · 1G| sw01 srv01 -->|eth0 → p1 · 1G| sw01 srv02 -->|eth0 → p1 · 1G| pp01 srv03 -->|eth0 → p2 · 1G| pp01 srv04 -->|eth0 → p3 · 1G| pp01 srv05 -->|eth0 → p4 · 1G| pp01 + srv06 -->|eth0 → p1 · 1G| sw01 + srv07 -->|eth0 → p1 · 1G| sw01 + style nas01 fill:#4c78a8,stroke:#333,color:#ffffff + click nas01 "/hardware/nas01/" + style nas02 fill:#4c78a8,stroke:#333,color:#ffffff + click nas02 "/hardware/nas02/" style pp01 fill:#9c755f,stroke:#333,color:#ffffff click pp01 "/hardware/pp01/" + style pp02 fill:#9c755f,stroke:#333,color:#ffffff + click pp02 "/hardware/pp02/" style srv01 fill:#4c78a8,stroke:#333,color:#ffffff click srv01 "/hardware/srv01/" style srv02 fill:#4c78a8,stroke:#333,color:#ffffff @@ -357,6 +438,10 @@ flowchart LR click srv04 "/hardware/srv04/" style srv05 fill:#4c78a8,stroke:#333,color:#ffffff click srv05 "/hardware/srv05/" + style srv06 fill:#4c78a8,stroke:#333,color:#ffffff + click srv06 "/hardware/srv06/" + style srv07 fill:#4c78a8,stroke:#333,color:#ffffff + click srv07 "/hardware/srv07/" style sw01 fill:#59a14f,stroke:#333,color:#ffffff click sw01 "/hardware/sw01/" ``` @@ -368,12 +453,21 @@ flowchart LR | U1 | [pdu01](../../hardware/pdu01.md) | pdu | rear | in-use | | U5–U6 | [srv04](../../hardware/srv04.md) | server | front | staging | | U5–U6 | [srv05](../../hardware/srv05.md) | server | rear | staging | -| U10 | [sw01](../../hardware/sw01.md) | switch | front | in-use | +| U8 | [sw01](../../hardware/sw01.md) | switch | front | in-use | +| U9 | [sw02](../../hardware/sw02.md) | switch | front | in-use | +| U10 | [sw03](../../hardware/sw03.md) | switch | front | in-use | | U11 | [pdu04](../../hardware/pdu04.md) | pdu | front | in-use | | U12 | [pdu02](../../hardware/pdu02.md) | pdu | rear | in-use | -| U24 | [pp01](../../hardware/pp01.md) | patch-panel | front | in-use | +| U25 | [pp01](../../hardware/pp01.md) | patch-panel | front | in-use | +| U26 | [pp02](../../hardware/pp02.md) | patch-panel | front | in-use | +| U32 | [sw04](../../hardware/sw04.md) | switch | front | in-use | | U33 | [pdu03](../../hardware/pdu03.md) | pdu | rear | in-use | +| U36 | [sw05](../../hardware/sw05.md) | switch | front | in-use | | U37–U46 | [shf01](../../hardware/shf01.md) | shelf | both | in-use | | U37–U46 | [srv01](../../hardware/srv01.md) | server | front · shf01/1 | staging | | U37–U46 | [srv02](../../hardware/srv02.md) | server | front · shf01/2 | staging | +| U37–U46 | [srv06](../../hardware/srv06.md) | server | front · shf01/6 | staging | +| U37–U46 | [srv07](../../hardware/srv07.md) | server | front · shf01/7 | staging | +| U37–U46 | [nas01](../../hardware/nas01.md) | server | front · shf01/8 | staging | +| U37–U46 | [nas02](../../hardware/nas02.md) | server | front · shf01/9 | staging | | U37–U46 | [srv03](../../hardware/srv03.md) | server | rear · shf01/1 | staging |