diff --git a/cat-consumer-advanced/src/main/java/com/dianping/cat/consumer/metric/ProductLineConfigManager.java b/cat-consumer-advanced/src/main/java/com/dianping/cat/consumer/metric/ProductLineConfigManager.java index 78430a0a5fa9249c4529219783fc339b1810d09b..7839ee5fd7446b0b5cea9dc3e4f16a941a8c0ea2 100644 --- a/cat-consumer-advanced/src/main/java/com/dianping/cat/consumer/metric/ProductLineConfigManager.java +++ b/cat-consumer-advanced/src/main/java/com/dianping/cat/consumer/metric/ProductLineConfigManager.java @@ -133,9 +133,9 @@ public class ProductLineConfigManager implements Initializable, LogEnabled { if ("broker-service".equals(domain)) { userMonitor = true; - } else if (line.startsWith(NETWORK_MONITOR_PREFIX)) { + } else if (line.toLowerCase().startsWith(NETWORK_MONITOR_PREFIX)) { networkMonitor = true; - } else if (line.startsWith(SYSTEM_MONITOR_PREFIX)) { + } else if (line.toLowerCase().startsWith(SYSTEM_MONITOR_PREFIX)) { systemMonitor = true; } productLine.setNetworkDashboard(networkMonitor); diff --git a/cat-home/src/main/java/com/dianping/cat/report/task/exceptionAlert/ExceptionAlert.java b/cat-home/src/main/java/com/dianping/cat/report/task/exceptionAlert/ExceptionAlert.java index 1745e50e526bc3c0c4330423058a4ff0ed4518fd..de4b4bc0674ae57c371d2e94f6b359a48a610270 100644 --- a/cat-home/src/main/java/com/dianping/cat/report/task/exceptionAlert/ExceptionAlert.java +++ b/cat-home/src/main/java/com/dianping/cat/report/task/exceptionAlert/ExceptionAlert.java @@ -66,7 +66,7 @@ public class ExceptionAlert implements Task, LogEnabled { private TopMetric buildTopMetric(Date date) { TopReport topReport = queryTopReport(date); TopMetric topMetric = new TopMetric(ALERT_PERIOD, Integer.MAX_VALUE, m_configManager); - + topMetric.setStart(date).setEnd(new Date(date.getTime() + TimeUtil.ONE_MINUTE)); topMetric.visitTopReport(topReport); return topMetric; @@ -209,7 +209,7 @@ public class ExceptionAlert implements Task, LogEnabled { List emails = m_alertConfig.buildMailReceivers(project); StringBuilder title = new StringBuilder(); - title.append("[异常告警] [项目组: ").append(domain).append("] [时间: ").append(new Date()).append("]"); + title.append("[异常告警] [项目组: ").append(domain).append("]"); List errorExceptions = new ArrayList(); List warnExceptions = new ArrayList(); @@ -220,10 +220,13 @@ public class ExceptionAlert implements Task, LogEnabled { errorExceptions.add(exception.getName()); } } - String mailContent = "[异常警告] [" + domain + "] : " + exceptions.toString(); + StringBuilder mailContent = new StringBuilder(); + + mailContent.append("[异常警告] [").append(domain).append(exceptions.toString()); + mailContent.append("[时间: ").append(new Date()).append("]"); m_logger.info(title + " " + mailContent + " " + emails); - m_mailSms.sendEmail(title.toString(), mailContent, emails); + m_mailSms.sendEmail(title.toString(), mailContent.toString(), emails); Cat.logEvent("ExceptionAlert", project.getDomain(), Event.SUCCESS, title + " " + mailContent); } diff --git a/cat-home/src/main/java/com/dianping/cat/system/page/config/Handler.java b/cat-home/src/main/java/com/dianping/cat/system/page/config/Handler.java index 4af442107ffd0dfa2bdbf46a159885e1adf233f3..7d8122e8c4cf51701469e286d4dd5573858cea4f 100644 --- a/cat-home/src/main/java/com/dianping/cat/system/page/config/Handler.java +++ b/cat-home/src/main/java/com/dianping/cat/system/page/config/Handler.java @@ -468,7 +468,8 @@ public class Handler implements PageHandler { private List queryDoaminList() { List result = new ArrayList(); List projects = queryAllProjects(); - + + result.add("Default"); for (Project p : projects) { result.add(p.getDomain()); } @@ -481,6 +482,8 @@ public class Handler implements PageHandler { Date end = new Date(start.getTime() + TimeUtil.ONE_HOUR); BugReport report = m_reportService.queryBugReport(Constants.CAT, start, end); Set exceptions = new HashSet(); + + exceptions.add("Total"); for (Entry domain : report.getDomains().entrySet()) { exceptions.addAll(domain.getValue().getExceptionItems().keySet());