diff --git a/docs/hardware/index.md b/docs/hardware/index.md index b11b679..9ec41ac 100644 --- a/docs/hardware/index.md +++ b/docs/hardware/index.md @@ -20,11 +20,11 @@ _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 | -| [mf00](mf00.md) | The pile | ? | ? | ? | ? | staging | -| [mf01](mf01.md) | The pile | Intel Core i5-8500 @ 3.00GHz · 6c | 8 GB | 40 GB NVME | 1 GbE | staging | -| [mf02](mf02.md) | The pile | Intel Core i5-8500 @ 3.00GHz · 6c | 16 GB | 40 GB NVME | 1 GbE | staging | -| [mf03](mf03.md) | The pile | Intel Core i5-3570K @ 3.40GHz · 4c | 8 GB | 500 GB HDD | 1 GbE | staging | -| [mf04](mf04.md) | The pile | Intel Core i5-3570K @ 3.40GHz · 4c | 8 GB | 500 GB HDD | 1 GbE | 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 | ## Switches diff --git a/docs/hardware/mf00.md b/docs/hardware/srv01.md similarity index 93% rename from docs/hardware/mf00.md rename to docs/hardware/srv01.md index 19647b9..8b6540a 100644 --- a/docs/hardware/mf00.md +++ b/docs/hardware/srv01.md @@ -1,7 +1,8 @@ --- -hostname: mf00 +hostname: srv01 kind: server status: staging +cluster: tappaas location: The pile cpu: "?" cpu_cores: "?" diff --git a/docs/hardware/mf01.md b/docs/hardware/srv02.md similarity index 96% rename from docs/hardware/mf01.md rename to docs/hardware/srv02.md index 2328008..c5bc5e3 100644 --- a/docs/hardware/mf01.md +++ b/docs/hardware/srv02.md @@ -1,5 +1,5 @@ --- -hostname: mf01 +hostname: srv02 kind: server status: staging location: The pile diff --git a/docs/hardware/mf02.md b/docs/hardware/srv03.md similarity index 96% rename from docs/hardware/mf02.md rename to docs/hardware/srv03.md index aa5bc0a..3b5ed34 100644 --- a/docs/hardware/mf02.md +++ b/docs/hardware/srv03.md @@ -1,5 +1,5 @@ --- -hostname: mf02 +hostname: srv03 kind: server status: staging location: The pile diff --git a/docs/hardware/mf03.md b/docs/hardware/srv04.md similarity index 96% rename from docs/hardware/mf03.md rename to docs/hardware/srv04.md index d99d2aa..2cd2da7 100644 --- a/docs/hardware/mf03.md +++ b/docs/hardware/srv04.md @@ -1,5 +1,5 @@ --- -hostname: mf03 +hostname: srv04 kind: server status: staging location: The pile diff --git a/docs/hardware/mf04.md b/docs/hardware/srv05.md similarity index 96% rename from docs/hardware/mf04.md rename to docs/hardware/srv05.md index 3fce863..0dc505f 100644 --- a/docs/hardware/mf04.md +++ b/docs/hardware/srv05.md @@ -1,5 +1,5 @@ --- -hostname: mf04 +hostname: srv05 kind: server status: staging location: The pile diff --git a/docs/infrastructure/racks/rack01-elevation.svg b/docs/infrastructure/racks/rack01-elevation.svg index 8df4916..d60a138 100644 --- a/docs/infrastructure/racks/rack01-elevation.svg +++ b/docs/infrastructure/racks/rack01-elevation.svg @@ -148,15 +148,15 @@ 47 48 -mf00 (U1) +srv01 (U1) -mf01 (U2) +srv02 (U2) -mf02 (U3) +srv03 (U3) -mf03 (U5–U6) +srv04 (U5–U6) -mf04 (U5–U6) +srv05 (U5–U6) sw01 (U10) diff --git a/docs/infrastructure/racks/rack01.md b/docs/infrastructure/racks/rack01.md index 99287c0..14f55ed 100644 --- a/docs/infrastructure/racks/rack01.md +++ b/docs/infrastructure/racks/rack01.md @@ -12,47 +12,47 @@ _Auto-generated from `docs/hardware/*.md` (items with `rack: rack01`) — do not flowchart LR pdu01["pdu01
8 outlets"] pdu02["pdu02
8 outlets"] - mf00["mf00"] - mf01["mf01"] - mf02["mf02"] - mf03["mf03"] - mf04["mf04"] - pdu01 -->|outlet 1| mf00 - pdu01 -->|outlet 2| mf01 - pdu01 -->|outlet 3| mf02 - pdu01 -->|outlet 4| mf03 - pdu01 -->|outlet 5| mf04 - pdu02 -->|outlet 1| mf00 + srv01["srv01"] + srv02["srv02"] + srv03["srv03"] + srv04["srv04"] + srv05["srv05"] + pdu01 -->|outlet 1| srv01 + pdu01 -->|outlet 2| srv02 + pdu01 -->|outlet 3| srv03 + pdu01 -->|outlet 4| srv04 + pdu01 -->|outlet 5| srv05 + pdu02 -->|outlet 1| srv01 ``` ## Network ```mermaid flowchart LR - mf00["mf00"] - mf01["mf01"] - mf02["mf02"] - mf03["mf03"] - mf04["mf04"] pp01["pp01
patch-panel"] + srv01["srv01"] + srv02["srv02"] + srv03["srv03"] + srv04["srv04"] + srv05["srv05"] sw01["sw01
switch"] - mf00 -->|eth0 → p1 · 1G| sw01 - mf01 -->|eth0 → p1 · 1G| pp01 - mf02 -->|eth0 → p2 · 1G| pp01 - mf03 -->|eth0 → p3 · 1G| pp01 - mf04 -->|eth0 → p4 · 1G| pp01 pp01 -->|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 ``` ## Occupancy | U | Device | Kind | Face | Status | |---|---|---|---|---| -| U1 | [mf00](../../hardware/mf00.md) | server | front | staging | -| U2 | [mf01](../../hardware/mf01.md) | server | front | staging | -| U3 | [mf02](../../hardware/mf02.md) | server | front | staging | -| U5–U6 | [mf03](../../hardware/mf03.md) | server | front | staging | -| U5–U6 | [mf04](../../hardware/mf04.md) | server | rear | staging | +| U1 | [srv01](../../hardware/srv01.md) | server | front | staging | +| U2 | [srv02](../../hardware/srv02.md) | server | front | staging | +| U3 | [srv03](../../hardware/srv03.md) | server | front | staging | +| 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 | | U24 | [pp01](../../hardware/pp01.md) | patch-panel | front | in-use | | 0U | [pdu01](../../hardware/pdu01.md) | pdu | left | in-use |