feat: Adding only PluginInstances field in asup

NetApp · Jul 1, 2024 · ad2af13 · ad2af13
1 parent d830d60
commit ad2af13
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 53 deletions.
diff --git a/cmd/collectors/rest/plugins/qtree/qtree.go b/cmd/collectors/rest/plugins/qtree/qtree.go
@@ -195,10 +195,7 @@ func (q *Qtree) Run(dataMap map[string]*matrix.Matrix) ([]*matrix.Matrix, *util.
 	}
 	parseD = time.Since(startTime)
 
-	q.client.Metadata.PluginObjects = uint64(quotaCount)
-	q.client.Metadata.PluginMetrics = uint64(numMetrics)
-	q.client.Metadata.PluginAPID = uint64(apiD.Round(time.Millisecond).Milliseconds())
-	q.client.Metadata.PluginParseD = uint64(parseD.Round(time.Millisecond).Milliseconds())
+	q.client.Metadata.PluginInstances = uint64(quotaCount)
 
 	q.Logger.Info().
 		Int("numQuotas", quotaCount).

diff --git a/cmd/collectors/rest/rest.go b/cmd/collectors/rest/rest.go
@@ -763,7 +763,9 @@ func (r *Rest) CollectAutoSupport(p *collector.Payload) {
 			p.Volumes = &info
 		}
 		if r.Object == "Qtree" {
-			info = r.getQuotas(md)
+			info = collector.InstanceInfo{
+				PluginInstances: md.LazyValueInt64("pluginInstances", "data"),
+			}
 			p.Quotas = &info
 		}
 	}
@@ -799,15 +801,6 @@ func (r *Rest) getNodeUuids() ([]collector.ID, error) {
 	return infos, nil
 }
 
-func (r *Rest) getQuotas(md *matrix.Matrix) collector.InstanceInfo {
-	return collector.InstanceInfo{
-		Count:      md.LazyValueInt64("pluginObjects", "data"),
-		DataPoints: md.LazyValueInt64("pluginMetrics", "data"),
-		APITime:    md.LazyValueInt64("pluginApiD", "data"),
-		ParseTime:  md.LazyValueInt64("pluginParseD", "data"),
-	}
-}
-
 func (r *Rest) InitProp() {
 	r.Prop = &prop{}
 	r.Prop.InstanceKeys = make([]string, 0)

diff --git a/cmd/collectors/zapi/collector/zapi.go b/cmd/collectors/zapi/collector/zapi.go
@@ -498,7 +498,9 @@ func (z *Zapi) CollectAutoSupport(p *collector.Payload) {
 		case "Volume":
 			p.Volumes = &info
 		case "Qtree":
-			info = z.getQuotas(md)
+			info = collector.InstanceInfo{
+				PluginInstances: md.LazyValueInt64("pluginInstances", "data"),
+			}
 			p.Quotas = &info
 		}
 	}
@@ -542,15 +544,6 @@ func (z *Zapi) getNodeUuids() ([]collector.ID, error) {
 	return infos, nil
 }
 
-func (z *Zapi) getQuotas(md *matrix.Matrix) collector.InstanceInfo {
-	return collector.InstanceInfo{
-		Count:      md.LazyValueInt64("pluginObjects", "data"),
-		DataPoints: md.LazyValueInt64("pluginMetrics", "data"),
-		APITime:    md.LazyValueInt64("pluginApiD", "data"),
-		ParseTime:  md.LazyValueInt64("pluginParseD", "data"),
-	}
-}
-
 // Interface guards
 var (
 	_ collector.Collector = (*Zapi)(nil)

diff --git a/cmd/collectors/zapi/plugins/qtree/qtree.go b/cmd/collectors/zapi/plugins/qtree/qtree.go
@@ -221,10 +221,7 @@ func (q *Qtree) Run(dataMap map[string]*matrix.Matrix) ([]*matrix.Matrix, *util.
 		}
 	}
 
-	q.client.Metadata.PluginObjects = uint64(quotaIndex)
-	q.client.Metadata.PluginMetrics = uint64(numMetrics)
-	q.client.Metadata.PluginAPID = uint64(apiT.Round(time.Millisecond).Milliseconds())
-	q.client.Metadata.PluginParseD = uint64(parseT.Round(time.Millisecond).Milliseconds())
+	q.client.Metadata.PluginInstances = uint64(quotaIndex)
 
 	q.Logger.Info().
 		Int("numQuotas", quotaIndex).

diff --git a/cmd/poller/collector/asup.go b/cmd/poller/collector/asup.go
@@ -50,13 +50,14 @@ type ID struct {
 }
 
 type InstanceInfo struct {
-	Count      int64
-	DataPoints int64
-	PollTime   int64
-	APITime    int64
-	ParseTime  int64
-	PluginTime int64
-	Ids        []ID `json:"Ids,omitempty"` // revive:disable-line var-naming
+	Count           int64
+	DataPoints      int64
+	PollTime        int64
+	APITime         int64
+	ParseTime       int64
+	PluginTime      int64
+	PluginInstances int64
+	Ids             []ID `json:"Ids,omitempty"` // revive:disable-line var-naming
 }
 
 type Process struct {

diff --git a/cmd/poller/collector/collector.go b/cmd/poller/collector/collector.go
@@ -256,10 +256,7 @@ func Init(c Collector) error {
 	_, _ = md.NewMetricUint64("instances")
 	_, _ = md.NewMetricUint64("bytesRx")
 	_, _ = md.NewMetricUint64("numCalls")
-	_, _ = md.NewMetricUint64("pluginObjects")
-	_, _ = md.NewMetricUint64("pluginMetrics")
-	_, _ = md.NewMetricUint64("pluginApiD")
-	_, _ = md.NewMetricUint64("pluginParseD")
+	_, _ = md.NewMetricUint64("pluginInstances")
 
 	// Used by collector logging but not exported
 	loggingOnly := []string{begin, "export_time"}
@@ -463,10 +460,7 @@ func (c *AbstractCollector) Start(wg *sync.WaitGroup) {
 							if pluginMetadata != nil {
 								_ = c.Metadata.LazyAddValueUint64("bytesRx", task.Name, pluginMetadata.BytesRx)
 								_ = c.Metadata.LazyAddValueUint64("numCalls", task.Name, pluginMetadata.NumCalls)
-								_ = c.Metadata.LazySetValueUint64("pluginObjects", task.Name, pluginMetadata.PluginObjects)
-								_ = c.Metadata.LazySetValueUint64("pluginMetrics", task.Name, pluginMetadata.PluginMetrics)
-								_ = c.Metadata.LazySetValueUint64("pluginApiD", task.Name, pluginMetadata.PluginAPID)
-								_ = c.Metadata.LazySetValueUint64("pluginParseD", task.Name, pluginMetadata.PluginParseD)
+								_ = c.Metadata.LazySetValueUint64("pluginInstances", task.Name, pluginMetadata.PluginInstances)
 							}
 						}
 					}

diff --git a/pkg/util/metadata.go b/pkg/util/metadata.go
@@ -1,19 +1,13 @@
 package util
 
 type Metadata struct {
-	BytesRx       uint64
-	NumCalls      uint64
-	PluginObjects uint64
-	PluginMetrics uint64
-	PluginAPID    uint64
-	PluginParseD  uint64
+	BytesRx         uint64
+	NumCalls        uint64
+	PluginInstances uint64
 }
 
 func (m *Metadata) Reset() {
 	m.BytesRx = 0
 	m.NumCalls = 0
-	m.PluginObjects = 0
-	m.PluginMetrics = 0
-	m.PluginAPID = 0
-	m.PluginParseD = 0
+	m.PluginInstances = 0
 }