Merge pull request #299 from replicatedhq/ceph-no-name

Ceph collector does not need a name property
replicatedhq · Nov 13, 2020 · c81576f · c81576f
2 parents 4cdfa5b + 1e8e20a
commit c81576f
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/pkg/apis/troubleshoot/v1beta2/collector_shared.go b/pkg/apis/troubleshoot/v1beta2/collector_shared.go
@@ -135,7 +135,6 @@ type Collectd struct {
 
 type Ceph struct {
 	CollectorMeta `json:",inline" yaml:",inline"`
-	Name          string `json:"name,omitempty" yaml:"name,omitempty"`
 	Namespace     string `json:"namespace" yaml:"namespace"`
 	Timeout       string `json:"timeout,omitempty" yaml:"timeout,omitempty"`
 }

diff --git a/pkg/collect/ceph.go b/pkg/collect/ceph.go
@@ -114,7 +114,7 @@ func cephCommandExec(ctx context.Context, c *Collector, cephCollector *troublesh
 
 	final := map[string][]byte{}
 	for filename, result := range results {
-		pathPrefix := GetCephCollectorFilepath(cephCollector.Name, cephCollector.Namespace)
+		pathPrefix := GetCephCollectorFilepath(cephCollector.CollectorName, cephCollector.Namespace)
 		switch {
 		case strings.HasSuffix(filename, "-stdout.txt"):
 			final[path.Join(pathPrefix, fmt.Sprintf("%s.%s", command.ID, command.Format))] = result