feat: adding ha_partner info in node

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/collector/zapi.go

@@ -16,6 +16,7 @@ import (
 	"github.com/netapp/harvest/v2/cmd/collectors/zapi/plugins/shelf"
 	"github.com/netapp/harvest/v2/cmd/collectors/zapi/plugins/snapmirror"
 	"github.com/netapp/harvest/v2/cmd/collectors/zapi/plugins/svm"
+	"github.com/netapp/harvest/v2/cmd/collectors/zapi/plugins/systemnode"
 	"github.com/netapp/harvest/v2/cmd/collectors/zapi/plugins/volume"
 	"github.com/netapp/harvest/v2/cmd/poller/plugin"
 	"github.com/netapp/harvest/v2/pkg/conf"
@@ -171,6 +172,8 @@ func (z *Zapi) LoadPlugin(kind string, abc *plugin.AbstractPlugin) plugin.Plugin
 		return qospolicyadaptive.New(abc)
 	case "Aggregate":
 		return aggregate.New(abc)
+	case "SystemNode":
+		return systemnode.New(abc)
 	default:
 		z.Logger.Info().Msgf("no zapi plugin found for %s", kind)
 	}

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

@@ -0,0 +1,104 @@
+package systemnode
+
+import (
+	"github.com/netapp/harvest/v2/cmd/collectors"
+	"github.com/netapp/harvest/v2/cmd/poller/plugin"
+	"github.com/netapp/harvest/v2/pkg/api/ontapi/zapi"
+	"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 {
+	*plugin.AbstractPlugin
+	client *zapi.Client
+}
+
+func New(p *plugin.AbstractPlugin) plugin.Plugin {
+	return &SystemNode{AbstractPlugin: p}
+}
+
+func (s *SystemNode) Init() error {
+
+	var err error
+
+	if err = s.InitAbc(); err != nil {
+		return err
+	}
+
+	if s.client, err = zapi.New(conf.ZapiPoller(s.ParentParams), s.Auth); err != nil {
+		s.Logger.Error().Stack().Err(err).Msg("connecting")
+		return err
+	}
+
+	if err = s.client.Init(5); err != nil {
+		return err
+	}
+
+	return nil
+}
+
+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")
+	}
+
+	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, s.client.Metadata, nil
+}
+
+func (s *SystemNode) getPartnerNodeInfo() (map[string]string, error) {
+	var (
+		result             []*node.Node
+		nodePartnerNodeMap map[string]string // node-name -> partner-node-name map
+		err                error
+	)
+
+	// system-get-node-info-iter zapi
+	nodePartnerNodeMap = make(map[string]string)
+	request := node.NewXMLS("system-get-node-info-iter")
+	request.NewChildS("max-records", collectors.DefaultBatchSize)
+
+	desired := node.NewXMLS("desired-attributes")
+	systemInfo := node.NewXMLS("system-info")
+	systemInfo.NewChildS("partner-system-name", "")
+	systemInfo.NewChildS("system-name", "")
+	desired.AddChild(systemInfo)
+	request.AddChild(desired)
+
+	if result, err = s.client.InvokeZapiCall(request); err != nil {
+		return nil, err
+	}
+
+	if len(result) == 0 || result == nil {
+		s.Logger.Debug().Err(err).Msg("no records found")
+		return nodePartnerNodeMap, nil
+	}
+
+	for _, objectStore := range result {
+		partnerName := objectStore.GetChildContentS("partner-system-name")
+		nodeName := objectStore.GetChildContentS("system-name")
+		nodePartnerNodeMap[nodeName] = partnerName
+	}
+	return nodePartnerNodeMap, nil
+}

conf/rest/9.12.0/node.yaml

@@ -9,6 +9,7 @@ counters:
   - ^controller.failed_fan.message.message            => failed_fan_message
   - ^controller.failed_power_supply.message.message   => failed_power_message
   - ^controller.over_temperature                      => over_temperature
+  - ^ha.partners.0.name                               => ha_partner
   - ^location
   - ^model
   - ^serial_number                                    => serial
@@ -31,6 +32,7 @@ endpoints:
       - cpu_busy_time                                 => cpu_busytime
 
 plugins:
+  - SystemNode
   - LabelAgent:
       value_to_num:
         - new_status healthy true up `0`
@@ -40,6 +42,7 @@ plugins:
 
 export_options:
   instance_keys:
+    - ha_partner
     - node
     - serial
   instance_labels:
@@ -50,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

@@ -41,6 +41,7 @@ counters:
 #    - sas2-sas3-mixed-stack-support
 
 plugins:
+  - SystemNode
   - LabelAgent:
     # metric label zapi_value rest_value `default_value`
     value_to_num:
@@ -51,6 +52,7 @@ plugins:
 
 export_options:
   instance_keys:
+    - ha_partner
     - node
     - serial
   instance_labels:
@@ -61,6 +63,7 @@ export_options:
     - max_vol_num
     - max_vol_size
     - model
+    - partner_healthy
     - uptime
     - vendor
     - version