Skip to content
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.

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

[ereport] index ereport ingestion by SP type/slot #7903

Draft
wants to merge 31 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
ba42796
[ereport] index ereport ingestion by SP type/slot
hawkw Apr 1, 2025
cb673ec
we're calling them "restart IDs" now
hawkw Apr 1, 2025
8d66c09
whoopsie...
hawkw Apr 1, 2025
df3a493
unused variables
hawkw Apr 1, 2025
731966a
regenerate golden file
hawkw Apr 2, 2025
e324481
less structured ereport type
hawkw Apr 2, 2025
4cf9246
update mgs dep
hawkw Apr 3, 2025
49973ae
track unrelated mgs changes (factor me out pls)
hawkw Apr 3, 2025
20863c6
plumbing
hawkw Apr 3, 2025
f941a08
sp-sim plumbing
hawkw Apr 3, 2025
d1cd98b
wire up api (poorly)
hawkw Apr 3, 2025
a45ff03
demo hour
hawkw Apr 4, 2025
ff56b84
update for gatway fix
hawkw Apr 4, 2025
e69fc91
put fake interface in logs
hawkw Apr 4, 2025
f250ded
actually good errors
hawkw Apr 4, 2025
7d53fdb
pick up gateway messages tweaks
hawkw Apr 5, 2025
d1738a7
simulator improvements
hawkw Apr 5, 2025
7cc88ea
add ereports to sim sidecar
hawkw Apr 5, 2025
d481e21
hakari
hawkw Apr 5, 2025
619ccf4
give them both something to say
hawkw Apr 5, 2025
914dcd4
update MGS
hawkw Apr 7, 2025
539b0ce
honor limit
hawkw Apr 8, 2025
46c3612
update SP simulator
hawkw Apr 9, 2025
a7905e0
rm unused import
hawkw Apr 9, 2025
02b65b2
pass through ereport addrs in gateway-test-utils
hawkw Apr 10, 2025
64fd8f3
update to pick up request IDs from MGS
hawkw Apr 10, 2025
24b009b
simple ereport ingestion integration test
hawkw Apr 10, 2025
fea3438
so it turns out i'm stupid. fix that.
hawkw Apr 10, 2025
69a6c0a
add some simple ereport integration tests
hawkw Apr 11, 2025
4dd8878
pick up latest gateway-sp-comms
hawkw Apr 11, 2025
7ebf1d6
Merge branch 'main' into eliza/ereport-sp-api
hawkw Apr 11, 2025
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
71 changes: 28 additions & 43 deletions Cargo.lock

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

11 changes: 3 additions & 8 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ members = [
"clients/cockroach-admin-client",
"clients/ddm-admin-client",
"clients/dns-service-client",
"clients/ereport-client",
"clients/gateway-client",
"clients/installinator-client",
"clients/nexus-client",
Expand Down Expand Up @@ -50,7 +49,6 @@ members = [
"dns-server",
"dns-server-api",
"end-to-end-tests",
"ereport/api",
"ereport/types",
"gateway",
"gateway-api",
Expand Down Expand Up @@ -153,7 +151,6 @@ default-members = [
"clients/cockroach-admin-client",
"clients/ddm-admin-client",
"clients/dns-service-client",
"clients/ereport-client",
"clients/gateway-client",
"clients/installinator-client",
"clients/nexus-client",
Expand Down Expand Up @@ -192,7 +189,6 @@ default-members = [
"dns-server",
"dns-server-api",
"end-to-end-tests",
"ereport/api",
"ereport/types",
"gateway",
"gateway-api",
Expand Down Expand Up @@ -393,8 +389,6 @@ dpd-client = { git = "https://github.com/oxidecomputer/dendrite" }
dropshot = { version = "0.16.0", features = [ "usdt-probes" ] }
dyn-clone = "1.0.19"
either = "1.14.0"
ereport-api = { path = "ereport/api" }
ereport-client = { path = "clients/ereport-client" }
ereport-types = { path = "ereport/types" }
expectorate = "1.1.0"
fatfs = "0.3.6"
Expand All @@ -415,8 +409,8 @@ gateway-client = { path = "clients/gateway-client" }
# is "fine", because SP/MGS communication maintains forwards and backwards
# compatibility, but will mean that faux-mgs might be missing new
# functionality.)
gateway-messages = { git = "https://github.com/oxidecomputer/management-gateway-service", rev = "f9566e68e0a0ccb7c3eeea081ae1cea279c11b2a", default-features = false, features = ["std"] }
gateway-sp-comms = { git = "https://github.com/oxidecomputer/management-gateway-service", rev = "f9566e68e0a0ccb7c3eeea081ae1cea279c11b2a" }
gateway-messages = { git = "https://github.com/oxidecomputer/management-gateway-service", rev = "a6b180dbb4262a94d73165a0d072b33376d174f8", default-features = false, features = ["std"] }
gateway-sp-comms = { git = "https://github.com/oxidecomputer/management-gateway-service", rev = "a6b180dbb4262a94d73165a0d072b33376d174f8" }
gateway-test-utils = { path = "gateway-test-utils" }
gateway-types = { path = "gateway-types" }
gethostname = "0.5.0"
Expand Down Expand Up @@ -613,6 +607,7 @@ scopeguard = "1.2.0"
secrecy = "0.8.0"
semver = { version = "1.0.25", features = ["std", "serde"] }
serde = { version = "1.0", default-features = false, features = [ "derive", "rc" ] }
serde_cbor = "0.11.2"
serde_human_bytes = { git = "https://github.com/oxidecomputer/serde_human_bytes", branch = "main" }
serde_json = "1.0.139"
serde_tokenstream = "0.2"
Expand Down
22 changes: 0 additions & 22 deletions clients/ereport-client/Cargo.toml

This file was deleted.

23 changes: 0 additions & 23 deletions clients/ereport-client/src/lib.rs

This file was deleted.

12 changes: 0 additions & 12 deletions dev-tools/ls-apis/api-manifest.toml
Original file line number Diff line number Diff line change
Expand Up @@ -266,18 +266,6 @@ and exists as a client library within omicron. This is because the Dendrite \
repo is not currently open source.
"""

[[apis]]
client_package_name = "ereport-client"
label = "ereport"
server_package_name = "ereport-api"
versioned_how = "server"
notes = """
Implemented by sled-agents and by MGS, and consumed by Nexus to collect \
ereports.

The sled-agent and MGS APIs are server-versioned, so this can be as well.
"""

[[apis]]
client_package_name = "lldpd-client"
label = "LLDP daemon"
Expand Down
3 changes: 0 additions & 3 deletions dev-tools/ls-apis/tests/api_dependencies.out
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,6 @@ Dendrite DPD (client: dpd-client)

Downstairs Controller (debugging only) (client: dsc-client)

ereport (client: ereport-client)
consumed by: omicron-nexus (omicron/nexus) via 1 path

Management Gateway Service (client: gateway-client)
consumed by: dpd (dendrite/dpd) via 1 path
consumed by: omicron-nexus (omicron/nexus) via 3 paths
Expand Down
1 change: 0 additions & 1 deletion dev-tools/openapi-manager/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ cockroach-admin-api.workspace = true
debug-ignore.workspace = true
dns-server-api.workspace = true
dropshot.workspace = true
ereport-api.workspace = true
hex.workspace = true
fs-err.workspace = true
gateway-api.workspace = true
Expand Down
12 changes: 0 additions & 12 deletions dev-tools/openapi-manager/src/omicron.rs
Original file line number Diff line number Diff line change
Expand Up @@ -85,18 +85,6 @@ pub fn all_apis() -> Vec<ManagedApiConfig> {
ident: "dns-server",
extra_validation: None,
},
ManagedApiConfig {
title: "Ereport Reporter API",
versions: Versions::new_versioned(
ereport_api::supported_versions()
),
description: "API for ereport producers",
boundary: ApiBoundary::Internal,
api_description:
ereport_api::ereport_api_mod::stub_api_description,
ident: "ereport",
extra_validation: None,
},
ManagedApiConfig {
title: "Installinator API",
versions: Versions::new_lockstep(semver::Version::new(0,0,1)),
Expand Down
19 changes: 0 additions & 19 deletions ereport/api/Cargo.toml

This file was deleted.

Loading
Loading