fix: handle interface api call in svm rest/zapi

cmd/collectors/rest/plugins/svm/svm.go

@@ -7,16 +7,21 @@ package svm
 import (
 	"github.com/netapp/harvest/v2/cmd/collectors"
 	"github.com/netapp/harvest/v2/cmd/poller/plugin"
+	"github.com/netapp/harvest/v2/cmd/tools/rest"
+	"github.com/netapp/harvest/v2/pkg/conf"
 	"github.com/netapp/harvest/v2/pkg/errs"
 	"github.com/netapp/harvest/v2/pkg/matrix"
 	"github.com/tidwall/gjson"
 	"sort"
 	"strings"
+	"time"
 )
 
 type SVM struct {
 	*plugin.AbstractPlugin
-	nsswitchInfo map[string]nsswitch
+	nsswitchInfo   map[string]nsswitch
+	kerberosConfig map[string]string
+	client         *rest.Client
 }
 
 type nsswitch struct {
@@ -28,13 +33,36 @@ func New(p *plugin.AbstractPlugin) plugin.Plugin {
 	return &SVM{AbstractPlugin: p}
 }
 
+func (my *SVM) Init() error {
+
+	var err error
+
+	if err = my.InitAbc(); err != nil {
+		return err
+	}
+
+	timeout, _ := time.ParseDuration(rest.DefaultTimeout)
+	if my.client, err = rest.New(conf.ZapiPoller(my.ParentParams), timeout, my.Auth); err != nil {
+		my.Logger.Error().Stack().Err(err).Msg("connecting")
+		return err
+	}
+
+	if err = my.client.Init(5); err != nil {
+		return err
+	}
+	my.nsswitchInfo = make(map[string]nsswitch)
+	my.kerberosConfig = make(map[string]string)
+
+	return nil
+}
+
 func (my *SVM) Run(dataMap map[string]*matrix.Matrix) ([]*matrix.Matrix, error) {
 	var (
 		err error
 	)
 
 	data := dataMap[my.Object]
-	// invoke nameservice-nsswitch-get-iter zapi and get nsswitch info
+	// update nsswitch info
 	if my.nsswitchInfo, err = my.GetNSSwitchInfo(data); err != nil {
 		if errs.IsRestErr(err, errs.APINotFound) {
 			my.Logger.Debug().Err(err).Msg("Failed to collect nsswitch info")
@@ -43,6 +71,15 @@ func (my *SVM) Run(dataMap map[string]*matrix.Matrix) ([]*matrix.Matrix, error)
 		}
 	}
 
+	// invoke api/protocols/nfs/kerberos/interfaces rest and get nfs_kerberos_protocol_enabled
+	if my.kerberosConfig, err = my.GetKerberosConfig(); err != nil {
+		if errs.IsRestErr(err, errs.APINotFound) {
+			my.Logger.Debug().Err(err).Msg("Failed to collect kerberos config")
+		} else {
+			my.Logger.Error().Err(err).Msg("Failed to collect kerberos config")
+		}
+	}
+
 	// update svm instance based on the above zapi response
 	for _, svmInstance := range data.GetInstances() {
 		svmName := svmInstance.GetLabel("svm")
@@ -58,6 +95,11 @@ func (my *SVM) Run(dataMap map[string]*matrix.Matrix) ([]*matrix.Matrix, error)
 			svmInstance.SetLabel("ns_db", nsDB)
 			collectors.SetNameservice(nsDB, nsSource, nisDomain, svmInstance)
 		}
+
+		// Update nfs_kerberos_protocol_enabled label in svm
+		if kerberosEnabled, ok := my.kerberosConfig[svmName]; ok {
+			svmInstance.SetLabel("nfs_kerberos_protocol_enabled", kerberosEnabled)
+		}
 	}
 	return nil, nil
 }
@@ -93,3 +135,35 @@ func (my *SVM) GetNSSwitchInfo(data *matrix.Matrix) (map[string]nsswitch, error)
 	}
 	return vserverNsswitchMap, nil
 }
+
+func (my *SVM) GetKerberosConfig() (map[string]string, error) {
+	var (
+		result         []gjson.Result
+		svmKerberosMap map[string]string
+		err            error
+	)
+
+	svmKerberosMap = make(map[string]string)
+	query := "api/protocols/nfs/kerberos/interfaces"
+	kerberosFields := []string{"svm.name", "enabled"}
+	href := rest.BuildHref("", strings.Join(kerberosFields, ","), nil, "", "", "", "", query)
+
+	if result, err = collectors.InvokeRestCall(my.client, href, my.Logger); err != nil {
+		return nil, err
+	}
+
+	for _, kerberosConfig := range result {
+		enable := kerberosConfig.Get("enabled").String()
+		svmName := kerberosConfig.Get("svm.name").String()
+		if _, ok := svmKerberosMap[svmName]; !ok {
+			svmKerberosMap[svmName] = enable
+		} else {
+			// If any interface on the svm has kerberos on, then only set to true
+			if enable == "true" {
+				svmKerberosMap[svmName] = enable
+			}
+		}
+	}
+
+	return svmKerberosMap, nil
+}

cmd/collectors/zapi/plugins/svm/svm.go

@@ -655,7 +655,15 @@ func (my *SVM) GetKerberosConfig() (map[string]string, error) {
 	for _, kerberosConfig := range result {
 		enable := kerberosConfig.GetChildContentS("is-kerberos-enabled")
 		svmName := kerberosConfig.GetChildContentS("vserver")
-		vserverKerberosMap[svmName] = enable
+		if _, ok := vserverKerberosMap[svmName]; !ok {
+			vserverKerberosMap[svmName] = enable
+		} else {
+			// If any interface on the svm has kerberos on, then only set to true
+			if enable == "true" {
+				vserverKerberosMap[svmName] = enable
+			}
+		}
+
 	}
 	return vserverKerberosMap, nil
 }

conf/rest/9.12.0/svm.yaml

@@ -46,10 +46,6 @@ endpoints:
     counters:
       - ^^svm.name                          => svm
       - ^session_security                   => ldap_session_security
-  - query: api/protocols/nfs/kerberos/interfaces
-    counters:
-      - ^^svm.name                          => svm
-      - ^enabled                            => nfs_kerberos_protocol_enabled
   - query: api/protocols/san/iscsi/credentials
     counters:
       - ^^svm.name                          => svm