feat: Updating Snapmirror dashboard

NetApp · Oct 21, 2024 · 3e7c66f · 3e7c66f
1 parent a64cdec
commit 3e7c66f
Show file tree

Hide file tree

Showing 5 changed files with 446 additions and 5,690 deletions.
diff --git a/cmd/tools/grafana/grafana.go b/cmd/tools/grafana/grafana.go
@@ -195,11 +195,8 @@ func exportFiles(dir string, folder *Folder) error {
 	return nil
 }
 
-func addSvmRegex(content []byte, fileName string, val string) []byte {
+func addSvmRegex(content []byte, val string) []byte {
 	svmExpression := []string{"templating.list.#(name=\"SVM\")"}
-	if fileName == "snapmirror.json" {
-		svmExpression = []string{"templating.list.#(name=\"DestinationSVM\")", "templating.list.#(name=\"SourceSVM\")"}
-	}
 	for _, s := range svmExpression {
 		var err error
 		svm := gjson.GetBytes(content, s)
@@ -514,7 +511,7 @@ func importFiles(dir string, folder *Folder) {
 
 		// add svm regex
 		if opts.svmRegex != "" {
-			data = addSvmRegex(data, file.Name(), opts.svmRegex)
+			data = addSvmRegex(data, opts.svmRegex)
 		}
 
 		// change cluster label if needed

diff --git a/cmd/tools/grafana/grafana_test.go b/cmd/tools/grafana/grafana_test.go
@@ -4,7 +4,6 @@ import (
 	"bytes"
 	"encoding/json"
 	"fmt"
-	"path/filepath"
 	"regexp"
 	"strings"
 	"testing"
@@ -113,22 +112,10 @@ func TestAddSvmRegex(t *testing.T) {
 	VisitDashboards(
 		[]string{"../../../grafana/dashboards/cmode/svm.json", "../../../grafana/dashboards/cmode/snapmirror.json"},
 		func(path string, data []byte) {
-			file := filepath.Base(path)
-			out := addSvmRegex(data, file, regex)
-			if file == "svm.json" {
-				r := gjson.GetBytes(out, "templating.list.#(name=\"SVM\").regex")
-				if r.String() != regex {
-					t.Errorf("path: %s \nExpected: [%s]\n     Got: [%s]", path, regex, r.String())
-				}
-			} else if file == "snapmirror.json" {
-				r := gjson.GetBytes(out, "templating.list.#(name=\"DestinationSVM\").regex")
-				if r.String() != regex {
-					t.Errorf("path: %s \nExpected: [%s]\n     Got: [%s]", path, regex, r.String())
-				}
-				r = gjson.GetBytes(out, "templating.list.#(name=\"SourceSVM\").regex")
-				if r.String() != regex {
-					t.Errorf("path: %s \nExpected: [%s]\n     Got: [%s]", path, regex, r.String())
-				}
+			out := addSvmRegex(data, regex)
+			r := gjson.GetBytes(out, "templating.list.#(name=\"SVM\").regex")
+			if r.String() != regex {
+				t.Errorf("path: %s \nExpected: [%s]\n     Got: [%s]", path, regex, r.String())
 			}
 		})
 }

diff --git a/conf/zapi/cdot/9.8.0/volume.yaml b/conf/zapi/cdot/9.8.0/volume.yaml
@@ -26,6 +26,10 @@ counters:
     - volume-inode-attributes:
         - files-total
         - files-used
+    - volume-mirror-attributes:
+        - ^is-snapmirror-source                       => isProtected
+        - ^is-snapmirror-source-to-object-store       => isDestinationCloud
+        - ^is-snapmirror-source-to-ontap              => isDestinationOntap
     - volume-sis-attributes:
         - ^is-sis-volume                              => is_sis_volume
         - compression-space-saved                     => sis_compress_saved
@@ -117,8 +121,11 @@ export_options:
     - clone_parent_snapshot
     - clone_parent_svm
     - clone_parent_volume
+    - isDestinationCloud
+    - isDestinationOntap
     - isEncrypted
     - isHardwareEncrypted
+    - isProtected
     - is_sis_volume
     - junction_path
     - node_root