[spr] initial version

Created using spr 1.3.6-beta.1

Author: papertigers

dev-tools/oxlog/src/lib.rs

@@ -272,6 +272,15 @@ impl Zones {
                     paths.extra.push(("cockroachdb", dir));
                 }
 
+                // Grab the chrony logs that are not apart of the standard SMF
+                // logs.
+                if zone.starts_with("oxz_ntp") {
+                    let mut dir = zones_path.clone();
+                    dir.push(zone);
+                    dir.push("root/var/log/chrony");
+                    paths.extra.push(("ntp", dir));
+                }
+
                 zones.insert(zone.to_string(), paths);
             }
         }

sled-diagnostics/src/logs.rs

@@ -682,6 +682,27 @@ impl LogsHandle {
                     }
                 }
             }
+
+            // Include the chrony logs found in "/var/log/chrony".
+            // These currently include:
+            // - measurements.log
+            // - statistics.log
+            // - tracking.log
+            //
+            // TODO: Once omicron#4728 is picked up we will need to handle the
+            // rotation and sorting of these files.
+            if service == "ntp" {
+                for log in service_logs.extra {
+                    self.process_logs(
+                        &service,
+                        &mut zip,
+                        &mut log_snapshots,
+                        log.path.as_path(),
+                        LogType::Extra,
+                    )
+                    .await?;
+                }
+            }
         }
 
         zip.finish()?;