github/troubleshoot
1
0
Fork 0
mirror of https://github.com/replicatedhq/troubleshoot.git synced 2026-04-15 07:16:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #640 from replicatedhq/diamonwiggins/generate-bundle-when-host-collectors-exist

Browse Source 
Always attempt to generate a Support Bundle when Host Collectors exist
This commit is contained in:
Diamon Wiggins
2022-08-01 13:12:45 -04:00
committed by GitHub
parent 4f8c1f3d8b 114749d5b7
commit 661bc3a557
2 changed files with 30 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/supportbundle/collect.go
View File

@@ -42,10 +42,10 @@ func runHostCollectors(hostCollectors []*troubleshootv1beta2.HostCollect, additi
continue
}
opts.ProgressChan <- fmt.Sprintf("[%s] Running collector...", collector.Title())
opts.ProgressChan <- fmt.Sprintf("[%s] Running host collector...", collector.Title())
result, err := collector.Collect(opts.ProgressChan)
if err != nil {
opts.ProgressChan <- errors.Errorf("failed to run collector: %s: %v", collector.Title(), err)
opts.ProgressChan <- errors.Errorf("failed to run host collector: %s: %v", collector.Title(), err)
}
for k, v := range result {
allCollectedData[k] = v

40
pkg/supportbundle/supportbundle.go
View File

@@ -86,19 +86,35 @@ func CollectSupportBundleFromSpec(spec *troubleshootv1beta2.SupportBundleSpec, a
return nil, errors.Wrap(err, "create bundle dir")
}
hostFiles, err := runHostCollectors(spec.HostCollectors, additionalRedactors, bundlePath, opts)
if err != nil {
return nil, errors.Wrap(err, "failed to run host collectors")
var result, files, hostFiles collect.CollectorResult
if spec.HostCollectors != nil {
// Run host collectors
hostFiles, err = runHostCollectors(spec.HostCollectors, additionalRedactors, bundlePath, opts)
if err != nil {
fmt.Println(errors.Wrap(err, "failed to run host collectors"))
}
}
// Run collectors
files, err := runCollectors(spec.Collectors, additionalRedactors, bundlePath, opts)
if err != nil {
return nil, errors.Wrap(err, "failed to run collectors")
if spec.Collectors != nil {
// Run collectors
files, err = runCollectors(spec.Collectors, additionalRedactors, bundlePath, opts)
if err != nil {
fmt.Println(errors.Wrap(err, "failed to run collectors"))
}
}
for k, v := range hostFiles {
files[k] = v
if files != nil && hostFiles != nil {
result = files
for k, v := range hostFiles {
result[k] = v
}
} else if files != nil {
result = files
} else if hostFiles != nil {
result = hostFiles
} else {
return nil, errors.Wrap(err, "failed to generate support bundle")
}
version, err := getVersionFile()
@@ -106,7 +122,7 @@ func CollectSupportBundleFromSpec(spec *troubleshootv1beta2.SupportBundleSpec, a
return nil, errors.Wrap(err, "failed to get version file")
}
err = files.SaveResult(bundlePath, VersionFilename, version)
err = result.SaveResult(bundlePath, VersionFilename, version)
if err != nil {
return nil, errors.Wrap(err, "failed to write version")
}
@@ -129,12 +145,12 @@ func CollectSupportBundleFromSpec(spec *troubleshootv1beta2.SupportBundleSpec, a
return nil, errors.Wrap(err, "failed to get analysis file")
}
err = files.SaveResult(bundlePath, AnalysisFilename, analysis)
err = result.SaveResult(bundlePath, AnalysisFilename, analysis)
if err != nil {
return nil, errors.Wrap(err, "failed to write analysis")
}
if err := collect.TarSupportBundleDir(bundlePath, files, filename); err != nil {
if err := collect.TarSupportBundleDir(bundlePath, result, filename); err != nil {
return nil, errors.Wrap(err, "create bundle file")
}