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

NetApp · Oct 24, 2024 · 76d0e6f · 76d0e6f
2 parents 5b0a062 + 995c381
commit 76d0e6f
Show file tree

Hide file tree

Showing 21 changed files with 29 additions and 308 deletions.
diff --git a/.clabot b/.clabot
@@ -16,6 +16,7 @@
         "cordelster",
         "george-strother",
         "7840vz",
+        "embusalacchi",
         "$$$ Bots $$$",
         "dependabot",
         "dependabot[bot]",

diff --git a/cmd/tools/generate/counter.go b/cmd/tools/generate/counter.go
@@ -787,6 +787,9 @@ func generateCounterTemplate(counters map[string]Counter, version [3]int) {
 
 	keys := make([]string, 0, len(counters))
 	for k := range counters {
+		if strings.Contains(k, "_labels") {
+			continue
+		}
 		keys = append(keys, k)
 	}
 	sort.Strings(keys)

diff --git a/conf/keyperf/9.15.0/aggr.yaml b/conf/keyperf/9.15.0/aggr.yaml
@@ -22,6 +22,8 @@ counters:
   - statistics.timestamp(timestamp)       => timestamp
   - hidden_fields:
       - statistics
+  - filter:
+      - statistics.timestamp=!"-"
 
 
 export_options:

diff --git a/conf/keyperf/9.15.0/cifs_vserver.yaml b/conf/keyperf/9.15.0/cifs_vserver.yaml
@@ -20,7 +20,8 @@ counters:
   - statistics.timestamp(timestamp)       => timestamp
   - hidden_fields:
       - statistics
-
+  - filter:
+      - statistics.timestamp=!"-"
 
 export_options:
   instance_keys:

diff --git a/conf/keyperf/9.15.0/cluster.yaml b/conf/keyperf/9.15.0/cluster.yaml
@@ -20,7 +20,8 @@ counters:
   - statistics.timestamp(timestamp)       => timestamp
   - hidden_fields:
       - statistics
-
+  - filter:
+      - statistics.timestamp=!"-"
 
 export_options:
   instance_keys:

diff --git a/conf/keyperf/9.15.0/iscsi_svm.yaml b/conf/keyperf/9.15.0/iscsi_svm.yaml
diff --git a/conf/keyperf/9.15.0/lif.yaml b/conf/keyperf/9.15.0/lif.yaml
@@ -15,7 +15,8 @@ counters:
   - statistics.timestamp(timestamp)       => timestamp
   - hidden_fields:
       - statistics
-
+  - filter:
+      - statistics.timestamp=!"-"
 
 export_options:
   instance_keys:

diff --git a/conf/keyperf/9.15.0/lun.yaml b/conf/keyperf/9.15.0/lun.yaml
@@ -23,7 +23,8 @@ counters:
   - statistics.timestamp(timestamp)       => timestamp
   - hidden_fields:
       - statistics
-
+  - filter:
+      - statistics.timestamp=!"-"
 
 plugins:
   LabelAgent:

diff --git a/conf/keyperf/9.15.0/namespace.yaml b/conf/keyperf/9.15.0/namespace.yaml
@@ -22,6 +22,8 @@ counters:
   - statistics.timestamp(timestamp)       => timestamp
   - hidden_fields:
       - statistics
+  - filter:
+      - statistics.timestamp=!"-"
 
 plugins:
   LabelAgent:

diff --git a/conf/keyperf/9.15.0/nfsv3.yaml b/conf/keyperf/9.15.0/nfsv3.yaml
@@ -23,6 +23,8 @@ counters:
   - statistics.v3.timestamp(timestamp)       => timestamp
   - hidden_fields:
       - statistics.v3
+  - filter:
+      - statistics.v3.timestamp=!"-"
 
 export_options:
   instance_keys:

diff --git a/conf/keyperf/9.15.0/nfsv4.yaml b/conf/keyperf/9.15.0/nfsv4.yaml
@@ -23,6 +23,8 @@ counters:
   - statistics.v4.timestamp(timestamp)       => timestamp
   - hidden_fields:
       - statistics.v4
+  - filter:
+      - statistics.v4.timestamp=!"-"
 
 export_options:
   instance_keys:

diff --git a/conf/keyperf/9.15.0/nfsv4_1.yaml b/conf/keyperf/9.15.0/nfsv4_1.yaml
@@ -23,6 +23,8 @@ counters:
   - statistics.v41.timestamp(timestamp)       => timestamp
   - hidden_fields:
       - statistics.v41
+  - filter:
+      - statistics.v41.timestamp=!"-"
 
 export_options:
   instance_keys:

diff --git a/conf/keyperf/9.15.0/nfsv4_2.yaml b/conf/keyperf/9.15.0/nfsv4_2.yaml
diff --git a/conf/keyperf/9.15.0/node.yaml b/conf/keyperf/9.15.0/node.yaml
@@ -10,6 +10,8 @@ counters:
   - statistics.timestamp(timestamp)                                                       => timestamp
   - hidden_fields:
       - statistics
+  - filter:
+      - statistics.timestamp=!"-"
 
 export_options:
   instance_keys:

diff --git a/conf/keyperf/9.15.0/nvme_services.yaml b/conf/keyperf/9.15.0/nvme_services.yaml
diff --git a/conf/keyperf/9.15.0/ontap_s3_svm.yaml b/conf/keyperf/9.15.0/ontap_s3_svm.yaml
diff --git a/conf/keyperf/9.15.0/qtree.yaml b/conf/keyperf/9.15.0/qtree.yaml
@@ -20,6 +20,7 @@ counters:
   - statistics.timestamp(timestamp)       => timestamp
   - filter:
       - name=!""
+      - statistics.timestamp=!"-"
   - hidden_fields:
       - statistics
 

diff --git a/conf/keyperf/9.15.0/volume.yaml b/conf/keyperf/9.15.0/volume.yaml
@@ -22,6 +22,8 @@ counters:
   - statistics.timestamp(timestamp)       => timestamp
   - hidden_fields:
       - statistics
+  - filter:
+      - statistics.timestamp=!"-"
 
 endpoints:
   - query: api/private/cli/volume

diff --git a/conf/keyperf/default.yaml b/conf/keyperf/default.yaml
@@ -9,16 +9,12 @@ objects:
   Aggregate:                   aggr.yaml
   CIFSvserver:                 cifs_vserver.yaml
   Cluster:                     cluster.yaml
-  ISCSISvm:                    iscsi_svm.yaml
   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
   Qtree:                       qtree.yaml
-  OntapS3SVM:                  ontap_s3_svm.yaml