feat: merge main and disable changelog by default

NetApp · Aug 30, 2023 · c01bde7 · c01bde7
1 parent b798c1b
commit c01bde7
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 6 deletions.
diff --git a/conf/rest/9.10.0/svm.yaml b/conf/rest/9.10.0/svm.yaml
@@ -59,7 +59,7 @@ plugins:
         - new_status state online online `0`
         - ldap_signed ldap_session_security sign sign `0`
         - ldap_encrypted ldap_session_security seal seal `0`
-  - ChangeLog
+#  - ChangeLog
 
 export_options:
   instance_keys:

diff --git a/conf/rest/9.10.0/volume.yaml b/conf/rest/9.10.0/volume.yaml
@@ -124,6 +124,7 @@ plugins:
 #        - volume `MDV_CRS_.+`
 #        # Exclude Metadata volumes, Audit volumes have a “MDV_aud_” prefix
 #        - volume `MDV_aud_.+`
+#  - ChangeLog
 
 export_options:
   instance_keys:

diff --git a/conf/rest/9.9.0/svm.yaml b/conf/rest/9.9.0/svm.yaml
@@ -53,6 +53,7 @@ plugins:
         - new_status state online online `0`
         - ldap_signed ldap_session_security sign sign `0`
         - ldap_encrypted ldap_session_security seal seal `0`
+#  - ChangeLog
 
 export_options:
   instance_keys:

diff --git a/conf/rest/9.9.0/volume.yaml b/conf/rest/9.9.0/volume.yaml
@@ -119,7 +119,7 @@ plugins:
 #        - volume `MDV_CRS_.+`
 #        # Exclude Metadata volumes, Audit volumes have a “MDV_aud_” prefix
 #        - volume `MDV_aud_.+`
-  - ChangeLog
+#  - ChangeLog
 
 export_options:
   instance_keys:

diff --git a/conf/zapi/cdot/9.8.0/shelf.yaml b/conf/zapi/cdot/9.8.0/shelf.yaml
@@ -6,7 +6,7 @@ object:                     shelf
 
 counters:
   storage-shelf-info:
-    - ^^shelf-uid
+    - ^^shelf-uid           => uuid
     - ^module-type          => module_type
     - ^op-status            => op_status
     - ^serial-number        => serial_number

diff --git a/conf/zapi/cdot/9.8.0/svm.yaml b/conf/zapi/cdot/9.8.0/svm.yaml
@@ -29,7 +29,7 @@ plugins:
         - new_status state online online `0`
         - ldap_signed ldap_session_security sign sign `0`
         - ldap_encrypted ldap_session_security seal seal `0`
-  - ChangeLog
+#  - ChangeLog
 
 export_options:
   instance_keys:

diff --git a/conf/zapi/cdot/9.8.0/volume.yaml b/conf/zapi/cdot/9.8.0/volume.yaml
@@ -103,7 +103,7 @@ plugins:
         - svm_root root_volume `false` `No`
         - node_root root_volume `true` `Yes`
         - svm_root root_volume `true` `Yes`
-  - ChangeLog
+#  - ChangeLog
 
 export_options:
   instance_keys:

diff --git a/grafana/dashboards/cmode/changelogMonitor.json b/grafana/dashboards/cmode/changelogMonitor.json
@@ -54,7 +54,7 @@
       }
     ]
   },
-  "description": "The ONTAP Changelog Monitor is a comprehensive dashboard that provides tracking of configuration changes for ONTAP objects such as volumes, SVMs, and nodes.",
+  "description": "The ONTAP Changelog Monitor, tracks configuration modifications in volumes, SVMs, and nodes, is deactivated by default. To leverage this feature, one must enable the ChangeLog plugin within the Volume, SVM, and Node Templates.",
   "editable": true,
   "gnetId": null,
   "graphTooltip": 1,