Merge pull request #22630 from vbotbuildovich/backport-pr-22334-v24.1…

….x-348 [v24.1.x] rpk: Add uname -a to debug bundle
redpanda-data · Jul 30, 2024 · 9cfcdd0 · 9cfcdd0
2 parents c74f61f + 83fcd35
commit 9cfcdd0
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/src/go/rpk/pkg/cli/debug/bundle/bundle_k8s_linux.go b/src/go/rpk/pkg/cli/debug/bundle/bundle_k8s_linux.go
@@ -79,6 +79,7 @@ func executeK8SBundle(ctx context.Context, bp bundleParams) error {
 		saveNTPDrift(ps),
 		saveResourceUsageData(ps, bp.y),
 		saveSlabInfo(ps),
+		saveUname(ctx, ps),
 	}
 
 	// We use the K8S to discover the cluster's admin API addresses and collect

diff --git a/src/go/rpk/pkg/cli/debug/bundle/bundle_linux.go b/src/go/rpk/pkg/cli/debug/bundle/bundle_linux.go
@@ -155,6 +155,7 @@ func executeBundle(ctx context.Context, bp bundleParams) error {
 		saveSysctl(ctx, ps),
 		saveSyslog(ps),
 		saveTopOutput(ctx, ps),
+		saveUname(ctx, ps),
 		saveVmstat(ctx, ps),
 	}
 
@@ -699,6 +700,13 @@ func saveDNSData(ctx context.Context, ps *stepParams) step {
 	}
 }
 
+// Saves the output of `uname -a`.
+func saveUname(ctx context.Context, ps *stepParams) step {
+	return func() error {
+		return writeCommandOutputToZip(ctx, ps, filepath.Join(linuxUtilsRoot, "uname.txt"), "uname", "-a")
+	}
+}
+
 // Saves the disk usage total within redpanda's data directory.
 func saveDiskUsage(ctx context.Context, ps *stepParams, y *config.RedpandaYaml) step {
 	return func() error {