Skip to content

Commit c8d6c04

Browse files
authored
[oxlog] want chrony logs in support bundles (#8529)
This threads chrony's logs found in the zone root at `/var/log/chrony/*` into oxlog's extra logs for `ntp`. ``` BRM42220009 # /var/tmp/oxlog logs --extra oxz_ntp_7529be1c-ca8b-441a-89aa-37166cc450df /pool/ext/845ff39a-3205-416f-8bda-e35829107c8a/crypt/zone/oxz_ntp_7529be1c-ca8b-441a-89aa-37166cc450df/root/var/log/chrony/measurements.log /pool/ext/845ff39a-3205-416f-8bda-e35829107c8a/crypt/zone/oxz_ntp_7529be1c-ca8b-441a-89aa-37166cc450df/root/var/log/chrony/statistics.log /pool/ext/845ff39a-3205-416f-8bda-e35829107c8a/crypt/zone/oxz_ntp_7529be1c-ca8b-441a-89aa-37166cc450df/root/var/log/chrony/tracking.log ``` This is part of the fix for #8516
1 parent 2561a7a commit c8d6c04

File tree

1 file changed

+9
-0
lines changed

1 file changed

+9
-0
lines changed

dev-tools/oxlog/src/lib.rs

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -272,6 +272,15 @@ impl Zones {
272272
paths.extra.push(("cockroachdb", dir));
273273
}
274274

275+
// Grab the chrony logs that are not apart of the standard SMF
276+
// logs.
277+
if zone.starts_with("oxz_ntp") {
278+
let mut dir = zones_path.clone();
279+
dir.push(zone);
280+
dir.push("root/var/log/chrony");
281+
paths.extra.push(("ntp", dir));
282+
}
283+
275284
zones.insert(zone.to_string(), paths);
276285
}
277286
}

0 commit comments

Comments
 (0)