Skip to content

Add fmd inventory to the database #10345

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
smklein wants to merge 31 commits into
base: main
Choose a base branch
from
Open

Add fmd inventory to the database #10345

Show file tree
Hide file tree
Changes from 19 commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
322d5b3
Add FMD fault inventory to sled-agent API
smklein Apr 16, 2026
ab9399b
Run FMD collection on a blocking thread
smklein Apr 17, 2026
32c5872
Regenerate sled-agent OpenAPI spec
smklein Apr 17, 2026
887f61a
xtask: allowlist libfmd_adm.so.1 for sled-agent binaries
smklein Apr 17, 2026
2c83840
merge
smklein Apr 20, 2026
026bd3f
InventoryResult, less optional
smklein Apr 20, 2026
bcb288d
Convert 'FMD unavailable' to a default impl that's empty
smklein Apr 22, 2026
778afd5
Destructuring
smklein Apr 23, 2026
34884ba
review feedback
smklein Apr 23, 2026
a659107
Bump fmd-adm rev; use InvisibleResources::Included
smklein Apr 28, 2026
0c26760
fmd: replace match on spawn_blocking JoinError with .expect()
smklein Apr 28, 2026
6d0ec5f
merge
smklein Apr 28, 2026
67ec15a
fmd: import GenericUuid so from_untyped_uuid resolves on illumos
smklein Apr 28, 2026
058314f
merge
smklein Apr 28, 2026
829bd2f
Add CRDB schema + DB model for FMD inventory tables
smklein Apr 29, 2026
00e6347
nexus-types/inventory: add fmd field on SledAgent + builder passthrough
smklein Apr 29, 2026
cfb3eea
datastore: write + prune for inv_fmd_* tables
smklein Apr 29, 2026
8e47394
datastore: read path for FMD inventory
smklein Apr 29, 2026
39053f7
Display wrappers + omdb golden output for FMD inventory
smklein Apr 29, 2026
3291762
merge
smklein May 14, 2026
d44c588
omicron-rpaths: panic on illumos if no DEP_*_LIBDIRS env vars are set
smklein May 14, 2026
604a831
Replace FmdInventoryResult with Result<FmdInventory, String>
smklein May 14, 2026
115d388
merge
smklein May 14, 2026
040b815
Add foreign-key comments to inv_fmd_* tables
smklein May 14, 2026
f677b4b
sled-agent: use InlineErrorChain for FMD collection errors
smklein May 14, 2026
2e3d1e9
merge
smklein May 14, 2026
e43ae1f
Add typed FmdInventoryError and per-sled FMD bounds
smklein May 15, 2026
d9d3da3
merge add-fmd-inventory + wire typed error through DB
smklein May 15, 2026
25e6cea
Split inv-fmd up01.sql into per-DDL files
smklein May 15, 2026
2d63473
merge
smklein May 15, 2026
cff0320
merge
smklein May 15, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions .cargo/xtask.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,3 +50,12 @@ binary_allow_list = [
"sled-agent",
"sled-agent-sim",
]

# libfmd_adm is the illumos Fault Management Daemon admin library, used by
# sled-agent to collect FMD case/resource information for inventory.
[libraries."libfmd_adm.so.1"]
binary_allow_list = [
"omicron-dev",
"sled-agent",
"sled-agent-sim",
]
50 changes: 50 additions & 0 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -506,6 +506,8 @@ filetime = "0.2.26"
flate2 = "1.1.2"
float-ord = "0.3.2"
flume = "0.11.1"
fmd-adm = { git = "https://github.com/oxidecomputer/fmd-adm", rev = "846361bf0a698a8c7efefd97b2828b9aa74858c4" }
fmd-adm-sys = { git = "https://github.com/oxidecomputer/fmd-adm", rev = "846361bf0a698a8c7efefd97b2828b9aa74858c4" }
foreign-types = "0.3.2"
fs-err = "3.1.1"
futures = "0.3.31"
Expand Down
4 changes: 4 additions & 0 deletions clients/sled-agent-client/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,10 @@ progenitor::generate_api!(
ExternalIpConfig = sled_agent_types_versions::latest::instance::ExternalIpConfig,
ExternalIpv4Config = sled_agent_types_versions::latest::instance::ExternalIpv4Config,
ExternalIpv6Config = sled_agent_types_versions::latest::instance::ExternalIpv6Config,
FmdHostCase = sled_agent_types_versions::latest::inventory::FmdHostCase,
FmdInventory = sled_agent_types_versions::latest::inventory::FmdInventory,
FmdInventoryResult = sled_agent_types_versions::latest::inventory::FmdInventoryResult,
FmdResource = sled_agent_types_versions::latest::inventory::FmdResource,
Generation = omicron_common::api::external::Generation,
Hostname = omicron_common::api::external::Hostname,
ImportExportPolicy = sled_agent_types_versions::latest::early_networking::ImportExportPolicy,
Expand Down
4 changes: 4 additions & 0 deletions cockroach-admin/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,10 @@ toml.workspace = true

omicron-workspace-hack.workspace = true

[target.'cfg(target_os = "illumos")'.dependencies]
# See omicron-rpaths for more about the "fmd-adm-sys" dependency.
fmd-adm-sys.workspace = true

[dev-dependencies]
expectorate.workspace = true
nexus-test-utils.workspace = true
Expand Down
4 changes: 4 additions & 0 deletions dev-tools/omdb/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,10 @@ update-engine.workspace = true
url.workspace = true
uuid.workspace = true

[target.'cfg(target_os = "illumos")'.dependencies]
# See omicron-rpaths for more about the "fmd-adm-sys" dependency.
fmd-adm-sys.workspace = true

[dev-dependencies]
camino-tempfile.workspace = true
expectorate.workspace = true
Expand Down
4 changes: 4 additions & 0 deletions dev-tools/omicron-dev/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,10 @@ signal-hook-tokio.workspace = true
tokio.workspace = true
toml.workspace = true

[target.'cfg(target_os = "illumos")'.dependencies]
# See omicron-rpaths for more about the "fmd-adm-sys" dependency.
fmd-adm-sys.workspace = true

[dev-dependencies]
expectorate.workspace = true
omicron-dev-lib.workspace = true
Expand Down
6 changes: 6 additions & 0 deletions dev-tools/reconfigurator-cli/tests/output/cmds-example-stdout
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1739,6 +1739,8 @@ LEDGERED SLED CONFIG
reconciler task status: idle (finished at <REDACTED_TIMESTAMP> after running for <REDACTED_DURATION>s)
reference measurements:
(measurement set is empty)
fmd:
no faults reported

SMF SERVICES STATUS
no data on SMF services has been collected
Expand Down Expand Up @@ -1890,6 +1892,8 @@ LEDGERED SLED CONFIG
reconciler task status: idle (finished at <REDACTED_TIMESTAMP> after running for <REDACTED_DURATION>s)
reference measurements:
(measurement set is empty)
fmd:
no faults reported

SMF SERVICES STATUS
no data on SMF services has been collected
Expand Down Expand Up @@ -2134,6 +2138,8 @@ LEDGERED SLED CONFIG
reconciler task status: idle (finished at <REDACTED_TIMESTAMP> after running for <REDACTED_DURATION>s)
reference measurements:
(measurement set is empty)
fmd:
no faults reported

SMF SERVICES STATUS
no data on SMF services has been collected
Expand Down
6 changes: 6 additions & 0 deletions dev-tools/reconfigurator-cli/tests/output/cmds-mupdate-update-flow-stdout
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -326,6 +326,8 @@ LEDGERED SLED CONFIG
reconciler task status: idle (finished at <REDACTED_TIMESTAMP> after running for <REDACTED_DURATION>s)
reference measurements:
(measurement set is empty)
fmd:
no faults reported

SMF SERVICES STATUS
no data on SMF services has been collected
Expand Down Expand Up @@ -461,6 +463,8 @@ LEDGERED SLED CONFIG
reconciler task status: idle (finished at <REDACTED_TIMESTAMP> after running for <REDACTED_DURATION>s)
reference measurements:
(measurement set is empty)
fmd:
no faults reported

SMF SERVICES STATUS
no data on SMF services has been collected
Expand Down Expand Up @@ -584,6 +588,8 @@ LEDGERED SLED CONFIG
reconciler task status: idle (finished at <REDACTED_TIMESTAMP> after running for <REDACTED_DURATION>s)
reference measurements:
(measurement set is empty)
fmd:
no faults reported

SMF SERVICES STATUS
no data on SMF services has been collected
Expand Down
6 changes: 6 additions & 0 deletions dev-tools/reconfigurator-cli/tests/output/cmds-nexus-generation-autobump-stdout
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -762,6 +762,8 @@ LEDGERED SLED CONFIG
reconciler task status: idle (finished at <REDACTED_TIMESTAMP> after running for <REDACTED_DURATION>s)
reference measurements:
(measurement set is empty)
fmd:
no faults reported

SMF SERVICES STATUS
no data on SMF services has been collected
Expand Down Expand Up @@ -955,6 +957,8 @@ LEDGERED SLED CONFIG
reconciler task status: idle (finished at <REDACTED_TIMESTAMP> after running for <REDACTED_DURATION>s)
reference measurements:
(measurement set is empty)
fmd:
no faults reported

SMF SERVICES STATUS
no data on SMF services has been collected
Expand Down Expand Up @@ -1148,6 +1152,8 @@ LEDGERED SLED CONFIG
reconciler task status: idle (finished at <REDACTED_TIMESTAMP> after running for <REDACTED_DURATION>s)
reference measurements:
(measurement set is empty)
fmd:
no faults reported

SMF SERVICES STATUS
no data on SMF services has been collected
Expand Down
6 changes: 6 additions & 0 deletions dev-tools/reconfigurator-cli/tests/output/cmds-target-release-stdout
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -746,6 +746,8 @@ LEDGERED SLED CONFIG
reconciler task status: idle (finished at <REDACTED_TIMESTAMP> after running for <REDACTED_DURATION>s)
reference measurements:
(measurement set is empty)
fmd:
no faults reported

SMF SERVICES STATUS
no data on SMF services has been collected
Expand Down Expand Up @@ -939,6 +941,8 @@ LEDGERED SLED CONFIG
reconciler task status: idle (finished at <REDACTED_TIMESTAMP> after running for <REDACTED_DURATION>s)
reference measurements:
(measurement set is empty)
fmd:
no faults reported

SMF SERVICES STATUS
no data on SMF services has been collected
Expand Down Expand Up @@ -1132,6 +1136,8 @@ LEDGERED SLED CONFIG
reconciler task status: idle (finished at <REDACTED_TIMESTAMP> after running for <REDACTED_DURATION>s)
reference measurements:
(measurement set is empty)
fmd:
no faults reported

SMF SERVICES STATUS
no data on SMF services has been collected
Expand Down
6 changes: 6 additions & 0 deletions dev-tools/reconfigurator-cli/tests/output/cmds-unsafe-zone-mgs-stdout
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -800,6 +800,8 @@ LEDGERED SLED CONFIG
reconciler task status: idle (finished at <REDACTED_TIMESTAMP> after running for <REDACTED_DURATION>s)
reference measurements:
(measurement set is empty)
fmd:
no faults reported

SMF SERVICES STATUS
no data on SMF services has been collected
Expand Down Expand Up @@ -993,6 +995,8 @@ LEDGERED SLED CONFIG
reconciler task status: idle (finished at <REDACTED_TIMESTAMP> after running for <REDACTED_DURATION>s)
reference measurements:
(measurement set is empty)
fmd:
no faults reported

SMF SERVICES STATUS
no data on SMF services has been collected
Expand Down Expand Up @@ -1186,6 +1190,8 @@ LEDGERED SLED CONFIG
reconciler task status: idle (finished at <REDACTED_TIMESTAMP> after running for <REDACTED_DURATION>s)
reference measurements:
(measurement set is empty)
fmd:
no faults reported

SMF SERVICES STATUS
no data on SMF services has been collected
Expand Down
Loading
Loading