feat: Harvest auto-support should include instance count in the colle…

…ctor section
NetApp · Aug 30, 2023 · f613d1a · f613d1a
1 parent 4c81750
commit f613d1a
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 34 deletions.
diff --git a/cmd/collectors/rest/rest.go b/cmd/collectors/rest/rest.go
@@ -581,7 +581,7 @@ func (r *Rest) CollectAutoSupport(p *collector.Payload) {
 		exporterTypes = append(exporterTypes, exporter.GetClass())
 	}
 
-	var counters = make([]string, 0)
+	var counters = make([]string, 0, len(r.Prop.Counters))
 	for k := range r.Prop.Counters {
 		counters = append(counters, k)
 	}
@@ -598,6 +598,16 @@ func (r *Rest) CollectAutoSupport(p *collector.Payload) {
 	}
 
 	// Add collector information
+	md := r.GetMetadata()
+	info := collector.InstanceInfo{
+		Count:      md.LazyValueInt64("instances", "data"),
+		DataPoints: md.LazyValueInt64("metrics", "data"),
+		PollTime:   md.LazyValueInt64("poll_time", "data"),
+		APITime:    md.LazyValueInt64("api_time", "data"),
+		ParseTime:  md.LazyValueInt64("parse_time", "data"),
+		PluginTime: md.LazyValueInt64("plugin_time", "data"),
+	}
+
 	p.AddCollectorAsup(collector.AsupCollector{
 		Name:      r.Name,
 		Query:     r.Prop.Query,
@@ -608,6 +618,7 @@ func (r *Rest) CollectAutoSupport(p *collector.Payload) {
 		},
 		Schedules:     schedules,
 		ClientTimeout: r.Client.Timeout.String(),
+		InstanceInfo:  &info,
 	})
 
 	if (r.Name == "Rest" && (r.Object == "Volume" || r.Object == "Node")) || r.Name == "Ems" {
@@ -619,16 +630,6 @@ func (r *Rest) CollectAutoSupport(p *collector.Payload) {
 		}
 		p.Target.ClusterUUID = r.Client.Cluster().UUID
 
-		md := r.GetMetadata()
-		info := collector.InstanceInfo{
-			Count:      md.LazyValueInt64("instances", "data"),
-			DataPoints: md.LazyValueInt64("metrics", "data"),
-			PollTime:   md.LazyValueInt64("poll_time", "data"),
-			APITime:    md.LazyValueInt64("api_time", "data"),
-			ParseTime:  md.LazyValueInt64("parse_time", "data"),
-			PluginTime: md.LazyValueInt64("plugin_time", "data"),
-		}
-
 		if r.Object == "Node" || r.Name == "ems" {
 			var (
 				nodeIds []collector.ID

diff --git a/cmd/collectors/storagegrid/storagegrid.go b/cmd/collectors/storagegrid/storagegrid.go
@@ -503,7 +503,7 @@ func (s *StorageGrid) CollectAutoSupport(p *collector.Payload) {
 		exporterTypes = append(exporterTypes, exporter.GetClass())
 	}
 
-	var counters = make([]string, 0)
+	var counters = make([]string, 0, len(s.Props.Counters))
 	for k := range s.Props.Counters {
 		counters = append(counters, k)
 	}
@@ -520,6 +520,16 @@ func (s *StorageGrid) CollectAutoSupport(p *collector.Payload) {
 	}
 
 	// Add collector information
+	md := s.GetMetadata()
+	info := collector.InstanceInfo{
+		Count:      md.LazyValueInt64("instances", "data"),
+		DataPoints: md.LazyValueInt64("metrics", "data"),
+		PollTime:   md.LazyValueInt64("poll_time", "data"),
+		APITime:    md.LazyValueInt64("api_time", "data"),
+		ParseTime:  md.LazyValueInt64("parse_time", "data"),
+		PluginTime: md.LazyValueInt64("plugin_time", "data"),
+	}
+
 	p.AddCollectorAsup(collector.AsupCollector{
 		Name:      s.Name,
 		Query:     s.Props.Query,
@@ -530,6 +540,7 @@ func (s *StorageGrid) CollectAutoSupport(p *collector.Payload) {
 		},
 		Schedules:     schedules,
 		ClientTimeout: s.client.Timeout.String(),
+		InstanceInfo:  &info,
 	})
 
 	version := s.client.Cluster.Version
@@ -551,15 +562,6 @@ func (s *StorageGrid) CollectAutoSupport(p *collector.Payload) {
 	}
 
 	if s.Object == "Tenant" {
-		md := s.GetMetadata()
-		info := collector.InstanceInfo{
-			Count:      md.LazyValueInt64("instances", "data"),
-			DataPoints: md.LazyValueInt64("metrics", "data"),
-			PollTime:   md.LazyValueInt64("poll_time", "data"),
-			APITime:    md.LazyValueInt64("api_time", "data"),
-			ParseTime:  md.LazyValueInt64("parse_time", "data"),
-			PluginTime: md.LazyValueInt64("plugin_time", "data"),
-		}
 		p.Tenants = &info
 	}
 }

diff --git a/cmd/collectors/zapi/collector/zapi.go b/cmd/collectors/zapi/collector/zapi.go
@@ -375,12 +375,12 @@ func (z *Zapi) PollData() (map[string]*matrix.Matrix, error) {
 		}
 
 		for _, instanceElem := range instances {
-			//c.logger.Printf(c.Prefix, "Handling instance element <%v> [%s]", &instance, instance.GetName())
+			// c.logger.Printf(c.Prefix, "Handling instance element <%v> [%s]", &instance, instance.GetName())
 			keys, found := instanceElem.SearchContent(z.shortestPathPrefix, z.instanceKeyPaths)
-			//logger.Debug(z.Prefix, "Fetched instance keys: %s", strings.Join(keys, "."))
+			// logger.Debug(z.Prefix, "Fetched instance keys: %s", strings.Join(keys, "."))
 
 			if !found {
-				//logger.Debug(z.Prefix, "Skipping instance: no keys fetched")
+				// logger.Debug(z.Prefix, "Skipping instance: no keys fetched")
 				continue
 			}
 
@@ -451,6 +451,16 @@ func (z *Zapi) CollectAutoSupport(p *collector.Payload) {
 	}
 
 	// Add collector information
+	md := z.GetMetadata()
+	info := collector.InstanceInfo{
+		Count:      md.LazyValueInt64("instances", "data"),
+		DataPoints: md.LazyValueInt64("metrics", "data"),
+		PollTime:   md.LazyValueInt64("poll_time", "data"),
+		APITime:    md.LazyValueInt64("api_time", "data"),
+		ParseTime:  md.LazyValueInt64("parse_time", "data"),
+		PluginTime: md.LazyValueInt64("plugin_time", "data"),
+	}
+
 	p.AddCollectorAsup(collector.AsupCollector{
 		Name:      z.Name,
 		Query:     z.Query,
@@ -462,6 +472,7 @@ func (z *Zapi) CollectAutoSupport(p *collector.Payload) {
 		},
 		Schedules:     schedules,
 		ClientTimeout: clientTimeout,
+		InstanceInfo:  &info,
 	})
 
 	if z.Name == "Zapi" && (z.Object == "Volume" || z.Object == "Node") {
@@ -472,16 +483,6 @@ func (z *Zapi) CollectAutoSupport(p *collector.Payload) {
 		}
 		p.Target.ClusterUUID = z.Client.ClusterUUID()
 
-		md := z.GetMetadata()
-		info := collector.InstanceInfo{
-			Count:      md.LazyValueInt64("instances", "data"),
-			DataPoints: md.LazyValueInt64("metrics", "data"),
-			PollTime:   md.LazyValueInt64("poll_time", "data"),
-			APITime:    md.LazyValueInt64("api_time", "data"),
-			ParseTime:  md.LazyValueInt64("parse_time", "data"),
-			PluginTime: md.LazyValueInt64("plugin_time", "data"),
-		}
-
 		if z.Object == "Node" {
 			var (
 				nodeIds []collector.ID

diff --git a/cmd/poller/collector/asup.go b/cmd/poller/collector/asup.go
@@ -112,6 +112,7 @@ type AsupCollector struct {
 	Schedules     []Schedule
 	Exporters     []string
 	Counters      Counters
+	InstanceInfo  *InstanceInfo `json:"InstanceInfo,omitempty"`
 }
 
 const (