Log previous and new value of configuration when reset/update API is called

server/src/main/java/com/cloud/configuration/ConfigurationManagerImpl.java

@@ -693,7 +693,7 @@
 
     @Override
     @DB
     public String updateConfiguration(final long userId, final String name, final String category, String value, ConfigKey.Scope scope, final Long resourceId) {
         final String validationMsg = validateConfigurationValue(name, value, scope);
         if (validationMsg != null) {
             logger.error("Invalid value [{}] for configuration [{}] due to [{}].", value, name, validationMsg);
@@ -812,7 +812,7 @@
             CallContext.current().setEventResourceId(resourceId);
             CallContext.current().setEventDetails(String.format(" Name: %s, New Value: %s, Scope: %s", name, value, scope.name()));
 
             _configDepot.invalidateConfigCache(name, scope, resourceId);
             return valueEncrypted ? DBEncryptionUtil.decrypt(value) : value;
         }
 
@@ -978,40 +978,40 @@
             return _configDao.findByName(name);
         }
 
-        ConfigKey.Scope scope = ConfigKey.Scope.Global;
+        ConfigKey.Scope scope = null;
         Long id = null;
         int paramCountCheck = 0;
 
         if (zoneId != null) {
             scope = ConfigKey.Scope.Zone;
             id = zoneId;
             paramCountCheck++;
         }
         if (clusterId != null) {
             scope = ConfigKey.Scope.Cluster;
             id = clusterId;
             paramCountCheck++;
         }
         if (accountId != null) {
             Account account = _accountMgr.getAccount(accountId);
             _accountMgr.checkAccess(caller, null, false, account);
             scope = ConfigKey.Scope.Account;
             id = accountId;
             paramCountCheck++;
         }
         if (domainId != null) {
             _accountMgr.checkAccess(caller, _domainDao.findById(domainId));
             scope = ConfigKey.Scope.Domain;
             id = domainId;
             paramCountCheck++;
         }
         if (storagepoolId != null) {
             scope = ConfigKey.Scope.StoragePool;
             id = storagepoolId;
             paramCountCheck++;
         }
         if (imageStoreId != null) {
             scope = ConfigKey.Scope.ImageStore;
             id = imageStoreId;
             paramCountCheck++;
         }
@@ -1026,14 +1026,14 @@
             value = (id == null) ? null : "";
         }
 
         String currentValueInScope = getConfigurationValueInScope(config, name, scope, id);
         final String updatedValue = updateConfiguration(userId, name, category, value, scope, id);
         if (value == null && updatedValue == null || updatedValue.equalsIgnoreCase(value)) {
             logger.debug("Config: {} value is updated from: {} to {} for scope: {}", name,
                     encryptEventValueIfConfigIsEncrypted(config, currentValueInScope),
                     encryptEventValueIfConfigIsEncrypted(config, value),
                     scope != null ? scope : ConfigKey.Scope.Global.name());
 
             return _configDao.findByName(name);
         } else {
             throw new CloudRuntimeException("Unable to update configuration parameter " + name);
@@ -1215,7 +1215,7 @@
         logger.debug("Config: {} value is updated from: {} to {} for scope: {}", name,
                 encryptEventValueIfConfigIsEncrypted(config, currentValueInScope),
                 encryptEventValueIfConfigIsEncrypted(config, newValue), scope);
 
         _configDepot.invalidateConfigCache(name, scope, id);
 
         CallContext.current().setEventDetails(" Name: " + name + " New Value: " + (name.toLowerCase().contains("password") ? "*****" : defaultValue == null ? "" : defaultValue));
@@ -1224,9 +1224,9 @@
 
     private String getConfigurationValueInScope(ConfigurationVO config, String name, ConfigKey.Scope scope, Long id) {
         String configValue;
-        if (ConfigKey.Scope.Global.equals(scope)) {
+        if (scope == null || ConfigKey.Scope.Global.equals(scope)) {
             configValue = config.getValue();
         } else {
             ConfigKey<?> configKey = _configDepot.get(name);
             Object currentValue = configKey.valueInScope(scope, id);
             configValue = currentValue != null ? currentValue.toString() : null;