feat: handled reivew comments

cmd/collectors/rest/plugins/systemnode/systemnode.go

@@ -0,0 +1,31 @@
+package systemnode
+
+import (
+	"github.com/netapp/harvest/v2/cmd/poller/plugin"
+	"github.com/netapp/harvest/v2/pkg/matrix"
+	"github.com/netapp/harvest/v2/pkg/util"
+)
+
+type SystemNode struct {
+	*plugin.AbstractPlugin
+}
+
+func New(p *plugin.AbstractPlugin) plugin.Plugin {
+	return &SystemNode{AbstractPlugin: p}
+}
+
+func (s *SystemNode) Run(dataMap map[string]*matrix.Matrix) ([]*matrix.Matrix, *util.Metadata, error) {
+	data := dataMap[s.Object]
+	nodeStateMap := make(map[string]string)
+
+	for _, node := range data.GetInstanceKeys() {
+		nodeStateMap[node] = data.GetInstance(node).GetLabel("healthy")
+	}
+
+	// update node instance with partner_healthy info
+	for _, node := range data.GetInstances() {
+		node.SetLabel("partner_healthy", nodeStateMap[node.GetLabel("ha_partner")])
+	}
+
+	return nil, nil, nil
+}

cmd/collectors/rest/rest.go

@@ -17,6 +17,7 @@ import (
 	"github.com/netapp/harvest/v2/cmd/collectors/rest/plugins/shelf"
 	"github.com/netapp/harvest/v2/cmd/collectors/rest/plugins/snapmirror"
 	"github.com/netapp/harvest/v2/cmd/collectors/rest/plugins/svm"
+	"github.com/netapp/harvest/v2/cmd/collectors/rest/plugins/systemnode"
 	"github.com/netapp/harvest/v2/cmd/collectors/rest/plugins/volume"
 	"github.com/netapp/harvest/v2/cmd/collectors/rest/plugins/volumeanalytics"
 	"github.com/netapp/harvest/v2/cmd/poller/collector"
@@ -445,6 +446,8 @@ func (r *Rest) LoadPlugin(kind string, abc *plugin.AbstractPlugin) plugin.Plugin
 		return ontaps3service.New(abc)
 	case "MetroclusterCheck":
 		return metroclustercheck.New(abc)
+	case "SystemNode":
+		return systemnode.New(abc)
 	default:
 		r.Logger.Warn().Str("kind", kind).Msg("no rest plugin found ")
 	}

cmd/collectors/zapi/plugins/systemnode/systemnode.go

@@ -7,6 +7,7 @@ import (
 	"github.com/netapp/harvest/v2/pkg/conf"
 	"github.com/netapp/harvest/v2/pkg/matrix"
 	"github.com/netapp/harvest/v2/pkg/tree/node"
+	"github.com/netapp/harvest/v2/pkg/util"
 )
 
 type SystemNode struct {
@@ -38,36 +39,43 @@ func (s *SystemNode) Init() error {
 	return nil
 }
 
-func (s *SystemNode) Run(dataMap map[string]*matrix.Matrix) ([]*matrix.Matrix, error) {
+func (s *SystemNode) Run(dataMap map[string]*matrix.Matrix) ([]*matrix.Matrix, *util.Metadata, error) {
 	data := dataMap[s.Object]
+	s.client.Metadata.Reset()
+	nodeStateMap := make(map[string]string)
 
 	// invoke system-get-node-info-iter zapi and populate node info
 	partnerNameMap, err := s.getPartnerNodeInfo()
 	if err != nil {
 		s.Logger.Error().Err(err).Msg("Failed to collect partner node detail")
 	}
 
-	// update node instance with partner info
+	for _, node := range data.GetInstanceKeys() {
+		nodeStateMap[node] = data.GetInstance(node).GetLabel("healthy")
+	}
+
+	// update node instance with partner and partner_healthy info
 	for nodeName, node := range data.GetInstances() {
 		node.SetLabel("ha_partner", partnerNameMap[nodeName])
+		node.SetLabel("partner_healthy", nodeStateMap[node.GetLabel("ha_partner")])
 	}
 
 	// update node metrics with partner info
 	for _, metric := range data.GetMetrics() {
 		metric.SetLabel("ha_partner", partnerNameMap[metric.GetLabel("node")])
 	}
-	return nil, nil
+	return nil, s.client.Metadata, nil
 }
 
 func (s *SystemNode) getPartnerNodeInfo() (map[string]string, error) {
 	var (
-		result         []*node.Node
-		partnerNameMap map[string]string // node-name -> partner name map
-		err            error
+		result             []*node.Node
+		nodePartnerNodeMap map[string]string // node-name -> partner-node-name map
+		err                error
 	)
 
 	// system-get-node-info-iter zapi
-	partnerNameMap = make(map[string]string)
+	nodePartnerNodeMap = make(map[string]string)
 	request := node.NewXMLS("system-get-node-info-iter")
 	request.NewChildS("max-records", collectors.DefaultBatchSize)
 
@@ -84,13 +92,13 @@ func (s *SystemNode) getPartnerNodeInfo() (map[string]string, error) {
 
 	if len(result) == 0 || result == nil {
 		s.Logger.Debug().Err(err).Msg("no records found")
-		return partnerNameMap, nil
+		return nodePartnerNodeMap, nil
 	}
 
 	for _, objectStore := range result {
 		partnerName := objectStore.GetChildContentS("partner-system-name")
 		nodeName := objectStore.GetChildContentS("system-name")
-		partnerNameMap[nodeName] = partnerName
+		nodePartnerNodeMap[nodeName] = partnerName
 	}
-	return partnerNameMap, nil
+	return nodePartnerNodeMap, nil
 }

conf/rest/9.12.0/node.yaml

@@ -32,6 +32,7 @@ endpoints:
       - cpu_busy_time                                 => cpu_busytime
 
 plugins:
+  - SystemNode
   - LabelAgent:
       value_to_num:
         - new_status healthy true up `0`
@@ -52,6 +53,7 @@ export_options:
     - max_vol_num
     - max_vol_size
     - model
+    - partner_healthy
     - state
     - uptime
     - vendor

conf/zapi/cdot/9.8.0/node.yaml

@@ -63,6 +63,7 @@ export_options:
     - max_vol_num
     - max_vol_size
     - model
+    - partner_healthy
     - uptime
     - vendor
     - version