fixes

Author: DaanHoogland

core/src/main/java/com/cloud/agent/resource/virtualnetwork/facade/SetMonitorServiceConfigItem.java

@@ -71,6 +71,7 @@ private void setupHealthChecksRelatedInfo(MonitorService monitorService, SetMoni
 
         monitorService.setExcludedHealthChecks(command.getAccessDetail(SetMonitorServiceCommand.ROUTER_HEALTH_CHECKS_EXCLUDED));
         monitorService.setHealthChecksConfig(command.getHealthChecksConfig());
+        monitorService.setDeleteProcessedFilesInterval(Integer.valueOf(command.getAccessDetail(SetMonitorServiceCommand.ROUTER_PROCESSED_COMMANDS_CLEANUP_INTERVAL)));
     }
 
     @Override

core/src/main/java/com/cloud/agent/resource/virtualnetwork/model/MonitorService.java

@@ -28,15 +28,17 @@ public class MonitorService extends ConfigBase {
     public Integer healthChecksAdvancedRunInterval;
     public String excludedHealthChecks;
     public Map<String, String> healthChecksConfig;
+    public Integer deleteProcessedFilesInterval;
 
     public MonitorService() {
         super(ConfigBase.MONITORSERVICE);
     }
 
     public MonitorService(String config, String disableMonitoring, String healthChecksEnabled) {
         super(ConfigBase.MONITORSERVICE);
-        this.config = config;
-        this.disableMonitoring = disableMonitoring;
+        this.setConfig(config);
+        this.setDisableMonitoring(disableMonitoring);
+        this.setHealthChecksEnabled(Boolean.parseBoolean(healthChecksEnabled));
     }
 
     public String getConfig() {
@@ -67,6 +69,10 @@ public Map<String, String> getHealthChecksConfig() {
         return healthChecksConfig;
     }
 
+    public Integer getDeleteProcessedFilesInterval() {
+        return deleteProcessedFilesInterval;
+    }
+
     public void setConfig(String config) {
         this.config = config;
     }
@@ -98,4 +104,8 @@ public void setHealthChecksConfig(Map<String, String> healthChecksConfig) {
     public void setDeleteFromProcessedCache(boolean deleteFromProcessedCache) {
         this.deleteFromProcessedCache = deleteFromProcessedCache;
     }
+
+    public void setDeleteProcessedFilesInterval(Integer deleteProcessedFilesInterval) {
+        this.deleteProcessedFilesInterval = deleteProcessedFilesInterval;
+    }
 }

systemvm/debian/opt/cloud/bin/cs_monitorservice.py

@@ -32,5 +32,7 @@ def merge(dbag, data):
         dbag["excluded_health_checks"] = data["excluded_health_checks"]
     if "health_checks_config" in data:
         dbag["health_checks_config"] = data["health_checks_config"]
+    if "delete_from_processed_cache" in data:
+        dbag["delete_from_processed_cache"] = data["delete_from_processed_cache"]
 
     return dbag

systemvm/debian/root/cleanup_processed.sh

@@ -33,7 +33,7 @@ fi
 
 files_to_delete=`find . -mtime +${days} 2>/dev/null`
 
-if [ -z $files_to_delete ]
+if [ -z "$files_to_delete" ]
 then
   echo "numberOfFiles: 0"
   exit 0