swadm quality of life improvements

Cargo.toml

@@ -75,6 +75,7 @@ dropshot-api-manager-types = "0.5.2"
 expectorate = "1"
 futures = "0.3"
 http = "1.2.0"
+humantime = "2.3"
 kstat-rs = "0.2.4"
 lazy_static = "1.5"
 libc = "0.2"

common/src/lib.rs

@@ -113,12 +113,18 @@ fn timestamp() -> Duration {
         Instant::now().duration_since(START_OF_DAY.unwrap())
     }
 }
-/// Return a timestamp in nanoseconds
+/// Return a START_OF_DAY-relative timestamp in nanoseconds
 pub fn timestamp_ns() -> i64 {
     i64::try_from(timestamp().as_nanos()).unwrap()
 }
 
-/// Return a timestamp in milliseconds
+/// Return a START_OF_DAY-relative timestamp in milliseconds
 pub fn timestamp_ms() -> i64 {
     i64::try_from(timestamp().as_millis()).unwrap()
 }
+
+/// Return a time-of-day timestamp in milliseconds
+pub fn wallclock_ms() -> i64 {
+    let now = chrono::Utc::now();
+    now.timestamp_millis()
+}

dpd-api/src/lib.rs

@@ -7,6 +7,7 @@
 //! DPD endpoint definitions.
 
 pub mod v1;
+pub mod v11;
 pub mod v2;
 pub mod v7;
 
@@ -63,6 +64,7 @@ api_versions!([
     // |  example for the next person.
     // v
     // (next_int, IDENT),
+    (11, WALLCLOCK_HISTORY),
     (10, ASIC_DETAILS),
     (9, SNAPSHOT),
     (8, MCAST_STRICT_UNDERLAY),
@@ -1173,6 +1175,24 @@ pub trait DpdApi {
     #[endpoint {
         method = GET,
         path = "/ports/{port_id}/links/{link_id}/history",
+        versions = ..VERSION_WALLCLOCK_HISTORY
+    }]
+    async fn link_history_get_v11(
+        rqctx: RequestContext<Self::Context>,
+        path: Path<LinkPath>,
+    ) -> Result<HttpResponseOk<v11::LinkHistory>, HttpError> {
+        let history = Self::link_history_get(rqctx, path).await?.0;
+        Ok(HttpResponseOk(v11::LinkHistory {
+            timestamp: history.relative,
+            events: history.events,
+        }))
+    }
+
+    /// Get the event history for the given link.
+    #[endpoint {
+        method = GET,
+        path = "/ports/{port_id}/links/{link_id}/history",
+        versions = VERSION_WALLCLOCK_HISTORY..
     }]
     async fn link_history_get(
         rqctx: RequestContext<Self::Context>,

dpd-api/src/v11.rs

@@ -0,0 +1,16 @@
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at https://mozilla.org/MPL/2.0/
+//
+// Copyright 2026 Oxide Computer Company
+
+use schemars::JsonSchema;
+use serde::{Deserialize, Serialize};
+
+#[derive(Clone, Debug, Deserialize, JsonSchema, Serialize)]
+pub struct LinkHistory {
+    /// The timestamp in milliseconds at which this history was collected
+    pub timestamp: i64,
+    /// The set of historical events recorded
+    pub events: Vec<dpd_types::views::LinkEvent>,
+}

dpd-types/src/views.rs

@@ -99,8 +99,11 @@ pub struct LinkEvent {
 
 #[derive(Clone, Debug, Deserialize, JsonSchema, Serialize)]
 pub struct LinkHistory {
-    /// The timestamp in milliseconds at which this history was collected.
+    /// The wallclock time in milliseconds at which this history was collected.
     pub timestamp: i64,
+    /// The timestamp in milliseconds at which this history was collected,
+    /// relative to the time the switch management daemon started.
+    pub relative: i64,
     /// The set of historical events recorded
     pub events: Vec<LinkEvent>,
 }

dpd/src/link.rs

@@ -995,7 +995,8 @@ impl Switch {
         let mut events = self.fetch_history(asic_ids);
         events.sort_by_key(|a| a.timestamp);
         Ok(views::LinkHistory {
-            timestamp: common::timestamp_ms(),
+            timestamp: common::wallclock_ms(),
+            relative: common::timestamp_ms(),
             events: events.iter().map(|er| er.into()).collect(),
         })
     }

openapi/dpd/dpd-10.0.0-57485f.json.gitstub

@@ -0,0 +1 @@
+78fa4e7c745169e48c7a1d4a0aaa5e9ac47d8057:openapi/dpd/dpd-10.0.0-57485f.json

openapi/dpd/dpd-10.0.0-57485f.json → openapi/dpd/dpd-11.0.0-b81c2a.json

@@ -7,7 +7,7 @@
       "url": "https://oxide.computer",
       "email": "api@oxide.computer"
     },
-    "version": "10.0.0"
+    "version": "11.0.0"
   },
   "paths": {
     "/all-settings": {
@@ -7758,14 +7758,20 @@
               "$ref": "#/components/schemas/LinkEvent"
             }
           },
+          "relative": {
+            "description": "The timestamp in milliseconds at which this history was collected, relative to the time the switch management daemon started.",
+            "type": "integer",
+            "format": "int64"
+          },
           "timestamp": {
-            "description": "The timestamp in milliseconds at which this history was collected.",
+            "description": "The wallclock time in milliseconds at which this history was collected.",
             "type": "integer",
             "format": "int64"
           }
         },
         "required": [
           "events",
+          "relative",
           "timestamp"
         ]
       },

openapi/dpd/dpd-latest.json

@@ -1 +1 @@
-dpd-10.0.0-57485f.json
+dpd-11.0.0-b81c2a.json

swadm/Cargo.toml

@@ -16,9 +16,11 @@ colored.workspace = true
 common.workspace = true
 dpd-client.workspace = true
 futures.workspace = true
-reqwest.workspace = true
+humantime.workspace = true
 oxide-tokio-rt.workspace = true
 oxnet.workspace = true
+regex.workspace = true
+reqwest.workspace = true
 slog.workspace = true
 tabwriter.workspace = true
 tokio.workspace = true

swadm/src/counters.rs

@@ -24,6 +24,7 @@ use dpd_client::types;
 /// non-development debugging, you probably want "swadm link counters".
 pub enum P4Counters {
     /// list all available counters
+    #[clap(visible_alias = "ls")]
     List,
     /// get data from the given counter
     Get {