Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
44 changes: 44 additions & 0 deletions Cargo.lock

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

3 changes: 3 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,7 @@ members = [
"sled-storage",
"sled-storage/zfs-test-harness",
"sp-sim",
"support-bundle-collection",
"test-utils",
"trust-quorum",
"trust-quorum/gfss",
Expand Down Expand Up @@ -347,6 +348,7 @@ default-members = [
"sled-storage",
"sled-storage/zfs-test-harness",
"sp-sim",
"support-bundle-collection",
"trust-quorum",
"trust-quorum/gfss",
"trust-quorum/protocol",
Expand Down Expand Up @@ -823,6 +825,7 @@ strum = { version = "0.27.2", features = [ "derive" ] }
subprocess = "0.2.9"
subtle = "2.6.1"
supports-color = "3.0.2"
support-bundle-collection = { path = "support-bundle-collection" }
support-bundle-viewer = "0.1.2"
swrite = "0.1.0"
sync-ptr = "0.1.4"
Expand Down
4 changes: 2 additions & 2 deletions dev-tools/ls-apis/tests/api_dependencies.out
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ Management Gateway Service (client: gateway-client)
consumed by: dpd (dendrite/dpd) via 1 path
consumed by: lldpd (lldp/lldpd) via 1 path
consumed by: mgd (maghemite/mgd) via 1 path
consumed by: omicron-nexus (omicron/nexus) via 5 paths
consumed by: omicron-nexus (omicron/nexus) via 6 paths
consumed by: omicron-sled-agent (omicron/sled-agent) via 1 path
consumed by: wicketd (omicron/wicketd) via 3 paths

Expand Down Expand Up @@ -96,7 +96,7 @@ Repo Depot API (client: repo-depot-client)
consumed by: omicron-sled-agent (omicron/sled-agent) via 1 path

Sled Agent (client: sled-agent-client)
consumed by: omicron-nexus (omicron/nexus) via 8 paths
consumed by: omicron-nexus (omicron/nexus) via 9 paths

Wicketd (client: wicketd-client)

4 changes: 4 additions & 0 deletions dev-tools/omdb/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ base64.workspace = true
bootstrap-agent-lockstep-client.workspace = true
bytes.workspace = true
camino.workspace = true
camino-tempfile.workspace = true
chrono.workspace = true
clap.workspace = true
clickhouse-admin-single-client.workspace = true
Expand Down Expand Up @@ -54,6 +55,7 @@ nexus-db-queries.workspace = true
nexus-db-schema.workspace = true
nexus-inventory.workspace = true
nexus-lockstep-client.workspace = true
nexus-networking.workspace = true
nexus-reconfigurator-preparation.workspace = true
nexus-saga-recovery.workspace = true
nexus-types.workspace = true
Expand Down Expand Up @@ -83,6 +85,7 @@ slog.workspace = true
slog-error-chain.workspace = true
steno.workspace = true
strum.workspace = true
support-bundle-collection.workspace = true
support-bundle-viewer.workspace = true
supports-color.workspace = true
tabled.workspace = true
Expand All @@ -104,6 +107,7 @@ nexus-test-utils-macros.workspace = true
omicron-nexus.workspace = true
omicron-test-utils.workspace = true
subprocess.workspace = true
zip.workspace = true

# Disable doc builds by default for our binaries to work around issue
# rust-lang/cargo#8373. These docs would not be very useful anyway.
Expand Down
4 changes: 4 additions & 0 deletions dev-tools/omdb/src/bin/omdb/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ mod oxql;
mod reconfigurator;
mod sled_agent;
mod support_bundle;
mod support_bundle_collect;

fn main() -> Result<(), anyhow::Error> {
sigpipe::reset();
Expand All @@ -83,6 +84,7 @@ async fn main_impl() -> Result<(), anyhow::Error> {
reconfig.run_cmd(&args, &log).await
}
OmdbCommands::SledAgent(sled) => sled.run_cmd(&args, &log).await,
OmdbCommands::SupportBundle(sb) => sb.run_cmd(&args, &log).await,
OmdbCommands::CrucibleAgent(crucible) => crucible.run_cmd(&args).await,
OmdbCommands::CruciblePantry(crucible) => crucible.run_cmd(&args).await,
OmdbCommands::ClickhouseAdmin(ch) => ch.run_cmd(&args, &log).await,
Expand Down Expand Up @@ -297,6 +299,8 @@ enum OmdbCommands {
Reconfigurator(reconfigurator::ReconfiguratorArgs),
/// Debug a specific Sled
SledAgent(sled_agent::SledAgentArgs),
/// Collect or inspect a support bundle
SupportBundle(support_bundle_collect::SupportBundleArgs),
}

fn parse_dropshot_log_level(
Expand Down
Loading
Loading