diff --git a/cmd/poller/plugin/changelog/change_log.go b/cmd/poller/plugin/changelog/change_log.go index 476c037d5..b2a031d69 100644 --- a/cmd/poller/plugin/changelog/change_log.go +++ b/cmd/poller/plugin/changelog/change_log.go @@ -70,7 +70,7 @@ func (c *ChangeLog) Init() error { } // Initialize the changeLogMap - c.changeLogMap = make(map[string]*matrix.Matrix, 0) + c.changeLogMap = make(map[string]*matrix.Matrix) object := c.ParentParams.GetChildS("object") c.matrixName = object.GetContentS() + "_" + changeLog @@ -143,7 +143,7 @@ func (c *ChangeLog) Run(dataMap map[string]*matrix.Matrix) ([]*matrix.Matrix, er prevMat := c.previousData oldInstances := set.New() - prevInstancesUUIDKey := make(map[string]string, 0) + prevInstancesUUIDKey := make(map[string]string) for key, prevInstance := range prevMat.GetInstances() { uuid := prevInstance.GetLabel("uuid") if uuid == "" { @@ -180,7 +180,7 @@ func (c *ChangeLog) Run(dataMap map[string]*matrix.Matrix) ([]*matrix.Matrix, er key: uuid + "_" + object, object: object, op: create, - labels: make(map[string]string, 0), + labels: make(map[string]string), time: currentTime, } c.updateChangeLogLabels(object, instance, change) @@ -194,7 +194,7 @@ func (c *ChangeLog) Run(dataMap map[string]*matrix.Matrix) ([]*matrix.Matrix, er key: uuid + "_" + object + "_" + currentLabel, object: object, op: update, - labels: make(map[string]string, 0), + labels: make(map[string]string), track: currentLabel, oldValue: old.Get(currentLabel), newValue: newLabel, @@ -223,7 +223,7 @@ func (c *ChangeLog) Run(dataMap map[string]*matrix.Matrix) ([]*matrix.Matrix, er key: uuid + "_" + object, object: object, op: del, - labels: make(map[string]string, 0), + labels: make(map[string]string), time: currentTime, } c.updateChangeLogLabels(object, prevInstance, change) @@ -255,7 +255,8 @@ func (c *ChangeLog) Run(dataMap map[string]*matrix.Matrix) ([]*matrix.Matrix, er // copyPreviousData creates a copy of the previous data for comparison func (c *ChangeLog) copyPreviousData(cur *matrix.Matrix) { - labels := append(c.changeLogConfig.PublishLabels, c.changeLogConfig.Track...) + labels := c.changeLogConfig.PublishLabels + labels = append(labels, c.changeLogConfig.Track...) labels = append(labels, "uuid") c.previousData = cur.Clone(matrix.With{Data: true, Metrics: false, Instances: true, ExportInstances: false, Labels: labels}) } diff --git a/conf/rest/9.10.0/svm.yaml b/conf/rest/9.10.0/svm.yaml index e74d01eb6..5f58f2d03 100644 --- 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 index 399be8bdb..64b750399 100644 --- 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 index 2d2957d11..6e56853df 100644 --- 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 index b6d61248e..01c062b08 100644 --- 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 index 77d441f63..f8b92c8d7 100644 --- 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 index 69df7b62c..1f31da08b 100644 --- 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 index f39e9793d..5072a1f8b 100644 --- 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 index bd2ea2f95..3a285d7e8 100644 --- 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,