迁docker

 package com.monitor.common.contants;
 
 public class AlarmSystemConstant {
-    public static final String SYSTEM_IDC="yohops_aws";
+    public static final String SYSTEM_IDC="yohops_aws_docker";
 }

@@ -20,7 +20,7 @@ public class ScheduledPlan {
     @Autowired
     JavaApiClient javaApiClient;
 
-    //@Scheduled(cron="${cron_task_javaapi_monitor}")
+    @Scheduled(cron="${cron_task_javaapi_monitor}")
     public void run() {
         log.info("########## task start...");
 

@@ -56,7 +56,7 @@ public class MongoTask {
      * 等价于：select name , success from job_log where beginTime >  new Date('2018/03/16 06:15:00') and  beginTime <  new Date('2018/03/16 07:15:00') and  success = false
      * 结束时间：当前的时间 起始时间：当前时间向前推一个小时
      */
-    //@Scheduled(cron = "0 0/30 * * * ?")
+    @Scheduled(cron = "0 0/30 * * * ?")
     public void alarm() {
         if("test1".equals(env)||"test".equals(env)){
             return ;

@@ -38,7 +38,7 @@ public class RabbitScanTask {
     RabbitAlertMapper rabbitAlertMapper;
 
     //自动发现rabbit监控对象,下发监控任务
-    //@Scheduled(cron="${cron_task_rabbit_scan}")
+    @Scheduled(cron="${cron_task_rabbit_scan}")
     public void doTask() {
 
         catchAllRabbit();

@@ -73,7 +73,7 @@ public class DockerMonitorTask {
         }
     }
 
-    //@Scheduled(cron = "${cron_task_docker_pod_scan}")
+    @Scheduled(cron = "${cron_task_docker_pod_scan}")
     public void monitor() {
         if("test1".equals(env)||"test".equals(env)){
             return ;

@@ -37,7 +37,7 @@ public class NodePm2Task {
     @Autowired
     private NodeHostMapper nodeHostMapper;
 
-    //@Scheduled(cron = "${cron_task_node_mem}")
+    @Scheduled(cron = "${cron_task_node_mem}")
     public void nodePm2Info() {
 
         logger.info("cron_task_node_mem start");

@@ -32,7 +32,7 @@ public class DeleteDockerImageTask {
     @Autowired
     private MailService mailService;
 
-    //@Scheduled(cron = "${cron_task_clear_docker_image}")
+    @Scheduled(cron = "${cron_task_clear_docker_image}")
     public void monitor() {
         if("1".equals(openFlag)){
             List<DockerProjectModel> projectList= dockerProjectMapper.selectAll();

@@ -7,14 +7,14 @@ JavaApiExecutorPoolMaxSize=50
 
 nginxsync.agent=172.31.16.167:6060
 
-#zookeeper.address=yoho-ops-zookeeper:2181
-zookeeper.address=172.31.50.139:2181
+zookeeper.address=yoho-ops-zookeeper:2181
+#zookeeper.address=172.31.50.139:2181
 
-#zkAddress=yoho-ops-zookeeper:2181
-zkAddress=172.31.50.139:2181
+zkAddress=yoho-ops-zookeeper:2181
+#zkAddress=172.31.50.139:2181
 
-aws.redis.proxy.address=172.31.31.170
-#aws.redis.proxy.address=yoho-ops-redis
+#aws.redis.proxy.address=172.31.31.170
+aws.redis.proxy.address=yoho-ops-redis
 aws.redis.proxy.port=6379
 aws.redis.proxy.auth=