Merge branch 'master' of http://git.yoho.cn/ops/monitor-service

 package com.monitor.other.degrade.service.impl;
 
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Set;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import javax.annotation.Resource;
+
+import org.apache.commons.lang.StringUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+
 import com.model.ZkConfigAll;
 import com.monitor.cmdb.service.IZkMoitorService;
 import com.monitor.model.domain.DegradeConfig;
@@ -8,14 +24,6 @@ import com.monitor.model.request.ZkTreeAllReq;
 import com.monitor.model.response.PageResponse;
 import com.monitor.mysql.mapper.DegradeConfigMapper;
 import com.monitor.other.degrade.service.DegradeService;
-import org.apache.commons.lang.StringUtils;
-import org.springframework.beans.BeanUtils;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-import java.util.*;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
 
 /**
  * Created by zhaoqi on 2016/8/26 0026.
@@ -211,6 +219,11 @@ public class DegradeServiceImpl implements DegradeService {
                     continue;
                 }
             }
+			// 只返回降级配置：（包含）
+            String configNameLower = degradeConfig.getConfigName().toLowerCase();
+			if (!configNameLower.startsWith("degrade.") && !configNameLower.contains(".degrade.")) {
+				continue;
+			}
             afterFilter.add(degradeConfig);
         }
         return afterFilter;