Physical location: building / room / rack / unit / asset tag
- machines.building/room/rack/rack_unit/asset_tag, racks table (height, comment)
- API: POST /machines/{id}/location, POST /locations/import (CSV or JSON, matched by
id/serial/mac/node_name, ?dry=1), GET/POST/DELETE /racks, ?building/?room/?rack filters
- CLI: rollcall location ..., location import, location racks/rack, list -rack/-room/-building
- UI: location column and building > room > rack chips, bulk Set location…, Racks page with
elevation views and CSV import dialog, location in machine detail
- .Node.Building/Room/Rack/Unit/AssetTag in overlay templates and tag match rules
Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
This commit is contained in:
1 parent
0333c1e486
commit
cb7b6fd19e
11 files changed
+678
-16
No files matched your search
+18
-2
@@ -87,6 +87,19 @@ ALTER TABLE machines ADD COLUMN IF NOT EXISTS tags jsonb NOT NULL DEFAULT '[]';
|
||||
ALTER TABLE machines ADD COLUMN IF NOT EXISTS auto_tags jsonb NOT NULL DEFAULT '[]';
|
||||
CREATE INDEX IF NOT EXISTS machines_tags ON machines USING gin(tags);
|
||||
CREATE INDEX IF NOT EXISTS machines_auto_tags ON machines USING gin(auto_tags);
|
||||
ALTER TABLE machines ADD COLUMN IF NOT EXISTS building text;
|
||||
ALTER TABLE machines ADD COLUMN IF NOT EXISTS room text;
|
||||
ALTER TABLE machines ADD COLUMN IF NOT EXISTS rack text;
|
||||
ALTER TABLE machines ADD COLUMN IF NOT EXISTS rack_unit int;
|
||||
ALTER TABLE machines ADD COLUMN IF NOT EXISTS asset_tag text;
|
||||
CREATE TABLE IF NOT EXISTS racks (
|
||||
building text NOT NULL,
|
||||
room text NOT NULL,
|
||||
name text NOT NULL,
|
||||
height int NOT NULL DEFAULT 42,
|
||||
comment text,
|
||||
PRIMARY KEY (building, room, name)
|
||||
);
|
||||
`
|
||||
|
||||
var errNotFound = errors.New("not found")
|
||||
@@ -117,6 +130,7 @@ type Machine struct {
|
||||
DeployedAt *time.Time `json:"deployed_at"`
|
||||
Tags []string `json:"tags"` // manual
|
||||
AutoTags []string `json:"auto_tags"` // from tag match rules, recomputed at commissioning
|
||||
Location Location `json:"location"`
|
||||
bmcSecret []byte
|
||||
nodeToken []byte
|
||||
hostKey []byte
|
||||
@@ -141,7 +155,8 @@ func openStore(ctx context.Context, url string) (*Store, error) {
|
||||
|
||||
const machineCols = `id, uuid, serial, hostname, manufacturer, product, state, first_seen, last_seen,
|
||||
commissioned_at, macs, bmc, bmc_secret, inventory, profile, node_name, mgmt_ip, ib_ip, node_token, host_key, booted_at,
|
||||
os, os_version, deployed_at, tags, auto_tags`
|
||||
os, os_version, deployed_at, tags, auto_tags,
|
||||
coalesce(building,''), coalesce(room,''), coalesce(rack,''), coalesce(rack_unit,0), coalesce(asset_tag,'')`
|
||||
|
||||
func scanMachine(row pgx.Row, full bool) (*Machine, error) {
|
||||
m := &Machine{}
|
||||
@@ -149,7 +164,8 @@ func scanMachine(row pgx.Row, full bool) (*Machine, error) {
|
||||
err := row.Scan(&m.ID, &m.UUID, &m.Serial, &m.Hostname, &m.Manufacturer, &m.Product, &m.State,
|
||||
&m.FirstSeen, &m.LastSeen, &m.CommissionedAt, &macs, &m.BMC, &m.bmcSecret, &m.Inventory,
|
||||
&m.Profile, &m.NodeName, &m.MgmtIP, &m.IBIP, &m.nodeToken, &m.hostKey, &m.BootedAt,
|
||||
&m.OS, &m.OSVersion, &m.DeployedAt, &tags, &auto)
|
||||
&m.OS, &m.OSVersion, &m.DeployedAt, &tags, &auto,
|
||||
&m.Location.Building, &m.Location.Room, &m.Location.Rack, &m.Location.Unit, &m.Location.AssetTag)
|
||||
if errors.Is(err, pgx.ErrNoRows) {
|
||||
return nil, errNotFound
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user