Merge pull request #246 from manavellamnimble/add_checkNames

divolgin · web-flow · commit 016d6e4f18ac · 2020-08-18T15:55:31.000-07:00
checkName in Distribution and Runtime
diff --git a/pkg/analyze/container_runtime.go b/pkg/analyze/container_runtime.go
@@ -26,8 +26,12 @@ func analyzeContainerRuntime(analyzer *troubleshootv1beta1.ContainerRuntime, get
 		foundRuntimes = append(foundRuntimes, node.Status.NodeInfo.ContainerRuntimeVersion)
 	}
 
+	title := analyzer.CheckName
+	if title == "" {
+		title = "Container Runtime"
+	}
 	result := &AnalyzeResult{
-		Title:   "Container Runtime",
+		Title:   title,
 		IconKey: "kubernetes_container_runtime",
 		IconURI: "https://troubleshoot.sh/images/analyzer-icons/container-runtime.svg?w=23&h=16",
 	}
diff --git a/pkg/analyze/distribution.go b/pkg/analyze/distribution.go
@@ -123,9 +123,12 @@ func analyzeDistribution(analyzer *troubleshootv1beta1.Distribution, getCollecte
 		}
 		_ = CheckOpenShift(&foundProviders, apiResources, "")
 	}
-
+	title := analyzer.CheckName
+	if title == "" {
+		title = "Kubernetes Distribution"
+	}
 	result := &AnalyzeResult{
-		Title:   "Kubernetes Distribution",
+		Title:   title,
 		IconKey: "kubernetes_distribution",
 		IconURI: "https://troubleshoot.sh/images/analyzer-icons/distribution.svg?w=20&h=14",
 	}
diff --git a/pkg/analyze/image_pull_secret.go b/pkg/analyze/image_pull_secret.go
@@ -22,9 +22,13 @@ func analyzeImagePullSecret(analyzer *troubleshootv1beta1.ImagePullSecret, getCh
 			passOutcome = outcome
 		}
 	}
+	title := analyzer.CheckName
+	if title == "" {
+		title = "Image Pull Secrets"
+	}
 
 	result := AnalyzeResult{
-		Title:   analyzer.CheckName,
+		Title:   title,
 		IconKey: "kubernetes_image_pull_secret",
 		IconURI: "https://troubleshoot.sh/images/analyzer-icons/image-pull-secret.svg?w=16&h=14",
 		IsFail:  true,
diff --git a/pkg/analyze/mysql.go b/pkg/analyze/mysql.go
@@ -28,13 +28,13 @@ func analyzeMysql(analyzer *troubleshootv1beta1.DatabaseAnalyze, getCollectedFil
 		return nil, errors.Wrap(err, "failed to unmarshal databased connection result")
 	}
 
-	checkName := analyzer.CheckName
-	if checkName == "" {
-		checkName = collectorName
+	title := analyzer.CheckName
+	if title == "" {
+		title = collectorName
 	}
 
 	result := &AnalyzeResult{
-		Title:   checkName,
+		Title:   title,
 		IconKey: "kubernetes_mysql_analyze",
 		IconURI: "https://troubleshoot.sh/images/analyzer-icons/mysql-analyze.svg",
 	}
diff --git a/pkg/analyze/postgres.go b/pkg/analyze/postgres.go
@@ -28,13 +28,13 @@ func analyzePostgres(analyzer *troubleshootv1beta1.DatabaseAnalyze, getCollected
 		return nil, errors.Wrap(err, "failed to unmarshal databased connection result")
 	}
 
-	checkName := analyzer.CheckName
-	if checkName == "" {
-		checkName = collectorName
+	title := analyzer.CheckName
+	if title == "" {
+		title = collectorName
 	}
 
 	result := &AnalyzeResult{
-		Title:   checkName,
+		Title:   title,
 		IconKey: "kubernetes_postgres_analyze",
 		IconURI: "https://troubleshoot.sh/images/analyzer-icons/postgres-analyze.svg",
 	}
diff --git a/pkg/analyze/redis.go b/pkg/analyze/redis.go
@@ -28,13 +28,13 @@ func analyzeRedis(analyzer *troubleshootv1beta1.DatabaseAnalyze, getCollectedFil
 		return nil, errors.Wrap(err, "failed to unmarshal database connection result")
 	}
 
-	checkName := analyzer.CheckName
-	if checkName == "" {
-		checkName = collectorName
+	title := analyzer.CheckName
+	if title == "" {
+		title = collectorName
 	}
 
 	result := &AnalyzeResult{
-		Title:   checkName,
+		Title:   title,
 		IconKey: "kubernetes_redis_analyze",
 		IconURI: "https://troubleshoot.sh/images/analyzer-icons/redis-analyze.svg",
 	}

Original file line number	Diff line number	Diff line change
`@@ -26,8 +26,12 @@ func analyzeContainerRuntime(analyzer *troubleshootv1beta1.ContainerRuntime, get`
`26`	`26`	`foundRuntimes = append(foundRuntimes, node.Status.NodeInfo.ContainerRuntimeVersion)`
`27`	`27`	`}`
`28`	`28`
	`29`	`+ title := analyzer.CheckName`
	`30`	`+ if title == "" {`
	`31`	`+ title = "Container Runtime"`
	`32`	`+ }`
`29`	`33`	`result := &AnalyzeResult{`
`30`		`- Title: "Container Runtime",`
	`34`	`+ Title: title,`
`31`	`35`	`IconKey: "kubernetes_container_runtime",`
`32`	`36`	`IconURI: "https://troubleshoot.sh/images/analyzer-icons/container-runtime.svg?w=23&h=16",`
`33`	`37`	`}`
Original file line number	Diff line number	Diff line change
`@@ -123,9 +123,12 @@ func analyzeDistribution(analyzer *troubleshootv1beta1.Distribution, getCollecte`
`123`	`123`	`}`
`124`	`124`	`_ = CheckOpenShift(&foundProviders, apiResources, "")`
`125`	`125`	`}`
`126`		`-`
	`126`	`+ title := analyzer.CheckName`
	`127`	`+ if title == "" {`
	`128`	`+ title = "Kubernetes Distribution"`
	`129`	`+ }`
`127`	`130`	`result := &AnalyzeResult{`
`128`		`- Title: "Kubernetes Distribution",`
	`131`	`+ Title: title,`
`129`	`132`	`IconKey: "kubernetes_distribution",`
`130`	`133`	`IconURI: "https://troubleshoot.sh/images/analyzer-icons/distribution.svg?w=20&h=14",`
`131`	`134`	`}`
Original file line number	Diff line number	Diff line change
`@@ -22,9 +22,13 @@ func analyzeImagePullSecret(analyzer *troubleshootv1beta1.ImagePullSecret, getCh`
`22`	`22`	`passOutcome = outcome`
`23`	`23`	`}`
`24`	`24`	`}`
	`25`	`+ title := analyzer.CheckName`
	`26`	`+ if title == "" {`
	`27`	`+ title = "Image Pull Secrets"`
	`28`	`+ }`
`25`	`29`
`26`	`30`	`result := AnalyzeResult{`
`27`		`- Title: analyzer.CheckName,`
	`31`	`+ Title: title,`
`28`	`32`	`IconKey: "kubernetes_image_pull_secret",`
`29`	`33`	`IconURI: "https://troubleshoot.sh/images/analyzer-icons/image-pull-secret.svg?w=16&h=14",`
`30`	`34`	`IsFail: true,`
Original file line number	Diff line number	Diff line change
`@@ -28,13 +28,13 @@ func analyzeMysql(analyzer *troubleshootv1beta1.DatabaseAnalyze, getCollectedFil`
`28`	`28`	`return nil, errors.Wrap(err, "failed to unmarshal databased connection result")`
`29`	`29`	`}`
`30`	`30`
`31`		`- checkName := analyzer.CheckName`
`32`		`- if checkName == "" {`
`33`		`- checkName = collectorName`
	`31`	`+ title := analyzer.CheckName`
	`32`	`+ if title == "" {`
	`33`	`+ title = collectorName`
`34`	`34`	`}`
`35`	`35`
`36`	`36`	`result := &AnalyzeResult{`
`37`		`- Title: checkName,`
	`37`	`+ Title: title,`
`38`	`38`	`IconKey: "kubernetes_mysql_analyze",`
`39`	`39`	`IconURI: "https://troubleshoot.sh/images/analyzer-icons/mysql-analyze.svg",`
`40`	`40`	`}`
Original file line number	Diff line number	Diff line change
`@@ -28,13 +28,13 @@ func analyzePostgres(analyzer *troubleshootv1beta1.DatabaseAnalyze, getCollected`
`28`	`28`	`return nil, errors.Wrap(err, "failed to unmarshal databased connection result")`
`29`	`29`	`}`
`30`	`30`
`31`		`- checkName := analyzer.CheckName`
`32`		`- if checkName == "" {`
`33`		`- checkName = collectorName`
	`31`	`+ title := analyzer.CheckName`
	`32`	`+ if title == "" {`
	`33`	`+ title = collectorName`
`34`	`34`	`}`
`35`	`35`
`36`	`36`	`result := &AnalyzeResult{`
`37`		`- Title: checkName,`
	`37`	`+ Title: title,`
`38`	`38`	`IconKey: "kubernetes_postgres_analyze",`
`39`	`39`	`IconURI: "https://troubleshoot.sh/images/analyzer-icons/postgres-analyze.svg",`
`40`	`40`	`}`
Original file line number	Diff line number	Diff line change
`@@ -28,13 +28,13 @@ func analyzeRedis(analyzer *troubleshootv1beta1.DatabaseAnalyze, getCollectedFil`
`28`	`28`	`return nil, errors.Wrap(err, "failed to unmarshal database connection result")`
`29`	`29`	`}`
`30`	`30`
`31`		`- checkName := analyzer.CheckName`
`32`		`- if checkName == "" {`
`33`		`- checkName = collectorName`
	`31`	`+ title := analyzer.CheckName`
	`32`	`+ if title == "" {`
	`33`	`+ title = collectorName`
`34`	`34`	`}`
`35`	`35`
`36`	`36`	`result := &AnalyzeResult{`
`37`		`- Title: checkName,`
	`37`	`+ Title: title,`
`38`	`38`	`IconKey: "kubernetes_redis_analyze",`
`39`	`39`	`IconURI: "https://troubleshoot.sh/images/analyzer-icons/redis-analyze.svg",`
`40`	`40`	`}`