From 1b254b3cc59211d1c9537ab04bc778fc77780bd8 Mon Sep 17 00:00:00 2001
From: Mike Zeller <mike@oxidecomputer.com>
Date: Fri, 18 Jul 2025 15:31:41 -0400
Subject: [PATCH 1/2] cleanup test

Created using spr 1.3.6-beta.1
---
 sled-diagnostics/src/logs.rs | 20 ++------------------
 1 file changed, 2 insertions(+), 18 deletions(-)

diff --git a/sled-diagnostics/src/logs.rs b/sled-diagnostics/src/logs.rs
index 7a8fe56d2d..0dc43c9f19 100644
--- a/sled-diagnostics/src/logs.rs
+++ b/sled-diagnostics/src/logs.rs
@@ -1390,15 +1390,7 @@ mod illumos_tests {
 
     #[test]
     fn test_extra_log_file_regex() {
-        let current = [
-            ("foo.log", "foo"),
-            ("foo.bar.baz.log", "foo"),
-            ("cockroach-health.log", "cockroach-health"),
-            (
-                "cockroach-health.oxzcockroachdba3628a56-6f85-43b5-be50-71d8f0e04877.root.2025-01-31T21_43_26Z.011435.log",
-                "cockroach-health",
-            ),
-        ];
+        let current = [("foo.log", "foo"), ("foo.bar.baz.log", "foo")];
         for (log, name) in current {
             let logfile = LogFile {
                 path: log.parse().unwrap(),
@@ -1412,15 +1404,7 @@ mod illumos_tests {
             );
         }
 
-        let rotated = [
-            ("foo.log.1", "foo"),
-            ("foo.bar.baz.log.1", "foo"),
-            ("cockroach-health.log.4", "cockroach-health"),
-            (
-                "cockroach-health.oxzcockroachdba3628a56-6f85-43b5-be50-71d8f0e04877.root.2025-01-31T21_43_26Z.011435.log.9",
-                "cockroach-health",
-            ),
-        ];
+        let rotated = [("foo.log.1", "foo"), ("foo.bar.baz.log.1", "foo")];
         for (log, name) in rotated {
             let logfile = LogFile {
                 path: log.parse().unwrap(),

From a520e4e566b8e13ea06f8215516efbbb9a8db6d7 Mon Sep 17 00:00:00 2001
From: Mike Zeller <mike@oxidecomputer.com>
Date: Fri, 18 Jul 2025 18:31:38 -0400
Subject: [PATCH 2/2] actually commit the oxlog filter change

Created using spr 1.3.6-beta.1
---
 sled-diagnostics/src/logs.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sled-diagnostics/src/logs.rs b/sled-diagnostics/src/logs.rs
index 0dc43c9f19..73b1620348 100644
--- a/sled-diagnostics/src/logs.rs
+++ b/sled-diagnostics/src/logs.rs
@@ -569,7 +569,7 @@ impl LogsHandle {
                 extra: true,
                 // This will cause oxlog to call stat on each file resulting
                 // in a sorted order.
-                show_empty: true,
+                show_empty: false,
                 date_range: None,
             },
         );
@@ -655,7 +655,7 @@ impl LogsHandle {
 
             // Attempt to parse and sort any extra logs we find for a service.
             let extra_logs = match service.as_str() {
-                // cockroach embeds it's rotation status in the name:
+                // cockroach embeds its rotation status in the name:
                 // "cockroach-health.log" vs
                 // "oach-health.oxzcockroachdba3628a56-6f85-43b5-be50-71d8f0e04877.root.2025-01-31T21_43_26Z.011435.log"
                 "cockroachdb" => sort_cockroach_extra_logs(&service_logs.extra),