..

Cargo.toml

@@ -82,11 +82,12 @@ rand = "0.8.5"
 backoff = "0.4"
 mg-common = { path = "mg-common" }
 chrono = { version = "0.4.38", features = ["serde"] }
-oximeter = { git = "https://github.com/oxidecomputer/omicron", branch = "main"}
-oximeter-producer = { git = "https://github.com/oxidecomputer/omicron", branch = "main"}
+oximeter = { git = "https://github.com/oxidecomputer/omicron", branch = "zl/mgd-ddm-meta"}
+oximeter-producer = { git = "https://github.com/oxidecomputer/omicron", branch = "zl/mgd-ddm-meta"}
 oxnet = { git = "https://github.com/oxidecomputer/oxnet" }
-omicron-common = { git = "https://github.com/oxidecomputer/omicron", branch = "main"}
-internal-dns = { git = "https://github.com/oxidecomputer/omicron", branch = "main"}
+omicron-common = { git = "https://github.com/oxidecomputer/omicron", branch = "zl/mgd-ddm-meta"}
+internal-dns-resolver = { git = "https://github.com/oxidecomputer/omicron", branch = "main" }
+internal-dns-types = { git = "https://github.com/oxidecomputer/omicron", branch = "main" }
 uuid = { version = "1.8", features = ["serde", "v4"] }
 smf = { git = "https://github.com/illumos/smf-rs", branch = "main" }
 libc = "0.2"
@@ -103,12 +104,12 @@ rev = "3dc9a3dd8d3c623f0cf2c659c7119ce0c026a96d"
 
 [workspace.dependencies.dpd-client]
 git = "https://github.com/oxidecomputer/dendrite"
-branch = "main"
+branch = "zl/tfportd-oximeter"
 package = "dpd-client"
 
 [workspace.dependencies.dendrite-common]
 git = "https://github.com/oxidecomputer/dendrite"
-branch = "main"
+branch = "zl/tfportd-oximeter"
 package = "common"
 
 [patch."https://github.com/oxidecomputer/oxnet"]

ddm/src/admin.rs

@@ -19,6 +19,7 @@ use dropshot::TypedBody;
 use dropshot::{endpoint, ApiDescriptionRegisterError};
 use mg_common::lock;
 use mg_common::net::TunnelOrigin;
+use omicron_common::api::internal::shared::SledIdentifiers;
 use oxnet::Ipv6Net;
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
@@ -369,14 +370,20 @@ async fn enable_stats(
             .expect("failed to get hostname")
             .to_string_lossy()
             .to_string();
+        let sled_idents = SledIdentifiers {
+            rack_id: rq.rack_id,
+            sled_id: rq.sled_id,
+            model: String::default(),
+            revision: 0,
+            serial: String::default(),
+        };
         *jh = Some(
             crate::oxstats::start_server(
                 DDM_STATS_PORT,
                 ctx.peers.clone(),
                 ctx.stats.clone(),
                 hostname,
-                rq.rack_id,
-                rq.sled_id,
+                sled_idents,
                 ctx.log.clone(),
             )
             .map_err(|e| {