Merge pull request #574 from replicatedhq/diamonwiggins/sc-46879/hostcollectors-supportbundles

Host Collectors in Support Bundles

Author: diamonwiggins

pkg/analyze/host_block_devices.go

@@ -27,7 +27,7 @@ func (a *AnalyzeHostBlockDevices) IsExcluded() (bool, error) {
 func (a *AnalyzeHostBlockDevices) Analyze(getCollectedFileContents func(string) ([]byte, error)) ([]*AnalyzeResult, error) {
 	hostAnalyzer := a.hostAnalyzer
 
-	contents, err := getCollectedFileContents("system/block_devices.json")
+	contents, err := getCollectedFileContents(collect.HostBlockDevicesPath)
 	if err != nil {
 		return nil, errors.Wrap(err, "failed to get collected file")
 	}

pkg/analyze/host_certificate.go

@@ -26,7 +26,7 @@ func (a *AnalyzeHostCertificate) Analyze(getCollectedFileContents func(string) (
 	if collectorName == "" {
 		collectorName = "certificate"
 	}
-	name := filepath.Join("certificate", collectorName+".json")
+	name := filepath.Join("host-collectors/certificate", collectorName+".json")
 	contents, err := getCollectedFileContents(name)
 	if err != nil {
 		return nil, errors.Wrap(err, "failed to get collected file")

pkg/analyze/host_cpu.go

@@ -25,7 +25,7 @@ func (a *AnalyzeHostCPU) IsExcluded() (bool, error) {
 func (a *AnalyzeHostCPU) Analyze(getCollectedFileContents func(string) ([]byte, error)) ([]*AnalyzeResult, error) {
 	hostAnalyzer := a.hostAnalyzer
 
-	contents, err := getCollectedFileContents("system/cpu.json")
+	contents, err := getCollectedFileContents(collect.HostCPUPath)
 	if err != nil {
 		return nil, errors.Wrap(err, "failed to get collected file")
 	}

pkg/analyze/host_disk_usage.go

@@ -3,6 +3,7 @@ package analyzer
 import (
 	"encoding/json"
 	"fmt"
+	"path/filepath"
 	"strconv"
 	"strings"
 
@@ -27,15 +28,18 @@ func (a *AnalyzeHostDiskUsage) IsExcluded() (bool, error) {
 func (a *AnalyzeHostDiskUsage) Analyze(getCollectedFileContents func(string) ([]byte, error)) ([]*AnalyzeResult, error) {
 	hostAnalyzer := a.hostAnalyzer
 
-	key := collect.HostDiskUsageKey(hostAnalyzer.CollectorName)
-	contents, err := getCollectedFileContents(key)
+	name := filepath.Join("host-collectors/diskUsage", "diskUsage.json")
+	if hostAnalyzer.CollectorName != "" {
+		name = filepath.Join("host-collectors/diskUsage", hostAnalyzer.CollectorName+".json")
+	}
+	contents, err := getCollectedFileContents(name)
 	if err != nil {
-		return nil, errors.Wrapf(err, "failed to get collected file %s", key)
+		return nil, errors.Wrapf(err, "failed to get collected file %s", name)
 	}
 
 	diskUsageInfo := collect.DiskUsageInfo{}
 	if err := json.Unmarshal(contents, &diskUsageInfo); err != nil {
-		return nil, errors.Wrapf(err, "failed to unmarshal disk usage info from %s", key)
+		return nil, errors.Wrapf(err, "failed to unmarshal disk usage info from %s", name)
 	}
 
 	result := AnalyzeResult{

pkg/analyze/host_filesystem_performance.go

@@ -34,7 +34,7 @@ func (a *AnalyzeHostFilesystemPerformance) Analyze(getCollectedFileContents func
 	if collectorName == "" {
 		collectorName = "filesystemPerformance"
 	}
-	name := filepath.Join("filesystemPerformance", collectorName+".json")
+	name := filepath.Join("host-collectors/filesystemPerformance", collectorName+".json")
 	contents, err := getCollectedFileContents(name)
 	if err != nil {
 		return nil, errors.Wrapf(err, "failed to get collected file %s", name)

pkg/analyze/host_http.go

@@ -32,9 +32,9 @@ func (a *AnalyzeHostHTTP) IsExcluded() (bool, error) {
 func (a *AnalyzeHostHTTP) Analyze(getCollectedFileContents func(string) ([]byte, error)) ([]*AnalyzeResult, error) {
 	hostAnalyzer := a.hostAnalyzer
 
-	name := filepath.Join("http", "result.json")
+	name := filepath.Join("host-collectors/http", "result.json")
 	if hostAnalyzer.CollectorName != "" {
-		name = filepath.Join("http", hostAnalyzer.CollectorName+".json")
+		name = filepath.Join("host-collectors/http", hostAnalyzer.CollectorName+".json")
 	}
 	contents, err := getCollectedFileContents(name)
 	if err != nil {

pkg/analyze/host_httploadbalancer.go

@@ -29,7 +29,7 @@ func (a *AnalyzeHostHTTPLoadBalancer) Analyze(getCollectedFileContents func(stri
 	if collectorName == "" {
 		collectorName = "httpLoadBalancer"
 	}
-	fullPath := path.Join("httpLoadBalancer", fmt.Sprintf("%s.json", collectorName))
+	fullPath := path.Join("host-collectors/httpLoadBalancer", fmt.Sprintf("%s.json", collectorName))
 
 	collected, err := getCollectedFileContents(fullPath)
 	if err != nil {

pkg/analyze/host_ipv4interfaces.go

@@ -9,6 +9,7 @@ import (
 
 	"github.com/pkg/errors"
 	troubleshootv1beta2 "github.com/replicatedhq/troubleshoot/pkg/apis/troubleshoot/v1beta2"
+	"github.com/replicatedhq/troubleshoot/pkg/collect"
 )
 
 type AnalyzeHostIPV4Interfaces struct {
@@ -26,7 +27,7 @@ func (a *AnalyzeHostIPV4Interfaces) IsExcluded() (bool, error) {
 func (a *AnalyzeHostIPV4Interfaces) Analyze(getCollectedFileContents func(string) ([]byte, error)) ([]*AnalyzeResult, error) {
 	hostAnalyzer := a.hostAnalyzer
 
-	contents, err := getCollectedFileContents("system/ipv4Interfaces.json")
+	contents, err := getCollectedFileContents(collect.HostIPV4InterfacesPath)
 	if err != nil {
 		return nil, errors.Wrap(err, "failed to get collected file")
 	}

pkg/analyze/host_kernel_modules.go

@@ -43,7 +43,7 @@ func (a *AnalyzeHostKernelModules) IsExcluded() (bool, error) {
 //
 func (a *AnalyzeHostKernelModules) Analyze(getCollectedFileContents func(string) ([]byte, error)) ([]*AnalyzeResult, error) {
 	hostAnalyzer := a.hostAnalyzer
-	contents, err := getCollectedFileContents("system/kernel_modules.json")
+	contents, err := getCollectedFileContents(collect.HostKernelModulesPath)
 	if err != nil {
 		return nil, errors.Wrap(err, "failed to get collected file")
 	}

pkg/analyze/host_memory.go

@@ -26,7 +26,7 @@ func (a *AnalyzeHostMemory) IsExcluded() (bool, error) {
 func (a *AnalyzeHostMemory) Analyze(getCollectedFileContents func(string) ([]byte, error)) ([]*AnalyzeResult, error) {
 	hostAnalyzer := a.hostAnalyzer
 
-	contents, err := getCollectedFileContents("system/memory.json")
+	contents, err := getCollectedFileContents(collect.HostMemoryPath)
 	if err != nil {
 		return nil, errors.Wrap(err, "failed to get collected file")
 	}