Bump dependencies, progenitor to dfc6e0f2, oxide.json to omicron:33bbad37

cli/src/cli_builder.rs

@@ -577,8 +577,8 @@ fn xxx<'a>(command: CliCommand) -> Option<&'a str> {
         CliCommand::ProbeView => Some("experimental probe view"),
 
         // Metrics-related subcommands
-        CliCommand::TimeseriesQuery => Some("experimental timeseries query"),
-        CliCommand::TimeseriesSchemaList => Some("experimental timeseries schema list"),
+        CliCommand::SystemTimeseriesQuery => Some("experimental timeseries query"),
+        CliCommand::SystemTimeseriesSchemaList => Some("experimental timeseries schema list"),
 
         // Commands not yet implemented
         CliCommand::DeviceAccessToken

cli/src/cmd_net.rs

@@ -95,7 +95,7 @@ pub struct CmdLinkAdd {
 
     /// The forward error correction mode of the link.
     #[arg(long, value_enum)]
-    pub fec: CliLinkFec,
+    pub fec: Option<CliLinkFec>,
 
     /// Maximum transmission unit for the link.
     #[arg(long, default_value_t = 1500u16)]
@@ -126,7 +126,7 @@ impl AuthenticatedCmd for CmdLinkAdd {
             });
         let link = LinkConfigCreate {
             autoneg: self.autoneg,
-            fec: self.fec.into(),
+            fec: self.fec.map(|fec| fec.into()),
             mtu: self.mtu,
             speed: self.speed.into(),
             lldp: LldpLinkConfigCreate {
@@ -1248,7 +1248,13 @@ impl AuthenticatedCmd for CmdPortConfig {
                 )?;
 
                 for l in &config.links {
-                    writeln!(&mut tw, "{:?}\t{:?}\t{:?}", l.autoneg, l.fec, l.speed,)?;
+                    writeln!(
+                        &mut tw,
+                        "{}\t{}\t{}",
+                        l.autoneg,
+                        l.fec.map_or("<auto>".to_string(), |fec| fec.to_string()),
+                        l.speed,
+                    )?;
                 }
                 tw.flush()?;
                 println_nopipe!();

cli/src/cmd_timeseries/dashboard.rs

@@ -12,7 +12,7 @@ use crossterm::event::{Event, EventStream, KeyCode, KeyEvent, KeyEventKind, KeyM
 use futures::{FutureExt, StreamExt};
 use oxide::{
     types::{MetricType, Table as OxqlTable, Timeseries, TimeseriesQuery, ValueArray},
-    Client, ClientMetricsExt,
+    Client, ClientSystemMetricsExt,
 };
 use ratatui::{
     prelude::{Alignment, Constraint, Direction, Layout},
@@ -218,7 +218,7 @@ async fn client_query_loop(
             _ = &mut done => break,
             _ = interval.tick() => {
                 let request = client
-                    .timeseries_query()
+                    .system_timeseries_query()
                     .body(TimeseriesQuery { query: query.clone() });
                 match request.send().await {
                     Ok(response) => {