Merge remote-tracking branch 'origin/main' into hl_sm_source

NetApp · Oct 23, 2024 · af230e5 · af230e5
2 parents 41848d2 + 2397a2f
commit af230e5
Show file tree

Hide file tree

Showing 10 changed files with 2,164 additions and 9 deletions.
diff --git a/cmd/collectors/keyperf/keyperf.go b/cmd/collectors/keyperf/keyperf.go
@@ -16,8 +16,7 @@ import (
 )
 
 const (
-	latencyIoReqd       = 10
-	timestampMetricName = "statistics.timestamp"
+	latencyIoReqd = 10
 )
 
 type KeyPerf struct {
@@ -33,9 +32,10 @@ type counter struct {
 }
 
 type perfProp struct {
-	isCacheEmpty  bool
-	counterInfo   map[string]*counter
-	latencyIoReqd int
+	isCacheEmpty        bool
+	counterInfo         map[string]*counter
+	latencyIoReqd       int
+	timestampMetricName string
 }
 
 func init() {
@@ -171,7 +171,8 @@ func (kp *KeyPerf) buildCounters() {
 					counterType: "rate",
 					unit:        "b_per_sec",
 				}
-			case strings.Contains(k, timestampMetricName):
+			case strings.Contains(k, "timestamp"):
+				kp.perfProp.timestampMetricName = k
 				ctr = &counter{
 					name:        k,
 					counterType: "delta",
@@ -346,9 +347,11 @@ func (kp *KeyPerf) pollData(
 		}
 	}
 
-	timestamp := curMat.GetMetric(timestampMetricName)
+	timestamp := curMat.GetMetric(kp.perfProp.timestampMetricName)
 	if timestamp != nil {
 		timestamp.SetExportable(false)
+	} else {
+		return nil, errs.New(errs.ErrConfig, "missing timestamp metric")
 	}
 	err = kp.validateMatrix(prevMat, curMat)
 	if err != nil {
@@ -427,7 +430,7 @@ func (kp *KeyPerf) pollData(
 		if property == "average" || property == "percent" {
 
 			if strings.HasSuffix(metric.GetName(), "latency") {
-				skips, err = curMat.DivideWithThreshold(key, counter.denominator, kp.perfProp.latencyIoReqd, cachedData, prevMat, timestampMetricName, kp.Logger)
+				skips, err = curMat.DivideWithThreshold(key, counter.denominator, kp.perfProp.latencyIoReqd, cachedData, prevMat, kp.perfProp.timestampMetricName, kp.Logger)
 			} else {
 				skips, err = curMat.Divide(key, counter.denominator)
 			}
@@ -470,7 +473,7 @@ func (kp *KeyPerf) pollData(
 		}
 		property := counter.counterType
 		if property == "rate" {
-			if skips, err = curMat.Divide(orderedKeys[i], timestampMetricName); err != nil {
+			if skips, err = curMat.Divide(orderedKeys[i], kp.perfProp.timestampMetricName); err != nil {
 				kp.Logger.Error(
 					"Calculate rate",
 					slogx.Err(err),

diff --git a/conf/keyperf/9.15.0/nfsv3.yaml b/conf/keyperf/9.15.0/nfsv3.yaml
@@ -0,0 +1,29 @@
+name:                     NFSv3
+query:                    api/protocols/nfs/services
+object:                   svm_nfs
+
+global_labels:
+  - nfsv: v3
+
+counters:
+  - ^^svm.uuid                               => uuid
+  - ^statistics.v3.status                    => status
+  - ^svm.name                                => svm
+  - statistics.v3.iops_raw.other             => other_ops
+  - statistics.v3.iops_raw.read              => read_ops
+  - statistics.v3.iops_raw.total             => ops
+  - statistics.v3.iops_raw.write             => write_ops
+  - statistics.v3.latency_raw.other          => other_latency
+  - statistics.v3.latency_raw.read           => read_avg_latency
+  - statistics.v3.latency_raw.total          => latency
+  - statistics.v3.latency_raw.write          => write_avg_latency
+  - statistics.v3.throughput_raw.read        => read_throughput
+  - statistics.v3.throughput_raw.total       => total_throughput
+  - statistics.v3.throughput_raw.write       => write_throughput
+  - statistics.v3.timestamp(timestamp)       => timestamp
+  - hidden_fields:
+      - statistics.v3
+
+export_options:
+  instance_keys:
+    - svm
diff --git a/conf/keyperf/9.15.0/nfsv4.yaml b/conf/keyperf/9.15.0/nfsv4.yaml
@@ -0,0 +1,29 @@
+name:                     NFSv4
+query:                    api/protocols/nfs/services
+object:                   svm_nfs
+
+global_labels:
+  - nfsv: v4
+
+counters:
+  - ^^svm.uuid                               => uuid
+  - ^statistics.v4.status                    => status
+  - ^svm.name                                => svm
+  - statistics.v4.iops_raw.other             => other_ops
+  - statistics.v4.iops_raw.read              => read_ops
+  - statistics.v4.iops_raw.total             => ops
+  - statistics.v4.iops_raw.write             => write_ops
+  - statistics.v4.latency_raw.other          => other_latency
+  - statistics.v4.latency_raw.read           => read_avg_latency
+  - statistics.v4.latency_raw.total          => latency
+  - statistics.v4.latency_raw.write          => write_avg_latency
+  - statistics.v4.throughput_raw.read        => read_throughput
+  - statistics.v4.throughput_raw.total       => total_throughput
+  - statistics.v4.throughput_raw.write       => write_throughput
+  - statistics.v4.timestamp(timestamp)       => timestamp
+  - hidden_fields:
+      - statistics.v4
+
+export_options:
+  instance_keys:
+    - svm
diff --git a/conf/keyperf/9.15.0/nfsv4_1.yaml b/conf/keyperf/9.15.0/nfsv4_1.yaml
@@ -0,0 +1,29 @@
+name:                     NFSv41
+query:                    api/protocols/nfs/services
+object:                   svm_nfs
+
+global_labels:
+  - nfsv: v4.1
+
+counters:
+  - ^^svm.uuid                                => uuid
+  - ^statistics.v41.status                    => status
+  - ^svm.name                                 => svm
+  - statistics.v41.iops_raw.other             => other_ops
+  - statistics.v41.iops_raw.read              => read_ops
+  - statistics.v41.iops_raw.total             => ops
+  - statistics.v41.iops_raw.write             => write_ops
+  - statistics.v41.latency_raw.other          => other_latency
+  - statistics.v41.latency_raw.read           => read_avg_latency
+  - statistics.v41.latency_raw.total          => latency
+  - statistics.v41.latency_raw.write          => write_avg_latency
+  - statistics.v41.throughput_raw.read        => read_throughput
+  - statistics.v41.throughput_raw.total       => total_throughput
+  - statistics.v41.throughput_raw.write       => write_throughput
+  - statistics.v41.timestamp(timestamp)       => timestamp
+  - hidden_fields:
+      - statistics.v41
+
+export_options:
+  instance_keys:
+    - svm
diff --git a/conf/keyperf/9.15.0/nfsv4_2.yaml b/conf/keyperf/9.15.0/nfsv4_2.yaml
@@ -0,0 +1,29 @@
+name:                     NFSv42
+query:                    api/protocols/nfs/services
+object:                   svm_nfs
+
+global_labels:
+  - nfsv: v4.2
+
+counters:
+  - ^^svm.uuid                                => uuid
+  - ^statistics.v42.status                    => status
+  - ^svm.name                                 => svm
+  - statistics.v42.iops_raw.other             => other_ops
+  - statistics.v42.iops_raw.read              => read_ops
+  - statistics.v42.iops_raw.total             => ops
+  - statistics.v42.iops_raw.write             => write_ops
+  - statistics.v42.latency_raw.other          => other_latency
+  - statistics.v42.latency_raw.read           => read_avg_latency
+  - statistics.v42.latency_raw.total          => latency
+  - statistics.v42.latency_raw.write          => write_avg_latency
+  - statistics.v42.throughput_raw.read        => read_throughput
+  - statistics.v42.throughput_raw.total       => total_throughput
+  - statistics.v42.throughput_raw.write       => write_throughput
+  - statistics.v42.timestamp(timestamp)       => timestamp
+  - hidden_fields:
+      - statistics.v42
+
+export_options:
+  instance_keys:
+    - svm
diff --git a/conf/keyperf/9.15.0/volume.yaml b/conf/keyperf/9.15.0/volume.yaml
@@ -36,6 +36,7 @@ plugins:
       # plugin will create summary/average for each object
       # any names after the object names will be treated as label names that will be added to instances
       - node
+      - svm<>svm_vol
 
 export_options:
   instance_keys:

diff --git a/conf/keyperf/default.yaml b/conf/keyperf/default.yaml
@@ -13,6 +13,10 @@ objects:
   LIF:                         lif.yaml
   Lun:                         lun.yaml
   Namespace:                   namespace.yaml
+  NFSv3:                       nfsv3.yaml
+  NFSv41:                      nfsv4_1.yaml
+  NFSv42:                      nfsv4_2.yaml
+  NFSv4:                       nfsv4.yaml
   Node:                        node.yaml
   NvmeServices:                nvme_services.yaml
   Volume:                      volume.yaml

diff --git a/conf/rest/9.12.0/snapmirror.yaml b/conf/rest/9.12.0/snapmirror.yaml
@@ -44,6 +44,7 @@ endpoints:
       - ^^destination.path                   => destination_location
       - ^^uuid                               => relationship_id
       - ^source.cluster.name                 => source_cluster
+      - ^state                               => relationship_state
       - ^unhealthy_reason.#.message          => last_transfer_error
 
 plugins:
@@ -71,6 +72,7 @@ export_options:
     - policy_type
     - protectedBy
     - protectionSourceType
+    - relationship_state
     - relationship_status
     - relationship_type
     - schedule

diff --git a/conf/zapi/cdot/9.8.0/snapmirror.yaml b/conf/zapi/cdot/9.8.0/snapmirror.yaml
@@ -11,6 +11,7 @@ counters:
     - ^is-healthy                    => healthy
     - ^last-transfer-error
     - ^last-transfer-type
+    - ^mirror-state                  => relationship_state
     - ^policy-type
     - ^relationship-group-type       => group_type
     - ^relationship-status
@@ -55,6 +56,7 @@ export_options:
     - policy_type
     - protectedBy
     - protectionSourceType
+    - relationship_state
     - relationship_status
     - relationship_type
     - schedule