From aed11e280ae18e6cbe4072bf912752508d3a7a88 Mon Sep 17 00:00:00 2001 From: Zeeshan Lakhani Date: Tue, 15 Oct 2024 20:32:21 +0000 Subject: [PATCH] Add switch/sled metadata to ddm/mgd related timeseries --- .../replicated/14/timeseries-to-delete.txt | 53 +++++++++ .../single-node/14/timeseries-to-delete.txt | 39 +++++++ oximeter/db/src/model.rs | 2 +- oximeter/oximeter/schema/bfd-session.toml | 60 +++++++++- oximeter/oximeter/schema/bgp-session.toml | 54 ++++++++- oximeter/oximeter/schema/ddm-router.toml | 54 ++++++++- oximeter/oximeter/schema/ddm-session.toml | 54 ++++++++- oximeter/oximeter/schema/mg-lower.toml | 54 ++++++++- .../schema/static-routing-config.toml | 54 ++++++++- oximeter/oximeter/schema/switch-rib.toml | 54 ++++++++- package-manifest.toml | 12 +- sled-agent/src/services.rs | 110 ++++++++++++++++-- tools/maghemite_ddm_openapi_version | 2 +- tools/maghemite_mg_openapi_version | 2 +- tools/maghemite_mgd_checksums | 4 +- 15 files changed, 579 insertions(+), 29 deletions(-) create mode 100644 oximeter/db/schema/replicated/14/timeseries-to-delete.txt create mode 100644 oximeter/db/schema/single-node/14/timeseries-to-delete.txt diff --git a/oximeter/db/schema/replicated/14/timeseries-to-delete.txt b/oximeter/db/schema/replicated/14/timeseries-to-delete.txt new file mode 100644 index 0000000000..3cf58f9f59 --- /dev/null +++ b/oximeter/db/schema/replicated/14/timeseries-to-delete.txt @@ -0,0 +1,53 @@ +bgp_session:active_connections_accepted +bgp_session:connection_retries +bgp_session:hold_timer_expirations +bgp_session:idle_hold_timer_expirations +bgp_session:keepalive_send_failures +bgp_session:keepalives_received +bgp_session:keepalives_sent +bgp_session:notification_send_failures +bgp_session:open_handle_failures +bgp_session:open_send_failures +bgp_session:opens_received +bgp_session:opens_sent +bgp_session:passive_connections_accepted +bgp_session:prefixes_advertised +bgp_session:prefixes_imported +bgp_session:transition_to_active +bgp_session:transition_to_connect +bgp_session:transition_to_established +bgp_session:transition_to_idle +bgp_session:transition_to_open_confirm +bgp_session:transition_to_open_sent +bgp_session:transition_to_session_setup +bgp_session:unexpected_keepalive_messages +bgp_session:unexpected_open_messages +bgp_session:unexpected_update_messages +bgp_session:update_nexthop_missing +bgp_session:update_send_failures +bgp_session:updates_received +bgp_session:updates_sent +bfd_session:control_packet_send_failures +bfd_session:control_packets_sent +bfd_session:control_packets_received +bfd_session:message_receive_error +bfd_session:timeout_expired +bfd_session:transition_to_down +bfd_session:transition_to_init +bfd_session:transition_to_up +mg_lower:routes_blocked_by_link_state +switch_rib:active_routes +ddm_session:advertisements_received +ddm_session:advertisements_sent +ddm_session:imported_tunnel_endpoints +ddm_session:imported_underlay_prefixes +ddm_session:peer_address_changes +ddm_session:peer_expirations +ddm_session:peer_sessions_established +ddm_session:solicitations_received +ddm_session:solicitations_sent +ddm_session:update_send_fail +ddm_session:updates_received +ddm_session:updates_sent +ddm_router:originated_tunnel_endpoints +ddm_router:originated_underlay_prefixes diff --git a/oximeter/db/schema/single-node/14/timeseries-to-delete.txt b/oximeter/db/schema/single-node/14/timeseries-to-delete.txt new file mode 100644 index 0000000000..379b699275 --- /dev/null +++ b/oximeter/db/schema/single-node/14/timeseries-to-delete.txt @@ -0,0 +1,39 @@ +bgp_session:active_connections_accepted +bgp_session:connection_retries +bgp_session:hold_timer_expirations +bgp_session:idle_hold_timer_expirations +bgp_session:keepalive_send_failures +bgp_session:keepalives_received +bgp_session:keepalives_sent +bgp_session:notification_send_failures +bgp_session:open_handle_failures +bgp_session:open_send_failures +bgp_session:opens_received +bgp_session:opens_sent +bgp_session:passive_connections_accepted +bgp_session:prefixes_advertised +bgp_session:prefixes_imported +bgp_session:transition_to_active +bgp_session:transition_to_connect +bgp_session:transition_to_established +bgp_session:transition_to_idle +bgp_session:transition_to_open_confirm +bgp_session:transition_to_open_sent +bgp_session:transition_to_session_setup +bgp_session:unexpected_keepalive_messages +bgp_session:unexpected_open_messages +bgp_session:unexpected_update_messages +bgp_session:update_nexthop_missing +bgp_session:update_send_failures +bgp_session:updates_received +bgp_session:updates_sent +bfd_session:control_packet_send_failures +bfd_session:control_packets_sent +bfd_session:control_packets_received +bfd_session:message_receive_error +bfd_session:timeout_expired +bfd_session:transition_to_down +bfd_session:transition_to_init +bfd_session:transition_to_up +mg_lower:routes_blocked_by_link_state +switch_rib:active_routes diff --git a/oximeter/db/src/model.rs b/oximeter/db/src/model.rs index 5f4db1e156..035f0c4a42 100644 --- a/oximeter/db/src/model.rs +++ b/oximeter/db/src/model.rs @@ -45,7 +45,7 @@ use uuid::Uuid; /// - [`crate::Client::initialize_db_with_version`] /// - [`crate::Client::ensure_schema`] /// - The `clickhouse-schema-updater` binary in this crate -pub const OXIMETER_VERSION: u64 = 13; +pub const OXIMETER_VERSION: u64 = 14; // Wrapper type to represent a boolean in the database. // diff --git a/oximeter/oximeter/schema/bfd-session.toml b/oximeter/oximeter/schema/bfd-session.toml index a7bdcf52e9..a2fa46671d 100644 --- a/oximeter/oximeter/schema/bfd-session.toml +++ b/oximeter/oximeter/schema/bfd-session.toml @@ -5,7 +5,7 @@ name = "bfd_session" description = "A Bidirectional Forwarding Protocol (BFD) session" authz_scope = "fleet" versions = [ - { version = 1, fields = [ "hostname", "rack_id", "sled_id", "peer" ] }, + { version = 1, fields = [ "hostname", "peer", "rack_id", "sled_id", "sled_model", "sled_revision", "sled_serial", "switch_id", "switch_fab", "switch_lot", "switch_wafer", "switch_wafer_loc_x", "switch_wafer_loc_y", "switch_model", "switch_revision", "switch_serial", "switch_slot" ] }, ] [[metrics]] @@ -88,6 +88,10 @@ versions = [ type = "string" description = "The hostname of the machine running the BFD session" +[fields.peer] +type = "ip_addr" +description = "Address of the BFD session peer" + [fields.rack_id] type = "uuid" description = "ID of the rack running the BFD session" @@ -96,6 +100,54 @@ description = "ID of the rack running the BFD session" type = "uuid" description = "ID of the sled running the BFD session" -[fields.peer] -type = "ip_addr" -description = "Address of the BFD session peer" +[fields.sled_model] +type = "string" +description = "Model number of the sled running the BFD session" + +[fields.sled_revision] +type = "u32" +description = "Revision number of the sled running the BFD session" + +[fields.sled_serial] +type = "string" +description = "Serial number of the sled running the BFD session" + +[fields.switch_id] +type = "uuid" +description = "ID of the switch running the BFD session" + +[fields.switch_fab] +type = "string" +description = "Fabrication plant identifier of the switch running the BFD session" + +[fields.switch_lot] +type = "string" +description = "Lot number of the switch running the BFD session" + +[fields.switch_wafer] +type = "u8" +description = "Wafer number of the switch running the BFD session" + +[fields.switch_wafer_loc_x] +type = "i8" +description = "X-coordinate wafer location of the switch running the BFD session" + +[fields.switch_wafer_loc_y] +type = "i8" +description = "Y-coordinate wafer location of the switch running the BFD session" + +[fields.switch_model] +type = "string" +description = "The model number switch running the BFD session" + +[fields.switch_revision] +type = "u32" +description = "Revision number of the switch running the BFD session" + +[fields.switch_serial] +type = "string" +description = "Serial number of the switch running the BFD session" + +[fields.switch_slot] +type = "u16" +description = "Slot number of the switch running the BFD session" diff --git a/oximeter/oximeter/schema/bgp-session.toml b/oximeter/oximeter/schema/bgp-session.toml index 093560beea..e80359abe4 100644 --- a/oximeter/oximeter/schema/bgp-session.toml +++ b/oximeter/oximeter/schema/bgp-session.toml @@ -5,7 +5,7 @@ name = "bgp_session" description = "A peer-to-peer session of the Border Gateway Protocol" authz_scope = "fleet" versions = [ - { version = 1, fields = [ "hostname", "local_asn", "peer", "rack_id", "sled_id" ] } + { version = 1, fields = [ "hostname", "local_asn", "peer", "rack_id", "sled_id", "sled_model", "sled_revision", "sled_serial", "switch_id", "switch_fab", "switch_lot", "switch_wafer", "switch_wafer_loc_x", "switch_wafer_loc_y", "switch_model", "switch_revision", "switch_serial", "switch_slot" ] } ] [[metrics]] @@ -291,3 +291,55 @@ description = "ID of the rack on which our BGP peer is running" [fields.sled_id] type = "uuid" description = "ID of the sled on which our BGP peer is running" + +[fields.sled_model] +type = "string" +description = "Model number of the sled on which our BGP peer is running" + +[fields.sled_revision] +type = "u32" +description = "Revision number of the sled on which our BGP peer is running" + +[fields.sled_serial] +type = "string" +description = "Serial number of the sled on which our BGP peer is running" + +[fields.switch_id] +type = "uuid" +description = "ID of the switch on which our BGP peer is running" + +[fields.switch_fab] +type = "string" +description = "Fabrication plant identifier on of the switch on which our BGP peer is running" + +[fields.switch_lot] +type = "string" +description = "Lot number of the switch on which our BGP peer is running" + +[fields.switch_wafer] +type = "u8" +description = "Wafer number of the switch on which our BGP peer is running" + +[fields.switch_wafer_loc_x] +type = "i8" +description = "X-coordinate wafer location of the switch on which our BGP peer is running" + +[fields.switch_wafer_loc_y] +type = "i8" +description = "Y-coordinate wafer location of the switch on which our BGP peer is running" + +[fields.switch_model] +type = "string" +description = "The model number switch on which our BGP peer is running" + +[fields.switch_revision] +type = "u32" +description = "Revision number of the switch on which our BGP peer is running" + +[fields.switch_serial] +type = "string" +description = "Serial number of the switch on which our BGP peer is running" + +[fields.switch_slot] +type = "u16" +description = "Slot number of the switch on which our BGP peer is running" diff --git a/oximeter/oximeter/schema/ddm-router.toml b/oximeter/oximeter/schema/ddm-router.toml index 2cb0851852..589162cb10 100644 --- a/oximeter/oximeter/schema/ddm-router.toml +++ b/oximeter/oximeter/schema/ddm-router.toml @@ -5,7 +5,7 @@ name = "ddm_router" description = "A Delay-Driven Multipath (DDM) router" authz_scope = "fleet" versions = [ - { version = 1, fields = [ "hostname", "rack_id", "sled_id" ] }, + { version = 1, fields = [ "hostname", "rack_id", "sled_id", "sled_model", "sled_revision", "sled_serial", "switch_id", "switch_fab", "switch_lot", "switch_wafer", "switch_wafer_loc_x", "switch_wafer_loc_y", "switch_model", "switch_revision", "switch_serial", "switch_slot" ] }, ] [[metrics]] @@ -37,3 +37,55 @@ description = "ID of the rack running the DDM router" [fields.sled_id] type = "uuid" description = "ID of the sled running the DDM router" + +[fields.sled_model] +type = "string" +description = "Model number of the sled running the DDM router" + +[fields.sled_revision] +type = "u32" +description = "Revision number of the sled running the DDM router" + +[fields.sled_serial] +type = "string" +description = "Serial number of the sled running the DDM router" + +[fields.switch_id] +type = "uuid" +description = "ID of the switch running the DDM router" + +[fields.switch_fab] +type = "string" +description = "Fabrication plant identifier on of the switch running the DDM router" + +[fields.switch_lot] +type = "string" +description = "Lot number of the switch running the DDM router" + +[fields.switch_wafer] +type = "u8" +description = "Wafer number of the switch running the DDM router" + +[fields.switch_wafer_loc_x] +type = "i8" +description = "X-coordinate wafer location of the switch running the DDM router" + +[fields.switch_wafer_loc_y] +type = "i8" +description = "Y-coordinate wafer location of the switch running the DDM router" + +[fields.switch_model] +type = "string" +description = "The model number switch running the DDM router" + +[fields.switch_revision] +type = "u32" +description = "Revision number of the switch running the DDM router" + +[fields.switch_serial] +type = "string" +description = "Serial number of the switch running the DDM router" + +[fields.switch_slot] +type = "u16" +description = "Slot number of the switch running the DDM router" diff --git a/oximeter/oximeter/schema/ddm-session.toml b/oximeter/oximeter/schema/ddm-session.toml index 89f6751524..62feabb99d 100644 --- a/oximeter/oximeter/schema/ddm-session.toml +++ b/oximeter/oximeter/schema/ddm-session.toml @@ -5,7 +5,7 @@ name = "ddm_session" description = "A session in a Delay-Driven Multipath (DDM) router" authz_scope = "fleet" versions = [ - { version = 1, fields = [ "hostname", "interface", "rack_id", "sled_id" ] }, + { version = 1, fields = [ "hostname", "interface", "rack_id", "sled_id", "sled_model", "sled_revision", "sled_serial", "switch_id", "switch_fab", "switch_lot", "switch_wafer", "switch_wafer_loc_x", "switch_wafer_loc_y", "switch_model", "switch_revision", "switch_serial", "switch_slot" ] }, ] [[metrics]] @@ -134,3 +134,55 @@ description = "ID of the rack running the DDM router" [fields.sled_id] type = "uuid" description = "ID of the sled running the DDM router" + +[fields.sled_model] +type = "string" +description = "Model number of the sled running the DDM router" + +[fields.sled_revision] +type = "u32" +description = "Revision number of the sled running the DDM router" + +[fields.sled_serial] +type = "string" +description = "Serial number of the sled running the DDM router" + +[fields.switch_id] +type = "uuid" +description = "ID of the switch running the DDM router" + +[fields.switch_fab] +type = "string" +description = "Fabrication plant identifier on of the switch running the DDM router" + +[fields.switch_lot] +type = "string" +description = "Lot number of the switch running the DDM router" + +[fields.switch_wafer] +type = "u8" +description = "Wafer number of the switch running the DDM router" + +[fields.switch_wafer_loc_x] +type = "i8" +description = "X-coordinate wafer location of the switch running the DDM router" + +[fields.switch_wafer_loc_y] +type = "i8" +description = "Y-coordinate wafer location of the switch running the DDM router" + +[fields.switch_model] +type = "string" +description = "The model number switch running the DDM router" + +[fields.switch_revision] +type = "u32" +description = "Revision number of the switch running the DDM router" + +[fields.switch_serial] +type = "string" +description = "Serial number of the switch running the DDM router" + +[fields.switch_slot] +type = "u16" +description = "Slot number of the switch running the DDM router" diff --git a/oximeter/oximeter/schema/mg-lower.toml b/oximeter/oximeter/schema/mg-lower.toml index bcdbbc0d02..55149636d3 100644 --- a/oximeter/oximeter/schema/mg-lower.toml +++ b/oximeter/oximeter/schema/mg-lower.toml @@ -11,7 +11,7 @@ exchanging information with peers.\ """ authz_scope = "fleet" versions = [ - { version = 1, fields = [ "hostname", "rack_id", "sled_id" ] }, + { version = 1, fields = [ "hostname", "rack_id", "sled_id", "sled_model", "sled_revision", "sled_serial", "switch_id", "switch_fab", "switch_lot", "switch_wafer", "switch_wafer_loc_x", "switch_wafer_loc_y", "switch_model", "switch_revision", "switch_serial", "switch_slot" ] }, ] [[metrics]] @@ -38,3 +38,55 @@ description = "ID of the rack running the router" [fields.sled_id] type = "uuid" description = "ID of the sled running the router" + +[fields.sled_model] +type = "string" +description = "Model number of the sled running the router" + +[fields.sled_revision] +type = "u32" +description = "Revision number of the sled running the router" + +[fields.sled_serial] +type = "string" +description = "Serial number of the sled running the router" + +[fields.switch_id] +type = "uuid" +description = "ID of the switch running the router" + +[fields.switch_fab] +type = "string" +description = "Fabrication plant identifier on of the switch running the router" + +[fields.switch_lot] +type = "string" +description = "Lot number of the switch running the router" + +[fields.switch_wafer] +type = "u8" +description = "Wafer number of the switch running the router" + +[fields.switch_wafer_loc_x] +type = "i8" +description = "X-coordinate wafer location of the switch running the router" + +[fields.switch_wafer_loc_y] +type = "i8" +description = "Y-coordinate wafer location of the switch running the router" + +[fields.switch_model] +type = "string" +description = "The model number switch running the router" + +[fields.switch_revision] +type = "u32" +description = "Revision number of the switch running the router" + +[fields.switch_serial] +type = "string" +description = "Serial number of the switch running the router" + +[fields.switch_slot] +type = "u16" +description = "Slot number of the switch running the router" diff --git a/oximeter/oximeter/schema/static-routing-config.toml b/oximeter/oximeter/schema/static-routing-config.toml index ad60da2680..70a023fa3d 100644 --- a/oximeter/oximeter/schema/static-routing-config.toml +++ b/oximeter/oximeter/schema/static-routing-config.toml @@ -5,7 +5,7 @@ name = "static_routing_config" description = "Static routing configuration used by the Oxide routing daemons" authz_scope = "fleet" versions = [ - { version = 1, fields = [ "hostname", "rack_id", "sled_id" ] }, + { version = 1, fields = [ "hostname", "rack_id", "sled_id", "sled_model", "sled_revision", "sled_serial", "switch_id", "switch_fab", "switch_lot", "switch_wafer", "switch_wafer_loc_x", "switch_wafer_loc_y", "switch_model", "switch_revision", "switch_serial", "switch_slot" ] }, ] [[metrics]] @@ -40,3 +40,55 @@ description = "ID of the rack running the router" [fields.sled_id] type = "uuid" description = "ID of the sled running the router" + + [fields.sled_model] +type = "string" +description = "Model number of the sled running the router" + +[fields.sled_revision] +type = "u32" +description = "Revision number of the sled running the router" + +[fields.sled_serial] +type = "string" +description = "Serial number of the sled running the router" + +[fields.switch_id] +type = "uuid" +description = "ID of the switch running the router" + +[fields.switch_fab] +type = "string" +description = "Fabrication plant identifier on of the switch running the router" + +[fields.switch_lot] +type = "string" +description = "Lot number of the switch running the router" + +[fields.switch_wafer] +type = "u8" +description = "Wafer number of the switch running the router" + +[fields.switch_wafer_loc_x] +type = "i8" +description = "X-coordinate wafer location of the switch running the router" + +[fields.switch_wafer_loc_y] +type = "i8" +description = "Y-coordinate wafer location of the switch running the router" + +[fields.switch_model] +type = "string" +description = "The model number switch running the router" + +[fields.switch_revision] +type = "u32" +description = "Revision number of the switch running the router" + +[fields.switch_serial] +type = "string" +description = "Serial number of the switch running the router" + +[fields.switch_slot] +type = "u16" +description = "Slot number of the switch running the router" diff --git a/oximeter/oximeter/schema/switch-rib.toml b/oximeter/oximeter/schema/switch-rib.toml index 7cbf020e25..1372d9cd26 100644 --- a/oximeter/oximeter/schema/switch-rib.toml +++ b/oximeter/oximeter/schema/switch-rib.toml @@ -5,7 +5,7 @@ name = "switch_rib" description = "Maghemite router routing information base" authz_scope = "fleet" versions = [ - { version = 1, fields = [ "hostname", "sled_id", "rack_id" ] } + { version = 1, fields = [ "hostname", "rack_id", "sled_id", "sled_model", "sled_revision", "sled_serial", "switch_id", "switch_fab", "switch_lot", "switch_wafer", "switch_wafer_loc_x", "switch_wafer_loc_y", "switch_model", "switch_revision", "switch_serial", "switch_slot" ] } ] [[metrics]] @@ -28,3 +28,55 @@ description = "ID of the rack of the sled running the Oxide router" [fields.sled_id] type = "uuid" description = "ID of the sled running the Oxide router" + +[fields.sled_model] +type = "string" +description = "Model number of the sled running the Oxide router" + +[fields.sled_revision] +type = "u32" +description = "Revision number of the sled running the Oxide router" + +[fields.sled_serial] +type = "string" +description = "Serial number of the sled running the Oxide router" + +[fields.switch_id] +type = "uuid" +description = "ID of the switch running the Oxide router" + +[fields.switch_fab] +type = "string" +description = "Fabrication plant identifier on of the switch running the Oxide router" + +[fields.switch_lot] +type = "string" +description = "Lot number of the switch running the Oxide router" + +[fields.switch_wafer] +type = "u8" +description = "Wafer number of the switch running the Oxide router" + +[fields.switch_wafer_loc_x] +type = "i8" +description = "X-coordinate wafer location of the switch running the Oxide router" + +[fields.switch_wafer_loc_y] +type = "i8" +description = "Y-coordinate wafer location of the switch running the Oxide router" + +[fields.switch_model] +type = "string" +description = "The model number switch running the Oxide router" + +[fields.switch_revision] +type = "u32" +description = "Revision number of the switch running the Oxide router" + +[fields.switch_serial] +type = "string" +description = "Serial number of the switch running the Oxide router" + +[fields.switch_slot] +type = "u16" +description = "Slot number of the switch running the Oxide router" diff --git a/package-manifest.toml b/package-manifest.toml index 3e345de35b..e9e6c84371 100644 --- a/package-manifest.toml +++ b/package-manifest.toml @@ -635,10 +635,10 @@ source.repo = "maghemite" # `tools/maghemite_openapi_version`. Failing to do so will cause a failure when # building `ddm-admin-client` (which will instruct you to update # `tools/maghemite_openapi_version`). -source.commit = "056283eb02b6887fbf27f66a215662520f7c159c" +source.commit = "dc9211904ae76f62c7c6ca5e7f8f810d4c8e0eae" # The SHA256 digest is automatically posted to: # https://buildomat.eng.oxide.computer/public/file/oxidecomputer/maghemite/image//mg-ddm-gz.sha256.txt -source.sha256 = "973fc43ed3b0727d72e3493339e1fdb69e7cb2767ee4aa27f65c4a2da8f8126b" +source.sha256 = "390b4a37731bf8841511dc4a4e87d097f655d929c045d6447ac0aaabef6b20bd" output.type = "tarball" [package.mg-ddm] @@ -651,10 +651,10 @@ source.repo = "maghemite" # `tools/maghemite_openapi_version`. Failing to do so will cause a failure when # building `ddm-admin-client` (which will instruct you to update # `tools/maghemite_openapi_version`). -source.commit = "056283eb02b6887fbf27f66a215662520f7c159c" +source.commit = "dc9211904ae76f62c7c6ca5e7f8f810d4c8e0eae" # The SHA256 digest is automatically posted to: # https://buildomat.eng.oxide.computer/public/file/oxidecomputer/maghemite/image//mg-ddm.sha256.txt -source.sha256 = "ed60620a32a35a6885064e7c777369d5092455cd5c1aa240672dfaac05c31f56" +source.sha256 = "b95eb69600c7935c36351cfe35af6db902169166d7ba5240a7b28129ff230429" output.type = "zone" output.intermediate_only = true @@ -666,10 +666,10 @@ source.repo = "maghemite" # `tools/maghemite_openapi_version`. Failing to do so will cause a failure when # building `ddm-admin-client` (which will instruct you to update # `tools/maghemite_openapi_version`). -source.commit = "056283eb02b6887fbf27f66a215662520f7c159c" +source.commit = "dc9211904ae76f62c7c6ca5e7f8f810d4c8e0eae" # The SHA256 digest is automatically posted to: # https://buildomat.eng.oxide.computer/public/file/oxidecomputer/maghemite/image//mgd.sha256.txt -source.sha256 = "7c10ac7d284ce78e70e652ad91bebf3fee7a2274ee403a09cc986c6ee73cf1eb" +source.sha256 = "c7c690ee8601f1735e0a3c6bc6321355867342f66ea7fa97be9c78726fc7b28b" output.type = "zone" output.intermediate_only = true diff --git a/sled-agent/src/services.rs b/sled-agent/src/services.rs index 91c5e0809e..499426b3f4 100644 --- a/sled-agent/src/services.rs +++ b/sled-agent/src/services.rs @@ -3066,7 +3066,7 @@ impl ServiceManager { if let Some(i) = info { mgd_config = mgd_config .add_property( - "sled_uuid", + "sled_id", "astring", &i.config .sled_identifiers @@ -3074,9 +3074,33 @@ impl ServiceManager { .to_string(), ) .add_property( - "rack_uuid", + "rack_id", "astring", &i.rack_id.to_string(), + ) + .add_property( + "sled_model", + "astring", + &i.config + .sled_identifiers + .model + .to_string(), + ) + .add_property( + "sled_serial", + "astring", + &i.config + .sled_identifiers + .serial + .to_string(), + ) + .add_property( + "sled_revision", + "astring", + &i.config + .sled_identifiers + .revision + .to_string(), ); } @@ -3115,7 +3139,7 @@ impl ServiceManager { if let Some(i) = info { mg_ddm_config = mg_ddm_config .add_property( - "sled_uuid", + "sled_id", "astring", &i.config .sled_identifiers @@ -3123,9 +3147,33 @@ impl ServiceManager { .to_string(), ) .add_property( - "rack_uuid", + "rack_id", "astring", &i.rack_id.to_string(), + ) + .add_property( + "sled_model", + "astring", + &i.config + .sled_identifiers + .model + .to_string(), + ) + .add_property( + "sled_serial", + "astring", + &i.config + .sled_identifiers + .serial + .to_string(), + ) + .add_property( + "sled_revision", + "astring", + &i.config + .sled_identifiers + .revision + .to_string(), ); } @@ -4621,13 +4669,36 @@ impl ServiceManager { )?; if let Some(info) = self.inner.sled_info.get() { smfh.setprop_default_instance( - "config/rack_uuid", + "config/rack_id", info.rack_id, )?; smfh.setprop_default_instance( - "config/sled_uuid", + "config/sled_id", info.config.sled_identifiers.sled_id, )?; + smfh.setprop_default_instance( + "config/sled_model", + info.config + .sled_identifiers + .model + .to_string(), + )?; + smfh.setprop_default_instance( + "config/sled_revision", + info.config.sled_identifiers.revision, + )?; + smfh.setprop_default_instance( + "config/sled_serial", + info.config + .sled_identifiers + .serial + .to_string(), + )?; + } else { + info!( + self.inner.log, + "no sled info available yet" + ); } for address in &request.addresses { if *address != Ipv6Addr::LOCALHOST { @@ -4664,13 +4735,36 @@ impl ServiceManager { )?; if let Some(info) = self.inner.sled_info.get() { smfh.setprop_default_instance( - "config/rack_uuid", + "config/rack_id", info.rack_id, )?; smfh.setprop_default_instance( - "config/sled_uuid", + "config/sled_id", info.config.sled_identifiers.sled_id, )?; + smfh.setprop_default_instance( + "config/sled_model", + info.config + .sled_identifiers + .model + .to_string(), + )?; + smfh.setprop_default_instance( + "config/sled_revision", + info.config.sled_identifiers.revision, + )?; + smfh.setprop_default_instance( + "config/sled_serial", + info.config + .sled_identifiers + .serial + .to_string(), + )?; + } else { + info!( + self.inner.log, + "no sled info available yet" + ); } smfh.delpropvalue_default_instance( "config/dns_servers", diff --git a/tools/maghemite_ddm_openapi_version b/tools/maghemite_ddm_openapi_version index 920e67ac5b..4a02438772 100644 --- a/tools/maghemite_ddm_openapi_version +++ b/tools/maghemite_ddm_openapi_version @@ -1,2 +1,2 @@ -COMMIT="056283eb02b6887fbf27f66a215662520f7c159c" +COMMIT="dc9211904ae76f62c7c6ca5e7f8f810d4c8e0eae" SHA2="007bfb717ccbc077c0250dee3121aeb0c5bb0d1c16795429a514fa4f8635a5ef" diff --git a/tools/maghemite_mg_openapi_version b/tools/maghemite_mg_openapi_version index 0811251c05..7dc13347bb 100644 --- a/tools/maghemite_mg_openapi_version +++ b/tools/maghemite_mg_openapi_version @@ -1,2 +1,2 @@ -COMMIT="056283eb02b6887fbf27f66a215662520f7c159c" +COMMIT="dc9211904ae76f62c7c6ca5e7f8f810d4c8e0eae" SHA2="28389b4a5fb5d9767b518aacdd09470135aefa2f6704a3b3fb05cd71b21613ae" diff --git a/tools/maghemite_mgd_checksums b/tools/maghemite_mgd_checksums index 42465a5a34..ccaaf88076 100644 --- a/tools/maghemite_mgd_checksums +++ b/tools/maghemite_mgd_checksums @@ -1,2 +1,2 @@ -CIDL_SHA256="7c10ac7d284ce78e70e652ad91bebf3fee7a2274ee403a09cc986c6ee73cf1eb" -MGD_LINUX_SHA256="be4c6f7375ff3e619102783513348e8769579bd011a85e33779b690759fd0868" +CIDL_SHA256="c7c690ee8601f1735e0a3c6bc6321355867342f66ea7fa97be9c78726fc7b28b" +MGD_LINUX_SHA256="bd63dfda97af885b029a326778ab8aa57f74cfecce6c15db8cf1c026a28b0742" \ No newline at end of file