Skip to content

C
cat

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

从无法访问的项目Fork

通知 1
Star 0
Fork 0
C
cat

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

提交 d7eb0eb4 编写于 作者: Y youyong205
浏览文件
操作

merge code

上级 832124a4 eba0ea1d
隐藏空白更改
内联 并排
Showing with 256 addition and 286 deletion
cat-home/src/main/java/com/dianping/cat/report/page/event/Payload.java
浏览文件 @ d7eb0eb4
package com.dianping.cat.report.page.event;
import java.net.URLEncoder;
import org.unidal.web.mvc.ActionContext;
import org.unidal.web.mvc.payload.annotation.FieldMeta;
......@@ -21,7 +23,7 @@ public class Payload extends AbstractReportPayload<Action> {
@FieldMeta("type")
private String m_type;
@FieldMeta("group")
private String m_group;
......@@ -35,8 +37,8 @@ public class Payload extends AbstractReportPayload<Action> {
}
public String getGroup() {
return m_group;
}
return m_group;
}
public String getName() {
return m_name;
......@@ -50,6 +52,14 @@ public class Payload extends AbstractReportPayload<Action> {
return m_type;
}
public String getEncodedType() {
try {
return URLEncoder.encode(m_type, "utf-8");
} catch (Exception e) {
return m_type;
}
}
public boolean isShowAll() {
return m_showAll;
}
......@@ -59,8 +69,8 @@ public class Payload extends AbstractReportPayload<Action> {
}
public void setGroup(String group) {
m_group = group;
}
m_group = group;
}
public void setName(String name) {
m_name = name;
......
cat-home/src/main/java/com/dianping/cat/report/page/transaction/Payload.java
浏览文件 @ d7eb0eb4
package com.dianping.cat.report.page.transaction;
import java.net.URLEncoder;
import org.unidal.web.mvc.ActionContext;
import org.unidal.web.mvc.payload.annotation.FieldMeta;
......@@ -24,10 +26,10 @@ public class Payload extends AbstractReportPayload<Action> {
@FieldMeta("xml")
private boolean m_xml;
@FieldMeta("group")
private String m_group;
public Payload() {
super(ReportPage.TRANSACTION);
}
......@@ -38,8 +40,8 @@ public class Payload extends AbstractReportPayload<Action> {
}
public String getGroup() {
return m_group;
}
return m_group;
}
public String getName() {
return m_name;
......@@ -56,7 +58,15 @@ public class Payload extends AbstractReportPayload<Action> {
public String getType() {
return m_type;
}
public String getEncodedType() {
try {
return URLEncoder.encode(m_type, "utf-8");
} catch (Exception e) {
return m_type;
}
}
public boolean isXml() {
return m_xml;
}
......@@ -66,8 +76,8 @@ public class Payload extends AbstractReportPayload<Action> {
}
public void setGroup(String group) {
m_group = group;
}
m_group = group;
}
public void setName(String name) {
m_name = name;
......
cat-home/src/main/resources/META-INF/dal/model/storage-report-codegen.xml 0 → 100644
浏览文件 @ d7eb0eb4
<?xml version="1.0" encoding="UTF-8"?>
<model>
<entity name="storage-report" root="true">
<attribute name="id" value-type="String" />
<attribute name="domain" value-type="String" />
<attribute name="type" value-type="String" />
<attribute name="startTime" value-type="Date" format="yyyy-MM-dd HH:mm:ss" />
<attribute name="endTime" value-type="Date" format="yyyy-MM-dd HH:mm:ss" />
<entity-ref name="machine" type="list" names="machines" />
</entity>
<entity name="machine">
<attribute name="id" value-type="String" />
<entity-ref name="domain" type="list" names="domains" />
</entity>
<entity name="domain">
<attribute name="id" value-type="String" />
<entity-ref name="operation" type="list" names="operations" />
</entity>
<entity name="operation">
<attribute name="id" value-type="String" />
<attribute name="count" value-type="int" />
<attribute name="avg" value-type="int" />
<attribute name="sum" value-type="int" />
<attribute name="error" value-type="int" />
<attribute name="long-count" value-type="int" />
<entity-ref name="segment" type="list" names="segments" />
</entity>
<entity name="segment">
<attribute name="id" value-type="int" />
<attribute name="count" value-type="int" />
<attribute name="avg" value-type="int" />
<attribute name="sum" value-type="int" />
<attribute name="error" value-type="int" />
<attribute name="long-count" value-type="int" />
</entity>
</model>
cat-home/src/main/resources/META-INF/dal/model/storage-report-manifest.xml 0 → 100644
浏览文件 @ d7eb0eb4
<?xml version="1.0" encoding="UTF-8"?>
<manifest>
<file path="storage-report-codegen.xml" />
<file path="storage-report-model.xml" />
</manifest>
cat-home/src/main/resources/META-INF/dal/model/storage-report-model.xml 0 → 100644
浏览文件 @ d7eb0eb4
<?xml version="1.0" encoding="UTF-8"?>
<model model-package="com.dianping.cat.home.storage" enable-merger="true" enable-sax-parser="true"
enable-base-visitor="true" enable-native-parser="true" enable-native-builder="true">
<entity name="storage-report" root="true">
<attribute name="id" value-type="String" />
<attribute name="domain" value-type="String" />
<attribute name="type" value-type="String" />
<attribute name="startTime" value-type="Date" format="yyyy-MM-dd HH:mm:ss" />
<attribute name="endTime" value-type="Date" format="yyyy-MM-dd HH:mm:ss" />
<entity-ref name="machine" type="map" names="machines" />
</entity>
<entity name="machine">
<attribute name="id" value-type="String" key="true"/>
<entity-ref name="domain" type="map" names="domains" />
</entity>
<entity name="domain">
<attribute name="id" value-type="String" key="true"/>
<entity-ref name="operation" type="map" names="operations" />
</entity>
<entity name="operation">
<attribute name="id" value-type="String" key="true"/>
<attribute name="count" value-type="long" primitive="true" method-inc="true" />
<attribute name="avg" value-type="double" primitive="true" format="0.0"/>
<attribute name="sum" value-type="double" primitive="true" format="0.0" method-inc="true" />
<attribute name="error" value-type="long" primitive="true" method-inc="true" />
<attribute name="long-count" value-type="long" primitive="true" method-inc="true" />
<entity-ref name="segment" type="map" names="segments" />
</entity>
<entity name="segment">
<attribute name="id" value-type="int" primitive="true" key="true"/>
<attribute name="count" value-type="long" primitive="true" method-inc="true" />
<attribute name="avg" value-type="double" primitive="true" format="0.0" />
<attribute name="sum" value-type="double" primitive="true" format="0.0" method-inc="true" />
<attribute name="error" value-type="long" primitive="true" method-inc="true" />
<attribute name="long-count" value-type="long" primitive="true" method-inc="true" />
</entity>
</model>
cat-home/src/main/resources/META-INF/wizard/model/wizard.xml
浏览文件 @ d7eb0eb4
......@@ -84,4 +84,7 @@
<model package="com.dianping.cat.home.exception" name="exception-rule-config">
<sample-model>src/main/resources/config/exceptionRuleConfig.xml</sample-model>
</model>
<model package="com.dianping.cat.home.storage" name="storage-report">
<sample-model>src/test/resources/com/dianping/cat/report/page/storage/storage.xml</sample-model>
</model>
</wizard>
cat-home/src/main/webapp/jsp/report/event/event.jsp
浏览文件 @ d7eb0eb4
......@@ -11,7 +11,7 @@
<a:report
title="Event Report${empty payload.type ? '' : ' :: '}<a href='?domain=${model.domain}&date=${model.date}&type=${payload.type}'>${payload.type}</a>"
navUrlPrefix="ip=${model.ipAddress}&domain=${model.domain}${empty payload.type ? '' : '&type='}${payload.type}"
navUrlPrefix="ip=${model.ipAddress}&domain=${model.domain}${empty payload.encodedType ? '' : '&type='}${payload.encodedType}"
timestamp="${w:format(model.creatTime,'yyyy-MM-dd HH:mm:ss')}">
<jsp:attribute name="subtitle">${w:format(report.startTime,'yyyy-MM-dd HH:mm:ss')} to ${w:format(report.endTime,'yyyy-MM-dd HH:mm:ss')}</jsp:attribute>
......@@ -23,19 +23,19 @@
<th>&nbsp;[&nbsp;
<c:choose>
<c:when test="${model.ipAddress eq 'All'}">
<a href="?domain=${model.domain}&date=${model.date}&type=${payload.type}" class="current">All</a>
<a href="?domain=${model.domain}&date=${model.date}&type=${payload.encodedType}" class="current">All</a>
</c:when>
<c:otherwise>
<a href="?domain=${model.domain}&date=${model.date}&type=${payload.type}">All</a>
<a href="?domain=${model.domain}&date=${model.date}&type=${payload.encodedType}">All</a>
</c:otherwise>
</c:choose> &nbsp;]&nbsp; <c:forEach var="ip" items="${model.ips}">
&nbsp;[&nbsp;
<c:choose>
<c:when test="${model.ipAddress eq ip}">
<a href="?domain=${model.domain}&ip=${ip}&date=${model.date}&type=${payload.type}" class="current">${ip}</a>
<a href="?domain=${model.domain}&ip=${ip}&date=${model.date}&type=${payload.encodedType}" class="current">${ip}</a>
</c:when>
<c:otherwise>
<a href="?domain=${model.domain}&ip=${ip}&date=${model.date}&type=${payload.type}">${ip}</a>
<a href="?domain=${model.domain}&ip=${ip}&date=${model.date}&type=${payload.encodedType}">${ip}</a>
</c:otherwise>
</c:choose>
&nbsp;]&nbsp;
......@@ -93,14 +93,14 @@
</c:when>
<c:otherwise>
<tr>
<th class="left"><a href="?op=graphs&domain=${model.domain}&date=${model.date}&type=${payload.type}&ip=${model.ipAddress}" class="graph_link" data-status="-1">[:: show ::]</a>
<th class="left"><a href="?op=graphs&domain=${model.domain}&date=${model.date}&type=${payload.encodedType}&ip=${model.ipAddress}" class="graph_link" data-status="-1">[:: show ::]</a>
<a href="?domain=${model.domain}&date=${model.date}&ip=${model.ipAddress}&type=${payload.type}&sort=type"> Name</a></th>
<th class="right"><a href="?domain=${model.domain}&date=${model.date}&ip=${model.ipAddress}&type=${payload.type}&sort=total">Total</a></th>
<th class="right"><a href="?domain=${model.domain}&date=${model.date}&ip=${model.ipAddress}&type=${payload.type}&sort=failure">Failure</a></th>
<th class="right"><a href="?domain=${model.domain}&date=${model.date}&ip=${model.ipAddress}&type=${payload.type}&sort=failurePercent">Failure%</a></th>
<th class="right"><a href="?domain=${model.domain}&date=${model.date}&ip=${model.ipAddress}&type=${payload.encodedType}&sort=total">Total</a></th>
<th class="right"><a href="?domain=${model.domain}&date=${model.date}&ip=${model.ipAddress}&type=${payload.encodedType}&sort=failure">Failure</a></th>
<th class="right"><a href="?domain=${model.domain}&date=${model.date}&ip=${model.ipAddress}&type=${payload.encodedType}&sort=failurePercent">Failure%</a></th>
<th class="center">Sample Link</th>
<th class="right"><a href="?domain=${model.domain}&date=${model.date}&ip=${model.ipAddress}&type=${payload.type}&sort=total">QPS</a></th>
<th class="right"><a href="?domain=${model.domain}&date=${model.date}&ip=${model.ipAddress}&type=${payload.type}&sort=total">Percent%</a></th>
<th class="right"><a href="?domain=${model.domain}&date=${model.date}&ip=${model.ipAddress}&type=${payload.encodedType}&sort=total">QPS</a></th>
<th class="right"><a href="?domain=${model.domain}&date=${model.date}&ip=${model.ipAddress}&type=${payload.encodedType}&sort=total">Percent%</a></th>
</tr>
<tr class="graphs"><td colspan="7" style="display:none"><div id="-1" style="display: none"></div></td></tr>
<c:forEach var="item" items="${model.displayNameReport.results}" varStatus="status">
......@@ -110,7 +110,7 @@
<td class="left">
<c:choose>
<c:when test="${status.index > 0}">
<a href="?op=graphs&domain=${report.domain}&ip=${model.ipAddress}&date=${model.date}&type=${payload.type}&name=${item.name}" class="graph_link" data-status="${status.index}">[:: show ::]</a>
<a href="?op=graphs&domain=${report.domain}&ip=${model.ipAddress}&date=${model.date}&type=${payload.encodedType}&name=${item.name}" class="graph_link" data-status="${status.index}">[:: show ::]</a>
</c:when>
</c:choose>
&nbsp;&nbsp;${e.id}
......
cat-home/src/main/webapp/jsp/report/event/eventGroup.jsp
浏览文件 @ d7eb0eb4
......@@ -10,8 +10,8 @@
<c:set var="report" value="${model.report}" />
<a:report
title="Event Report${empty payload.type ? '' : ' :: '}<a href='?op=groupReport&domain=${model.domain}&date=${model.date}&group=${payload.group}&type=${payload.type}'>${payload.type}</a>"
navUrlPrefix="op=groupReport&op=groupReport&domain=${model.domain}${empty payload.type ? '' : '&type='}${payload.type}"
title="Event Report${empty payload.type ? '' : ' :: '}<a href='?op=groupReport&domain=${model.domain}&date=${model.date}&group=${payload.group}&type=${payload.encodedType}'>${payload.type}</a>"
navUrlPrefix="op=groupReport&op=groupReport&domain=${model.domain}${empty payload.type ? '' : '&type='}${payload.encodedType}"
timestamp="${w:format(model.creatTime,'yyyy-MM-dd HH:mm:ss')}">
<jsp:attribute name="subtitle">${w:format(report.startTime,'yyyy-MM-dd HH:mm:ss')} to ${w:format(report.endTime,'yyyy-MM-dd HH:mm:ss')}</jsp:attribute>
......@@ -21,11 +21,11 @@
<table class="machines">
<tr class="left">
<th>&nbsp;[&nbsp;
<a href="?domain=${model.domain}&date=${model.date}&group=${payload.group}&type=${payload.type}" >All</a>
<a href="?domain=${model.domain}&date=${model.date}&group=${payload.group}&type=${payload.encodedType}" >All</a>
&nbsp;]&nbsp;
<c:forEach var="ip" items="${model.ips}">
&nbsp;[&nbsp;
<a href="?domain=${model.domain}&ip=${ip}&date=${model.date}&group=${payload.group}&type=${payload.type}">${ip}</a>
<a href="?domain=${model.domain}&ip=${ip}&date=${model.date}&group=${payload.group}&type=${payload.encodedType}">${ip}</a>
&nbsp;]&nbsp;
</c:forEach>
</th>
......@@ -83,7 +83,7 @@ $(document).ready(function() {
<tr class=" right">
<td class="left">
<a href="?domain=${model.domain}&date=${model.date}&group=${payload.group}&op=groupReport&sort=type"><a href="?op=groupGraphs&domain=${model.domain}&date=${model.date}&group=${payload.group}&type=${item.type}" class="graph_link" data-status="${status.index}">[:: show ::]</a>
&nbsp;&nbsp;<a href="?domain=${report.domain}&date=${model.date}&group=${payload.group}&op=groupReport&type=${item.type}">${item.type}</a>
&nbsp;&nbsp;<a href="?domain=${report.domain}&date=${model.date}&group=${payload.group}&op=groupReport&type=${item.type}">${item.detail.id}</a>
</td>
<td>${w:format(e.totalCount,'#,###,###,###,##0')}</td>
<td>${w:format(e.failCount,'#,###,###,###,##0')}</td>
......@@ -98,14 +98,14 @@ $(document).ready(function() {
</c:when>
<c:otherwise>
<tr>
<th class="left"><a href="?op=groupGraphs&domain=${model.domain}&date=${model.date}&group=${payload.group}&type=${payload.type}&op=groupReport" class="graph_link" data-status="-1">[:: show ::]</a>
<a href="?domain=${model.domain}&date=${model.date}&group=${payload.group}&op=groupReport&type=${payload.type}&sort=type"> Name</a></th>
<th><a href="?domain=${model.domain}&date=${model.date}&group=${payload.group}&op=groupReport&type=${payload.type}&sort=total">Total</a></th>
<th><a href="?domain=${model.domain}&date=${model.date}&group=${payload.group}&op=groupReport&type=${payload.type}&sort=failure">Failure</a></th>
<th><a href="?domain=${model.domain}&date=${model.date}&group=${payload.group}&op=groupReport&type=${payload.type}&sort=failurePercent">Failure%</a></th>
<th class="left"><a href="?op=groupGraphs&domain=${model.domain}&date=${model.date}&group=${payload.group}&type=${payload.encodedType}&op=groupReport" class="graph_link" data-status="-1">[:: show ::]</a>
<a href="?domain=${model.domain}&date=${model.date}&group=${payload.group}&op=groupReport&type=${payload.encodedType}&sort=type"> Name</a></th>
<th><a href="?domain=${model.domain}&date=${model.date}&group=${payload.group}&op=groupReport&type=${payload.encodedType}&sort=total">Total</a></th>
<th><a href="?domain=${model.domain}&date=${model.date}&group=${payload.group}&op=groupReport&type=${payload.encodedType}&sort=failure">Failure</a></th>
<th><a href="?domain=${model.domain}&date=${model.date}&group=${payload.group}&op=groupReport&type=${payload.encodedType}&sort=failurePercent">Failure%</a></th>
<th>Sample Link</th>
<th><a href="?domain=${model.domain}&date=${model.date}&group=${payload.group}&op=groupReport&type=${payload.type}&sort=total">QPS</a></th>
<th><a href="?domain=${model.domain}&date=${model.date}&group=${payload.group}&op=groupReport&type=${payload.type}&sort=total">Percent%</a></th>
<th><a href="?domain=${model.domain}&date=${model.date}&group=${payload.group}&op=groupReport&type=${payload.encodedType}&sort=total">QPS</a></th>
<th><a href="?domain=${model.domain}&date=${model.date}&group=${payload.group}&op=groupReport&type=${payload.encodedType}&sort=total">Percent%</a></th>
</tr>
<tr class="graphs"><td colspan="7" style="display:none"><div id="-1" style="display: none"></div></td></tr>
<c:forEach var="item" items="${model.displayNameReport.results}" varStatus="status">
......@@ -115,7 +115,7 @@ $(document).ready(function() {
<td class="left">
<c:choose>
<c:when test="${status.index > 0}">
<a href="?op=groupGraphs&domain=${report.domain}&op=groupReport&date=${model.date}&group=${payload.group}&type=${payload.type}&name=${item.name}" class="graph_link" data-status="${status.index}">[:: show ::]</a>
<a href="?op=groupGraphs&domain=${report.domain}&op=groupReport&date=${model.date}&group=${payload.group}&type=${payload.encodedType}&name=${item.name}" class="graph_link" data-status="${status.index}">[:: show ::]</a>
</c:when>
</c:choose>
&nbsp;&nbsp;${e.id}
......
cat-home/src/main/webapp/jsp/report/event/eventHistoryGroupReport.jsp
浏览文件 @ d7eb0eb4
......@@ -7,7 +7,7 @@
<jsp:useBean id="payload" type="com.dianping.cat.report.page.event.Payload" scope="request" />
<jsp:useBean id="model" type="com.dianping.cat.report.page.event.Model" scope="request" />
<a:historyReport title="History Report" navUrlPrefix="type=${payload.type}&group=${payload.group}">
<a:historyReport title="History Report" navUrlPrefix="type=${payload.encodedType}&group=${payload.group}">
<jsp:attribute name="subtitle">${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:useJs value="${res.js.local['baseGraph.js']}" target="head-js"/>
......@@ -62,10 +62,10 @@ $(document).ready(function() {
<c:choose>
<c:when test="${empty payload.type}">
<tr>
<th style="text-align: left;"><a href="?op=historyGroupReport&domain=${model.domain}&date=${model.date}&group=${payload.group}&reportType=${model.reportType}&sort=type${model.customDate}"> Type</a></th>
<th class="right"><a href="?op=historyGroupReport&domain=${model.domain}&date=${model.date}&group=${payload.group}&reportType=${model.reportType}&sort=total${model.customDate}">Total</a></th>
<th class="right"><a href="?op=historyGroupReport&domain=${model.domain}&date=${model.date}&group=${payload.group}&reportType=${model.reportType}&sort=failure${model.customDate}">Failure</a></th>
<th class="right"><a href="?op=historyGroupReport&domain=${model.domain}&date=${model.date}&group=${payload.group}&reportType=${model.reportType}&sort=failurePercent${model.customDate}">Failure%</a></th>
<th style="text-align: left;"><a href="?op=historyGroupReport&domain=${model.domain}&date=${model.date}&group=${payload.group}&reportType=${model.reportType}&sort=type${model.customDate}"> Type</a></th>
<th class="right"><a href="?op=historyGroupReport&domain=${model.domain}&date=${model.date}&group=${payload.group}&reportType=${model.reportType}&sort=total${model.customDate}">Total</a></th>
<th class="right"><a href="?op=historyGroupReport&domain=${model.domain}&date=${model.date}&group=${payload.group}&reportType=${model.reportType}&sort=failure${model.customDate}">Failure</a></th>
<th class="right"><a href="?op=historyGroupReport&domain=${model.domain}&date=${model.date}&group=${payload.group}&reportType=${model.reportType}&sort=failurePercent${model.customDate}">Failure%</a></th>
<th class="right">Sample Link</th><th class="right"><a href="?op=historyGroupReport&domain=${model.domain}&date=${model.date}&group=${payload.group}&reportType=${model.reportType}&sort=total${model.customDate}">QPS</a></th>
</tr>
<c:forEach var="item" items="${model.displayTypeReport.results}"
......@@ -74,8 +74,8 @@ $(document).ready(function() {
<c:set var="lastIndex" value="${status.index}" />
<tr class=" right">
<td style="text-align: left">
<a href="?op=historyGroupGraph&domain=${model.domain}&date=${model.date}&group=${payload.group}&reportType=${model.reportType}&type=${item.type}${model.customDate}" class="history_graph_link" data-status="${status.index}">[:: show ::]</a>
&nbsp;&nbsp;&nbsp;<a href="?op=historyGroupReport&domain=${model.domain}&date=${model.date}&group=${payload.group}&reportType=${model.reportType}&type=${item.type}${model.customDate}">${item.type}</a></td>
<a href="?op=historyGroupGraph&domain=${model.domain}&date=${model.date}&group=${payload.encodedType}&reportType=${model.reportType}&type=${item.type}${model.customDate}" class="history_graph_link" data-status="${status.index}">[:: show ::]</a>
&nbsp;&nbsp;&nbsp;<a href="?op=historyGroupReport&domain=${model.domain}&date=${model.date}&group=${payload.group}&reportType=${model.reportType}&type=${item.type}${model.customDate}">${e.id}</a></td>
<td>${w:format(e.totalCount,'#,###,###,###,##0')}</td>
<td>${e.failCount}</td>
<td>${w:format(e.failPercent/100,'0.0000%')}</td>
......@@ -88,12 +88,12 @@ $(document).ready(function() {
</c:when>
<c:otherwise>
<tr>
<th style="text-align: left;"><a href="?op=historyGroupGraph&domain=${model.domain}&date=${model.date}&group=${payload.group}&reportType=${model.reportType}&type=${payload.type}&sort=type${model.customDate}"> Name</a></th>
<th class="right"><a href="?op=historyGroupReport&domain=${model.domain}&date=${model.date}&group=${payload.group}&reportType=${model.reportType}&type=${payload.type}&sort=total${model.customDate}">Total</a></th>
<th class="right"><a href="?op=historyGroupReport&domain=${model.domain}&date=${model.date}&group=${payload.group}&reportType=${model.reportType}&type=${payload.type}&sort=failure${model.customDate}">Failure</a></th>
<th class="right"><a href="?op=historyGroupReport&domain=${model.domain}&date=${model.date}&group=${payload.group}&reportType=${model.reportType}&type=${payload.type}&sort=failurePercent${model.customDate}">Failure%</a></th>
<th class="right">Sample Link</th><th class="right"><a href="?op=historyGroupReport&domain=${model.domain}&date=${model.date}&group=${payload.group}&reportType=${model.reportType}&type=${payload.type}&sort=type${model.customDate}">QPS</a></th>
<th class="right"><a href="?op=historyGroupReport&domain=${model.domain}&date=${model.date}&group=${payload.group}&reportType=${model.reportType}&type=${payload.type}&sort=type${model.customDate}">Percent%</a></th>
<th style="text-align: left;"><a href="?op=historyGroupGraph&domain=${model.domain}&date=${model.date}&group=${payload.group}&reportType=${model.reportType}&type=${payload.encodedType}&sort=type${model.customDate}"> Name</a></th>
<th class="right"><a href="?op=historyGroupReport&domain=${model.domain}&date=${model.date}&group=${payload.group}&reportType=${model.reportType}&type=${payload.encodedType}&sort=total${model.customDate}">Total</a></th>
<th class="right"><a href="?op=historyGroupReport&domain=${model.domain}&date=${model.date}&group=${payload.group}&reportType=${model.reportType}&type=${payload.encodedType}&sort=failure${model.customDate}">Failure</a></th>
<th class="right"><a href="?op=historyGroupReport&domain=${model.domain}&date=${model.date}&group=${payload.group}&reportType=${model.reportType}&type=${payload.encodedType}&sort=failurePercent${model.customDate}">Failure%</a></th>
<th class="right">Sample Link</th><th class="right"><a href="?op=historyGroupReport&domain=${model.domain}&date=${model.date}&group=${payload.group}&reportType=${model.reportType}&type=${payload.encodedType}&sort=type${model.customDate}">QPS</a></th>
<th class="right"><a href="?op=historyGroupReport&domain=${model.domain}&date=${model.date}&group=${payload.group}&reportType=${model.reportType}&type=${payload.encodedType}&sort=type${model.customDate}">Percent%</a></th>
</tr>
<c:forEach var="item" items="${model.displayNameReport.results}"
varStatus="status">
......@@ -103,7 +103,7 @@ $(document).ready(function() {
<td style="text-align: left">
<c:choose>
<c:when test="${status.index > 0}">
<a href="?op=historyGroupGraph&domain=${model.domain}&date=${model.date}&group=${payload.group}&reportType=${model.reportType}&type=${payload.type}&name=${item.name}${model.customDate}" class="history_graph_link" data-status="${status.index}">[:: show ::]</a>
<a href="?op=historyGroupGraph&domain=${model.domain}&date=${model.date}&group=${payload.group}&reportType=${model.reportType}&type=${payload.encodedType}&name=${item.name}${model.customDate}" class="history_graph_link" data-status="${status.index}">[:: show ::]</a>
&nbsp;&nbsp;&nbsp;${e.id}</td>
</c:when>
<c:otherwise>
......
cat-home/src/main/webapp/jsp/report/event/eventHistoryReport.jsp
浏览文件 @ d7eb0eb4
......@@ -7,7 +7,7 @@
<jsp:useBean id="payload" type="com.dianping.cat.report.page.event.Payload" scope="request" />
<jsp:useBean id="model" type="com.dianping.cat.report.page.event.Model" scope="request" />
<a:historyReport title="History Report" navUrlPrefix="type=${payload.type}&ip=${model.ipAddress}">
<a:historyReport title="History Report" navUrlPrefix="type=${payload.encodedType}&ip=${model.ipAddress}">
<jsp:attribute name="subtitle">${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:useJs value="${res.js.local['baseGraph.js']}" target="head-js"/>
......@@ -63,7 +63,7 @@
<tr class=" right">
<td style="text-align: left">
<a href="?op=historyGraph&domain=${model.domain}&date=${model.date}&ip=${model.ipAddress}&reportType=${model.reportType}&type=${item.type}${model.customDate}" class="history_graph_link" data-status="${status.index}">[:: show ::]</a>
&nbsp;&nbsp;&nbsp;<a href="?op=history&domain=${model.domain}&date=${model.date}&ip=${model.ipAddress}&reportType=${model.reportType}&type=${item.type}${model.customDate}">${item.type}</a></td>
&nbsp;&nbsp;&nbsp;<a href="?op=history&domain=${model.domain}&date=${model.date}&ip=${model.ipAddress}&reportType=${model.reportType}&type=${item.type}${model.customDate}">${item.detail.id}</a></td>
<td>${w:format(e.totalCount,'#,###,###,###,##0')}</td>
<td>${e.failCount}</td>
<td>${w:format(e.failPercent/100,'0.0000%')}</td>
......@@ -76,12 +76,12 @@
</c:when>
<c:otherwise>
<tr>
<th style="text-align: left;"><a href="?op=history&domain=${model.domain}&date=${model.date}&ip=${model.ipAddress}&reportType=${model.reportType}&type=${payload.type}&sort=type${model.customDate}"> Name</a></th>
<th class="right"><a href="?op=history&domain=${model.domain}&date=${model.date}&ip=${model.ipAddress}&reportType=${model.reportType}&type=${payload.type}&sort=total${model.customDate}">Total</a></th>
<th class="right"><a href="?op=history&domain=${model.domain}&date=${model.date}&ip=${model.ipAddress}&reportType=${model.reportType}&type=${payload.type}&sort=failure${model.customDate}">Failure</a></th>
<th class="right"><a href="?op=history&domain=${model.domain}&date=${model.date}&ip=${model.ipAddress}&reportType=${model.reportType}&type=${payload.type}&sort=failurePercent${model.customDate}">Failure%</a></th>
<th class="right">Sample Link</th><th class="right"><a href="?op=history&domain=${model.domain}&date=${model.date}&ip=${model.ipAddress}&reportType=${model.reportType}&type=${payload.type}&sort=type${model.customDate}">QPS</a></th>
<th class="right"><a href="?op=history&domain=${model.domain}&date=${model.date}&ip=${model.ipAddress}&reportType=${model.reportType}&type=${payload.type}&sort=type${model.customDate}">Percent%</a></th>
<th style="text-align: left;"><a href="?op=history&domain=${model.domain}&date=${model.date}&ip=${model.ipAddress}&reportType=${model.reportType}&type=${payload.encodedType}&sort=type${model.customDate}"> Name</a></th>
<th class="right"><a href="?op=history&domain=${model.domain}&date=${model.date}&ip=${model.ipAddress}&reportType=${model.reportType}&type=${payload.encodedType}&sort=total${model.customDate}">Total</a></th>
<th class="right"><a href="?op=history&domain=${model.domain}&date=${model.date}&ip=${model.ipAddress}&reportType=${model.reportType}&type=${payload.encodedType}&sort=failure${model.customDate}">Failure</a></th>
<th class="right"><a href="?op=history&domain=${model.domain}&date=${model.date}&ip=${model.ipAddress}&reportType=${model.reportType}&type=${payload.encodedType}&sort=failurePercent${model.customDate}">Failure%</a></th>
<th class="right">Sample Link</th><th class="right"><a href="?op=history&domain=${model.domain}&date=${model.date}&ip=${model.ipAddress}&reportType=${model.reportType}&type=${payload.encodedType}&sort=type${model.customDate}">QPS</a></th>
<th class="right"><a href="?op=history&domain=${model.domain}&date=${model.date}&ip=${model.ipAddress}&reportType=${model.reportType}&type=${payload.encodedType}&sort=type${model.customDate}">Percent%</a></th>
</tr>
<c:forEach var="item" items="${model.displayNameReport.results}"
varStatus="status">
......@@ -91,7 +91,7 @@
<td style="text-align: left">
<c:choose>
<c:when test="${status.index > 0}">
<a href="?op=historyGraph&domain=${model.domain}&date=${model.date}&ip=${model.ipAddress}&reportType=${model.reportType}&type=${payload.type}&name=${item.name}${model.customDate}" class="history_graph_link" data-status="${status.index}">[:: show ::]</a>
<a href="?op=historyGraph&domain=${model.domain}&date=${model.date}&ip=${model.ipAddress}&reportType=${model.reportType}&type=${payload.encodedType}&name=${item.name}${model.customDate}" class="history_graph_link" data-status="${status.index}">[:: show ::]</a>
&nbsp;&nbsp;&nbsp;${e.id}</td>
</c:when>
<c:otherwise>
......
cat-home/src/main/webapp/jsp/report/transaction/transaction.jsp
浏览文件 @ d7eb0eb4
......@@ -10,7 +10,7 @@
<jsp:useBean id="model" type="com.dianping.cat.report.page.transaction.Model" scope="request" />
<c:set var="report" value="${model.report}"/>
<a:report title="Transaction Report${empty payload.type ? '' : ' :: '}<a href='?domain=${model.domain}&date=${model.date}&type=${payload.type}'>${payload.type}</a>" navUrlPrefix="ip=${model.ipAddress}&queryname=${model.queryName}&domain=${model.domain}${empty payload.type ? '' : '&type='}${payload.type}" timestamp="${w:format(model.creatTime,'yyyy-MM-dd HH:mm:ss')}">
<a:report title="Transaction Report${empty payload.type ? '' : ' :: '}<a href='?domain=${model.domain}&date=${model.date}&type=${payload.encodedType}'>${payload.type}</a>" navUrlPrefix="ip=${model.ipAddress}&queryname=${model.queryName}&domain=${model.domain}${empty payload.type ? '' : '&type='}${payload.encodedType}" timestamp="${w:format(model.creatTime,'yyyy-MM-dd HH:mm:ss')}">
<jsp:attribute name="subtitle">${w:format(report.startTime,'yyyy-MM-dd HH:mm:ss')} to ${w:format(report.endTime,'yyyy-MM-dd HH:mm:ss')}</jsp:attribute>
<jsp:body>
<res:useJs value="${res.js.local['baseGraph.js']}" target="head-js"/>
......@@ -19,21 +19,21 @@
<tr class="left">
<th>&nbsp;[&nbsp; <c:choose>
<c:when test="${model.ipAddress eq 'All'}">
<a href="?domain=${model.domain}&date=${model.date}&type=${payload.type}&queryname=${model.queryName}"
<a href="?domain=${model.domain}&date=${model.date}&type=${payload.encodedType}&queryname=${model.queryName}"
class="current">All</a>
</c:when>
<c:otherwise>
<a href="?domain=${model.domain}&date=${model.date}&type=${payload.type}&queryname=${model.queryName}">All</a>
<a href="?domain=${model.domain}&date=${model.date}&type=${payload.encodedType}&queryname=${model.queryName}">All</a>
</c:otherwise>
</c:choose> &nbsp;]&nbsp; <c:forEach var="ip" items="${model.ips}">
&nbsp;[&nbsp;
<c:choose>
<c:when test="${model.ipAddress eq ip}">
<a href="?domain=${model.domain}&ip=${ip}&date=${model.date}&type=${payload.type}&queryname=${model.queryName}"
<a href="?domain=${model.domain}&ip=${ip}&date=${model.date}&type=${payload.encodedType}&queryname=${model.queryName}"
class="current">${ip}</a>
</c:when>
<c:otherwise>
<a href="?domain=${model.domain}&ip=${ip}&date=${model.date}&type=${payload.type}&queryname=${model.queryName}">${ip}</a>
<a href="?domain=${model.domain}&ip=${ip}&date=${model.date}&type=${payload.encodedType}&queryname=${model.queryName}">${ip}</a>
</c:otherwise>
</c:choose>
&nbsp;]&nbsp;
......@@ -102,20 +102,20 @@
支持多个字符串查询，例如sql|url|task，查询结果为包含任一sql、url、task的列。
</th></tr>
<tr>
<th style="text-align: left;"><a href="?op=graphs&domain=${report.domain}&date=${model.date}&ip=${model.ipAddress}&type=${payload.type}" class="graph_link" data-status="-1">[:: show ::]</a>
<a href="?domain=${model.domain}&date=${model.date}&ip=${model.ipAddress}&type=${payload.type}&sort=type&queryname=${model.queryName}">Name</a></th>
<th class="right"><a href="?domain=${model.domain}&date=${model.date}&ip=${model.ipAddress}&type=${payload.type}&sort=total&queryname=${model.queryName}">Total</a></th>
<th class="right"><a href="?domain=${model.domain}&date=${model.date}&ip=${model.ipAddress}&type=${payload.type}&sort=failure&queryname=${model.queryName}">Failure</a></th>
<th class="right"><a href="?domain=${model.domain}&date=${model.date}&ip=${model.ipAddress}&type=${payload.type}&sort=failurePercent&queryname=${model.queryName}">Failure%</a></th>
<th style="text-align: left;"><a href="?op=graphs&domain=${report.domain}&date=${model.date}&ip=${model.ipAddress}&type=${payload.encodedType}" class="graph_link" data-status="-1">[:: show ::]</a>
<a href="?domain=${model.domain}&date=${model.date}&ip=${model.ipAddress}&type=${payload.encodedType}&sort=type&queryname=${model.queryName}">Name</a></th>
<th class="right"><a href="?domain=${model.domain}&date=${model.date}&ip=${model.ipAddress}&type=${payload.encodedType}&sort=total&queryname=${model.queryName}">Total</a></th>
<th class="right"><a href="?domain=${model.domain}&date=${model.date}&ip=${model.ipAddress}&type=${payload.encodedType}&sort=failure&queryname=${model.queryName}">Failure</a></th>
<th class="right"><a href="?domain=${model.domain}&date=${model.date}&ip=${model.ipAddress}&type=${payload.encodedType}&sort=failurePercent&queryname=${model.queryName}">Failure%</a></th>
<th class="right">Sample Link</th>
<th class="right"><a href="?domain=${model.domain}&date=${model.date}&ip=${model.ipAddress}&type=${payload.type}&sort=min&queryname=${model.queryName}">Min</a>(ms)</th>
<th class="right"><a href="?domain=${model.domain}&date=${model.date}&ip=${model.ipAddress}&type=${payload.type}&sort=max&queryname=${model.queryName}">Max</a>(ms)</th>
<th class="right"><a href="?domain=${model.domain}&date=${model.date}&ip=${model.ipAddress}&type=${payload.type}&sort=avg&queryname=${model.queryName}">Avg</a>(ms)</th>
<th class="right"><a href="?domain=${model.domain}&date=${model.date}&ip=${model.ipAddress}&type=${payload.type}&sort=95line&queryname=${model.queryName}">95Line</a>(ms)</th>
<th class="right"><a href="?domain=${model.domain}&date=${model.date}&ip=${model.ipAddress}&type=${payload.type}&sort=99line&queryname=${model.queryName}">99.9Line</a>(ms)</th>
<th class="right"><a href="?domain=${model.domain}&date=${model.date}&ip=${model.ipAddress}&type=${payload.type}&sort=std&queryname=${model.queryName}">Std</a>(ms)</th>
<th class="right"><a href="?domain=${model.domain}&date=${model.date}&ip=${model.ipAddress}&type=${payload.type}&sort=total&queryname=${model.queryName}">QPS</a></th>
<th class="right"><a href="?domain=${model.domain}&date=${model.date}&ip=${model.ipAddress}&type=${payload.type}&sort=total&queryname=${model.queryName}">Percent%</a></th></tr>
<th class="right"><a href="?domain=${model.domain}&date=${model.date}&ip=${model.ipAddress}&type=${payload.encodedType}&sort=min&queryname=${model.queryName}">Min</a>(ms)</th>
<th class="right"><a href="?domain=${model.domain}&date=${model.date}&ip=${model.ipAddress}&type=${payload.encodedType}&sort=max&queryname=${model.queryName}">Max</a>(ms)</th>
<th class="right"><a href="?domain=${model.domain}&date=${model.date}&ip=${model.ipAddress}&type=${payload.encodedType}&sort=avg&queryname=${model.queryName}">Avg</a>(ms)</th>
<th class="right"><a href="?domain=${model.domain}&date=${model.date}&ip=${model.ipAddress}&type=${payload.encodedType}&sort=95line&queryname=${model.queryName}">95Line</a>(ms)</th>
<th class="right"><a href="?domain=${model.domain}&date=${model.date}&ip=${model.ipAddress}&type=${payload.encodedType}&sort=99line&queryname=${model.queryName}">99.9Line</a>(ms)</th>
<th class="right"><a href="?domain=${model.domain}&date=${model.date}&ip=${model.ipAddress}&type=${payload.encodedType}&sort=std&queryname=${model.queryName}">Std</a>(ms)</th>
<th class="right"><a href="?domain=${model.domain}&date=${model.date}&ip=${model.ipAddress}&type=${payload.encodedType}&sort=total&queryname=${model.queryName}">QPS</a></th>
<th class="right"><a href="?domain=${model.domain}&date=${model.date}&ip=${model.ipAddress}&type=${payload.encodedType}&sort=total&queryname=${model.queryName}">Percent%</a></th></tr>
<tr class="graphs"><td colspan="13" style="display:none"><div id="-1" style="display:none"></div></td></tr>
<c:forEach var="item" items="${model.displayNameReport.results}" varStatus="status">
<c:set var="e" value="${item.detail}"/>
......@@ -124,7 +124,7 @@
<c:choose>
<c:when test="${status.index > 0}">
<td class="left longText" style="white-space:normal">
<a href="?op=graphs&domain=${report.domain}&date=${model.date}&ip=${model.ipAddress}&type=${payload.type}&name=${item.name}" class="graph_link" data-status="${status.index}">[:: show ::]</a>
<a href="?op=graphs&domain=${report.domain}&date=${model.date}&ip=${model.ipAddress}&type=${payload.encodedType}&name=${item.name}" class="graph_link" data-status="${status.index}">[:: show ::]</a>
&nbsp;&nbsp;${w:shorten(e.id, 120)}</td>
</c:when>
<c:otherwise>
......
cat-home/src/main/webapp/jsp/report/transaction/transactionGroup.jsp
浏览文件 @ d7eb0eb4
......@@ -14,8 +14,8 @@
<c:set var="report" value="${model.report}" />
<a:report
title="Transaction Report${empty payload.type ? '' : ' :: '}<a href='?op=groupReport&group=${payload.group}&domain=${model.domain}&date=${model.date}&type=${payload.type}'>${payload.type}</a>"
navUrlPrefix="op=groupReport&group=${payload.group}&queryname=${model.queryName}&domain=${model.domain}${empty payload.type ? '' : '&type='}${payload.type}"
title="Transaction Report${empty payload.type ? '' : ' :: '}<a href='?op=groupReport&group=${payload.group}&domain=${model.domain}&date=${model.date}&type=${payload.encodedType}'>${payload.type}</a>"
navUrlPrefix="op=groupReport&group=${payload.group}&queryname=${model.queryName}&domain=${model.domain}${empty payload.type ? '' : '&type='}${payload.encodedType}"
timestamp="${w:format(model.creatTime,'yyyy-MM-dd HH:mm:ss')}">
<jsp:attribute name="subtitle">${w:format(report.startTime,'yyyy-MM-dd HH:mm:ss')} to ${w:format(report.endTime,'yyyy-MM-dd HH:mm:ss')}</jsp:attribute>
<jsp:body>
......@@ -24,17 +24,14 @@
<tr class="left">
<th>&nbsp;[&nbsp; <c:choose>
<c:when test="${model.ipAddress eq 'All'}">
<a
href="?op=view&domain=${model.domain}&date=${model.date}&type=${payload.type}&queryname=${model.queryName}">All</a>
<a href="?op=view&domain=${model.domain}&date=${model.date}&type=${payload.encodedType}&queryname=${model.queryName}">All</a>
</c:when>
<c:otherwise>
<a
href="?op=view&domain=${model.domain}&date=${model.date}&type=${payload.type}&queryname=${model.queryName}">All</a>
<a href="?op=view&domain=${model.domain}&date=${model.date}&type=${payload.encodedType}&queryname=${model.queryName}">All</a>
</c:otherwise>
</c:choose> &nbsp;]&nbsp; <c:forEach var="ip" items="${model.ips}">
&nbsp;[&nbsp;
<a
href="?op=view&domain=${model.domain}&ip=${ip}&date=${model.date}&type=${payload.type}&queryname=${model.queryName}">${ip}</a>
<a href="?op=view&domain=${model.domain}&ip=${ip}&date=${model.date}&type=${payload.encodedType}&queryname=${model.queryName}">${ip}</a>
&nbsp;]&nbsp;
</c:forEach>
</th>
......@@ -137,21 +134,21 @@
</th>
</tr>
<tr>
<th style="text-align: left;"><a href="?op=groupGraphs&domain=${report.domain}&date=${model.date}&group=${payload.group}&type=${payload.type}"
<th style="text-align: left;"><a href="?op=groupGraphs&domain=${report.domain}&date=${model.date}&group=${payload.group}&type=${payload.encodedType}"
class="graph_link" data-status="-1">[:: show ::]</a>
<a href="?op=groupReport&domain=${model.domain}&date=${model.date}&group=${payload.group}&type=${payload.type}&sort=type&queryname=${model.queryName}">Name</a></th>
<th class="right"><a href="?op=groupReport&domain=${model.domain}&date=${model.date}&group=${payload.group}&type=${payload.type}&sort=total&queryname=${model.queryName}">Total</a></th>
<th class="right"><a href="?op=groupReport&domain=${model.domain}&date=${model.date}&group=${payload.group}&type=${payload.type}&sort=failure&queryname=${model.queryName}">Failure</a></th>
<th class="right"><a href="?op=groupReport&domain=${model.domain}&date=${model.date}&group=${payload.group}&type=${payload.type}&sort=failurePercent&queryname=${model.queryName}">Failure%</a></th>
<a href="?op=groupReport&domain=${model.domain}&date=${model.date}&group=${payload.group}&type=${payload.encodedType}&sort=type&queryname=${model.queryName}">Name</a></th>
<th class="right"><a href="?op=groupReport&domain=${model.domain}&date=${model.date}&group=${payload.group}&type=${payload.encodedType}&sort=total&queryname=${model.queryName}">Total</a></th>
<th class="right"><a href="?op=groupReport&domain=${model.domain}&date=${model.date}&group=${payload.group}&type=${payload.encodedType}&sort=failure&queryname=${model.queryName}">Failure</a></th>
<th class="right"><a href="?op=groupReport&domain=${model.domain}&date=${model.date}&group=${payload.group}&type=${payload.encodedType}&sort=failurePercent&queryname=${model.queryName}">Failure%</a></th>
<th class="right">Sample Link</th>
<th class="right"><a href="?op=groupReport&domain=${model.domain}&date=${model.date}&group=${payload.group}&type=${payload.type}&sort=min&queryname=${model.queryName}">min</a>(ms)</th>
<th class="right"><a href="?op=groupReport&domain=${model.domain}&date=${model.date}&group=${payload.group}&type=${payload.type}&sort=max&queryname=${model.queryName}">max</a>(ms)</th>
<th class="right"><a href="?op=groupReport&domain=${model.domain}&date=${model.date}&group=${payload.group}&type=${payload.type}&sort=avg&queryname=${model.queryName}">Avg</a>(ms)</th>
<th class="right"><a href="?op=groupReport&domain=${model.domain}&date=${model.date}&group=${payload.group}&type=${payload.type}&sort=95line&queryname=${model.queryName}">95Line</a>(ms)</th>
<th class="right"><a href="?op=groupReport&domain=${model.domain}&date=${model.date}&group=${payload.group}&type=${payload.type}&sort=99line&queryname=${model.queryName}">99.9Line</a>(ms)</th>
<th class="right"><a href="?op=groupReport&domain=${model.domain}&date=${model.date}&group=${payload.group}&type=${payload.type}&sort=std&queryname=${model.queryName}">Std</a>(ms)</th>
<th class="right"><a href="?op=groupReport&domain=${model.domain}&date=${model.date}&group=${payload.group}&type=${payload.type}&sort=total&queryname=${model.queryName}">QPS</a></th>
<th class="right"><a href="?op=groupReport&domain=${model.domain}&date=${model.date}&group=${payload.group}&type=${payload.type}&sort=total&queryname=${model.queryName}">Percent%</a></th>
<th class="right"><a href="?op=groupReport&domain=${model.domain}&date=${model.date}&group=${payload.group}&type=${payload.encodedType}&sort=min&queryname=${model.queryName}">min</a>(ms)</th>
<th class="right"><a href="?op=groupReport&domain=${model.domain}&date=${model.date}&group=${payload.group}&type=${payload.encodedType}&sort=max&queryname=${model.queryName}">max</a>(ms)</th>
<th class="right"><a href="?op=groupReport&domain=${model.domain}&date=${model.date}&group=${payload.group}&type=${payload.encodedType}&sort=avg&queryname=${model.queryName}">Avg</a>(ms)</th>
<th class="right"><a href="?op=groupReport&domain=${model.domain}&date=${model.date}&group=${payload.group}&type=${payload.encodedType}&sort=95line&queryname=${model.queryName}">95Line</a>(ms)</th>
<th class="right"><a href="?op=groupReport&domain=${model.domain}&date=${model.date}&group=${payload.group}&type=${payload.encodedType}&sort=99line&queryname=${model.queryName}">99.9Line</a>(ms)</th>
<th class="right"><a href="?op=groupReport&domain=${model.domain}&date=${model.date}&group=${payload.group}&type=${payload.encodedType}&sort=std&queryname=${model.queryName}">Std</a>(ms)</th>
<th class="right"><a href="?op=groupReport&domain=${model.domain}&date=${model.date}&group=${payload.group}&type=${payload.encodedType}&sort=total&queryname=${model.queryName}">QPS</a></th>
<th class="right"><a href="?op=groupReport&domain=${model.domain}&date=${model.date}&group=${payload.group}&type=${payload.encodedType}&sort=total&queryname=${model.queryName}">Percent%</a></th>
</tr>
<tr class="graphs">
<td colspan="13" style="display: none"><div id="-1" style="display: none"></div></td>
......@@ -164,8 +161,7 @@
<c:choose>
<c:when test="${status.index > 0}">
<td class="left longText" style="white-space: normal">
<a
href="?op=groupGraphs&domain=${report.domain}&date=${model.date}&group=${payload.group}&type=${payload.type}&name=${item.name}"
<a href="?op=groupGraphs&domain=${report.domain}&date=${model.date}&group=${payload.group}&type=${payload.encodedType}&name=${item.name}"
class="graph_link" data-status="${status.index}">[:: show ::]</a>
&nbsp;&nbsp;${w:shorten(e.id, 120)}</td>
</c:when>
......
cat-home/src/main/webapp/jsp/report/transaction/transactionHistoryGroupReport.jsp
浏览文件 @ d7eb0eb4
......@@ -11,7 +11,7 @@
type="com.dianping.cat.report.page.transaction.Model" scope="request" />
<a:historyReport title="History Report"
navUrlPrefix="type=${payload.type}&queryname=${model.queryName}">
navUrlPrefix="type=${payload.encodedType}&queryname=${model.queryName}">
<jsp:attribute name="subtitle">${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:useJs value="${res.js.local['baseGraph.js']}" target="head-js" />
......@@ -19,7 +19,7 @@
<tr style="text-align: left">
<th>
<c:forEach var="ip" items="${model.ips}">&nbsp;[&nbsp;
<a href="?op=history&domain=${model.domain}&date=${model.date}&ip=${ip}&type=${payload.type}&queryname=${model.queryName}&reportType=${model.reportType}${model.customDate}">${ip}</a>
<a href="?op=history&domain=${model.domain}&date=${model.date}&ip=${ip}&type=${payload.encodedType}&queryname=${model.queryName}&reportType=${model.reportType}${model.customDate}">${ip}</a>
&nbsp;]&nbsp;
</c:forEach>
</th>
......@@ -90,7 +90,7 @@
href="?op=historyGroupGraph&domain=${model.domain}&date=${model.date}&group=${payload.group}&reportType=${model.reportType}&type=${item.type}${model.customDate}"
class="history_graph_link" data-status="${status.index}">[:: show ::]</a>
&nbsp;&nbsp;&nbsp;<a
href="?op=historyGroupReport&domain=${model.domain}&date=${model.date}&group=${payload.group}&reportType=${model.reportType}&type=${item.type}${model.customDate}">${item.type}</a>
href="?op=historyGroupReport&domain=${model.domain}&date=${model.date}&group=${payload.group}&reportType=${model.reportType}&type=${item.type}${model.customDate}">${e.id}</a>
</td>
<td>${w:format(e.totalCount,'#,###,###,###,##0')}</td>
<td>${e.failCount}</td>
......@@ -145,20 +145,20 @@
</script>
<tr>
<th style="text-align: left;">
<a href="?op=historyGroupReport&domain=${model.domain}&date=${model.date}&group=${payload.group}&reportType=${model.reportType}&type=${payload.type}&sort=type${model.customDate}&queryname=${model.queryName}">Name</a>
<a href="?op=historyGroupReport&domain=${model.domain}&date=${model.date}&group=${payload.group}&reportType=${model.reportType}&type=${payload.encodedType}&sort=type${model.customDate}&queryname=${model.queryName}">Name</a>
</th>
<th class="right"><a href="?op=historyGroupReport&domain=${model.domain}&date=${model.date}&group=${payload.group}&reportType=${model.reportType}&type=${payload.type}&sort=total${model.customDate}&queryname=${model.queryName}">Total</a></th>
<th class="right"><a href="?op=historyGroupReport&domain=${model.domain}&date=${model.date}&group=${payload.group}&reportType=${model.reportType}&type=${payload.type}&sort=failure${model.customDate}&queryname=${model.queryName}">Failure</a></th>
<th class="right"><a href="?op=historyGroupReport&domain=${model.domain}&date=${model.date}&group=${payload.group}&reportType=${model.reportType}&type=${payload.type}&sort=failurePercent${model.customDate}&queryname=${model.queryName}">Failure%</a></th>
<th class="right"><a href="?op=historyGroupReport&domain=${model.domain}&date=${model.date}&group=${payload.group}&reportType=${model.reportType}&type=${payload.encodedType}&sort=total${model.customDate}&queryname=${model.queryName}">Total</a></th>
<th class="right"><a href="?op=historyGroupReport&domain=${model.domain}&date=${model.date}&group=${payload.group}&reportType=${model.reportType}&type=${payload.encodedType}&sort=failure${model.customDate}&queryname=${model.queryName}">Failure</a></th>
<th class="right"><a href="?op=historyGroupReport&domain=${model.domain}&date=${model.date}&group=${payload.group}&reportType=${model.reportType}&type=${payload.encodedType}&sort=failurePercent${model.customDate}&queryname=${model.queryName}">Failure%</a></th>
<th class="right">Sample Link</th>
<th class="right"><a href="?op=historyGroupReport&domain=${model.domain}&date=${model.date}&group=${payload.group}&reportType=${model.reportType}&type=${payload.type}&sort=min${model.customDate}&queryname=${model.queryName}">Min</a>(ms)</th>
<th class="right"><a href="?op=historyGroupReport&domain=${model.domain}&date=${model.date}&group=${payload.group}&reportType=${model.reportType}&type=${payload.type}&sort=max${model.customDate}&queryname=${model.queryName}">Max</a>(ms)</th>
<th class="right"><a href="?op=historyGroupReport&domain=${model.domain}&date=${model.date}&group=${payload.group}&reportType=${model.reportType}&type=${payload.type}&sort=avg${model.customDate}&queryname=${model.queryName}">Avg</a>(ms)</th>
<th class="right"><a href="?op=historyGroupReport&domain=${model.domain}&date=${model.date}&group=${payload.group}&reportType=${model.reportType}&type=${payload.type}&sort=95line${model.customDate}&queryname=${model.queryName}">95Line</a>(ms)</th>
<th class="right"><a href="?op=historyGroupReport&domain=${model.domain}&date=${model.date}&group=${payload.group}&reportType=${model.reportType}&type=${payload.type}&sort=99line${model.customDate}&queryname=${model.queryName}">99.9Line</a>(ms)</th>
<th class="right"><a href="?op=historyGroupReport&domain=${model.domain}&date=${model.date}&group=${payload.group}&reportType=${model.reportType}&type=${payload.type}&sort=std${model.customDate}&queryname=${model.queryName}">Std</a>(ms)</th>
<th class="right"><a href="?op=historyGroupReport&domain=${model.domain}&date=${model.date}&group=${payload.group}&reportType=${model.reportType}&type=${payload.type}&sort=total${model.customDate}&queryname=${model.queryName}">QPS</a></th>
<th class="right"><a href="?op=historyGroupReport&domain=${model.domain}&date=${model.date}&group=${payload.group}&reportType=${model.reportType}&type=${payload.type}&sort=total${model.customDate}&queryname=${model.queryName}">Percent%</a></th>
<th class="right"><a href="?op=historyGroupReport&domain=${model.domain}&date=${model.date}&group=${payload.group}&reportType=${model.reportType}&type=${payload.encodedType}&sort=min${model.customDate}&queryname=${model.queryName}">Min</a>(ms)</th>
<th class="right"><a href="?op=historyGroupReport&domain=${model.domain}&date=${model.date}&group=${payload.group}&reportType=${model.reportType}&type=${payload.encodedType}&sort=max${model.customDate}&queryname=${model.queryName}">Max</a>(ms)</th>
<th class="right"><a href="?op=historyGroupReport&domain=${model.domain}&date=${model.date}&group=${payload.group}&reportType=${model.reportType}&type=${payload.encodedType}&sort=avg${model.customDate}&queryname=${model.queryName}">Avg</a>(ms)</th>
<th class="right"><a href="?op=historyGroupReport&domain=${model.domain}&date=${model.date}&group=${payload.group}&reportType=${model.reportType}&type=${payload.encodedType}&sort=95line${model.customDate}&queryname=${model.queryName}">95Line</a>(ms)</th>
<th class="right"><a href="?op=historyGroupReport&domain=${model.domain}&date=${model.date}&group=${payload.group}&reportType=${model.reportType}&type=${payload.encodedType}&sort=99line${model.customDate}&queryname=${model.queryName}">99.9Line</a>(ms)</th>
<th class="right"><a href="?op=historyGroupReport&domain=${model.domain}&date=${model.date}&group=${payload.group}&reportType=${model.reportType}&type=${payload.encodedType}&sort=std${model.customDate}&queryname=${model.queryName}">Std</a>(ms)</th>
<th class="right"><a href="?op=historyGroupReport&domain=${model.domain}&date=${model.date}&group=${payload.group}&reportType=${model.reportType}&type=${payload.encodedType}&sort=total${model.customDate}&queryname=${model.queryName}">QPS</a></th>
<th class="right"><a href="?op=historyGroupReport&domain=${model.domain}&date=${model.date}&group=${payload.group}&reportType=${model.reportType}&type=${payload.encodedType}&sort=total${model.customDate}&queryname=${model.queryName}">Percent%</a></th>
</tr>
<c:forEach var="item" items="${model.displayNameReport.results}"
varStatus="status">
......@@ -168,7 +168,7 @@
<td class="longText" style="text-align: left; white-space: normal">
<c:choose>
<c:when test="${status.index > 0}">
<a href="?op=historyGroupGraph&domain=${model.domain}&date=${model.date}&group=${payload.group}&reportType=${model.reportType}&type=${payload.type}&name=${item.name}${model.customDate}"
<a href="?op=historyGroupGraph&domain=${model.domain}&date=${model.date}&group=${payload.group}&reportType=${model.reportType}&type=${payload.encodedType}&name=${item.name}${model.customDate}"
class="history_graph_link" data-status="${status.index}">[:: show ::]</a>
</c:when>
<c:otherwise></c:otherwise>
......
cat-home/src/main/webapp/jsp/report/transaction/transactionHistoryReport.jsp
浏览文件 @ d7eb0eb4
......@@ -14,7 +14,7 @@
word-break: normal;
}
</style>
<a:historyReport title="History Report" navUrlPrefix="type=${payload.type}&queryname=${model.queryName}">
<a:historyReport title="History Report" navUrlPrefix="type=${payload.encodedType}&queryname=${model.queryName}">
<jsp:attribute name="subtitle">${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:useJs value="${res.js.local['baseGraph.js']}" target="head-js"/>
......@@ -24,11 +24,11 @@
<c:forEach var="ip" items="${model.ips}">&nbsp;[&nbsp;
<c:choose>
<c:when test="${model.ipAddress eq ip}">
<a href="?op=history&domain=${model.domain}&date=${model.date}&ip=${ip}&type=${payload.type}&queryname=${model.queryName}&reportType=${model.reportType}${model.customDate}"
<a href="?op=history&domain=${model.domain}&date=${model.date}&ip=${ip}&type=${payload.encodedType}&queryname=${model.queryName}&reportType=${model.reportType}${model.customDate}"
class="current">${ip}</a>
</c:when>
<c:otherwise>
<a href="?op=history&domain=${model.domain}&date=${model.date}&ip=${ip}&type=${payload.type}&queryname=${model.queryName}&reportType=${model.reportType}${model.customDate}">${ip}</a>
<a href="?op=history&domain=${model.domain}&date=${model.date}&ip=${ip}&type=${payload.encodedType}&queryname=${model.queryName}&reportType=${model.reportType}${model.customDate}">${ip}</a>
</c:otherwise>
</c:choose>
&nbsp;]&nbsp;
......@@ -111,20 +111,20 @@
</script>
<tr>
<th style="text-align: left;">
<a href="?op=history&domain=${model.domain}&date=${model.date}&ip=${model.ipAddress}&reportType=${model.reportType}&type=${payload.type}&sort=type${model.customDate}&queryname=${model.queryName}">Name</a>
<a href="?op=history&domain=${model.domain}&date=${model.date}&ip=${model.ipAddress}&reportType=${model.reportType}&type=${payload.encodedType}&sort=type${model.customDate}&queryname=${model.queryName}">Name</a>
</th>
<th class="right"><a href="?op=history&domain=${model.domain}&date=${model.date}&ip=${model.ipAddress}&reportType=${model.reportType}&type=${payload.type}&sort=total${model.customDate}&queryname=${model.queryName}">Total</a></th>
<th class="right"><a href="?op=history&domain=${model.domain}&date=${model.date}&ip=${model.ipAddress}&reportType=${model.reportType}&type=${payload.type}&sort=failure${model.customDate}&queryname=${model.queryName}">Failure</a></th>
<th class="right"><a href="?op=history&domain=${model.domain}&date=${model.date}&ip=${model.ipAddress}&reportType=${model.reportType}&type=${payload.type}&sort=failurePercent${model.customDate}&queryname=${model.queryName}">Failure%</a></th>
<th class="right"><a href="?op=history&domain=${model.domain}&date=${model.date}&ip=${model.ipAddress}&reportType=${model.reportType}&type=${payload.encodedType}&sort=total${model.customDate}&queryname=${model.queryName}">Total</a></th>
<th class="right"><a href="?op=history&domain=${model.domain}&date=${model.date}&ip=${model.ipAddress}&reportType=${model.reportType}&type=${payload.encodedType}&sort=failure${model.customDate}&queryname=${model.queryName}">Failure</a></th>
<th class="right"><a href="?op=history&domain=${model.domain}&date=${model.date}&ip=${model.ipAddress}&reportType=${model.reportType}&type=${payload.encodedType}&sort=failurePercent${model.customDate}&queryname=${model.queryName}">Failure%</a></th>
<th class="right">Sample Link</th>
<th class="right"><a href="?op=history&domain=${model.domain}&date=${model.date}&ip=${model.ipAddress}&reportType=${model.reportType}&type=${payload.type}&sort=min${model.customDate}&queryname=${model.queryName}">Min</a>(ms)</th>
<th class="right"><a href="?op=history&domain=${model.domain}&date=${model.date}&ip=${model.ipAddress}&reportType=${model.reportType}&type=${payload.type}&sort=max${model.customDate}&queryname=${model.queryName}">Max</a>(ms)</th>
<th class="right"><a href="?op=history&domain=${model.domain}&date=${model.date}&ip=${model.ipAddress}&reportType=${model.reportType}&type=${payload.type}&sort=avg${model.customDate}&queryname=${model.queryName}">Avg</a>(ms)</th>
<th class="right"><a href="?op=history&domain=${model.domain}&date=${model.date}&ip=${model.ipAddress}&reportType=${model.reportType}&type=${payload.type}&sort=95line${model.customDate}&queryname=${model.queryName}">95Line</a>(ms)</th>
<th class="right"><a href="?op=history&domain=${model.domain}&date=${model.date}&ip=${model.ipAddress}&reportType=${model.reportType}&type=${payload.type}&sort=99line${model.customDate}&queryname=${model.queryName}">99.9Line</a>(ms)</th>
<th class="right"><a href="?op=history&domain=${model.domain}&date=${model.date}&ip=${model.ipAddress}&reportType=${model.reportType}&type=${payload.type}&sort=std${model.customDate}&queryname=${model.queryName}">Std</a>(ms)</th>
<th class="right"><a href="?op=history&domain=${model.domain}&date=${model.date}&ip=${model.ipAddress}&reportType=${model.reportType}&type=${payload.type}&sort=total${model.customDate}&queryname=${model.queryName}">QPS</a></th>
<th class="right"><a href="?op=history&domain=${model.domain}&date=${model.date}&ip=${model.ipAddress}&reportType=${model.reportType}&type=${payload.type}&sort=total${model.customDate}&queryname=${model.queryName}">Percent%</a></th>
<th class="right"><a href="?op=history&domain=${model.domain}&date=${model.date}&ip=${model.ipAddress}&reportType=${model.reportType}&type=${payload.encodedType}&sort=min${model.customDate}&queryname=${model.queryName}">Min</a>(ms)</th>
<th class="right"><a href="?op=history&domain=${model.domain}&date=${model.date}&ip=${model.ipAddress}&reportType=${model.reportType}&type=${payload.encodedType}&sort=max${model.customDate}&queryname=${model.queryName}">Max</a>(ms)</th>
<th class="right"><a href="?op=history&domain=${model.domain}&date=${model.date}&ip=${model.ipAddress}&reportType=${model.reportType}&type=${payload.encodedType}&sort=avg${model.customDate}&queryname=${model.queryName}">Avg</a>(ms)</th>
<th class="right"><a href="?op=history&domain=${model.domain}&date=${model.date}&ip=${model.ipAddress}&reportType=${model.reportType}&type=${payload.encodedType}&sort=95line${model.customDate}&queryname=${model.queryName}">95Line</a>(ms)</th>
<th class="right"><a href="?op=history&domain=${model.domain}&date=${model.date}&ip=${model.ipAddress}&reportType=${model.reportType}&type=${payload.encodedType}&sort=99line${model.customDate}&queryname=${model.queryName}">99.9Line</a>(ms)</th>
<th class="right"><a href="?op=history&domain=${model.domain}&date=${model.date}&ip=${model.ipAddress}&reportType=${model.reportType}&type=${payload.encodedType}&sort=std${model.customDate}&queryname=${model.queryName}">Std</a>(ms)</th>
<th class="right"><a href="?op=history&domain=${model.domain}&date=${model.date}&ip=${model.ipAddress}&reportType=${model.reportType}&type=${payload.encodedType}&sort=total${model.customDate}&queryname=${model.queryName}">QPS</a></th>
<th class="right"><a href="?op=history&domain=${model.domain}&date=${model.date}&ip=${model.ipAddress}&reportType=${model.reportType}&type=${payload.encodedType}&sort=total${model.customDate}&queryname=${model.queryName}">Percent%</a></th>
</tr>
<c:forEach var="item" items="${model.displayNameReport.results}"
varStatus="status">
......@@ -134,7 +134,7 @@
<td class="longText" style="text-align:left;white-space:normal">
<c:choose>
<c:when test="${status.index > 0}">
<a href="?op=historyGraph&domain=${model.domain}&date=${model.date}&ip=${model.ipAddress}&reportType=${model.reportType}&type=${payload.type}&name=${item.name}${model.customDate}" class="history_graph_link" data-status="${status.index}">[:: show ::]</a>
<a href="?op=historyGraph&domain=${model.domain}&date=${model.date}&ip=${model.ipAddress}&reportType=${model.reportType}&type=${payload.encodedType}&name=${item.name}${model.customDate}" class="history_graph_link" data-status="${status.index}">[:: show ::]</a>
</c:when>
<c:otherwise></c:otherwise></c:choose>
&nbsp;&nbsp;&nbsp;${w:shorten(e.id, 120)}</td>
......
cat-home/src/test/resources/com/dianping/cat/report/page/sql/SqlReportMergeAllResult.xml 已删除 100644 → 0
浏览文件 @ 832124a4
<?xml version="1.0" encoding="utf-8"?>
<sql-report domain="Cat" startTime="2012-09-06 20:00:00" endTime="2012-09-06 20:59:59">
<domainName>Cat</domainName>
<domainName>Cat1</domainName>
<domainName>Cat0</domainName>
<databaseName>database3</databaseName>
<databaseName>database0</databaseName>
<databaseName>database1</databaseName>
<database id="All">
<table id="All" totalCount="600" failCount="600" failPercent="1.00" avg="1.00" sum="600.00" tps="0.00" totalPercent="0.00">
<method id="Update" totalCount="600" failCount="600" failPercent="1.00" avg="1.00" sum="600.00" tps="0.00" totalPercent="0.00">
</method>
</table>
<table id="Table1" totalCount="300" failCount="300" failPercent="1.00" avg="1.00" sum="300.00" tps="0.00" totalPercent="0.00">
<method id="Update" totalCount="300" failCount="300" failPercent="1.00" avg="1.00" sum="300.00" tps="0.00" totalPercent="0.00">
<sql>User.insert0</sql>
<sql>User.insert1</sql>
</method>
</table>
<table id="Table2" totalCount="200" failCount="200" failPercent="1.00" avg="1.00" sum="200.00" tps="0.00" totalPercent="0.00">
<method id="Update" totalCount="200" failCount="200" failPercent="1.00" avg="1.00" sum="200.00" tps="0.00" totalPercent="0.00">
<sql>User.insert0</sql>
<sql>User.insert1</sql>
</method>
</table>
<table id="Table3" totalCount="100" failCount="100" failPercent="1.00" avg="1.00" sum="100.00" tps="0.00" totalPercent="0.00">
<method id="Update" totalCount="100" failCount="100" failPercent="1.00" avg="1.00" sum="100.00" tps="0.00" totalPercent="0.00">
<sql>User.insert0</sql>
<sql>User.insert1</sql>
</method>
</table>
</database>
</sql-report>
cat-home/src/test/resources/com/dianping/cat/report/page/sql/SqlReportMergeResult.xml 已删除 100644 → 0
浏览文件 @ 832124a4
<?xml version="1.0" encoding="utf-8"?>
<sql-report domain="Cat" startTime="2012-09-06 20:00:00" endTime="2012-09-06 20:59:59">
<domainName>Cat</domainName>
<domainName>Cat1</domainName>
<domainName>Cat0</domainName>
<databaseName>database3</databaseName>
<databaseName>database0</databaseName>
<databaseName>database1</databaseName>
<database id="database0" connect-url="jdbc:mysql://192.168.7.43:3306/database1">
<table id="All" totalCount="400" failCount="400" failPercent="1.00" avg="1.00" sum="400.00" tps="0.00" totalPercent="0.00">
<method id="Update" totalCount="400" failCount="400" failPercent="1.00" avg="1.00" sum="400.00" tps="0.00" totalPercent="0.00">
</method>
</table>
<table id="Table1" totalCount="200" failCount="200" failPercent="1.00" avg="1.00" sum="200.00" tps="0.00" totalPercent="0.00">
<method id="Update" totalCount="200" failCount="200" failPercent="1.00" avg="1.00" sum="200.00" tps="0.00" totalPercent="0.00">
<sql>User.insert0</sql>
<sql>User.insert1</sql>
</method>
</table>
<table id="Table2" totalCount="100" failCount="100" failPercent="1.00" avg="1.00" sum="100.00" tps="0.00" totalPercent="0.00">
<method id="Update" totalCount="100" failCount="100" failPercent="1.00" avg="1.00" sum="100.00" tps="0.00" totalPercent="0.00">
<sql>User.insert0</sql>
<sql>User.insert1</sql>
</method>
</table>
<table id="Table3" totalCount="100" failCount="100" failPercent="1.00" avg="1.00" sum="100.00" tps="0.00" totalPercent="0.00">
<method id="Update" totalCount="100" failCount="100" failPercent="1.00" avg="1.00" sum="100.00" tps="0.00" totalPercent="0.00">
<sql>User.insert0</sql>
<sql>User.insert1</sql>
</method>
</table>
</database>
<database id="database1" connect-url="jdbc:mysql://192.168.7.43:3306/database1">
<table id="All" totalCount="200" failCount="200" failPercent="1.00" avg="1.00" sum="200.00" tps="0.00" totalPercent="0.00">
<method id="Update" totalCount="200" failCount="200" failPercent="1.00" avg="1.00" sum="200.00" tps="0.00" totalPercent="0.00">
</method>
</table>
<table id="Table1" totalCount="100" failCount="100" failPercent="1.00" avg="1.00" sum="100.00" tps="0.00" totalPercent="0.00">
<method id="Update" totalCount="100" failCount="100" failPercent="1.00" avg="1.00" sum="100.00" tps="0.00" totalPercent="0.00">
<sql>User.insert0</sql>
<sql>User.insert1</sql>
</method>
</table>
<table id="Table2" totalCount="100" failCount="100" failPercent="1.00" avg="1.00" sum="100.00" tps="0.00" totalPercent="0.00">
<method id="Update" totalCount="100" failCount="100" failPercent="1.00" avg="1.00" sum="100.00" tps="0.00" totalPercent="0.00">
<sql>User.insert0</sql>
<sql>User.insert1</sql>
</method>
</table>
</database>
</sql-report>
cat-home/src/test/resources/com/dianping/cat/report/page/sql/SqlReportNew.xml 已删除 100644 → 0
浏览文件 @ 832124a4
<?xml version="1.0" encoding="utf-8"?>
<sql-report domain="Cat" startTime="2012-09-06 20:00:00" endTime="2012-09-06 20:59:59">
<domainName>Cat</domainName>
<domainName>Cat0</domainName>
<databaseName>database0</databaseName>
<databaseName>database1</databaseName>
<database id="database0" connect-url="jdbc:mysql://192.168.7.43:3306/database1">
<table id="All" totalCount="200" failCount="200" failPercent="1.00" avg="1.00" sum="200.00" tps="0.00" totalPercent="1.00">
<method id="Update" totalCount="200" failCount="200" failPercent="1.00" avg="1.00" sum="200.00" tps="0.00" totalPercent="1.00">
</method>
</table>
<table id="Table1" totalCount="100" failCount="100" failPercent="1.00" avg="1.00" sum="100.00" tps="0.00" totalPercent="0.50">
<method id="Update" totalCount="100" failCount="100" failPercent="1.00" avg="1.00" sum="100.00" tps="0.00" totalPercent="1.00">
<sql>User.insert0</sql>
<sql>User.insert1</sql>
</method>
</table>
<table id="Table3" totalCount="100" failCount="100" failPercent="1.00" avg="1.00" sum="100.00" tps="0.00" totalPercent="0.50">
<method id="Update" totalCount="100" failCount="100" failPercent="1.00" avg="1.00" sum="100.00" tps="0.00" totalPercent="1.00">
<sql>User.insert0</sql>
<sql>User.insert1</sql>
</method>
</table>
</database>
<database id="database1" connect-url="jdbc:mysql://192.168.7.43:3306/database1">
<table id="All" totalCount="200" failCount="200" failPercent="1.00" avg="1.00" sum="200.00" tps="0.00" totalPercent="1.00">
<method id="Update" totalCount="200" failCount="200" failPercent="1.00" avg="1.00" sum="200.00" tps="0.00" totalPercent="1.00">
</method>
</table>
<table id="Table1" totalCount="100" failCount="100" failPercent="1.00" avg="1.00" sum="100.00" tps="0.00" totalPercent="0.50">
<method id="Update" totalCount="100" failCount="100" failPercent="1.00" avg="1.00" sum="100.00" tps="0.00" totalPercent="1.00">
<sql>User.insert0</sql>
<sql>User.insert1</sql>
</method>
</table>
<table id="Table2" totalCount="100" failCount="100" failPercent="1.00" avg="1.00" sum="100.00" tps="0.00" totalPercent="0.50">
<method id="Update" totalCount="100" failCount="100" failPercent="1.00" avg="1.00" sum="100.00" tps="0.00" totalPercent="1.00">
<sql>User.insert0</sql>
<sql>User.insert1</sql>
</method>
</table>
</database>
</sql-report>
cat-home/src/test/resources/com/dianping/cat/report/page/sql/SqlReportOld.xml 已删除 100644 → 0
浏览文件 @ 832124a4
<?xml version="1.0" encoding="utf-8"?>
<sql-report domain="Cat" startTime="2012-09-06 20:00:00" endTime="2012-09-06 20:59:59">
<domainName>Cat</domainName>
<domainName>Cat1</domainName>
<databaseName>database3</databaseName>
<databaseName>database0</databaseName>
<database id="database0" connect-url="jdbc:mysql://192.168.7.43:3306/database1">
<table id="All" totalCount="200" failCount="200" failPercent="1.00" avg="1.00" sum="200.00" tps="0.00" totalPercent="1.00">
<method id="Update" totalCount="200" failCount="200" failPercent="1.00" avg="1.00" sum="200.00" tps="0.00" totalPercent="1.00">
</method>
</table>
<table id="Table1" totalCount="100" failCount="100" failPercent="1.00" avg="1.00" sum="100.00" tps="0.00" totalPercent="0.50">
<method id="Update" totalCount="100" failCount="100" failPercent="1.00" avg="1.00" sum="100.00" tps="0.00" totalPercent="1.00">
<sql>User.insert0</sql>
<sql>User.insert1</sql>
</method>
</table>
<table id="Table2" totalCount="100" failCount="100" failPercent="1.00" avg="1.00" sum="100.00" tps="0.00" totalPercent="0.50">
<method id="Update" totalCount="100" failCount="100" failPercent="1.00" avg="1.00" sum="100.00" tps="0.00" totalPercent="1.00">
<sql>User.insert0</sql>
<sql>User.insert1</sql>
</method>
</table>
</database>
</sql-report>
cat-home/src/test/resources/com/dianping/cat/report/page/storage/storage.xml 0 → 100644
浏览文件 @ d7eb0eb4
<?xml version="1.0" encoding="utf-8"?>
<storage-report id="cat" domain="${id}+${type}" type="sql" startTime="2012-09-06 20:00:00" endTime="2012-09-06 20:59:59">
<machine id="10.1.6.102">
<domain id="All">
<operation id="get" count="100" avg="100" sum="10000" error="100" long-count="100">
<segment id="1" count="50" avg="10" sum="500" error="100" long-count="100"></segment>
<segment id="2" count="50" avg="10" sum="500" error="100" long-count="100"></segment>
</operation>
<operation id="mget" count="100" avg="100" sum="10000" error="100" long-count="100"></operation>
<operation id="add" count="100" avg="100" sum="10000" error="100" long-count="100"></operation>
<operation id="delete" count="100" avg="100" sum="10000" error="100" long-count="100"></operation>
</domain>
<domain id="shop-web">
<operation id="get" count="100" avg="100" sum="10000" error="100" long-count="100"></operation>
<operation id="mget" count="100" avg="100" sum="10000" error="100" long-count="100"></operation>
<operation id="add" count="100" avg="100" sum="10000" error="100" long-count="100"></operation>
<operation id="delete" count="100" avg="100" sum="10000" error="100" long-count="100"></operation>
</domain>
</machine>
<machine id="10.1.6.103">
</machine>
</storage-report>
\ No newline at end of file
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或