feat: add journalctl logs to support-bundle (runfinch#1630)

Signed-off-by: David Son <davbson@amazon.com>

Author: sondavidb

cmd/finch/main_native_test.go

@@ -88,7 +88,6 @@ func TestXmain(t *testing.T) {
 	}
 
 	for _, tc := range testCases {
-		tc := tc
 		t.Run(tc.name, func(t *testing.T) {
 			t.Parallel()
 

cmd/finch/nerdctl_native_test.go

@@ -43,7 +43,6 @@ func TestNerdctlCommand_runAdaptor(t *testing.T) {
 	}
 
 	for _, tc := range testCases {
-		tc := tc
 		t.Run(tc.name, func(t *testing.T) {
 			t.Parallel()
 
@@ -160,7 +159,6 @@ func TestNerdctlCommand_run(t *testing.T) {
 	}
 
 	for _, tc := range testCases {
-		tc := tc
 		t.Run(tc.name, func(t *testing.T) {
 			t.Parallel()
 

cmd/finch/support_bundle.go

@@ -33,15 +33,19 @@ func newSupportBundleGenerateCommand(logger flog.Logger, builder support.BundleB
 		RunE:  newGenerateSupportBundleAction(logger, builder, ncc).runAdapter,
 	}
 
-	includeUsage := "additional files to include in the support bundle, specified by absolute or relative path."
+	includeUsage := `additional files to include in the support bundle, specified by absolute or relative path.` +
+		`To include journal logs for a service, prefix the file path with "service:".`
 	if runtime.GOOS != "linux" {
-		includeUsage += `To include a file from the VM, prefix the file path with "vm:"`
+		includeUsage += ` To include a file from the VM, prefix the file path with "vm:"`
 	}
+	excludeUsage := `files to exclude from the support bundle. ` +
+		`If you specify a base name, all files matching that base name will be excluded. ` +
+		`If you specify an absolute or relative path, only exact matches will be excluded.` +
+		`To exclude journal logs for a service, prefix the file path with "service":".` +
+		`To exclude all journal logs, use "service:all"`
 
 	supportBundleGenerateCommand.Flags().StringArray("include", []string{}, includeUsage)
-	supportBundleGenerateCommand.Flags().StringArray("exclude", []string{},
-		//nolint:lll // usage string
-		"files to exclude from the support bundle. if you specify a base name, all files matching that base name will be excluded. if you specify an absolute or relative path, only exact matches will be excluded")
+	supportBundleGenerateCommand.Flags().StringArray("exclude", []string{}, excludeUsage)
 	return supportBundleGenerateCommand
 }
 

cmd/finch/version_native_test.go

@@ -115,7 +115,6 @@ func TestVersionAction_runAdaptor(t *testing.T) {
 	}
 
 	for _, tc := range testCases {
-		tc := tc
 		t.Run(tc.name, func(t *testing.T) {
 			t.Parallel()
 
@@ -295,7 +294,6 @@ func TestVersionAction_run(t *testing.T) {
 	}
 
 	for _, tc := range testCases {
-		tc := tc
 		t.Run(tc.name, func(t *testing.T) {
 			t.Parallel()
 

docs/cmd/finch_support-bundle_generate.md

@@ -9,7 +9,7 @@ Generates a collection of logs and configs that can be uploaded to a Github issu
 ## Options
 
 ```text
-      --exclude stringArray   files to exclude from the support bundle. if you specify a base name, all files matching that base name will be excluded. if you specify an absolute or relative path, only exact matches will be excluded
+      --exclude stringArray   files to exclude from the support bundle. If you specify a base name, all files matching that base name will be excluded. If you specify an absolute or relative path, only exact matches will be excluded. To exclude journal logs for a service, prefix the file path with "service":. To exclude all journal logs, use "service:all"
   -h, --help                  help for generate
-      --include stringArray   additional files to include in the support bundle, specified by absolute or relative path. to include a file from the VM, prefix the file path with "vm:"
+      --include stringArray   additional files to include in the support bundle, specified by absolute or relative path. To include journal logs for a service, prefix the file path with "service:". To include a file from the VM, prefix the file path with "vm:"
 ```