Skip to content

C
cat

梦中观雨 / cat
与 Fork 源项目一致

从无法访问的项目Fork

通知 1
Star 0
Fork 0
C
cat

体验新版 GitCode，发现更多精彩内容 >>

提交 532e95a5 编写于 作者: Y youyong
浏览文件
操作

modify the cat healthreport

上级 e266f092
隐藏空白更改
内联 并排
Showing with 84 addition and 73 deletion
cat-home/src/main/java/com/dianping/cat/report/page/health/Handler.java
浏览文件 @ 532e95a5
package com.dianping.cat.report.page.health;
import java.io.IOException;
import java.util.Calendar;
import java.util.Date;
import java.util.List;
......@@ -58,7 +59,7 @@ public class Handler implements PageHandler<Context> {
switch (payload.getAction()) {
case HOURLY_REPORT:
HealthReport report = getHourlyReport(payload.getDate(), payload.getDomain());
HealthReport report = getHourlyReport(getLastDate(payload), payload.getDomain());
model.setReport(report);
break;
case HISTORY_REPORT:
......@@ -70,6 +71,25 @@ public class Handler implements PageHandler<Context> {
m_jspViewer.view(ctx, model);
}
private long getLastDate(Payload payload) {
long date = payload.getDate();
long lastHour = payload.getCurrentDate() - ONE_HOUR;
long lastTwoHour = payload.getCurrentDate() - 2 * ONE_HOUR;
Calendar cal = Calendar.getInstance();
int minute = cal.get(Calendar.MINUTE);
if (minute > 15) {
if (date > lastHour) {
date = lastHour;
}
} else {
if (date >= lastTwoHour) {
date = lastTwoHour;
}
}
return date;
}
private HealthReport getHistoryReport(Date startDate, Date endDate, String domain) {
try {
List<Dailyreport> reports = m_dailyReportDao.findAllByDomainNameDuration(startDate, endDate, domain, "health",
......@@ -131,7 +151,7 @@ public class Handler implements PageHandler<Context> {
} else {
model.setLongDate(payload.getDate());
}
if (action == Action.HISTORY_REPORT) {
String type = payload.getReportType();
if (type == null || type.length() == 0) {
......
cat-home/src/main/webapp/jsp/report/health.jsp
浏览文件 @ 532e95a5
......@@ -3,24 +3,21 @@
<%@ taglib prefix="w" uri="http://www.unidal.org/web/core"%>
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
<%@ taglib prefix="res" uri="http://www.unidal.org/webres"%>
<jsp:useBean id="ctx" type="com.dianping.cat.report.page.task.health.Context"
scope="request" />
<jsp:useBean id="payload"
type="com.dianping.cat.report.page.task.health.Payload" scope="request" />
<jsp:useBean id="model" type="com.dianping.cat.report.page.task.health.Model"
scope="request" />
<jsp:useBean id="ctx" type="com.dianping.cat.report.page.health.Context" scope="request" />
<jsp:useBean id="payload" type="com.dianping.cat.report.page.health.Payload" scope="request" />
<jsp:useBean id="model" type="com.dianping.cat.report.page.health.Model" scope="request" />
<a:report title="Health Report" navUrlPrefix="domain=${model.domain}">
<jsp:attribute name="subtitle">From ${w:format(model.report.startTime,'yyyy-MM-dd HH:mm:ss')} to ${w:format(model.report.endTime,'yyyy-MM-dd HH:mm:ss')}</jsp:attribute>
<jsp:body>
<res:useCss value="${res.css.local.health_css}" target="head-css" />
<br>
<h2>综合指标：99</h2>
<h2>综合指标：***</h2>
<div style="float: left;width:100%">
<div style="width: 33%; float: left">
<table class="health">
<tr class="odd">
<th>URL请求平均响应时间（ms）</th>
<th>URL请求平均响应时间</th>
<td>${w:formatNumber(model.report.url.baseInfo.responseTime,'0.0','ms')}</td>
</tr>
<tr class="even">
......@@ -42,7 +39,7 @@
</tr>
<tr class="odd">
<th>(从服务端看)Service请求平均响应时间（ms）</th>
<th>(从服务端看)Service请求平均响应时间</th>
<td>${w:formatNumber(model.report.service.baseInfo.responseTime,'0.0','ms')}</td>
</tr>
<tr class="even">
......@@ -64,7 +61,7 @@
</tr>
<tr class="odd">
<th>(从客户端看)Service请求平均响应时间（ms）</th>
<th>(从客户端看)Service请求平均响应时间</th>
<td>${w:formatNumber(model.report.clientService.baseInfo.responseTime,'0.0','ms')}</td>
</tr>
<tr class="even">
......@@ -86,7 +83,7 @@
</tr>
<tr class="odd">
<th>远程调用平均响应时间（ms）</th>
<th>远程调用平均响应时间</th>
<td>${w:formatNumber(model.report.call.baseInfo.responseTime,'0.0','ms')}</td>
</tr>
<tr class="even">
......@@ -108,7 +105,7 @@
</tr>
<tr class="odd">
<th>数据库平均响应时间（ms）</th>
<th>数据库平均响应时间</th>
<td>${w:formatNumber(model.report.sql.baseInfo.responseTime,'0.0','ms')}</td>
</tr>
<tr class="even">
......@@ -128,48 +125,48 @@
<div style="width: 33%; float:left">
<table>
<tr class="odd">
<th>memcached缓存平均响应时间（ms）</th>
<th>Memcached缓存平均响应时间</th>
<td>${w:formatNumber(model.report.memCache.baseCacheInfo.responseTime,'0.0','ms')}</td>
</tr>
<tr class="even">
<th>memcached缓存月总访问量</th>
<th>Memcached缓存总访问量</th>
<td>${w:formatNumber(model.report.memCache.baseCacheInfo.total,'0.0','')}</td>
</tr>
<tr class="odd">
<th>memcached缓存命中率</th>
<td>${w:format(model.report.memCache.baseCacheInfo.hitPercent,'00.0000%')}</td>
<th>Memcached缓存命中率</th>
<td>${w:format(model.report.memCache.baseCacheInfo.hitPercent,'00.0%')}</td>
</tr>
<tr>
<td>&nbsp;</td>
<td>&nbsp;</td>
</tr>
<tr class="odd">
<th>kvdbCache缓存平均响应时间（ms）</th>
<th>KvdbCache缓存平均响应时间</th>
<td>${w:formatNumber(model.report.kvdbCache.baseCacheInfo.responseTime,'0.0','ms')}</td>
</tr>
<tr class="even">
<th>kvdbCache缓存月总访问量</th>
<th>KvdbCache缓存总访问量</th>
<td>${w:formatNumber(model.report.kvdbCache.baseCacheInfo.total,'0.0','')}</td>
</tr>
<tr class="odd">
<th>kvdbCache缓存命中率</th>
<td>${w:format(model.report.kvdbCache.baseCacheInfo.hitPercent,'00.0000%')}</td>
<th>KvdbCache缓存命中率</th>
<td>${w:format(model.report.kvdbCache.baseCacheInfo.hitPercent,'00.0%')}</td>
</tr>
<tr>
<td>&nbsp;</td>
<td>&nbsp;</td>
</tr>
<tr class="odd">
<th>webCache缓存平均响应时间（ms）</th>
<th>WebCache缓存平均响应时间</th>
<td>${w:formatNumber(model.report.webCache.baseCacheInfo.responseTime,'0.0','ms')}</td>
</tr>
<tr class="even">
<th>webCache缓存月总访问量</th>
<th>WebCache缓存总访问量</th>
<td>${w:formatNumber(model.report.webCache.baseCacheInfo.total,'0.0','')}</td>
</tr>
<tr class="odd">
<th>webCache缓存命中率</th>
<td>${w:format(model.report.webCache.baseCacheInfo.hitPercent,'00.0000%')}</td>
<th>WebCache缓存命中率</th>
<td>${w:format(model.report.webCache.baseCacheInfo.hitPercent,'00.0%')}</td>
</tr>
<tr>
......@@ -178,17 +175,17 @@
</tr>
<tr class="odd">
<th>Exception月异常数</th>
<th>Exception异常数</th>
<td>${w:formatNumber(model.report.problemInfo.exceptions,'0.0','')}</td>
</tr>
<tr class="even">
<th>Long-url月总次数（大于1000ms）</th>
<th>Long-url总次数（大于1000ms）</th>
<td>${w:formatNumber(model.report.problemInfo.longUrls,'0.0','')}</td>
</tr>
<tr class="odd">
<th>Long-url百分比</th>
<td>${w:format(model.report.problemInfo.longUrlPercent,'00.0000%')}</td>
<td>${w:format(model.report.problemInfo.longUrlPercent,'00.0%')}</td>
</tr>
<tr>
......@@ -197,12 +194,12 @@
</tr>
<tr class="odd">
<th>Long-service月总次数（大于1000ms）</th>
<th>Long-service总次数（大于50ms）</th>
<td>${w:formatNumber(model.report.problemInfo.longServices,'0.0','')}</td>
</tr>
<tr class="even">
<th>Long-service百分比</th>
<td>${w:format(model.report.problemInfo.longServicePercent,'00.0000%')}</td>
<td>${w:format(model.report.problemInfo.longServicePercent,'00.0%')}</td>
</tr>
<tr>
......@@ -211,23 +208,23 @@
</tr>
<tr class="odd">
<th>Long-sql月总次数（大于100ms）</th>
<th>Long-sql总次数（大于100ms）</th>
<td>${w:formatNumber(model.report.problemInfo.longSqls,'0.0','')}</td>
</tr>
<tr class="even">
<th>Long-sql百分比</th>
<td>${w:format(model.report.problemInfo.longSqlPercent,'00.0000%')}</td>
<td>${w:format(model.report.problemInfo.longSqlPercent,'00.0%')}</td>
</tr>
<tr><td>&nbsp;</td><td>&nbsp;</td></tr>
<tr class="odd">
<th>Long-cache月总次数（大于10ms）</th>
<th>Long-cache总次数（大于10ms）</th>
<td>${w:formatNumber(model.report.problemInfo.longCaches,'0.0','')}</td>
</tr>
<tr class="even">
<th>Long-cache百分比</th>
<td>${w:format(model.report.problemInfo.longCachePercent,'00.0000%')}</td>
<td>${w:format(model.report.problemInfo.longCachePercent,'00.0%')}</td>
</tr>
</table>
</div>
......
cat-home/src/main/webapp/jsp/report/healthHistory.jsp
浏览文件 @ 532e95a5
......@@ -3,24 +3,21 @@
<%@ taglib prefix="w" uri="http://www.unidal.org/web/core"%>
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
<%@ taglib prefix="res" uri="http://www.unidal.org/webres"%>
<jsp:useBean id="ctx" type="com.dianping.cat.report.page.task.health.Context"
scope="request" />
<jsp:useBean id="payload"
type="com.dianping.cat.report.page.task.health.Payload" scope="request" />
<jsp:useBean id="model" type="com.dianping.cat.report.page.task.health.Model"
scope="request" />
<jsp:useBean id="ctx" type="com.dianping.cat.report.page.health.Context" scope="request" />
<jsp:useBean id="payload"type="com.dianping.cat.report.page.health.Payload" scope="request" />
<jsp:useBean id="model" type="com.dianping.cat.report.page.health.Model" scope="request" />
<a:historyReport title="Health Report" navUrlPrefix="domain=${model.domain}&reportType=${model.reportType}">
<jsp:attribute name="subtitle">From ${w:format(payload.historyStartDate,'yyyy-MM-dd HH:mm:ss')} to ${w:format(payload.historyDisplayEndDate,'yyyy-MM-dd HH:mm:ss')}</jsp:attribute>
<jsp:body>
<res:useCss value="${res.css.local.health_css}" target="head-css" />
<br>
<h2>综合指标：99</h2>
<h2>综合指标：***</h2>
<div style="float: left;width:100%">
<div style="width: 33%; float: left">
<table class="health">
<tr class="odd">
<th>URL请求平均响应时间（ms）</th>
<th>URL请求平均响应时间</th>
<td>${w:formatNumber(model.report.url.baseInfo.responseTime,'0.0','ms')}</td>
</tr>
<tr class="even">
......@@ -42,7 +39,7 @@
</tr>
<tr class="odd">
<th>(从服务端看)Service请求平均响应时间（ms）</th>
<th>(从服务端看)Service请求平均响应时间</th>
<td>${w:formatNumber(model.report.service.baseInfo.responseTime,'0.0','ms')}</td>
</tr>
<tr class="even">
......@@ -64,7 +61,7 @@
</tr>
<tr class="odd">
<th>(从客户端看)Service请求平均响应时间（ms）</th>
<th>(从客户端看)Service请求平均响应时间</th>
<td>${w:formatNumber(model.report.clientService.baseInfo.responseTime,'0.0','ms')}</td>
</tr>
<tr class="even">
......@@ -86,7 +83,7 @@
</tr>
<tr class="odd">
<th>远程调用平均响应时间（ms）</th>
<th>远程调用平均响应时间</th>
<td>${w:formatNumber(model.report.call.baseInfo.responseTime,'0.0','ms')}</td>
</tr>
<tr class="even">
......@@ -108,7 +105,7 @@
</tr>
<tr class="odd">
<th>数据库平均响应时间（ms）</th>
<th>数据库平均响应时间</th>
<td>${w:formatNumber(model.report.sql.baseInfo.responseTime,'0.0','ms')}</td>
</tr>
<tr class="even">
......@@ -128,48 +125,48 @@
<div style="width: 33%; float:left">
<table>
<tr class="odd">
<th>memcached缓存平均响应时间（ms）</th>
<th>Memcached缓存平均响应时间</th>
<td>${w:formatNumber(model.report.memCache.baseCacheInfo.responseTime,'0.0','ms')}</td>
</tr>
<tr class="even">
<th>memcached缓存月总访问量</th>
<th>Memcached缓存总访问量</th>
<td>${w:formatNumber(model.report.memCache.baseCacheInfo.total,'0.0','')}</td>
</tr>
<tr class="odd">
<th>memcached缓存命中率</th>
<td>${w:format(model.report.memCache.baseCacheInfo.hitPercent,'00.0000%')}</td>
<th>Memcached缓存命中率</th>
<td>${w:format(model.report.memCache.baseCacheInfo.hitPercent,'00.0%')}</td>
</tr>
<tr>
<td>&nbsp;</td>
<td>&nbsp;</td>
</tr>
<tr class="odd">
<th>kvdbCache缓存平均响应时间（ms）</th>
<th>KvdbCache缓存平均响应时间</th>
<td>${w:formatNumber(model.report.kvdbCache.baseCacheInfo.responseTime,'0.0','ms')}</td>
</tr>
<tr class="even">
<th>kvdbCache缓存月总访问量</th>
<th>KvdbCache缓存总访问量</th>
<td>${w:formatNumber(model.report.kvdbCache.baseCacheInfo.total,'0.0','')}</td>
</tr>
<tr class="odd">
<th>kvdbCache缓存命中率</th>
<td>${w:format(model.report.kvdbCache.baseCacheInfo.hitPercent,'00.0000%')}</td>
<th>KvdbCache缓存命中率</th>
<td>${w:format(model.report.kvdbCache.baseCacheInfo.hitPercent,'00.0%')}</td>
</tr>
<tr>
<td>&nbsp;</td>
<td>&nbsp;</td>
</tr>
<tr class="odd">
<th>webCache缓存平均响应时间（ms）</th>
<th>WebCache缓存平均响应时间</th>
<td>${w:formatNumber(model.report.webCache.baseCacheInfo.responseTime,'0.0','ms')}</td>
</tr>
<tr class="even">
<th>webCache缓存月总访问量</th>
<th>WebCache缓存总访问量</th>
<td>${w:formatNumber(model.report.webCache.baseCacheInfo.total,'0.0','')}</td>
</tr>
<tr class="odd">
<th>webCache缓存命中率</th>
<td>${w:format(model.report.webCache.baseCacheInfo.hitPercent,'00.0000%')}</td>
<th>WebCache缓存命中率</th>
<td>${w:format(model.report.webCache.baseCacheInfo.hitPercent,'00.0%')}</td>
</tr>
<tr>
......@@ -178,17 +175,17 @@
</tr>
<tr class="odd">
<th>Exception月异常数</th>
<th>Exception异常数</th>
<td>${w:formatNumber(model.report.problemInfo.exceptions,'0.0','')}</td>
</tr>
<tr class="even">
<th>Long-url月总次数（大于1000ms）</th>
<th>Long-url总次数（大于1000ms）</th>
<td>${w:formatNumber(model.report.problemInfo.longUrls,'0.0','')}</td>
</tr>
<tr class="odd">
<th>Long-url百分比</th>
<td>${w:format(model.report.problemInfo.longUrlPercent,'00.0000%')}</td>
<td>${w:format(model.report.problemInfo.longUrlPercent,'00.0%')}</td>
</tr>
<tr>
......@@ -197,12 +194,12 @@
</tr>
<tr class="odd">
<th>Long-service月总次数（大于1000ms）</th>
<th>Long-service总次数（大于50ms）</th>
<td>${w:formatNumber(model.report.problemInfo.longServices,'0.0','')}</td>
</tr>
<tr class="even">
<th>Long-service百分比</th>
<td>${w:format(model.report.problemInfo.longServicePercent,'00.0000%')}</td>
<td>${w:format(model.report.problemInfo.longServicePercent,'00.0%')}</td>
</tr>
<tr>
......@@ -211,23 +208,23 @@
</tr>
<tr class="odd">
<th>Long-sql月总次数（大于100ms）</th>
<th>Long-sql总次数（大于100ms）</th>
<td>${w:formatNumber(model.report.problemInfo.longSqls,'0.0','')}</td>
</tr>
<tr class="even">
<th>Long-sql百分比</th>
<td>${w:format(model.report.problemInfo.longSqlPercent,'00.0000%')}</td>
<td>${w:format(model.report.problemInfo.longSqlPercent,'00.0%')}</td>
</tr>
<tr><td>&nbsp;</td><td>&nbsp;</td></tr>
<tr class="odd">
<th>Long-cache月总次数（大于10ms）</th>
<th>Long-cache总次数（大于10ms）</th>
<td>${w:formatNumber(model.report.problemInfo.longCaches,'0.0','')}</td>
</tr>
<tr class="even">
<th>Long-cache百分比</th>
<td>${w:format(model.report.problemInfo.longCachePercent,'00.0000%')}</td>
<td>${w:format(model.report.problemInfo.longCachePercent,'00.0%')}</td>
</tr>
</table>
</div>
......@@ -309,9 +306,6 @@
</table>
</div>
</div>
</jsp:body>
</a:historyReport>
cat-home/src/main/webapp/jsp/report/home.jsp
浏览文件 @ 532e95a5
......@@ -25,8 +25,8 @@ Welcome to <b>Central Application Tracking (CAT)</b>.
<br>
<br>
<table class='version'>
<tr class="odd"><td>版本</td><td>说明</td><td>发布时间</td></tr>
<tr class="even"><td>0.4.1</td><td>1、默认禁止心跳线程获取线程锁信息，以降低对业务线程的影响。</td><td>2012-09-06</td></tr>
<tr class="even"><td>版本</td><td>说明</td><td>发布时间</td></tr>
<tr class="odd"><td>0.4.1</td><td>1、默认禁止心跳线程获取线程锁信息，以降低对业务线程的影响。</td><td>2012-09-06</td></tr>
<tr class="even"><td>0.4.0</td><td>1、支持开关动态关闭。2、支持分布式Logview的查看(关联pigeon的call)。</td><td>2012-08-20</td></tr>
<tr class="odd"><td>0.3.4</td><td>1、规范了CAT客户端的日志。2、规范了后台模块的加载顺序。3、统一服务端配置存取。4、新增心跳报表的Http线程 </td><td>2012-07-25</td></tr>
<tr class="even"><td>0.3.3</td><td>1、修改CAT线程为后台Dameon线程。2、减少CAT的日志输出。3、修复了极端情况客户端丢失部分消息。4、支持CAT的延迟加载。5、修复了0.3.2一个getLog的bug</td><td>2012-07-17</td></tr>
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或