diff --git a/cat-home/src/main/java/com/dianping/cat/report/page/cache/Model.java b/cat-home/src/main/java/com/dianping/cat/report/page/cache/Model.java index 637d34d06b8669cc16afa92924d352a733d5f81a..a87f437e87cb0b4c8371a0363fb890364d640a56 100644 --- a/cat-home/src/main/java/com/dianping/cat/report/page/cache/Model.java +++ b/cat-home/src/main/java/com/dianping/cat/report/page/cache/Model.java @@ -4,12 +4,17 @@ import java.util.ArrayList; import java.util.Collection; import java.util.Set; +import org.unidal.web.mvc.view.annotation.EntityMeta; +import org.unidal.web.mvc.view.annotation.ModelMeta; + import com.dianping.cat.report.page.AbstractReportModel; import com.dianping.cat.report.view.StringSortHelper; +@ModelMeta("cache") public class Model extends AbstractReportModel { private String m_queryName; + @EntityMeta private CacheReport m_report; public Model(Context ctx) { diff --git a/cat-home/src/main/java/com/dianping/cat/report/page/cross/Model.java b/cat-home/src/main/java/com/dianping/cat/report/page/cross/Model.java index 4cf0884d3025dc7e9458d340bd3a42d3dd5ebffd..25e215c4e22656576545dc0904e0b2e0629ce6b0 100644 --- a/cat-home/src/main/java/com/dianping/cat/report/page/cross/Model.java +++ b/cat-home/src/main/java/com/dianping/cat/report/page/cross/Model.java @@ -4,6 +4,10 @@ import java.util.ArrayList; import java.util.Collection; import java.util.Set; +import org.unidal.web.mvc.view.annotation.EntityMeta; +import org.unidal.web.mvc.view.annotation.ModelMeta; + +import com.dianping.cat.consumer.cross.CrossAnalyzer; import com.dianping.cat.consumer.cross.model.entity.CrossReport; import com.dianping.cat.report.page.AbstractReportModel; import com.dianping.cat.report.page.cross.display.HostInfo; @@ -12,22 +16,28 @@ import com.dianping.cat.report.page.cross.display.MethodQueryInfo; import com.dianping.cat.report.page.cross.display.ProjectInfo; import com.dianping.cat.report.view.StringSortHelper; +@ModelMeta(CrossAnalyzer.ID) public class Model extends AbstractReportModel { private String m_callSort; private String m_queryName; + @EntityMeta private HostInfo m_hostInfo; + @EntityMeta private MethodInfo m_methodInfo; + @EntityMeta private ProjectInfo m_projectInfo; + @EntityMeta private CrossReport m_report; private String m_serviceSort; - + + @EntityMeta private MethodQueryInfo m_info; public Model(Context ctx) { diff --git a/cat-home/src/main/java/com/dianping/cat/report/page/dependency/Model.java b/cat-home/src/main/java/com/dianping/cat/report/page/dependency/Model.java index 2741fac2310feae173dd69e179452ad6f76553aa..62444ac7298623fcb0b0e8c6082a9dccd7a5dd39 100644 --- a/cat-home/src/main/java/com/dianping/cat/report/page/dependency/Model.java +++ b/cat-home/src/main/java/com/dianping/cat/report/page/dependency/Model.java @@ -11,6 +11,7 @@ import org.unidal.web.mvc.view.annotation.EntityMeta; import org.unidal.web.mvc.view.annotation.ModelMeta; import com.dianping.cat.consumer.company.model.entity.ProductLine; +import com.dianping.cat.consumer.dependency.DependencyAnalyzer; import com.dianping.cat.consumer.dependency.model.entity.DependencyReport; import com.dianping.cat.consumer.dependency.model.entity.Segment; import com.dianping.cat.consumer.top.model.entity.TopReport; @@ -20,8 +21,9 @@ import com.dianping.cat.report.page.dependency.dashboard.ProductLinesDashboard; import com.dianping.cat.report.page.top.TopMetric; import com.dianping.cat.report.view.StringSortHelper; -@ModelMeta("dependecy") +@ModelMeta(DependencyAnalyzer.ID) public class Model extends AbstractReportModel { + @EntityMeta private DependencyReport m_report; @@ -57,7 +59,6 @@ public class Model extends AbstractReportModel { private TopReport m_topReport; - public List getProductLines() { return m_productLines; } diff --git a/cat-home/src/main/java/com/dianping/cat/report/page/event/Model.java b/cat-home/src/main/java/com/dianping/cat/report/page/event/Model.java index e8f327f41a292b6841750e8a3b3e610892a869a5..2cf6dfe647541f87c07957774166aee8463f423c 100755 --- a/cat-home/src/main/java/com/dianping/cat/report/page/event/Model.java +++ b/cat-home/src/main/java/com/dianping/cat/report/page/event/Model.java @@ -4,13 +4,20 @@ import java.util.ArrayList; import java.util.List; import java.util.Set; +import org.unidal.web.mvc.view.annotation.EntityMeta; +import org.unidal.web.mvc.view.annotation.ModelMeta; + +import com.dianping.cat.consumer.event.EventAnalyzer; import com.dianping.cat.consumer.event.model.entity.EventReport; import com.dianping.cat.report.page.AbstractReportModel; import com.dianping.cat.report.view.StringSortHelper; +@ModelMeta(EventAnalyzer.ID) public class Model extends AbstractReportModel { + @EntityMeta private DisplayNames m_displayNameReport; + @EntityMeta private DisplayTypes m_displayTypeReport; private String m_failureTrend; @@ -27,6 +34,7 @@ public class Model extends AbstractReportModel { private String m_mobileResponse; + @EntityMeta private EventReport m_report; private String m_type; diff --git a/cat-home/src/main/java/com/dianping/cat/report/page/heartbeat/Model.java b/cat-home/src/main/java/com/dianping/cat/report/page/heartbeat/Model.java index 23f7a986180b2fbe2a8e34979ee87abc114159dc..9dd7de4ea63ce031369e426790a6e4fbbd40e2f5 100644 --- a/cat-home/src/main/java/com/dianping/cat/report/page/heartbeat/Model.java +++ b/cat-home/src/main/java/com/dianping/cat/report/page/heartbeat/Model.java @@ -4,10 +4,15 @@ import java.util.ArrayList; import java.util.List; import java.util.Set; +import org.unidal.web.mvc.view.annotation.EntityMeta; +import org.unidal.web.mvc.view.annotation.ModelMeta; + +import com.dianping.cat.consumer.heartbeat.HeartbeatAnalyzer; import com.dianping.cat.consumer.heartbeat.model.entity.HeartbeatReport; import com.dianping.cat.report.page.AbstractReportModel; import com.dianping.cat.report.view.StringSortHelper; +@ModelMeta(HeartbeatAnalyzer.ID) public class Model extends AbstractReportModel { private String m_activeThreadGraph; @@ -47,6 +52,7 @@ public class Model extends AbstractReportModel { private String m_pigeonThreadGraph; + @EntityMeta private HeartbeatReport m_report; private DisplayHeartbeat m_result; diff --git a/cat-home/src/main/java/com/dianping/cat/report/page/matrix/Model.java b/cat-home/src/main/java/com/dianping/cat/report/page/matrix/Model.java index eba5dfa244b7eaa38974d4d9de7759533b730827..db09c592a6b9d2e494db21c81c31ffbce8d70950 100644 --- a/cat-home/src/main/java/com/dianping/cat/report/page/matrix/Model.java +++ b/cat-home/src/main/java/com/dianping/cat/report/page/matrix/Model.java @@ -4,13 +4,20 @@ import java.util.ArrayList; import java.util.Collection; import java.util.Set; +import org.unidal.web.mvc.view.annotation.EntityMeta; +import org.unidal.web.mvc.view.annotation.ModelMeta; + +import com.dianping.cat.consumer.matrix.MatrixAnalyzer; import com.dianping.cat.consumer.matrix.model.entity.MatrixReport; import com.dianping.cat.report.page.AbstractReportModel; import com.dianping.cat.report.view.StringSortHelper; +@ModelMeta(MatrixAnalyzer.ID) public class Model extends AbstractReportModel { + @EntityMeta private DisplayMatrix m_matrix; + @EntityMeta private MatrixReport m_report; public Model(Context ctx) { diff --git a/cat-home/src/main/java/com/dianping/cat/report/page/metric/Handler.java b/cat-home/src/main/java/com/dianping/cat/report/page/metric/Handler.java index ca5ae6aa9477942d2ccd6e8ad813c453925e1b69..04b9422edbb320b48dbb1dbd00b2002de7bba5b4 100644 --- a/cat-home/src/main/java/com/dianping/cat/report/page/metric/Handler.java +++ b/cat-home/src/main/java/com/dianping/cat/report/page/metric/Handler.java @@ -136,7 +136,7 @@ public class Handler implements PageHandler { List allCharts = new ArrayList(); for (ProductLine productLine : productLines) { - metricDisplay = buildMetricsByProduct(date, productLine.getId(), payload.getTest(), false); + metricDisplay = buildMetricsByProduct(date, productLine.getId(), payload.getTest(), true); List charts = metricDisplay.getLineCharts(); diff --git a/cat-home/src/main/java/com/dianping/cat/report/page/metric/Model.java b/cat-home/src/main/java/com/dianping/cat/report/page/metric/Model.java index a13c862b6065b59c4c209613db1105d4178199d0..f928001dcade0c8075ee2d28312a20d320f18c6d 100644 --- a/cat-home/src/main/java/com/dianping/cat/report/page/metric/Model.java +++ b/cat-home/src/main/java/com/dianping/cat/report/page/metric/Model.java @@ -6,13 +6,19 @@ import java.util.HashSet; import java.util.List; import java.util.Map; +import org.unidal.web.mvc.view.annotation.EntityMeta; +import org.unidal.web.mvc.view.annotation.ModelMeta; + +import com.dianping.cat.consumer.advanced.MetricAnalyzer; import com.dianping.cat.consumer.company.model.entity.ProductLine; import com.dianping.cat.home.dal.abtest.Abtest; import com.dianping.cat.report.page.AbstractReportModel; import com.dianping.cat.report.page.LineChart; +@ModelMeta(MetricAnalyzer.ID) public class Model extends AbstractReportModel { + @EntityMeta private List m_lineCharts; private Collection m_productLines; diff --git a/cat-home/src/main/java/com/dianping/cat/report/page/problem/Model.java b/cat-home/src/main/java/com/dianping/cat/report/page/problem/Model.java index 85a3c24eff9d870797f817f45dea838392932548..f5a8c9bc31e0f424eebc6cbb88ce0d25a18bef9a 100755 --- a/cat-home/src/main/java/com/dianping/cat/report/page/problem/Model.java +++ b/cat-home/src/main/java/com/dianping/cat/report/page/problem/Model.java @@ -4,11 +4,18 @@ import java.util.ArrayList; import java.util.List; import java.util.Set; +import org.unidal.web.mvc.view.annotation.EntityMeta; +import org.unidal.web.mvc.view.annotation.ModelMeta; + +import com.dianping.cat.consumer.problem.ProblemAnalyzer; import com.dianping.cat.consumer.problem.model.entity.ProblemReport; import com.dianping.cat.report.page.AbstractReportModel; import com.dianping.cat.report.view.StringSortHelper; +@ModelMeta(ProblemAnalyzer.ID) public class Model extends AbstractReportModel { + + @EntityMeta private ProblemStatistics m_allStatistics; private int m_currentMinute; // for navigation @@ -17,10 +24,12 @@ public class Model extends AbstractReportModel { private String m_defaultThreshold; + @EntityMeta private DetailStatistics m_detailStatistics; private String m_errorsTrend; + @EntityMeta private GroupLevelInfo m_groupLevelInfo; private String m_groupName; @@ -29,14 +38,12 @@ public class Model extends AbstractReportModel { private int m_lastMinute; // last minute of current hour - private String m_mobileResponse; - - private ProblemStatistics m_problemStatistics; - + @EntityMeta private ProblemReport m_report; private String m_threadId; + @EntityMeta private ThreadLevelInfo m_threadLevelInfo; public Model(Context ctx) { @@ -133,14 +140,6 @@ public class Model extends AbstractReportModel { return m_currentMinute + 1; } - public String getMobileResponse() { - return m_mobileResponse; - } - - public ProblemStatistics getProblemStatistics() { - return m_problemStatistics; - } - public ProblemReport getReport() { return m_report; } @@ -193,14 +192,6 @@ public class Model extends AbstractReportModel { m_lastMinute = lastMinute; } - public void setMobileResponse(String mobileResponse) { - m_mobileResponse = mobileResponse; - } - - public void setProblemStatistics(ProblemStatistics problemStatistics) { - m_problemStatistics = problemStatistics; - } - public void setReport(ProblemReport report) { m_report = report; } diff --git a/cat-home/src/main/java/com/dianping/cat/report/page/sql/Model.java b/cat-home/src/main/java/com/dianping/cat/report/page/sql/Model.java index aee94acfd1be6b91da12c754a7740fda66558350..4ebf2324e9b54e1d6612e4865e6ab8d31c8a5226 100755 --- a/cat-home/src/main/java/com/dianping/cat/report/page/sql/Model.java +++ b/cat-home/src/main/java/com/dianping/cat/report/page/sql/Model.java @@ -3,14 +3,21 @@ package com.dianping.cat.report.page.sql; import java.util.ArrayList; import java.util.List; +import org.unidal.web.mvc.view.annotation.EntityMeta; +import org.unidal.web.mvc.view.annotation.ModelMeta; + +import com.dianping.cat.consumer.sql.SqlAnalyzer; import com.dianping.cat.consumer.sql.model.entity.SqlReport; import com.dianping.cat.report.page.AbstractReportModel; import com.dianping.cat.report.view.StringSortHelper; +@ModelMeta(SqlAnalyzer.ID) public class Model extends AbstractReportModel { + @EntityMeta private SqlReport m_report; + @EntityMeta private DisplaySqlReport m_displaySqlReport; private String m_database; diff --git a/cat-home/src/main/java/com/dianping/cat/report/page/state/Model.java b/cat-home/src/main/java/com/dianping/cat/report/page/state/Model.java index 0cd8405b368f58bafc027ba9c5a4aff7335dc52d..fbc7ba702a5a455f6bbc33b5b97083b5dbaa6a7f 100644 --- a/cat-home/src/main/java/com/dianping/cat/report/page/state/Model.java +++ b/cat-home/src/main/java/com/dianping/cat/report/page/state/Model.java @@ -4,13 +4,21 @@ import java.util.ArrayList; import java.util.Collection; import java.util.List; +import org.unidal.web.mvc.view.annotation.EntityMeta; +import org.unidal.web.mvc.view.annotation.ModelMeta; + +import com.dianping.cat.consumer.state.StateAnalyzer; import com.dianping.cat.consumer.state.model.entity.StateReport; import com.dianping.cat.report.page.AbstractReportModel; import com.dianping.cat.report.view.StringSortHelper; +@ModelMeta(StateAnalyzer.ID) public class Model extends AbstractReportModel { + + @EntityMeta public StateReport m_report; + @EntityMeta public StateShow m_state; public String m_graph; diff --git a/cat-home/src/main/java/com/dianping/cat/report/page/top/Model.java b/cat-home/src/main/java/com/dianping/cat/report/page/top/Model.java index a2dbaad96cde14c0fa5005d3d5df29351ac6d722..06dcc296c2f4a189a7d1c0ba8a58cff01d89ca42 100644 --- a/cat-home/src/main/java/com/dianping/cat/report/page/top/Model.java +++ b/cat-home/src/main/java/com/dianping/cat/report/page/top/Model.java @@ -3,13 +3,20 @@ package com.dianping.cat.report.page.top; import java.util.ArrayList; import java.util.Collection; +import org.unidal.web.mvc.view.annotation.EntityMeta; +import org.unidal.web.mvc.view.annotation.ModelMeta; + +import com.dianping.cat.consumer.top.TopAnalyzer; import com.dianping.cat.consumer.top.model.entity.TopReport; import com.dianping.cat.report.page.AbstractReportModel; +@ModelMeta(TopAnalyzer.ID) public class Model extends AbstractReportModel { + @EntityMeta private TopReport m_topReport; - + + @EntityMeta private TopMetric m_topMetric; private boolean m_refresh = false; diff --git a/cat-home/src/main/java/com/dianping/cat/report/page/transaction/Model.java b/cat-home/src/main/java/com/dianping/cat/report/page/transaction/Model.java index 8430794e28a17523c706df2aa873614bbb1bbf49..a90b6222bc1d813df472518143ed9dd88e6123d6 100755 --- a/cat-home/src/main/java/com/dianping/cat/report/page/transaction/Model.java +++ b/cat-home/src/main/java/com/dianping/cat/report/page/transaction/Model.java @@ -14,8 +14,10 @@ import com.dianping.cat.report.view.StringSortHelper; @ModelMeta(TransactionAnalyzer.ID) public class Model extends AbstractReportModel { + @EntityMeta private DisplayNames m_displayNameReport; + @EntityMeta private DisplayTypes m_displayTypeReport; private String m_errorTrend; diff --git a/cat-home/src/main/java/com/dianping/cat/system/page/alarm/RecordManager.java b/cat-home/src/main/java/com/dianping/cat/system/page/alarm/RecordManager.java index 19b9af17b7f3262390d10d51ccefa915c027f56f..81058601cdbd4fbc383b1e92f43e882441f16963 100644 --- a/cat-home/src/main/java/com/dianping/cat/system/page/alarm/RecordManager.java +++ b/cat-home/src/main/java/com/dianping/cat/system/page/alarm/RecordManager.java @@ -26,7 +26,7 @@ public class RecordManager { int id = payload.getAlarmRecordId(); try { - MailRecord record = m_mailRecordDao.findByPK(id, MailRecordEntity.READSET_ALL_EXCLUDE_CONTENT); + MailRecord record = m_mailRecordDao.findByPK(id, MailRecordEntity.READSET_FULL); model.setMailRecord(record); } catch (DalException e) { Cat.logError(e); @@ -44,7 +44,7 @@ public class RecordManager { ScheduledReportSubscription scheduledReportSubscription = scheduledReportSubscriptions.get(i); ruleIds[i] = scheduledReportSubscription.getScheduledReportId(); } - List mails = m_mailRecordDao.findReportRecordByRuleId(ruleIds, MailRecordEntity.READSET_FULL); + List mails = m_mailRecordDao.findReportRecordByRuleId(ruleIds, MailRecordEntity.READSET_ALL_EXCLUDE_CONTENT); model.setMailRecords(mails); } catch (DalNotFoundException e) { } catch (DalException e) { diff --git a/cat-home/src/main/java/com/dianping/cat/system/tool/DefaultGMailImpl.java b/cat-home/src/main/java/com/dianping/cat/system/tool/DefaultGMailImpl.java index eeb5acc8f5c16dc1d7b367bbb2d76ed45370e146..bc2a9bd53b9944a151a65e2c8d3bd11542e0756e 100644 --- a/cat-home/src/main/java/com/dianping/cat/system/tool/DefaultGMailImpl.java +++ b/cat-home/src/main/java/com/dianping/cat/system/tool/DefaultGMailImpl.java @@ -60,7 +60,7 @@ public class DefaultGMailImpl implements MailSMS, Initializable { HtmlEmail email = createHtmlEmail(); email.setSubject(title); - email.setFrom("CAT"); + email.setFrom("CAT@dianping.com"); if (content != null) { email.setHtmlMsg(content); diff --git a/cat-home/src/main/webapp/jsp/report/bug/detail.jsp b/cat-home/src/main/webapp/jsp/report/bug/detail.jsp index 46d0cfec2ea04b2debc41d48f168f47cd7149edd..d94754a2af53b904ad57fbad579db2e188308e1b 100644 --- a/cat-home/src/main/webapp/jsp/report/bug/detail.jsp +++ b/cat-home/src/main/webapp/jsp/report/bug/detail.jsp @@ -1,6 +1,6 @@ <%@ page session="false" language="java" pageEncoding="UTF-8" %>

项目Bug异常数据 异常规范配置

- +
@@ -28,7 +28,7 @@
部门 产品线

项目其他异常数据(比如框架类异常，超时等)

- +
diff --git a/cat-home/src/main/webapp/jsp/report/dependency/dependencyEvent.jsp b/cat-home/src/main/webapp/jsp/report/dependency/dependencyEvent.jsp index 212a544e94f9f36a09958eac2ce4880e8d08eed6..24a3d61a25b3ff576f80d6068768865945c91fb3 100644 --- a/cat-home/src/main/webapp/jsp/report/dependency/dependencyEvent.jsp +++ b/cat-home/src/main/webapp/jsp/report/dependency/dependencyEvent.jsp @@ -13,7 +13,7 @@
-
部门 产品线
+
diff --git a/cat-home/src/main/webapp/jsp/report/heavy/detail.jsp b/cat-home/src/main/webapp/jsp/report/heavy/detail.jsp index c57606ade01e993866ede82da68c19107901431a..6a97e85a5722e64d8293e266a247fd23acb9f70e 100644 --- a/cat-home/src/main/webapp/jsp/report/heavy/detail.jsp +++ b/cat-home/src/main/webapp/jsp/report/heavy/detail.jsp @@ -10,7 +10,7 @@
-
时间 标题
+
@@ -28,7 +28,7 @@
项目名【1】 URL名称
- +
@@ -46,7 +46,7 @@
项目名【2】 Service名称
- +
@@ -64,7 +64,7 @@
项目名【3】 URL名称
- +
@@ -82,7 +82,7 @@
项目名【4】 URL名称
- +
@@ -100,7 +100,7 @@
项目名【5】 URL名称
- +
diff --git a/cat-home/src/main/webapp/jsp/report/home/userDocument/heartbeat.jsp b/cat-home/src/main/webapp/jsp/report/home/userDocument/heartbeat.jsp index b7a9b1ed926e8703e32e1413fcd2c156269b7d19..0e1f201053424a843e4670bacd6250d2d7c8f430 100644 --- a/cat-home/src/main/webapp/jsp/report/home/userDocument/heartbeat.jsp +++ b/cat-home/src/main/webapp/jsp/report/home/userDocument/heartbeat.jsp @@ -2,7 +2,7 @@

Heartbeat实时报表

Heartbeart是CAT客户端一分钟一次向服务器发送自身的状态信息。Machine是当前项目下所有的部署机器。Heartbeat包括：
Thread信息包括
-
项目名【6】 URL名称
+
@@ -11,24 +11,24 @@
Active Thread 系统当前活动线程
Daemon Thread系统后台线程
Total Started Thread 系统总共开启线程
Pigeon Started Thread 系统中Pigeon客户端启动线程数
System Info信息包括
- +
NewGc Count新生代GC次数
OldGc Count旧生代GC次数
System Load Average系统Load详细信息
Memery Info信息包括
- +
Memory Free系统memoryFree情况
Heap UsageJava虚拟机堆的使用情况
None Heap UsageJava虚拟机Perm的使用情况
Disk Info信息包括
- +
/根的使用情况
/data盘的使用情况
Cat Info信息包括
- +
diff --git a/cat-home/src/main/webapp/jsp/report/home/userDocument/problem.jsp b/cat-home/src/main/webapp/jsp/report/home/userDocument/problem.jsp index 0df9ed6ab09421bc39c51653aebf059d71f0e390..70bf5a5355d41a976c93f9606f48c3bf9f4be838 100644 --- a/cat-home/src/main/webapp/jsp/report/home/userDocument/problem.jsp +++ b/cat-home/src/main/webapp/jsp/report/home/userDocument/problem.jsp @@ -1,7 +1,7 @@ <%@ page session="false" language="java" pageEncoding="UTF-8" %>

Problem功能介绍

Problem记录整个项目在运行过程中出现的问题，包括一些错误、访问较长的行为。Problem的类型如下：
-
Cat每分钟产生消息数
Cat每分钟丢掉的消息数
Cat每分钟产生消息大小
+
diff --git a/cat-home/src/main/webapp/jsp/report/service/service.jsp b/cat-home/src/main/webapp/jsp/report/service/service.jsp index 2ba0a0fc3071c54633599c67c89273c00e5e74fc..de09296e12c9348efe826ef45e32c875f602ce54 100644 --- a/cat-home/src/main/webapp/jsp/report/service/service.jsp +++ b/cat-home/src/main/webapp/jsp/report/service/service.jsp @@ -38,7 +38,7 @@

-
errorLog4j记录的错误异常
call表示在远程调用中transaction中出错
sql表示在数据库的调用中transaction中出错
+
diff --git a/cat-home/src/main/webapp/jsp/report/service/serviceHistory.jsp b/cat-home/src/main/webapp/jsp/report/service/serviceHistory.jsp index 7e3159d23e3e62238093c5a288f8c399e3c33ecf..343c59c4f62e4b452b859743fc7ff016369107a6 100644 --- a/cat-home/src/main/webapp/jsp/report/service/serviceHistory.jsp +++ b/cat-home/src/main/webapp/jsp/report/service/serviceHistory.jsp @@ -46,7 +46,7 @@

-
Server(Domain) Total
+
diff --git a/cat-home/src/main/webapp/jsp/report/utilization/detail.jsp b/cat-home/src/main/webapp/jsp/report/utilization/detail.jsp index 35018e2e529b894e6bf19060ebd2563fcf5161ef..96862c7ff40479ee4a6e01f3e2cfd39d1beb53a3 100644 --- a/cat-home/src/main/webapp/jsp/report/utilization/detail.jsp +++ b/cat-home/src/main/webapp/jsp/report/utilization/detail.jsp @@ -12,7 +12,7 @@
-
Server(Domain) Total
+
@@ -43,7 +43,7 @@
-
id Machine Number
+
diff --git a/cat-home/src/main/webapp/jsp/report/utilization/utilizationHistory.jsp b/cat-home/src/main/webapp/jsp/report/utilization/utilizationHistory.jsp index d2ffa109830c3279c049817d9d73ceae6dab9210..18fc9bde53b728db7b2fd0b5b8915c63b8b82fbf 100644 --- a/cat-home/src/main/webapp/jsp/report/utilization/utilizationHistory.jsp +++ b/cat-home/src/main/webapp/jsp/report/utilization/utilizationHistory.jsp @@ -53,7 +53,7 @@
-
id Machine Number
+
@@ -84,7 +84,7 @@
-
id Machine Number
+
diff --git a/cat-home/src/main/webapp/jsp/system/aggregation/aggregation.jsp b/cat-home/src/main/webapp/jsp/system/aggregation/aggregation.jsp index aebee921b0c888bdbef18b2858c32db1cb386300..44f47eabf56e9e9f80183dd077a7653cebbc13c8 100644 --- a/cat-home/src/main/webapp/jsp/system/aggregation/aggregation.jsp +++ b/cat-home/src/main/webapp/jsp/system/aggregation/aggregation.jsp @@ -25,7 +25,7 @@

-
id Machine Number
+
diff --git a/cat-home/src/main/webapp/jsp/system/bug/bugConfig.jsp b/cat-home/src/main/webapp/jsp/system/bug/bugConfig.jsp index d47df9660ed2da6a5ac19a4b3f7cf171feb7c442..331fdbeddb80e6801af409df2a55ba79291281fa 100644 --- a/cat-home/src/main/webapp/jsp/system/bug/bugConfig.jsp +++ b/cat-home/src/main/webapp/jsp/system/bug/bugConfig.jsp @@ -20,7 +20,7 @@ action="${model.pageUri}?op=bugConfigUpdate">

 

异常规范配置

-
报表类型
+
diff --git a/cat-home/src/main/webapp/jsp/system/exception/exceptionThreshold.jsp b/cat-home/src/main/webapp/jsp/system/exception/exceptionThreshold.jsp index 71bfaf5ffb2c544a94a471d00e76de7d8fd84db3..b877be8ef446ce39bcb0ffe7c7ab99bd105854b3 100644 --- a/cat-home/src/main/webapp/jsp/system/exception/exceptionThreshold.jsp +++ b/cat-home/src/main/webapp/jsp/system/exception/exceptionThreshold.jsp @@ -66,7 +66,7 @@
-
+
diff --git a/cat-home/src/main/webapp/jsp/system/exception/exceptionThresholdConfig.jsp b/cat-home/src/main/webapp/jsp/system/exception/exceptionThresholdConfig.jsp index 2c9952b72f34d003ac2895ca71ecad2f798c95ec..3e173d78891890b07ca669026df9a69556a8d250 100644 --- a/cat-home/src/main/webapp/jsp/system/exception/exceptionThresholdConfig.jsp +++ b/cat-home/src/main/webapp/jsp/system/exception/exceptionThresholdConfig.jsp @@ -6,7 +6,7 @@ action="${model.pageUri}?op=exceptionThresholdUpdateSubmit">

 

修改异常报警配置信息

-
域名
+
域名

${product.title}：产品线内业务监控配置        表示放入总的业务监控大盘

- +
diff --git a/cat-home/src/main/webapp/jsp/system/topology/topologyGraphEdgeConfigs.jsp b/cat-home/src/main/webapp/jsp/system/topology/topologyGraphEdgeConfigs.jsp index 8ed166c04e44b7c197d82fc5c93a66f8a17b287c..0f83279d262c4d5cb85e6c2859e3ff81d301f5b4 100644 --- a/cat-home/src/main/webapp/jsp/system/topology/topologyGraphEdgeConfigs.jsp +++ b/cat-home/src/main/webapp/jsp/system/topology/topologyGraphEdgeConfigs.jsp @@ -92,7 +92,7 @@

拓扑图依赖关系配置信息:${item.key}

-
项目
类型
+
diff --git a/cat-home/src/main/webapp/jsp/system/topology/topologyGraphNodeConfigs.jsp b/cat-home/src/main/webapp/jsp/system/topology/topologyGraphNodeConfigs.jsp index 69553c7c62373211aeb2c9897d1dc2216476b3f2..63c86bc69b0aa1abac0c8aa9ea8ee4d05cfd30c1 100644 --- a/cat-home/src/main/webapp/jsp/system/topology/topologyGraphNodeConfigs.jsp +++ b/cat-home/src/main/webapp/jsp/system/topology/topologyGraphNodeConfigs.jsp @@ -91,7 +91,7 @@

拓扑图节点配置信息：${item.key}

-
类型
调用者
+
diff --git a/cat-home/src/main/webapp/jsp/system/utilization/utilizationConfig.jsp b/cat-home/src/main/webapp/jsp/system/utilization/utilizationConfig.jsp index 560131087118f4101be6708ffc17680b98d797f2..f1d805385f8aa296ead3e2e7b9176b8296f4162b 100644 --- a/cat-home/src/main/webapp/jsp/system/utilization/utilizationConfig.jsp +++ b/cat-home/src/main/webapp/jsp/system/utilization/utilizationConfig.jsp @@ -20,7 +20,7 @@ action="${model.pageUri}?op=utilizationConfigUpdate">

 

应用排行榜资源权重配置

-
项目
异常Warning阀值
异常Error阀值
响应时间Warning阀值
+
diff --git a/cat-home/src/test/java/com/dianping/cat/demo/TestBusinessMessage.java b/cat-home/src/test/java/com/dianping/cat/demo/TestBusinessMessage.java index 39bb1577da2955aceb036781270382d178198349..c892e9277fd7bfd491ddafe8c7b5fede48cd5b3e 100644 --- a/cat-home/src/test/java/com/dianping/cat/demo/TestBusinessMessage.java +++ b/cat-home/src/test/java/com/dianping/cat/demo/TestBusinessMessage.java @@ -113,4 +113,33 @@ public class TestBusinessMessage { Thread.sleep(100000); } + public void sample() { + String pageName = ""; + String serverIp = ""; + double amount = 0; + + Transaction t = Cat.newTransaction("URL", pageName); //创建一个Transaction + + try { + //记录一个事件 + Cat.logEvent("URL.Server", serverIp, Event.SUCCESS, "ip=" + serverIp + "&..."); + //记录一个业务指标，记录次数 + Cat.logMetricForCount("PayCount"); + //记录一个业务指标，记录支付金额 + Cat.logMetricForSum("PayAmount", amount); + + yourBusiness();//自己业务代码 + + t.setStatus(Transaction.SUCCESS);//设置状态 + } catch (Exception e) { + t.setStatus(e);//设置错误状态 + } finally { + t.complete();//结束Transaction + } + } + + private void yourBusiness(){ + + } + } diff --git a/cat-home/src/test/java/com/dianping/cat/system/tool/DefaultGmailTest.java b/cat-home/src/test/java/com/dianping/cat/system/tool/DefaultGmailTest.java index 7eaf3424357da32a2a8f665f6eaae58598734b95..5e673096ea6def47e3c790d52d31cb259c88d24f 100644 --- a/cat-home/src/test/java/com/dianping/cat/system/tool/DefaultGmailTest.java +++ b/cat-home/src/test/java/com/dianping/cat/system/tool/DefaultGmailTest.java @@ -18,7 +18,8 @@ public class DefaultGmailTest extends ComponentTestCase { emails.add("yong.you@dianping.com"); emails.add("youyong205@126.com"); - boolean result = mailsms.sendEmail("ts", "ts", emails); + boolean result = mailsms.sendEmail("title", "content", emails); + Assert.assertEquals(true, result); } diff --git a/cat-home/src/test/resources/com/dianping/cat/report/page/browser/browserVersion.jsp b/cat-home/src/test/resources/com/dianping/cat/report/page/browser/browserVersion.jsp index a0102432d7574be19fd4fee32832841a33887ab1..d9ddb0636472501f0943b62b93db3f9034c8a836 100644 --- a/cat-home/src/test/resources/com/dianping/cat/report/page/browser/browserVersion.jsp +++ b/cat-home/src/test/resources/com/dianping/cat/report/page/browser/browserVersion.jsp @@ -40,7 +40,7 @@
-
+
diff --git a/cat-home/src/test/resources/com/dianping/cat/report/page/browser/detail.jsp b/cat-home/src/test/resources/com/dianping/cat/report/page/browser/detail.jsp index 22d44484abd88c66fa45ab982f97195375570f4c..baa57b046e86809622b916fe911c469880ea2a17 100644 --- a/cat-home/src/test/resources/com/dianping/cat/report/page/browser/detail.jsp +++ b/cat-home/src/test/resources/com/dianping/cat/report/page/browser/detail.jsp @@ -4,7 +4,7 @@
-
Browser Version Count
+
@@ -24,7 +24,7 @@
-
Browser Count
+
OS Count