Add tfport-data-link timeseries schema and SMF config adds.

common/src/address.rs

@@ -49,7 +49,7 @@ pub const MGS_PORT: u16 = 12225;
 pub const WICKETD_PORT: u16 = 12226;
 pub const BOOTSTRAP_ARTIFACT_PORT: u16 = 12227;
 pub const CRUCIBLE_PANTRY_PORT: u16 = 17000;
-
+pub const TFPORTD_PORT: u16 = 12231;
 pub const NEXUS_INTERNAL_PORT: u16 = 12221;
 
 /// The port on which Nexus exposes its external API on the underlay network.

oximeter/oximeter/schema/tfport-data-link.toml

@@ -0,0 +1,132 @@
+format_version = 1
+
+[target]
+name = "tfport_data_link"
+description = "A network data link on a tfport interface"
+authz_scope = "fleet"
+
+versions = [
+    { version = 1, fields = [ "kind", "link_name", "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" ] },
+]
+
+[fields.kind]
+type = "string"
+description = "The kind or class of the data link"
+
+[fields.link_name]
+type = "string"
+description = "Name of the data link"
+
+[fields.rack_id]
+type = "uuid"
+description = "ID for the link's rack"
+
+[fields.sled_id]
+type = "uuid"
+description = "ID for the link's sled"
+
+[fields.sled_model]
+type = "string"
+description = "Model number of the link's sled"
+
+[fields.sled_revision]
+type = "u32"
+description = "Revision number of the sled"
+
+[fields.sled_serial]
+type = "string"
+description = "Serial number of the sled"
+
+[fields.switch_id]
+type = "uuid"
+description = "ID of the switch the link is on"
+
+[fields.switch_fab]
+type = "string"
+description = "Fabrication plant identifier of the switch the link is on"
+
+[fields.switch_lot]
+type = "string"
+description = "Lot number of the switch the link is on"
+
+[fields.switch_wafer]
+type = "u8"
+description = "Wafer number of the switch the link is on"
+
+[fields.switch_wafer_loc_x]
+type = "i16"
+description = "X-coordinate wafer location of the switch the link is on"
+
+[fields.switch_wafer_loc_y]
+type = "i16"
+description = "Y-coordinate wafer location of the switch the link is on"
+
+[fields.switch_model]
+type = "string"
+description = "The model number switch the link is on"
+
+[fields.switch_revision]
+type = "u32"
+description = "Revision number of the switch the link is on"
+
+[fields.switch_serial]
+type = "string"
+description = "Serial number of the switch the link is on"
+
+[fields.switch_slot]
+type = "u16"
+description = "Slot number of the switch the link is on"
+
+[[metrics]]
+name = "bytes_sent"
+description = "Number of bytes sent on the link"
+units = "bytes"
+datum_type = "cumulative_u64"
+versions = [
+    { added_in = 1, fields = [] }
+]
+
+[[metrics]]
+name = "bytes_received"
+description = "Number of bytes received on the link"
+units = "bytes"
+datum_type = "cumulative_u64"
+versions = [
+    { added_in = 1, fields = [] }
+]
+
+[[metrics]]
+name = "packets_sent"
+description = "Number of packets sent on the link"
+units = "count"
+datum_type = "cumulative_u64"
+versions = [
+    { added_in = 1, fields = [] }
+]
+
+[[metrics]]
+name = "packets_received"
+description = "Number of packets received on the link"
+units = "count"
+datum_type = "cumulative_u64"
+versions = [
+    { added_in = 1, fields = [] }
+]
+
+[[metrics]]
+name = "errors_sent"
+description = "Number of errors encountered when sending on the link"
+units = "count"
+datum_type = "cumulative_u64"
+versions = [
+    { added_in = 1, fields = [] }
+]
+
+[[metrics]]
+name = "errors_received"
+description = "Number of errors encountered when receiving on the link"
+units = "count"
+datum_type = "cumulative_u64"
+versions = [
+    { added_in = 1, fields = [] }
+]

package-manifest.toml

@@ -719,8 +719,8 @@ only_for_targets.image = "standard"
 # the other `source.*` keys.
 source.type = "prebuilt"
 source.repo = "dendrite"
-source.commit = "11bcc3e0f5d28dc7aed150f4df1174844e4dfbef"
-source.sha256 = "98c0778ee7645bab82fc71188378ff1ad80bc24619c03a645dafca158dd63bfd"
+source.commit = "38eb75b831698abc2920e12f0ad24ceb3318aa46"
+source.sha256 = "2e6819583e83cf77e2c20fc938684ed5f3f5fe27d5d40c09e403bf0298c31ce8"
 output.type = "zone"
 output.intermediate_only = true
 
@@ -746,8 +746,8 @@ only_for_targets.image = "standard"
 # the other `source.*` keys.
 source.type = "prebuilt"
 source.repo = "dendrite"
-source.commit = "11bcc3e0f5d28dc7aed150f4df1174844e4dfbef"
-source.sha256 = "e1f356866490e8cada9e53c25c4ef9965af0a29632868948edcacb13e248648d"
+source.commit = "38eb75b831698abc2920e12f0ad24ceb3318aa46"
+source.sha256 = "5e6cad5e2df96356c424972ee229109e65f7d42d514b11516dbd72610076ceae"
 output.type = "zone"
 output.intermediate_only = true
 
@@ -766,8 +766,8 @@ only_for_targets.image = "standard"
 # the other `source.*` keys.
 source.type = "prebuilt"
 source.repo = "dendrite"
-source.commit = "11bcc3e0f5d28dc7aed150f4df1174844e4dfbef"
-source.sha256 = "6a4b51d71d132f8877c15c5a3882bad715a85d11d4a45c1aec9b5f4cb2ea8a6e"
+source.commit = "38eb75b831698abc2920e12f0ad24ceb3318aa46"
+source.sha256 = "595f4f05d6f190154644616a3210edd67a94bbfe54167e2acc7dceb082b35221"
 output.type = "zone"
 output.intermediate_only = true
 

sled-agent/src/metrics.rs

@@ -223,15 +223,15 @@ async fn remove_datalink(
             Ok(_) => {
                 debug!(
                     log,
-                    "Removed VNIC from tracked links";
+                    "removed VNIC from tracked links";
                     "link_name" => name,
                 );
             }
             Err(err) => {
                 error!(
                     log,
-                    "Failed to remove VNIC from kstat sampler, \
-                    metrics may still be produced for it";
+                    "failed to remove VNIC from kstat sampler, \
+                     metrics may still be produced for it";
                     "link_name" => name,
                     "error" => ?err,
                 );
@@ -263,7 +263,7 @@ async fn add_datalink(
                 Ok(id) => {
                     debug!(
                         log,
-                        "Added new link to kstat sampler";
+                        "added new link to kstat sampler";
                         "link_name" => entry.key(),
                         "link_kind" => %link.kind(),
                         "zone_name" => %link.zone_name(),
@@ -273,8 +273,8 @@ async fn add_datalink(
                 Err(err) => {
                     error!(
                         log,
-                        "Failed to add VNIC to kstat sampler, \
-                        no metrics will be collected for it";
+                        "failed to add VNIC to kstat sampler, \
+                         no metrics will be collected for it";
                         "link_name" => entry.key(),
                         "link_kind" => %link.kind(),
                         "zone_name" => %link.zone_name(),
@@ -310,14 +310,14 @@ async fn sync_sled_datalinks(
             Ok(_) => {
                 debug!(
                     log,
-                    "Updated link already tracked by kstat sampler";
+                    "updated link already tracked by kstat sampler";
                     "link_name" => link_name,
                 );
             }
             Err(err) => {
                 error!(
                     log,
-                    "Failed to update link already tracked by kstat sampler";
+                    "failed to update link already tracked by kstat sampler";
                     "link_name" => link_name,
                     "error" => ?err,
                 );