Merge pull request #92 from replicatedhq/optional-collectors

Optional collectors and analyzers
replicatedhq · Dec 18, 2019 · 1ee6629 · 1ee6629
2 parents fd257b5 + c61acdc
commit 1ee6629
Show file tree

Hide file tree

Showing 19 changed files with 250 additions and 245 deletions.
diff --git a/cmd/preflight/cli/root.go b/cmd/preflight/cli/root.go
@@ -27,12 +27,7 @@ that a cluster meets the requirements to run an application.`,
 		},
 		RunE: func(cmd *cobra.Command, args []string) error {
 			v := viper.GetViper()
-
-			if len(args) == 0 {
-				return runPreflightsCRD(v)
-			}
-
-			return runPreflightsNoCRD(v, args[0])
+			return runPreflights(v, args[0])
 		},
 	}
 

diff --git a/cmd/preflight/cli/run_nocrd.go → cmd/preflight/cli/run.go b/cmd/preflight/cli/run_nocrd.go → cmd/preflight/cli/run.go
@@ -22,7 +22,7 @@ import (
 	"gopkg.in/yaml.v2"
 )
 
-func runPreflightsNoCRD(v *viper.Viper, arg string) error {
+func runPreflights(v *viper.Viper, arg string) error {
 	fmt.Print(cursor.Hide())
 	defer fmt.Print(cursor.Show())
 
@@ -112,7 +112,9 @@ func runPreflightsNoCRD(v *viper.Viper, arg string) error {
 			continue
 		}
 
-		analyzeResults = append(analyzeResults, analyzeResult)
+		if analyzeResult != nil {
+			analyzeResults = append(analyzeResults, analyzeResult)
+		}
 	}
 
 	finishedCh <- true
@@ -156,12 +158,14 @@ func runCollectors(v *viper.Viper, preflight troubleshootv1beta1.Preflight) (map
 			return nil, errors.Wrap(err, "failed to run collector")
 		}
 
-		output, err := parseCollectorOutput(string(result))
-		if err != nil {
-			return nil, errors.Wrap(err, "failed to parse collector output")
-		}
-		for k, v := range output {
-			allCollectedData[k] = v
+		if result != nil {
+			output, err := parseCollectorOutput(string(result))
+			if err != nil {
+				return nil, errors.Wrap(err, "failed to parse collector output")
+			}
+			for k, v := range output {
+				allCollectedData[k] = v
+			}
 		}
 	}
 

diff --git a/cmd/preflight/cli/run_crd.go b/cmd/preflight/cli/run_crd.go
diff --git a/cmd/troubleshoot/cli/root.go b/cmd/troubleshoot/cli/root.go
@@ -30,12 +30,7 @@ from a server that can be used to assist when troubleshooting a server.`,
 			v := viper.GetViper()
 
 			logger.SetQuiet(v.GetBool("quiet"))
-
-			if len(args) == 0 {
-				return runTroubleshootCRD(v)
-			}
-
-			return runTroubleshootNoCRD(v, args[0])
+			return runTroubleshoot(v, args[0])
 		},
 	}
 

diff --git a/cmd/troubleshoot/cli/run_nocrd.go → cmd/troubleshoot/cli/run.go b/cmd/troubleshoot/cli/run_nocrd.go → cmd/troubleshoot/cli/run.go
@@ -22,7 +22,7 @@ import (
 	"gopkg.in/yaml.v2"
 )
 
-func runTroubleshootNoCRD(v *viper.Viper, arg string) error {
+func runTroubleshoot(v *viper.Viper, arg string) error {
 	fmt.Print(cursor.Hide())
 	defer fmt.Print(cursor.Show())
 
@@ -179,10 +179,12 @@ func runCollectors(v *viper.Viper, collector troubleshootv1beta1.Collector, prog
 			continue
 		}
 
-		err = parseAndSaveCollectorOutput(string(result), bundlePath)
-		if err != nil {
-			progressChan <- fmt.Errorf("failed to parse collector spec %q: %v", collector.GetDisplayName(), err)
-			continue
+		if result != nil {
+			err = parseAndSaveCollectorOutput(string(result), bundlePath)
+			if err != nil {
+				progressChan <- fmt.Errorf("failed to parse collector spec %q: %v", collector.GetDisplayName(), err)
+				continue
+			}
 		}
 	}
 

diff --git a/cmd/troubleshoot/cli/run_crd.go b/cmd/troubleshoot/cli/run_crd.go
diff --git a/config/crds/troubleshoot.replicated.com_analyzers.yaml b/config/crds/troubleshoot.replicated.com_analyzers.yaml
@@ -398,6 +398,8 @@ spec:
                       properties:
                         checkName:
                           type: string
+                        exclude:
+                          type: boolean
                         outcomes:
                           items:
                             properties:
@@ -437,6 +439,8 @@ spec:
                       properties:
                         checkName:
                           type: string
+                        exclude:
+                          type: boolean
                         outcomes:
                           items:
                             properties:
@@ -478,6 +482,8 @@ spec:
                           type: string
                         customResourceDefinitionName:
                           type: string
+                        exclude:
+                          type: boolean
                         outcomes:
                           items:
                             properties:
@@ -518,6 +524,8 @@ spec:
                       properties:
                         checkName:
                           type: string
+                        exclude:
+                          type: boolean
                         name:
                           type: string
                         namespace:
@@ -563,6 +571,8 @@ spec:
                       properties:
                         checkName:
                           type: string
+                        exclude:
+                          type: boolean
                         outcomes:
                           items:
                             properties:
@@ -602,6 +612,8 @@ spec:
                       properties:
                         checkName:
                           type: string
+                        exclude:
+                          type: boolean
                         outcomes:
                           items:
                             properties:
@@ -644,6 +656,8 @@ spec:
                       properties:
                         checkName:
                           type: string
+                        exclude:
+                          type: boolean
                         ingressName:
                           type: string
                         namespace:
@@ -689,6 +703,8 @@ spec:
                       properties:
                         checkName:
                           type: string
+                        exclude:
+                          type: boolean
                         key:
                           type: string
                         namespace:
@@ -736,6 +752,8 @@ spec:
                       properties:
                         checkName:
                           type: string
+                        exclude:
+                          type: boolean
                         name:
                           type: string
                         namespace:
@@ -781,6 +799,8 @@ spec:
                       properties:
                         checkName:
                           type: string
+                        exclude:
+                          type: boolean
                         outcomes:
                           items:
                             properties: