Showing
1 changed file
with
1 additions
and
1 deletions
@@ -121,7 +121,7 @@ public class DockerMonitorTask { | @@ -121,7 +121,7 @@ public class DockerMonitorTask { | ||
121 | if(records!=null&&records.size()>0){ | 121 | if(records!=null&&records.size()>0){ |
122 | logger.info("DockerMonitorTask record is {} ", JSON.toJSONString(records)); | 122 | logger.info("DockerMonitorTask record is {} ", JSON.toJSONString(records)); |
123 | for(DockerJenkinsRecord record:records){ | 123 | for(DockerJenkinsRecord record:records){ |
124 | - if(model.getClusterId()!=null&&model.getClusterId().equals(record.getClusterId()) | 124 | + if(model.getClusterId()!=null&&record.getClusterId()!=null&&record.getClusterId().indexOf(model.getClusterId())>=0 |
125 | &&model.getNamespace()!=null&&model.getNamespace().equals(record.getNamespace()) | 125 | &&model.getNamespace()!=null&&model.getNamespace().equals(record.getNamespace()) |
126 | &&model.getServiceName()!=null&&model.getServiceName().equals(record.getDockerProjectName())){ | 126 | &&model.getServiceName()!=null&&model.getServiceName().equals(record.getDockerProjectName())){ |
127 | alarmFlag=false; | 127 | alarmFlag=false; |
-
Please register or login to post a comment