Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
梦中观雨
cat
提交
74a90e3e
C
cat
项目概览
梦中观雨
/
cat
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
C
cat
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
74a90e3e
编写于
9月 23, 2013
作者:
Y
yong.you
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix mail send bug and add cat model api
上级
9fd0fc56
变更
36
隐藏空白更改
内联
并排
Showing
36 changed file
with
149 addition
and
61 deletion
+149
-61
cat-home/src/main/java/com/dianping/cat/report/page/cache/Model.java
...c/main/java/com/dianping/cat/report/page/cache/Model.java
+5
-0
cat-home/src/main/java/com/dianping/cat/report/page/cross/Model.java
...c/main/java/com/dianping/cat/report/page/cross/Model.java
+11
-1
cat-home/src/main/java/com/dianping/cat/report/page/dependency/Model.java
...n/java/com/dianping/cat/report/page/dependency/Model.java
+3
-2
cat-home/src/main/java/com/dianping/cat/report/page/event/Model.java
...c/main/java/com/dianping/cat/report/page/event/Model.java
+8
-0
cat-home/src/main/java/com/dianping/cat/report/page/heartbeat/Model.java
...in/java/com/dianping/cat/report/page/heartbeat/Model.java
+6
-0
cat-home/src/main/java/com/dianping/cat/report/page/matrix/Model.java
.../main/java/com/dianping/cat/report/page/matrix/Model.java
+7
-0
cat-home/src/main/java/com/dianping/cat/report/page/metric/Handler.java
...ain/java/com/dianping/cat/report/page/metric/Handler.java
+1
-1
cat-home/src/main/java/com/dianping/cat/report/page/metric/Model.java
.../main/java/com/dianping/cat/report/page/metric/Model.java
+6
-0
cat-home/src/main/java/com/dianping/cat/report/page/problem/Model.java
...main/java/com/dianping/cat/report/page/problem/Model.java
+11
-20
cat-home/src/main/java/com/dianping/cat/report/page/sql/Model.java
...src/main/java/com/dianping/cat/report/page/sql/Model.java
+7
-0
cat-home/src/main/java/com/dianping/cat/report/page/state/Model.java
...c/main/java/com/dianping/cat/report/page/state/Model.java
+8
-0
cat-home/src/main/java/com/dianping/cat/report/page/top/Model.java
...src/main/java/com/dianping/cat/report/page/top/Model.java
+8
-1
cat-home/src/main/java/com/dianping/cat/report/page/transaction/Model.java
.../java/com/dianping/cat/report/page/transaction/Model.java
+2
-0
cat-home/src/main/java/com/dianping/cat/system/page/alarm/RecordManager.java
...ava/com/dianping/cat/system/page/alarm/RecordManager.java
+2
-2
cat-home/src/main/java/com/dianping/cat/system/tool/DefaultGMailImpl.java
...n/java/com/dianping/cat/system/tool/DefaultGMailImpl.java
+1
-1
cat-home/src/main/webapp/jsp/report/bug/detail.jsp
cat-home/src/main/webapp/jsp/report/bug/detail.jsp
+2
-2
cat-home/src/main/webapp/jsp/report/dependency/dependencyEvent.jsp
...src/main/webapp/jsp/report/dependency/dependencyEvent.jsp
+1
-1
cat-home/src/main/webapp/jsp/report/heavy/detail.jsp
cat-home/src/main/webapp/jsp/report/heavy/detail.jsp
+6
-6
cat-home/src/main/webapp/jsp/report/home/userDocument/heartbeat.jsp
...rc/main/webapp/jsp/report/home/userDocument/heartbeat.jsp
+5
-5
cat-home/src/main/webapp/jsp/report/home/userDocument/problem.jsp
.../src/main/webapp/jsp/report/home/userDocument/problem.jsp
+1
-1
cat-home/src/main/webapp/jsp/report/service/service.jsp
cat-home/src/main/webapp/jsp/report/service/service.jsp
+1
-1
cat-home/src/main/webapp/jsp/report/service/serviceHistory.jsp
...ome/src/main/webapp/jsp/report/service/serviceHistory.jsp
+1
-1
cat-home/src/main/webapp/jsp/report/utilization/detail.jsp
cat-home/src/main/webapp/jsp/report/utilization/detail.jsp
+2
-2
cat-home/src/main/webapp/jsp/report/utilization/utilizationHistory.jsp
...main/webapp/jsp/report/utilization/utilizationHistory.jsp
+2
-2
cat-home/src/main/webapp/jsp/system/aggregation/aggregation.jsp
...me/src/main/webapp/jsp/system/aggregation/aggregation.jsp
+1
-1
cat-home/src/main/webapp/jsp/system/bug/bugConfig.jsp
cat-home/src/main/webapp/jsp/system/bug/bugConfig.jsp
+1
-1
cat-home/src/main/webapp/jsp/system/exception/exceptionThreshold.jsp
...c/main/webapp/jsp/system/exception/exceptionThreshold.jsp
+1
-1
cat-home/src/main/webapp/jsp/system/exception/exceptionThresholdConfig.jsp
.../webapp/jsp/system/exception/exceptionThresholdConfig.jsp
+1
-1
cat-home/src/main/webapp/jsp/system/metric/metricConfigs.jsp
cat-home/src/main/webapp/jsp/system/metric/metricConfigs.jsp
+1
-1
cat-home/src/main/webapp/jsp/system/topology/topologyGraphEdgeConfigs.jsp
...n/webapp/jsp/system/topology/topologyGraphEdgeConfigs.jsp
+1
-1
cat-home/src/main/webapp/jsp/system/topology/topologyGraphNodeConfigs.jsp
...n/webapp/jsp/system/topology/topologyGraphNodeConfigs.jsp
+1
-1
cat-home/src/main/webapp/jsp/system/utilization/utilizationConfig.jsp
.../main/webapp/jsp/system/utilization/utilizationConfig.jsp
+1
-1
cat-home/src/test/java/com/dianping/cat/demo/TestBusinessMessage.java
.../test/java/com/dianping/cat/demo/TestBusinessMessage.java
+29
-0
cat-home/src/test/java/com/dianping/cat/system/tool/DefaultGmailTest.java
...t/java/com/dianping/cat/system/tool/DefaultGmailTest.java
+2
-1
cat-home/src/test/resources/com/dianping/cat/report/page/browser/browserVersion.jsp
...s/com/dianping/cat/report/page/browser/browserVersion.jsp
+1
-1
cat-home/src/test/resources/com/dianping/cat/report/page/browser/detail.jsp
...resources/com/dianping/cat/report/page/browser/detail.jsp
+2
-2
未找到文件。
cat-home/src/main/java/com/dianping/cat/report/page/cache/Model.java
浏览文件 @
74a90e3e
...
...
@@ -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
<
Action
,
Context
>
{
private
String
m_queryName
;
@EntityMeta
private
CacheReport
m_report
;
public
Model
(
Context
ctx
)
{
...
...
cat-home/src/main/java/com/dianping/cat/report/page/cross/Model.java
浏览文件 @
74a90e3e
...
...
@@ -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
<
Action
,
Context
>
{
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
)
{
...
...
cat-home/src/main/java/com/dianping/cat/report/page/dependency/Model.java
浏览文件 @
74a90e3e
...
...
@@ -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
<
Action
,
Context
>
{
@EntityMeta
private
DependencyReport
m_report
;
...
...
@@ -57,7 +59,6 @@ public class Model extends AbstractReportModel<Action, Context> {
private
TopReport
m_topReport
;
public
List
<
ProductLine
>
getProductLines
()
{
return
m_productLines
;
}
...
...
cat-home/src/main/java/com/dianping/cat/report/page/event/Model.java
浏览文件 @
74a90e3e
...
...
@@ -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
<
Action
,
Context
>
{
@EntityMeta
private
DisplayNames
m_displayNameReport
;
@EntityMeta
private
DisplayTypes
m_displayTypeReport
;
private
String
m_failureTrend
;
...
...
@@ -27,6 +34,7 @@ public class Model extends AbstractReportModel<Action, Context> {
private
String
m_mobileResponse
;
@EntityMeta
private
EventReport
m_report
;
private
String
m_type
;
...
...
cat-home/src/main/java/com/dianping/cat/report/page/heartbeat/Model.java
浏览文件 @
74a90e3e
...
...
@@ -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
<
Action
,
Context
>
{
private
String
m_activeThreadGraph
;
...
...
@@ -47,6 +52,7 @@ public class Model extends AbstractReportModel<Action, Context> {
private
String
m_pigeonThreadGraph
;
@EntityMeta
private
HeartbeatReport
m_report
;
private
DisplayHeartbeat
m_result
;
...
...
cat-home/src/main/java/com/dianping/cat/report/page/matrix/Model.java
浏览文件 @
74a90e3e
...
...
@@ -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
<
Action
,
Context
>
{
@EntityMeta
private
DisplayMatrix
m_matrix
;
@EntityMeta
private
MatrixReport
m_report
;
public
Model
(
Context
ctx
)
{
...
...
cat-home/src/main/java/com/dianping/cat/report/page/metric/Handler.java
浏览文件 @
74a90e3e
...
...
@@ -136,7 +136,7 @@ public class Handler implements PageHandler<Context> {
List
<
LineChart
>
allCharts
=
new
ArrayList
<
LineChart
>();
for
(
ProductLine
productLine
:
productLines
)
{
metricDisplay
=
buildMetricsByProduct
(
date
,
productLine
.
getId
(),
payload
.
getTest
(),
fals
e
);
metricDisplay
=
buildMetricsByProduct
(
date
,
productLine
.
getId
(),
payload
.
getTest
(),
tru
e
);
List
<
LineChart
>
charts
=
metricDisplay
.
getLineCharts
();
...
...
cat-home/src/main/java/com/dianping/cat/report/page/metric/Model.java
浏览文件 @
74a90e3e
...
...
@@ -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
<
Action
,
Context
>
{
@EntityMeta
private
List
<
LineChart
>
m_lineCharts
;
private
Collection
<
ProductLine
>
m_productLines
;
...
...
cat-home/src/main/java/com/dianping/cat/report/page/problem/Model.java
浏览文件 @
74a90e3e
...
...
@@ -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
<
Action
,
Context
>
{
@EntityMeta
private
ProblemStatistics
m_allStatistics
;
private
int
m_currentMinute
;
// for navigation
...
...
@@ -17,10 +24,12 @@ public class Model extends AbstractReportModel<Action, Context> {
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<Action, Context> {
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<Action, Context> {
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<Action, Context> {
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
;
}
...
...
cat-home/src/main/java/com/dianping/cat/report/page/sql/Model.java
浏览文件 @
74a90e3e
...
...
@@ -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
<
Action
,
Context
>
{
@EntityMeta
private
SqlReport
m_report
;
@EntityMeta
private
DisplaySqlReport
m_displaySqlReport
;
private
String
m_database
;
...
...
cat-home/src/main/java/com/dianping/cat/report/page/state/Model.java
浏览文件 @
74a90e3e
...
...
@@ -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
<
Action
,
Context
>
{
@EntityMeta
public
StateReport
m_report
;
@EntityMeta
public
StateShow
m_state
;
public
String
m_graph
;
...
...
cat-home/src/main/java/com/dianping/cat/report/page/top/Model.java
浏览文件 @
74a90e3e
...
...
@@ -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
<
Action
,
Context
>
{
@EntityMeta
private
TopReport
m_topReport
;
@EntityMeta
private
TopMetric
m_topMetric
;
private
boolean
m_refresh
=
false
;
...
...
cat-home/src/main/java/com/dianping/cat/report/page/transaction/Model.java
浏览文件 @
74a90e3e
...
...
@@ -14,8 +14,10 @@ import com.dianping.cat.report.view.StringSortHelper;
@ModelMeta
(
TransactionAnalyzer
.
ID
)
public
class
Model
extends
AbstractReportModel
<
Action
,
Context
>
{
@EntityMeta
private
DisplayNames
m_displayNameReport
;
@EntityMeta
private
DisplayTypes
m_displayTypeReport
;
private
String
m_errorTrend
;
...
...
cat-home/src/main/java/com/dianping/cat/system/page/alarm/RecordManager.java
浏览文件 @
74a90e3e
...
...
@@ -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
<
MailRecord
>
mails
=
m_mailRecordDao
.
findReportRecordByRuleId
(
ruleIds
,
MailRecordEntity
.
READSET_
FULL
);
List
<
MailRecord
>
mails
=
m_mailRecordDao
.
findReportRecordByRuleId
(
ruleIds
,
MailRecordEntity
.
READSET_
ALL_EXCLUDE_CONTENT
);
model
.
setMailRecords
(
mails
);
}
catch
(
DalNotFoundException
e
)
{
}
catch
(
DalException
e
)
{
...
...
cat-home/src/main/java/com/dianping/cat/system/tool/DefaultGMailImpl.java
浏览文件 @
74a90e3e
...
...
@@ -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
);
...
...
cat-home/src/main/webapp/jsp/report/bug/detail.jsp
浏览文件 @
74a90e3e
<%@ page
session=
"false"
language=
"java"
pageEncoding=
"UTF-8"
%>
<h4
class=
'text-error'
>
项目Bug异常数据
<a
class=
"btn btn-small btn-danger"
target=
'_blank'
href=
"/cat/s/config?op=bugConfigUpdate"
>
异常规范配置
</a></h4>
<table
class=
"table table-striped table-bordered table-condensed"
>
<table
class=
"table table-striped table-bordered table-condensed
table-hover
"
>
<tr>
<th
width=
"10%"
>
部门
</th>
<th
width=
"10%"
>
产品线
</th>
...
...
@@ -28,7 +28,7 @@
</c:forEach>
</table>
<h4
class=
'text-info'
>
项目其他异常数据(比如框架类异常,超时等)
</h4>
<table
class=
"table table-striped table-bordered table-condensed"
>
<table
class=
"table table-striped table-bordered table-condensed
table-hover
"
>
<tr>
<th
width=
"10%"
>
部门
</th>
<th
width=
"10%"
>
产品线
</th>
...
...
cat-home/src/main/webapp/jsp/report/dependency/dependencyEvent.jsp
浏览文件 @
74a90e3e
...
...
@@ -13,7 +13,7 @@
<c:forEach
var=
"entry"
items=
"
${
model
.
events
}
"
varStatus=
"status"
>
<c:set
var=
"items"
value=
"
${
entry
.
value
}
"
/>
<div
class=
"tab-pane"
id=
"zabbixTab${status.index}"
>
<table
class=
"table table-striped table-bordered table-condensed"
>
<table
class=
"table table-striped table-bordered table-condensed
table-hover
"
>
<thead>
<tr><th>
时间
</th>
<th>
标题
</th>
...
...
cat-home/src/main/webapp/jsp/report/heavy/detail.jsp
浏览文件 @
74a90e3e
...
...
@@ -10,7 +10,7 @@
</ul>
<div
class=
"tab-content"
>
<div
class=
"tab-pane active"
id=
"tab1"
>
<table
class=
"table table-striped table-bordered table-condensed"
>
<table
class=
"table table-striped table-bordered table-condensed
table-hover
"
>
<tr>
<th>
项目名【1】
</th>
<th>
URL名称
</th>
...
...
@@ -28,7 +28,7 @@
</table>
</div>
<div
class=
"tab-pane"
id=
"tab2"
>
<table
class=
"table table-striped table-bordered table-condensed"
>
<table
class=
"table table-striped table-bordered table-condensed
table-hover
"
>
<tr>
<th>
项目名【2】
</th>
<th>
Service名称
</th>
...
...
@@ -46,7 +46,7 @@
</table>
</div>
<div
class=
"tab-pane"
id=
"tab3"
>
<table
class=
"table table-striped table-bordered table-condensed"
>
<table
class=
"table table-striped table-bordered table-condensed
table-hover
"
>
<tr>
<th>
项目名【3】
</th>
<th>
URL名称
</th>
...
...
@@ -64,7 +64,7 @@
</table>
</div>
<div
class=
"tab-pane"
id=
"tab4"
>
<table
class=
"table table-striped table-bordered table-condensed"
>
<table
class=
"table table-striped table-bordered table-condensed
table-hover
"
>
<tr>
<th>
项目名【4】
</th>
<th>
URL名称
</th>
...
...
@@ -82,7 +82,7 @@
</table>
</div>
<div
class=
"tab-pane"
id=
"tab5"
>
<table
class=
"table table-striped table-bordered table-condensed"
>
<table
class=
"table table-striped table-bordered table-condensed
table-hover
"
>
<tr>
<th>
项目名【5】
</th>
<th>
URL名称
</th>
...
...
@@ -100,7 +100,7 @@
</table>
</div>
<div
class=
"tab-pane"
id=
"tab6"
>
<table
class=
"table table-striped table-bordered table-condensed"
>
<table
class=
"table table-striped table-bordered table-condensed
table-hover
"
>
<tr>
<th>
项目名【6】
</th>
<th>
URL名称
</th>
...
...
cat-home/src/main/webapp/jsp/report/home/userDocument/heartbeat.jsp
浏览文件 @
74a90e3e
...
...
@@ -2,7 +2,7 @@
<h4
class=
"text-success"
>
Heartbeat实时报表
</h4>
<h5>
Heartbeart是CAT客户端一分钟一次向服务器发送自身的状态信息。Machine是当前项目下所有的部署机器。Heartbeat包括:
</h5>
<h5
class=
"text-info"
>
Thread信息包括
</h5>
<table
style=
"width:50%"
class=
"table table-striped table-bordered table-condensed"
>
<table
style=
"width:50%"
class=
"table table-striped table-bordered table-condensed
table-hover
"
>
<tr><td>
Active Thread
</td><td>
系统当前活动线程
</td></tr>
<tr><td>
Daemon Thread
</td><td>
系统后台线程
</td></tr>
<tr><td>
Total Started Thread
</td><td>
系统总共开启线程
</td></tr>
...
...
@@ -11,24 +11,24 @@
<tr><td>
Pigeon Started Thread
</td><td>
系统中Pigeon客户端启动线程数
</td></tr>
</table>
<h5
class=
"text-info"
>
System Info信息包括
</h5>
<table
style=
"width:50%"
class=
"table table-striped table-bordered table-condensed"
>
<table
style=
"width:50%"
class=
"table table-striped table-bordered table-condensed
table-hover
"
>
<tr><td>
NewGc Count
</td><td>
新生代GC次数
</td></tr>
<tr><td>
OldGc Count
</td><td>
旧生代GC次数
</td></tr>
<tr><td>
System Load Average
</td><td>
系统Load详细信息
</td></tr>
</table>
<h5
class=
"text-info"
>
Memery Info信息包括
</h5>
<table
style=
"width:50%"
class=
"table table-striped table-bordered table-condensed"
>
<table
style=
"width:50%"
class=
"table table-striped table-bordered table-condensed
table-hover
"
>
<tr><td>
Memory Free
</td><td>
系统memoryFree情况
</td></tr>
<tr><td>
Heap Usage
</td><td>
Java虚拟机堆的使用情况
</td></tr>
<tr><td>
None Heap Usage
</td><td>
Java虚拟机Perm的使用情况
</td></tr>
</table>
<h5
class=
"text-info"
>
Disk Info信息包括
</h5>
<table
style=
"width:50%"
class=
"table table-striped table-bordered table-condensed"
>
<table
style=
"width:50%"
class=
"table table-striped table-bordered table-condensed
table-hover
"
>
<tr><td>
/根的使用情况
</td></tr>
<tr><td>
/data盘的使用情况
</td></tr>
</table>
<h5
class=
"text-info"
>
Cat Info信息包括
</h5>
<table
style=
"width:50%"
class=
"table table-striped table-bordered table-condensed"
>
<table
style=
"width:50%"
class=
"table table-striped table-bordered table-condensed
table-hover
"
>
<tr><td>
Cat每分钟产生消息数
</td></tr>
<tr><td>
Cat每分钟丢掉的消息数
</td></tr>
<tr><td>
Cat每分钟产生消息大小
</td></tr>
...
...
cat-home/src/main/webapp/jsp/report/home/userDocument/problem.jsp
浏览文件 @
74a90e3e
<%@ page
session=
"false"
language=
"java"
pageEncoding=
"UTF-8"
%>
<h4
class=
"text-success"
>
Problem功能介绍
</h4>
<h5>
Problem记录整个项目在运行过程中出现的问题,包括一些错误、访问较长的行为。Problem的类型如下:
</h5>
<table
class=
"table table-striped table-bordered table-condensed"
>
<table
class=
"table table-striped table-bordered table-condensed
table-hover
"
>
<tr><td>
error
</td><td>
Log4j记录的错误异常
</td></tr>
<tr><td>
call
</td><td>
表示在远程调用中transaction中出错
</td></tr>
<tr><td>
sql
</td><td>
表示在数据库的调用中transaction中出错
</td></tr>
...
...
cat-home/src/main/webapp/jsp/report/service/service.jsp
浏览文件 @
74a90e3e
...
...
@@ -38,7 +38,7 @@
<div
class=
"span10"
>
<div
class=
"report"
>
</br>
<table
class=
"table table-striped table-bordered table-condensed"
>
<table
class=
"table table-striped table-bordered table-condensed
table-hover
"
>
<tr>
<th
class=
"left"
>
Server(Domain)
</th>
<th
style=
"text-align:right"
><a
href=
"?domain=${model.domain}&date=${model.date}&ip=${model.ipAddress}&op=service&sort=total"
>
Total
</th>
...
...
cat-home/src/main/webapp/jsp/report/service/serviceHistory.jsp
浏览文件 @
74a90e3e
...
...
@@ -46,7 +46,7 @@
<div
class=
"span10"
>
<div
class=
"report"
>
</br>
<table
class=
"table table-striped table-bordered table-condensed"
>
<table
class=
"table table-striped table-bordered table-condensed
table-hover
"
>
<tr>
<th
class=
"left"
>
Server(Domain)
</th>
<th
style=
"text-align:right"
><a
href=
"?domain=${model.domain}&date=${model.date}&ip=${model.ipAddress}&op=historyService&sort=total&reportType=${payload.reportType}"
>
Total
</th>
...
...
cat-home/src/main/webapp/jsp/report/utilization/detail.jsp
浏览文件 @
74a90e3e
...
...
@@ -12,7 +12,7 @@
<div
class=
"tab-content"
>
<div
class=
"tab-pane active"
id=
"tab1"
>
<div
class=
"report"
>
<table
class=
"table table-striped table-bordered table-condensed"
>
<table
class=
"table table-striped table-bordered table-condensed
table-hover
"
>
<tr>
<th
class=
"left"
>
id
</th>
<th
style=
"text-align:right"
><a
href=
"?domain=${model.domain}&date=${model.date}&ip=${model.ipAddress}&op=utilization&tab=tab1"
>
Machine Number
</th>
...
...
@@ -43,7 +43,7 @@
</div>
<div
class=
"tab-pane"
id=
"tab2"
>
<div
class=
"report"
>
<table
class=
"table table-striped table-bordered table-condensed"
>
<table
class=
"table table-striped table-bordered table-condensed
table-hover
"
>
<tr>
<th
class=
"left"
>
id
</th>
<th
style=
"text-align:right"
><a
href=
"?domain=${model.domain}&date=${model.date}&ip=${model.ipAddress}&op=utilization&tab=tab2"
>
Machine Number
</th>
...
...
cat-home/src/main/webapp/jsp/report/utilization/utilizationHistory.jsp
浏览文件 @
74a90e3e
...
...
@@ -53,7 +53,7 @@
<div
class=
"tab-content"
>
<div
class=
"tab-pane active"
id=
"tab1"
>
<div
class=
"report"
>
<table
class=
"table table-striped table-bordered table-condensed"
>
<table
class=
"table table-striped table-bordered table-condensed
table-hover
"
>
<tr>
<th
class=
"left"
>
id
</th>
<th
style=
"text-align:right"
><a
href=
"?domain=${model.domain}&date=${model.date}&ip=${model.ipAddress}&op=historyUtilization&tab=tab1"
>
Machine Number
</th>
...
...
@@ -84,7 +84,7 @@
</div>
<div
class=
"tab-pane"
id=
"tab2"
>
<div
class=
"report"
>
<table
class=
"table table-striped table-bordered table-condensed"
>
<table
class=
"table table-striped table-bordered table-condensed
table-hover
"
>
<tr>
<th
class=
"left"
>
id
</th>
<th
style=
"text-align:right"
><a
href=
"?domain=${model.domain}&date=${model.date}&ip=${model.ipAddress}&op=historyUtilization&tab=tab2"
>
Machine Number
</th>
...
...
cat-home/src/main/webapp/jsp/system/aggregation/aggregation.jsp
浏览文件 @
74a90e3e
...
...
@@ -25,7 +25,7 @@
<div
class=
"span10"
>
<div>
</br>
<table
class=
"table table-striped table-bordered table-condensed"
id=
"contents"
width=
"100%"
>
<table
class=
"table table-striped table-bordered table-condensed
table-hover
"
id=
"contents"
width=
"100%"
>
<thead>
<tr
class=
"odd"
>
<th
width=
"15%"
>
报表类型
</th>
...
...
cat-home/src/main/webapp/jsp/system/bug/bugConfig.jsp
浏览文件 @
74a90e3e
...
...
@@ -20,7 +20,7 @@
action=
"${model.pageUri}?op=bugConfigUpdate"
>
<h4
class=
"text-center text-error"
id=
"state"
>
</h4>
<h4
class=
"text-center text-error"
>
异常规范配置
</h4>
<table
class=
"table table-striped table-bordered table-condensed"
>
<table
class=
"table table-striped table-bordered table-condensed
table-hover
"
>
<tr>
<td><textarea
name=
"bug"
style=
"width:auto"
rows=
"20"
cols=
"150"
>
${model.bug}
</textarea></td>
</tr>
...
...
cat-home/src/main/webapp/jsp/system/exception/exceptionThreshold.jsp
浏览文件 @
74a90e3e
...
...
@@ -66,7 +66,7 @@
<div
id=
"myModal"
class=
"modal hide fade"
tabindex=
"-1"
role=
"dialog"
aria-labelledby=
"myModalLabel"
aria-hidden=
"true"
>
</div>
<div>
<table
class=
"table table-striped table-bordered table-condensed"
id=
"contents"
width=
"100%"
>
<table
class=
"table table-striped table-bordered table-condensed
table-hover
"
id=
"contents"
width=
"100%"
>
<thead>
<tr
class=
"odd"
>
<th
width=
"25%"
>
域名
</th>
...
...
cat-home/src/main/webapp/jsp/system/exception/exceptionThresholdConfig.jsp
浏览文件 @
74a90e3e
...
...
@@ -6,7 +6,7 @@
action=
"${model.pageUri}?op=exceptionThresholdUpdateSubmit"
>
<h4
class=
"text-center text-error"
id=
"state"
>
</h4>
<h4
class=
"text-center text-error"
>
修改异常报警配置信息
</h4>
<table
class=
"table table-striped table-bordered table-condensed"
>
<table
class=
"table table-striped table-bordered table-condensed
table-hover
"
>
<tr>
<td
width=
"40%"
style=
"text-align: right"
class=
"text-success"
>
域名
</td>
<td>
<input
id=
"domain"
name=
"exceptionLimit.domain"
...
...
cat-home/src/main/webapp/jsp/system/metric/metricConfigs.jsp
浏览文件 @
74a90e3e
...
...
@@ -89,7 +89,7 @@
<c:set
var=
"value"
value=
"
${
item
.
value
}
"
/>
<div
class=
"tab-pane"
id=
"tabContent-${key}"
>
<h4
class=
"text-center text-error"
>
${product.title}:产品线内业务监控配置
<span
class=
"dashboard"
>
</span>
表示放入总的业务监控大盘
</h4>
<table
class=
"table table-striped table-bordered table-condensed"
>
<table
class=
"table table-striped table-bordered table-condensed
table-hover
"
>
<tr
class=
"text-success"
>
<th><h5
class=
'text-center'
>
项目
</h5></th>
<th><h5
class=
'text-center'
>
类型
</h5></th>
...
...
cat-home/src/main/webapp/jsp/system/topology/topologyGraphEdgeConfigs.jsp
浏览文件 @
74a90e3e
...
...
@@ -92,7 +92,7 @@
<c:set
var=
"value"
value=
"
${
item
.
value
}
"
/>
<div
class=
"tab-pane"
id=
"tabContent-${item.key}"
>
<h4
class=
"text-center text-error"
>
拓扑图依赖关系配置信息:${item.key}
</h4>
<table
class=
"table table-striped table-bordered table-condensed"
>
<table
class=
"table table-striped table-bordered table-condensed
table-hover
"
>
<tr
class=
"text-success"
>
<th><h5
class=
'text-center'
>
类型
</h5></th>
<th><h5
class=
'text-center'
>
调用者
</h5></th>
...
...
cat-home/src/main/webapp/jsp/system/topology/topologyGraphNodeConfigs.jsp
浏览文件 @
74a90e3e
...
...
@@ -91,7 +91,7 @@
<c:set
var=
"value"
value=
"
${
item
.
value
}
"
/>
<div
class=
"tab-pane"
id=
"tabContent-${key}"
>
<h4
class=
"text-center text-error"
>
拓扑图节点配置信息:${item.key}
</h4>
<table
class=
"table table-striped table-bordered table-condensed"
>
<table
class=
"table table-striped table-bordered table-condensed
table-hover
"
>
<tr
class=
"text-success"
>
<th><h5
class=
'text-center'
>
项目
</h5></th><th><h5
class=
'text-center'
>
异常Warning阀值
</h5></th>
<th><h5
class=
'text-center'
>
异常Error阀值
</h5></th><th><h5
class=
'text-center'
>
响应时间Warning阀值
</h5></th>
...
...
cat-home/src/main/webapp/jsp/system/utilization/utilizationConfig.jsp
浏览文件 @
74a90e3e
...
...
@@ -20,7 +20,7 @@
action=
"${model.pageUri}?op=utilizationConfigUpdate"
>
<h4
class=
"text-center text-error"
id=
"state"
>
</h4>
<h4
class=
"text-center text-error"
>
应用排行榜资源权重配置
</h4>
<table
class=
"table table-striped table-bordered table-condensed"
>
<table
class=
"table table-striped table-bordered table-condensed
table-hover
"
>
<tr>
<td><textarea
name=
"content"
style=
"width:auto"
rows=
"20"
cols=
"150"
>
${model.content}
</textarea></td>
</tr>
...
...
cat-home/src/test/java/com/dianping/cat/demo/TestBusinessMessage.java
浏览文件 @
74a90e3e
...
...
@@ -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
(){
}
}
cat-home/src/test/java/com/dianping/cat/system/tool/DefaultGmailTest.java
浏览文件 @
74a90e3e
...
...
@@ -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
);
}
...
...
cat-home/src/test/resources/com/dianping/cat/report/page/browser/browserVersion.jsp
浏览文件 @
74a90e3e
...
...
@@ -40,7 +40,7 @@
<div
class=
"span10"
>
<div
class=
"report"
>
<div
class=
"span6"
>
<table
class=
"table table-striped table-bordered table-condensed"
>
<table
class=
"table table-striped table-bordered table-condensed
table-hover
"
>
<tr>
<th
style=
"text-align:left"
>
Browser Version
</th>
<th
style=
"text-align:right"
><a
href=
"?domain=${model.domain}&date=${model.date}&ip=${model.ipAddress}&op=browserVersion&favor=${payload.favor}&sort=browserVersionCount"
>
Count
</th>
...
...
cat-home/src/test/resources/com/dianping/cat/report/page/browser/detail.jsp
浏览文件 @
74a90e3e
...
...
@@ -4,7 +4,7 @@
</br>
<div>
<div
class=
"span6"
>
<table
class=
"table table-striped table-bordered table-condensed"
>
<table
class=
"table table-striped table-bordered table-condensed
table-hover
"
>
<tr>
<th
style=
"text-align:left"
>
Browser
</th>
<th
style=
"text-align:right"
><a
href=
"?domain=${model.domain}&date=${model.date}&ip=${model.ipAddress}&op=browser&sort=browserCount"
>
Count
</th>
...
...
@@ -24,7 +24,7 @@
</div>
<div>
<div
class=
"span6"
>
<table
class=
"table table-striped table-bordered table-condensed"
>
<table
class=
"table table-striped table-bordered table-condensed
table-hover
"
>
<tr>
<th
style=
"text-align:left"
>
OS
</th>
<th
style=
"text-align:right"
><a
href=
"?domain=${model.domain}&date=${model.date}&ip=${model.ipAddress}&op=browser&sort=osCount"
>
Count
</th>
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录