Skip to content

Export in native journald format #10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bleggett merged 2 commits into from
May 20, 2026
Merged

Export in native journald format #10

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f5a9c32
Export in native journald format so that the export can be easily mun…
bleggett May 20, 2026
18546f2
fmt
bleggett May 20, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 22 additions & 8 deletions edera-debug-report
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1031,16 +1031,30 @@ def collect_all(
use_zstd = bool(which("zstd"))
if cfg.journal:
# journalctl, limited to 40000 lines (current boot) -> zstd -> STORED
# we capture using journalctl's `export` format, which can be later exported
# to the format of your choice and filtered on a different machine
# using e.g. `journalctl -o cat < myexport.export` or `journalctl -o json < myexport.export`
# or converted back to the full binary format for indexed querying on a remote machine, e.g.
# `systemd-journal-remote --output=/tmp/myexport.journal < myexport.export`
# `journalctl --file /tmp/myexport.journal --since "2026-01-01" --until "2026-01-02"`
arc = (
f"{top_name}/systemd-journal-boot0.json.zst"
f"{top_name}/systemd-journal-boot0.export.zst"
if use_zstd
else f"{top_name}/systemd-journal-boot0.json"
else f"{top_name}/systemd-journal-boot0.export"
)
run_and_write(
log,
aw,
arc,
["journalctl", "--system", "-n", "40000", "-b", "-0", "--output=json"],
[
"journalctl",
"--system",
"-n",
"40000",
"-b",
"-0",
"--output=export",
],
pipe_zstd=use_zstd,
zstd_level=13,
timeout_s=300.0,
Expand All @@ -1064,9 +1078,9 @@ def collect_all(
]
for service in services:
arc = (
f"{top_name}/systemd-journal-unit-{service}.json.zst"
f"{top_name}/systemd-journal-unit-{service}.export.zst"
if use_zstd
else f"{top_name}/systemd-journal-unit-{service}.json"
else f"{top_name}/systemd-journal-unit-{service}.export"
)
run_and_write(
log,
Expand All @@ -1081,7 +1095,7 @@ def collect_all(
"-0",
"-u",
service,
"--output=json",
"--output=export",
],
pipe_zstd=use_zstd,
zstd_level=13,
Expand All @@ -1095,12 +1109,12 @@ def collect_all(
# systemctl list-units
if cfg.systemctl:
if which("systemctl"):
arc = f"{top_name}/systemd-units.json"
arc = f"{top_name}/systemd-units.export"
run_and_write(
log,
aw,
arc,
["systemctl", "--system", "list-units", "--output=json"],
["systemctl", "--system", "list-units", "--output=export"],
)
else:
log.append("FAIL: systemd not found; skipping unit list capture")
Expand Down
Loading