diff --git a/.gitignore b/.gitignore index 61a0c56d91b9e99e1d0a9051ac2095479ef00d16..dd52a5e00ed642ff37aa8945187619b4f153aee2 100644 --- a/.gitignore +++ b/.gitignore @@ -12,4 +12,3 @@ cat-client/src/main/resources/com/dianping/cat/configuration/client/config.xsd cat-client/src/main/resources/com/dianping/cat/status/model/status.xsd -cat-client/src/test/java/com/dianping/cat/message/io/ChannelManagerTest.java diff --git a/cat-client/src/main/java/com/dianping/cat/CatClientModule.java b/cat-client/src/main/java/com/dianping/cat/CatClientModule.java index 2983cd1a9fdeb072845eca3e33fa5fb3773997a8..df7ae27a6d507041bfa2ffbf81c2faf13fb18c9d 100644 --- a/cat-client/src/main/java/com/dianping/cat/CatClientModule.java +++ b/cat-client/src/main/java/com/dianping/cat/CatClientModule.java @@ -14,7 +14,6 @@ import org.unidal.initialization.Module; import org.unidal.initialization.ModuleContext; import com.dianping.cat.configuration.ClientConfigManager; -import com.dianping.cat.configuration.client.entity.ClientConfig; import com.dianping.cat.message.internal.MilliSecondTimer; import com.dianping.cat.message.io.TransportManager; import com.dianping.cat.status.StatusUpdateTask; @@ -53,8 +52,6 @@ public class CatClientModule extends AbstractModule { Threads.forGroup("Cat").start(statusUpdateTask); LockSupport.parkNanos(10 * 1000 * 1000L); // wait 10 ms - ClientConfig config = clientConfigManager.getClientConfig(); - // MmapConsumerTask mmapReaderTask = ctx.lookup(MmapConsumerTask.class); // Threads.forGroup("Cat").start(mmapReaderTask); } diff --git a/cat-consumer-advanced/src/test/java/com/dianping/cat/consumer/AllTests.java b/cat-consumer-advanced/src/test/java/com/dianping/cat/consumer/AllTests.java index d813d5273e384f293764c7a55524417cba88851e..0fc5cb9b42887b2f4c10622e1b17dd36f1f92f6f 100644 --- a/cat-consumer-advanced/src/test/java/com/dianping/cat/consumer/AllTests.java +++ b/cat-consumer-advanced/src/test/java/com/dianping/cat/consumer/AllTests.java @@ -13,7 +13,6 @@ import com.dianping.cat.consumer.matrix.MatrixAnalyzerTest; import com.dianping.cat.consumer.matrix.MatrixModelTest; import com.dianping.cat.consumer.matrix.MatrixReportMergerTest; import com.dianping.cat.consumer.metric.MetricAnalyzerTest; -import com.dianping.cat.consumer.metric.MetricConfigManagerTest; import com.dianping.cat.consumer.metric.ProductLineConfigManagerTest; @RunWith(Suite.class) diff --git a/cat-home/src/main/java/com/dianping/cat/build/ComponentsConfigurator.java b/cat-home/src/main/java/com/dianping/cat/build/ComponentsConfigurator.java index 0cc7363b2c957a1e451b1f3c5c6a70fb022a2b1e..04b7f9614716f75d8da005bda7bd9d46c2214af6 100755 --- a/cat-home/src/main/java/com/dianping/cat/build/ComponentsConfigurator.java +++ b/cat-home/src/main/java/com/dianping/cat/build/ComponentsConfigurator.java @@ -64,7 +64,6 @@ import com.dianping.cat.report.task.alert.RemoteMetricReportService; import com.dianping.cat.report.task.alert.business.BusinessAlert; import com.dianping.cat.report.task.alert.exception.AlertExceptionBuilder; import com.dianping.cat.report.task.alert.exception.ExceptionAlert; -import com.dianping.cat.report.task.alert.manager.AlertEntityService; import com.dianping.cat.report.task.alert.network.NetworkAlert; import com.dianping.cat.report.task.alert.sender.AlertManager; import com.dianping.cat.report.task.alert.sender.decorator.BusinessDecorator; @@ -91,6 +90,7 @@ import com.dianping.cat.report.task.alert.sender.spliter.SmsSpliter; import com.dianping.cat.report.task.alert.sender.spliter.Spliter; import com.dianping.cat.report.task.alert.sender.spliter.SpliterManager; import com.dianping.cat.report.task.alert.sender.spliter.WeixinSpliter; +import com.dianping.cat.report.task.alert.service.AlertEntityService; import com.dianping.cat.report.task.alert.summary.AlertSummaryDecorator; import com.dianping.cat.report.task.alert.summary.AlertSummaryExecutor; import com.dianping.cat.report.task.alert.summary.AlertSummaryFTLDecorator; diff --git a/cat-home/src/main/java/com/dianping/cat/report/task/alert/sender/AlertConstants.java b/cat-home/src/main/java/com/dianping/cat/report/task/alert/AlertConstants.java similarity index 89% rename from cat-home/src/main/java/com/dianping/cat/report/task/alert/sender/AlertConstants.java rename to cat-home/src/main/java/com/dianping/cat/report/task/alert/AlertConstants.java index 612f44ca8c34660a28fa4f146b705ce4f3cf36bd..74bf143235ee604fe333e6eff18405d6d121e18b 100644 --- a/cat-home/src/main/java/com/dianping/cat/report/task/alert/sender/AlertConstants.java +++ b/cat-home/src/main/java/com/dianping/cat/report/task/alert/AlertConstants.java @@ -1,4 +1,4 @@ -package com.dianping.cat.report.task.alert.sender; +package com.dianping.cat.report.task.alert; public class AlertConstants { diff --git a/cat-home/src/main/java/com/dianping/cat/report/task/alert/BaseAlert.java b/cat-home/src/main/java/com/dianping/cat/report/task/alert/BaseAlert.java index 0048379212a1fe1cbe8fe45bbbfa3ea630c00383..caae6bca4bf1fbf6df7ac7e73291b526ff6b6c4c 100644 --- a/cat-home/src/main/java/com/dianping/cat/report/task/alert/BaseAlert.java +++ b/cat-home/src/main/java/com/dianping/cat/report/task/alert/BaseAlert.java @@ -25,7 +25,6 @@ import com.dianping.cat.home.rule.entity.Condition; import com.dianping.cat.home.rule.entity.Config; import com.dianping.cat.report.baseline.BaselineService; import com.dianping.cat.report.task.alert.sender.AlertEntity; -import com.dianping.cat.report.task.alert.sender.AlertEntity.AlertEntityBuilder; import com.dianping.cat.report.task.alert.sender.AlertManager; import com.dianping.cat.service.ModelPeriod; import com.dianping.cat.service.ModelRequest; @@ -233,21 +232,12 @@ public abstract class BaseAlert { m_alertInfo.addAlertInfo(productlineName, metricKey, new Date().getTime()); String metricName = buildMetricName(metricKey); - - AlertEntityBuilder builder = new AlertEntity().new AlertEntityBuilder(); - builder.buildDate(alertResult.getAlertTime()).buildContent(alertResult.getContent()) - .buildLevel(alertResult.getAlertLevel()); - builder.buildMetric(metricName).buildType(getName()); + AlertEntity entity = new AlertEntity(); - if ("network".equals(getName())) { - builder.buildGroup(productlineName); - } else { - String domain = extractDomain(metricKey); - builder.buildGroup(domain); - } - AlertEntity alertEntity = builder.getAlertEntity(); + entity.setDate(alertResult.getAlertTime()).setContent(alertResult.getContent()).setLevel(alertResult.getAlertLevel()); + entity.setMetric(metricName).setType(getName()).setGroup(productlineName); - m_sendManager.addAlert(alertEntity); + m_sendManager.addAlert(entity); } } } diff --git a/cat-home/src/main/java/com/dianping/cat/report/task/alert/business/BusinessAlert.java b/cat-home/src/main/java/com/dianping/cat/report/task/alert/business/BusinessAlert.java index a464559173a540e41c77631c0b11e81dc1ba7720..16f5857d292bbaab65e26ae51b42d6d73580ce47 100644 --- a/cat-home/src/main/java/com/dianping/cat/report/task/alert/business/BusinessAlert.java +++ b/cat-home/src/main/java/com/dianping/cat/report/task/alert/business/BusinessAlert.java @@ -15,12 +15,11 @@ import com.dianping.cat.advanced.metric.config.entity.MetricItemConfig; import com.dianping.cat.consumer.company.model.entity.ProductLine; import com.dianping.cat.consumer.metric.MetricConfigManager; import com.dianping.cat.message.Transaction; +import com.dianping.cat.report.task.alert.AlertConstants; import com.dianping.cat.report.task.alert.AlertResultEntity; import com.dianping.cat.report.task.alert.BaseAlert; import com.dianping.cat.report.task.alert.MetricType; -import com.dianping.cat.report.task.alert.sender.AlertConstants; import com.dianping.cat.report.task.alert.sender.AlertEntity; -import com.dianping.cat.report.task.alert.sender.AlertEntity.AlertEntityBuilder; public class BusinessAlert extends BaseAlert implements Task, LogEnabled { @@ -70,15 +69,12 @@ public class BusinessAlert extends BaseAlert implements Task, LogEnabled { m_alertInfo.addAlertInfo(product, metricKey, new Date().getTime()); String metricName = buildMetricName(metricKey); - AlertEntityBuilder builder = new AlertEntity().new AlertEntityBuilder(); - builder.buildDate(alertResult.getAlertTime()).buildContent(alertResult.getContent()) - .buildLevel(alertResult.getAlertLevel()); - builder.buildMetric(metricName).buildType(getName()); + AlertEntity entity = new AlertEntity(); + + entity.setDate(alertResult.getAlertTime()).setContent(alertResult.getContent()).setLevel(alertResult.getAlertLevel()); + entity.setMetric(metricName).setType(getName()).setGroup(product); - builder.buildGroup(domain); - AlertEntity alertEntity = builder.getAlertEntity(); - - m_sendManager.addAlert(alertEntity); + m_sendManager.addAlert(entity); } } } diff --git a/cat-home/src/main/java/com/dianping/cat/report/task/alert/exception/ExceptionAlert.java b/cat-home/src/main/java/com/dianping/cat/report/task/alert/exception/ExceptionAlert.java index 9f3429b1fb3a2e8d7d3429bb9baa54263e4f58e0..dfd5f59d66722e73f684ea671fb998383eb4383c 100644 --- a/cat-home/src/main/java/com/dianping/cat/report/task/alert/exception/ExceptionAlert.java +++ b/cat-home/src/main/java/com/dianping/cat/report/task/alert/exception/ExceptionAlert.java @@ -20,10 +20,9 @@ import com.dianping.cat.message.Transaction; import com.dianping.cat.report.page.model.spi.ModelService; import com.dianping.cat.report.page.top.TopMetric; import com.dianping.cat.report.page.top.TopMetric.Item; +import com.dianping.cat.report.task.alert.AlertConstants; import com.dianping.cat.report.task.alert.exception.AlertExceptionBuilder.AlertException; -import com.dianping.cat.report.task.alert.sender.AlertConstants; import com.dianping.cat.report.task.alert.sender.AlertEntity; -import com.dianping.cat.report.task.alert.sender.AlertEntity.AlertEntityBuilder; import com.dianping.cat.report.task.alert.sender.AlertManager; import com.dianping.cat.service.ModelRequest; import com.dianping.cat.service.ModelResponse; @@ -110,13 +109,12 @@ public class ExceptionAlert implements Task { for (AlertException exception : exceptions) { String metricName = exception.getName(); + AlertEntity entity = new AlertEntity(); + + entity.setDate(new Date()).setContent(exception.toString()).setLevel(exception.getType()); + entity.setMetric(metricName).setType(getName()).setGroup(domain); - AlertEntityBuilder builder = new AlertEntity().new AlertEntityBuilder(); - builder.buildDate(new Date()).buildLevel(exception.getType()).buildContent(exception.toString()); - builder.buildMetric(metricName).buildType(getName()).buildGroup(domain); - AlertEntity alertEntity = builder.getAlertEntity(); - - m_sendManager.addAlert(alertEntity); + m_sendManager.addAlert(entity); } } catch (Exception e) { Cat.logError(e); diff --git a/cat-home/src/main/java/com/dianping/cat/report/task/alert/network/NetworkAlert.java b/cat-home/src/main/java/com/dianping/cat/report/task/alert/network/NetworkAlert.java index 73e47dda293ada37f7ba3067cac32095146d0f6b..eebda6a383a6a986c9fe16e7955d1feeccddd7ac 100644 --- a/cat-home/src/main/java/com/dianping/cat/report/task/alert/network/NetworkAlert.java +++ b/cat-home/src/main/java/com/dianping/cat/report/task/alert/network/NetworkAlert.java @@ -10,8 +10,8 @@ import org.unidal.helper.Threads.Task; import com.dianping.cat.Cat; import com.dianping.cat.consumer.company.model.entity.ProductLine; import com.dianping.cat.message.Transaction; +import com.dianping.cat.report.task.alert.AlertConstants; import com.dianping.cat.report.task.alert.BaseAlert; -import com.dianping.cat.report.task.alert.sender.AlertConstants; public class NetworkAlert extends BaseAlert implements Task, LogEnabled { diff --git a/cat-home/src/main/java/com/dianping/cat/report/task/alert/sender/AlertChannel.java b/cat-home/src/main/java/com/dianping/cat/report/task/alert/sender/AlertChannel.java index 0c56f0f0188b58df24c64b72341fa27d5ded02be..f0da3bfc4d473570a16ccc2ea0866125b61c9938 100644 --- a/cat-home/src/main/java/com/dianping/cat/report/task/alert/sender/AlertChannel.java +++ b/cat-home/src/main/java/com/dianping/cat/report/task/alert/sender/AlertChannel.java @@ -1,5 +1,7 @@ package com.dianping.cat.report.task.alert.sender; +import com.dianping.cat.report.task.alert.AlertConstants; + public enum AlertChannel { MAIL(AlertConstants.MAIL), diff --git a/cat-home/src/main/java/com/dianping/cat/report/task/alert/sender/AlertEntity.java b/cat-home/src/main/java/com/dianping/cat/report/task/alert/sender/AlertEntity.java index 1485f6e7a7e1bd5d9c6002438068c0a545738a72..33a0b10052486be481b0d739c607776712a73d2c 100644 --- a/cat-home/src/main/java/com/dianping/cat/report/task/alert/sender/AlertEntity.java +++ b/cat-home/src/main/java/com/dianping/cat/report/task/alert/sender/AlertEntity.java @@ -48,71 +48,40 @@ public class AlertEntity { return m_type; } - public void setDate(Date alertDate) { + public AlertEntity setDate(Date alertDate) { m_date = alertDate; + return this; } - public void setContent(String content) { + public AlertEntity setContent(String content) { m_content = content; + return this; } - public void setGroup(String group) { + public AlertEntity setGroup(String group) { m_group = group; + return this; } - public void setLevel(String level) { + public AlertEntity setLevel(String level) { m_level = level; + return this; } - public void setMetric(String metricName) { + public AlertEntity setMetric(String metricName) { m_metric = metricName; + return this; } - public void setParas(Map paras) { + public AlertEntity setParas(Map paras) { m_paras = paras; + return this; } - public void setType(String type) { + public AlertEntity setType(String type) { m_type = type; + return this; } - public class AlertEntityBuilder { - - private AlertEntity m_alertEntity = new AlertEntity(); - - public AlertEntityBuilder buildDate(Date date) { - m_alertEntity.setDate(date); - return this; - } - - public AlertEntityBuilder buildType(String type) { - m_alertEntity.setType(type); - return this; - } - - public AlertEntityBuilder buildGroup(String group) { - m_alertEntity.setGroup(group); - return this; - } - - public AlertEntityBuilder buildLevel(String level) { - m_alertEntity.setLevel(level); - return this; - } - - public AlertEntityBuilder buildMetric(String metric) { - m_alertEntity.setMetric(metric); - return this; - } - - public AlertEntityBuilder buildContent(String content) { - m_alertEntity.setContent(content); - return this; - } - - public AlertEntity getAlertEntity(){ - return m_alertEntity; - } - } } diff --git a/cat-home/src/main/java/com/dianping/cat/report/task/alert/sender/AlertManager.java b/cat-home/src/main/java/com/dianping/cat/report/task/alert/sender/AlertManager.java index 0a3df7263bf7b9d6c15edabfa64e6c50ded28bd2..9b799710c1fcd5676a1133718f34bb3118a327e9 100644 --- a/cat-home/src/main/java/com/dianping/cat/report/task/alert/sender/AlertManager.java +++ b/cat-home/src/main/java/com/dianping/cat/report/task/alert/sender/AlertManager.java @@ -13,11 +13,11 @@ import org.unidal.lookup.annotation.Inject; import org.unidal.tuple.Pair; import com.dianping.cat.Cat; -import com.dianping.cat.report.task.alert.manager.AlertEntityService; import com.dianping.cat.report.task.alert.sender.decorator.DecoratorManager; import com.dianping.cat.report.task.alert.sender.receiver.ContactorManager; import com.dianping.cat.report.task.alert.sender.sender.SenderManager; import com.dianping.cat.report.task.alert.sender.spliter.SpliterManager; +import com.dianping.cat.report.task.alert.service.AlertEntityService; import com.dianping.cat.system.config.AlertPolicyManager; public class AlertManager implements Initializable { @@ -31,14 +31,14 @@ public class AlertManager implements Initializable { @Inject private ContactorManager m_contactorManager; - @Inject - protected AlertEntityService m_alertEntityService; - @Inject protected SpliterManager m_splitterManager; @Inject protected SenderManager m_senderManager; + + @Inject + protected AlertEntityService m_alertEntityService; private BlockingQueue m_alerts = new LinkedBlockingDeque(10000); diff --git a/cat-home/src/main/java/com/dianping/cat/report/task/alert/sender/decorator/BusinessDecorator.java b/cat-home/src/main/java/com/dianping/cat/report/task/alert/sender/decorator/BusinessDecorator.java index 2e52bb7c9b8e23f98b04e3796678bbdb30117e59..85e552c76924414e7964cc6d89e39186fecd3fa1 100644 --- a/cat-home/src/main/java/com/dianping/cat/report/task/alert/sender/decorator/BusinessDecorator.java +++ b/cat-home/src/main/java/com/dianping/cat/report/task/alert/sender/decorator/BusinessDecorator.java @@ -1,6 +1,6 @@ package com.dianping.cat.report.task.alert.sender.decorator; -import com.dianping.cat.report.task.alert.sender.AlertConstants; +import com.dianping.cat.report.task.alert.AlertConstants; import com.dianping.cat.report.task.alert.sender.AlertEntity; public class BusinessDecorator extends DefaultDecorator { diff --git a/cat-home/src/main/java/com/dianping/cat/report/task/alert/sender/decorator/DecoratorManager.java b/cat-home/src/main/java/com/dianping/cat/report/task/alert/sender/decorator/DecoratorManager.java index e0ef394b1d75963e7df8930de1f6cf9dd8c16e38..e088f47c9bb1e82aa6bcc477d7c1b2e550f9b14b 100644 --- a/cat-home/src/main/java/com/dianping/cat/report/task/alert/sender/decorator/DecoratorManager.java +++ b/cat-home/src/main/java/com/dianping/cat/report/task/alert/sender/decorator/DecoratorManager.java @@ -30,11 +30,17 @@ public class DecoratorManager implements Initializable { private Map m_decorators = new HashMap(); public Pair generateTitleAndContent(AlertEntity alert) { - Decorator decorator = m_decorators.get(alert.getType()); - String title = decorator.generateTitle(alert); - String content = decorator.generateContent(alert); + String alertType = alert.getType(); + Decorator decorator = m_decorators.get(alertType); - return new Pair(title, content); + if (decorator != null) { + String title = decorator.generateTitle(alert); + String content = decorator.generateContent(alert); + + return new Pair(title, content); + } else { + throw new RuntimeException("error alert type:" + alert.getType()); + } } @Override diff --git a/cat-home/src/main/java/com/dianping/cat/report/task/alert/sender/decorator/ExceptionDecorator.java b/cat-home/src/main/java/com/dianping/cat/report/task/alert/sender/decorator/ExceptionDecorator.java index b44fb311860384bdfbf2025dc3e1e5daa1a9c82c..197618c3437c6bdc8886a49f3fc197294cefa209 100644 --- a/cat-home/src/main/java/com/dianping/cat/report/task/alert/sender/decorator/ExceptionDecorator.java +++ b/cat-home/src/main/java/com/dianping/cat/report/task/alert/sender/decorator/ExceptionDecorator.java @@ -1,7 +1,7 @@ package com.dianping.cat.report.task.alert.sender.decorator; import com.dianping.cat.Cat; -import com.dianping.cat.report.task.alert.sender.AlertConstants; +import com.dianping.cat.report.task.alert.AlertConstants; import com.dianping.cat.report.task.alert.sender.AlertEntity; public class ExceptionDecorator extends DefaultDecorator { @@ -30,7 +30,7 @@ public class ExceptionDecorator extends DefaultDecorator { sb.append("[CAT异常告警] [项目: ").append(domain).append("] : "); sb.append(alert.getContent()).append("[时间: ").append(date).append("]"); sb.append(" 点击此处查看详情").append("
"); + .append(date).append("'>点击此处查看详情[联系人修改请联系黄永,修改CMDB]").append("
"); sb.append(buildContactInfo(domain)); return sb.toString(); diff --git a/cat-home/src/main/java/com/dianping/cat/report/task/alert/sender/decorator/NetworkDecorator.java b/cat-home/src/main/java/com/dianping/cat/report/task/alert/sender/decorator/NetworkDecorator.java index c38864b81f5e959ce5a499d3cafbf4042d24e5ee..0821c5404215fa163590af01955a3dc2d1f2c7ce 100644 --- a/cat-home/src/main/java/com/dianping/cat/report/task/alert/sender/decorator/NetworkDecorator.java +++ b/cat-home/src/main/java/com/dianping/cat/report/task/alert/sender/decorator/NetworkDecorator.java @@ -1,6 +1,6 @@ package com.dianping.cat.report.task.alert.sender.decorator; -import com.dianping.cat.report.task.alert.sender.AlertConstants; +import com.dianping.cat.report.task.alert.AlertConstants; import com.dianping.cat.report.task.alert.sender.AlertEntity; public class NetworkDecorator extends DefaultDecorator { diff --git a/cat-home/src/main/java/com/dianping/cat/report/task/alert/sender/decorator/SystemDecorator.java b/cat-home/src/main/java/com/dianping/cat/report/task/alert/sender/decorator/SystemDecorator.java index b2b29db8a25dee935762aaf2d65c80d3e4f74107..0373ec4d01ef5ba48e99989e9f56dfba2d6e34d2 100644 --- a/cat-home/src/main/java/com/dianping/cat/report/task/alert/sender/decorator/SystemDecorator.java +++ b/cat-home/src/main/java/com/dianping/cat/report/task/alert/sender/decorator/SystemDecorator.java @@ -1,6 +1,6 @@ package com.dianping.cat.report.task.alert.sender.decorator; -import com.dianping.cat.report.task.alert.sender.AlertConstants; +import com.dianping.cat.report.task.alert.AlertConstants; import com.dianping.cat.report.task.alert.sender.AlertEntity; public class SystemDecorator extends DefaultDecorator { diff --git a/cat-home/src/main/java/com/dianping/cat/report/task/alert/sender/decorator/ThirdpartyDecorator.java b/cat-home/src/main/java/com/dianping/cat/report/task/alert/sender/decorator/ThirdpartyDecorator.java index 4c3f3cbc07f1583d100b03b25b05d028e5e6f9f2..fcb6606d4343bc8f678a56574cccd75909e14454 100644 --- a/cat-home/src/main/java/com/dianping/cat/report/task/alert/sender/decorator/ThirdpartyDecorator.java +++ b/cat-home/src/main/java/com/dianping/cat/report/task/alert/sender/decorator/ThirdpartyDecorator.java @@ -3,7 +3,7 @@ package com.dianping.cat.report.task.alert.sender.decorator; import java.util.Date; import com.dianping.cat.Cat; -import com.dianping.cat.report.task.alert.sender.AlertConstants; +import com.dianping.cat.report.task.alert.AlertConstants; import com.dianping.cat.report.task.alert.sender.AlertEntity; public class ThirdpartyDecorator extends DefaultDecorator { diff --git a/cat-home/src/main/java/com/dianping/cat/report/task/alert/sender/receiver/BusinessContactor.java b/cat-home/src/main/java/com/dianping/cat/report/task/alert/sender/receiver/BusinessContactor.java index 4eafa8838c3e5c188074fc2fd0ee05d1b250a910..5a5cbfbb6a6ca3bc185780baedde52beaf5b9bc3 100644 --- a/cat-home/src/main/java/com/dianping/cat/report/task/alert/sender/receiver/BusinessContactor.java +++ b/cat-home/src/main/java/com/dianping/cat/report/task/alert/sender/receiver/BusinessContactor.java @@ -1,6 +1,6 @@ package com.dianping.cat.report.task.alert.sender.receiver; -import com.dianping.cat.report.task.alert.sender.AlertConstants; +import com.dianping.cat.report.task.alert.AlertConstants; public class BusinessContactor extends ProductlineContactor { diff --git a/cat-home/src/main/java/com/dianping/cat/report/task/alert/sender/receiver/ContactorManager.java b/cat-home/src/main/java/com/dianping/cat/report/task/alert/sender/receiver/ContactorManager.java index 4778fdee92c3f623373c390794832753f6cb1e1e..ff0cd3bea47b4f85589ef5a7c514c2e81eb53982 100644 --- a/cat-home/src/main/java/com/dianping/cat/report/task/alert/sender/receiver/ContactorManager.java +++ b/cat-home/src/main/java/com/dianping/cat/report/task/alert/sender/receiver/ContactorManager.java @@ -9,7 +9,7 @@ import org.codehaus.plexus.personality.plexus.lifecycle.phase.Initializable; import org.codehaus.plexus.personality.plexus.lifecycle.phase.InitializationException; import org.unidal.lookup.annotation.Inject; -import com.dianping.cat.report.task.alert.sender.AlertConstants; +import com.dianping.cat.report.task.alert.AlertConstants; public class ContactorManager implements Initializable { @@ -40,9 +40,9 @@ public class ContactorManager implements Initializable { return contactor.querySmsContactors(); } else if (AlertConstants.WEIXIN.equals(channel)) { return contactor.queryWeiXinContactors(); + } else { + return new ArrayList(); } - - return new ArrayList(); } @Override diff --git a/cat-home/src/main/java/com/dianping/cat/report/task/alert/sender/receiver/ExceptionContactor.java b/cat-home/src/main/java/com/dianping/cat/report/task/alert/sender/receiver/ExceptionContactor.java index 65ad8eabfbf2fd91d87a5749d9599738d1b3e72b..fd5dc115c70d80391743b304e88baed39e52d501 100644 --- a/cat-home/src/main/java/com/dianping/cat/report/task/alert/sender/receiver/ExceptionContactor.java +++ b/cat-home/src/main/java/com/dianping/cat/report/task/alert/sender/receiver/ExceptionContactor.java @@ -1,6 +1,6 @@ package com.dianping.cat.report.task.alert.sender.receiver; -import com.dianping.cat.report.task.alert.sender.AlertConstants; +import com.dianping.cat.report.task.alert.AlertConstants; public class ExceptionContactor extends ProjectContactor { diff --git a/cat-home/src/main/java/com/dianping/cat/report/task/alert/sender/receiver/NetworkContactor.java b/cat-home/src/main/java/com/dianping/cat/report/task/alert/sender/receiver/NetworkContactor.java index 305a22ab5d1951dbc6a54a8b922e596728ce4795..ab3d58c3c399acc8fe4cdd507d7ac45da5c1c572 100644 --- a/cat-home/src/main/java/com/dianping/cat/report/task/alert/sender/receiver/NetworkContactor.java +++ b/cat-home/src/main/java/com/dianping/cat/report/task/alert/sender/receiver/NetworkContactor.java @@ -1,6 +1,6 @@ package com.dianping.cat.report.task.alert.sender.receiver; -import com.dianping.cat.report.task.alert.sender.AlertConstants; +import com.dianping.cat.report.task.alert.AlertConstants; public class NetworkContactor extends ProductlineContactor { diff --git a/cat-home/src/main/java/com/dianping/cat/report/task/alert/sender/receiver/SystemContactor.java b/cat-home/src/main/java/com/dianping/cat/report/task/alert/sender/receiver/SystemContactor.java index 3f957980d1e9915833b1d10f273de547e3c81d87..19b3db50097f9f9c19656bc0e4af2d70bc0a073c 100644 --- a/cat-home/src/main/java/com/dianping/cat/report/task/alert/sender/receiver/SystemContactor.java +++ b/cat-home/src/main/java/com/dianping/cat/report/task/alert/sender/receiver/SystemContactor.java @@ -1,6 +1,6 @@ package com.dianping.cat.report.task.alert.sender.receiver; -import com.dianping.cat.report.task.alert.sender.AlertConstants; +import com.dianping.cat.report.task.alert.AlertConstants; public class SystemContactor extends ProductlineContactor { diff --git a/cat-home/src/main/java/com/dianping/cat/report/task/alert/sender/receiver/ThirdpartyContactor.java b/cat-home/src/main/java/com/dianping/cat/report/task/alert/sender/receiver/ThirdpartyContactor.java index 56f8b9118b937c7b50afb0c640bb01e66096a26c..3406b02e8ec9a5615d103a8cc9c699390a755f02 100644 --- a/cat-home/src/main/java/com/dianping/cat/report/task/alert/sender/receiver/ThirdpartyContactor.java +++ b/cat-home/src/main/java/com/dianping/cat/report/task/alert/sender/receiver/ThirdpartyContactor.java @@ -1,6 +1,6 @@ package com.dianping.cat.report.task.alert.sender.receiver; -import com.dianping.cat.report.task.alert.sender.AlertConstants; +import com.dianping.cat.report.task.alert.AlertConstants; public class ThirdpartyContactor extends ProjectContactor { diff --git a/cat-home/src/main/java/com/dianping/cat/report/task/alert/sender/sender/MailSender.java b/cat-home/src/main/java/com/dianping/cat/report/task/alert/sender/sender/MailSender.java index 5db3a878ee314f210ed49c65e459491ce205ef5f..13295915f3b1a7e1519ba08df51914305e24272f 100644 --- a/cat-home/src/main/java/com/dianping/cat/report/task/alert/sender/sender/MailSender.java +++ b/cat-home/src/main/java/com/dianping/cat/report/task/alert/sender/sender/MailSender.java @@ -21,7 +21,7 @@ import org.unidal.lookup.annotation.Inject; import com.dianping.cat.Cat; import com.dianping.cat.ServerConfigManager; import com.dianping.cat.message.Event; -import com.dianping.cat.report.task.alert.sender.AlertConstants; +import com.dianping.cat.report.task.alert.AlertConstants; import com.dianping.cat.report.task.alert.sender.AlertMessageEntity; public class MailSender implements Initializable, Sender, LogEnabled { diff --git a/cat-home/src/main/java/com/dianping/cat/report/task/alert/sender/sender/SmsSender.java b/cat-home/src/main/java/com/dianping/cat/report/task/alert/sender/sender/SmsSender.java index db98718b2bccf20002ccb1ef7a44352dd6e0ec56..95293c7e4f2dbfd4f815128a42c1b715c6fedf7d 100644 --- a/cat-home/src/main/java/com/dianping/cat/report/task/alert/sender/sender/SmsSender.java +++ b/cat-home/src/main/java/com/dianping/cat/report/task/alert/sender/sender/SmsSender.java @@ -13,7 +13,7 @@ import org.unidal.helper.Files; import com.dianping.cat.Cat; import com.dianping.cat.message.Event; -import com.dianping.cat.report.task.alert.sender.AlertConstants; +import com.dianping.cat.report.task.alert.AlertConstants; import com.dianping.cat.report.task.alert.sender.AlertMessageEntity; public class SmsSender implements Sender, LogEnabled { diff --git a/cat-home/src/main/java/com/dianping/cat/report/task/alert/sender/sender/WeixinSender.java b/cat-home/src/main/java/com/dianping/cat/report/task/alert/sender/sender/WeixinSender.java index 9ff8dd7bb6fb5c635230e123bc441dde9dbcb227..185942b96e192635fab8b18ab3efd94f470503c8 100644 --- a/cat-home/src/main/java/com/dianping/cat/report/task/alert/sender/sender/WeixinSender.java +++ b/cat-home/src/main/java/com/dianping/cat/report/task/alert/sender/sender/WeixinSender.java @@ -13,7 +13,7 @@ import org.codehaus.plexus.logging.Logger; import com.dianping.cat.Cat; import com.dianping.cat.message.Event; -import com.dianping.cat.report.task.alert.sender.AlertConstants; +import com.dianping.cat.report.task.alert.AlertConstants; import com.dianping.cat.report.task.alert.sender.AlertMessageEntity; public class WeixinSender implements Sender, LogEnabled { diff --git a/cat-home/src/main/java/com/dianping/cat/report/task/alert/sender/spliter/MailSpliter.java b/cat-home/src/main/java/com/dianping/cat/report/task/alert/sender/spliter/MailSpliter.java index 0ee1506c1e6afd4e967d4514b9b5d929af5ab26e..cbc7d50eafb680a09f388185296914d94c008bfc 100644 --- a/cat-home/src/main/java/com/dianping/cat/report/task/alert/sender/spliter/MailSpliter.java +++ b/cat-home/src/main/java/com/dianping/cat/report/task/alert/sender/spliter/MailSpliter.java @@ -1,6 +1,6 @@ package com.dianping.cat.report.task.alert.sender.spliter; -import com.dianping.cat.report.task.alert.sender.AlertConstants; +import com.dianping.cat.report.task.alert.AlertConstants; public class MailSpliter implements Spliter { diff --git a/cat-home/src/main/java/com/dianping/cat/report/task/alert/sender/spliter/SmsSpliter.java b/cat-home/src/main/java/com/dianping/cat/report/task/alert/sender/spliter/SmsSpliter.java index 6f119f4828594ad7a480a2d094055688df112d04..55982f21dae20149bade03bf4261fe70114a40dc 100644 --- a/cat-home/src/main/java/com/dianping/cat/report/task/alert/sender/spliter/SmsSpliter.java +++ b/cat-home/src/main/java/com/dianping/cat/report/task/alert/sender/spliter/SmsSpliter.java @@ -1,6 +1,6 @@ package com.dianping.cat.report.task.alert.sender.spliter; -import com.dianping.cat.report.task.alert.sender.AlertConstants; +import com.dianping.cat.report.task.alert.AlertConstants; public class SmsSpliter implements Spliter { diff --git a/cat-home/src/main/java/com/dianping/cat/report/task/alert/sender/spliter/WeixinSpliter.java b/cat-home/src/main/java/com/dianping/cat/report/task/alert/sender/spliter/WeixinSpliter.java index e5e9f4be7553094264b5e0203a4b611fdf3855bb..e86679a00f20cfff1e9c931f467a7cacf144635b 100644 --- a/cat-home/src/main/java/com/dianping/cat/report/task/alert/sender/spliter/WeixinSpliter.java +++ b/cat-home/src/main/java/com/dianping/cat/report/task/alert/sender/spliter/WeixinSpliter.java @@ -1,6 +1,6 @@ package com.dianping.cat.report.task.alert.sender.spliter; -import com.dianping.cat.report.task.alert.sender.AlertConstants; +import com.dianping.cat.report.task.alert.AlertConstants; public class WeixinSpliter implements Spliter { diff --git a/cat-home/src/main/java/com/dianping/cat/report/task/alert/manager/AlertEntityService.java b/cat-home/src/main/java/com/dianping/cat/report/task/alert/service/AlertEntityService.java similarity index 95% rename from cat-home/src/main/java/com/dianping/cat/report/task/alert/manager/AlertEntityService.java rename to cat-home/src/main/java/com/dianping/cat/report/task/alert/service/AlertEntityService.java index 63d7c46625b42fb0e242cca90b003c3b477b72f4..09067c73623472aa70472a8cff386cf2d8b4e57b 100644 --- a/cat-home/src/main/java/com/dianping/cat/report/task/alert/manager/AlertEntityService.java +++ b/cat-home/src/main/java/com/dianping/cat/report/task/alert/service/AlertEntityService.java @@ -1,4 +1,4 @@ -package com.dianping.cat.report.task.alert.manager; +package com.dianping.cat.report.task.alert.service; import org.unidal.dal.jdbc.DalException; import org.unidal.lookup.annotation.Inject; diff --git a/cat-home/src/main/java/com/dianping/cat/report/task/alert/system/SystemAlert.java b/cat-home/src/main/java/com/dianping/cat/report/task/alert/system/SystemAlert.java index 39bd0eae411b49b2643aabcaf3fc83ca9a507847..091451dfd67894f2660772e7778c8508b67cb225 100644 --- a/cat-home/src/main/java/com/dianping/cat/report/task/alert/system/SystemAlert.java +++ b/cat-home/src/main/java/com/dianping/cat/report/task/alert/system/SystemAlert.java @@ -10,8 +10,8 @@ import org.unidal.helper.Threads.Task; import com.dianping.cat.Cat; import com.dianping.cat.consumer.company.model.entity.ProductLine; import com.dianping.cat.message.Transaction; +import com.dianping.cat.report.task.alert.AlertConstants; import com.dianping.cat.report.task.alert.BaseAlert; -import com.dianping.cat.report.task.alert.sender.AlertConstants; public class SystemAlert extends BaseAlert implements Task, LogEnabled { diff --git a/cat-home/src/main/java/com/dianping/cat/report/task/alert/thirdParty/ThirdPartyAlert.java b/cat-home/src/main/java/com/dianping/cat/report/task/alert/thirdParty/ThirdPartyAlert.java index cc19ef0fa9348b8a453eb5f1d54ecd808431e58a..2cb111b3afc4e58e0f1c8341f311e61d27dab815 100644 --- a/cat-home/src/main/java/com/dianping/cat/report/task/alert/thirdParty/ThirdPartyAlert.java +++ b/cat-home/src/main/java/com/dianping/cat/report/task/alert/thirdParty/ThirdPartyAlert.java @@ -17,9 +17,8 @@ import org.unidal.lookup.annotation.Inject; import com.dianping.cat.Cat; import com.dianping.cat.helper.TimeUtil; import com.dianping.cat.message.Transaction; -import com.dianping.cat.report.task.alert.sender.AlertConstants; +import com.dianping.cat.report.task.alert.AlertConstants; import com.dianping.cat.report.task.alert.sender.AlertEntity; -import com.dianping.cat.report.task.alert.sender.AlertEntity.AlertEntityBuilder; import com.dianping.cat.report.task.alert.sender.AlertManager; public class ThirdPartyAlert implements Task { @@ -78,13 +77,12 @@ public class ThirdPartyAlert implements Task { for (Entry> entry : domain2AlertMap.entrySet()) { String domain = entry.getKey(); List thirdPartyAlerts = entry.getValue(); + AlertEntity entity = new AlertEntity(); + + entity.setDate(new Date()).setContent(thirdPartyAlerts.toString()).setLevel("warning"); + entity.setMetric(getName()).setType(getName()).setGroup(domain); - AlertEntityBuilder builder = new AlertEntity().new AlertEntityBuilder(); - builder.buildDate(new Date()).buildLevel("warning").buildContent(thirdPartyAlerts.toString()); - builder.buildMetric(getName()).buildType(getName()).buildGroup(domain); - AlertEntity alertEntity = builder.getAlertEntity(); - - m_sendManager.addAlert(alertEntity); + m_sendManager.addAlert(entity); } t.setStatus(Transaction.SUCCESS); } catch (Exception e) { diff --git a/cat-home/src/main/resources/META-INF/plexus/components.xml b/cat-home/src/main/resources/META-INF/plexus/components.xml index 41fa0315365ef43d4902260aa73ce560ecbbebe0..c48c6325b5eb2bb03b5ea48548a8b865553a88b5 100755 --- a/cat-home/src/main/resources/META-INF/plexus/components.xml +++ b/cat-home/src/main/resources/META-INF/plexus/components.xml @@ -471,8 +471,8 @@ - com.dianping.cat.report.task.alert.manager.AlertEntityService - com.dianping.cat.report.task.alert.manager.AlertEntityService + com.dianping.cat.report.task.alert.service.AlertEntityService + com.dianping.cat.report.task.alert.service.AlertEntityService com.dianping.cat.home.dal.report.AlertDao @@ -840,7 +840,7 @@ com.dianping.cat.report.task.alert.sender.receiver.ContactorManager - com.dianping.cat.report.task.alert.manager.AlertEntityService + com.dianping.cat.report.task.alert.service.AlertEntityService com.dianping.cat.report.task.alert.sender.spliter.SpliterManager