Skip to content

C
cat

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

从无法访问的项目Fork

通知 1
Star 0
Fork 0
C
cat

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

提交 c08f10f4 编写于 作者: F Frankie Wu
浏览文件
操作

remove images and changes for ip report

上级 ca441a1d
展开全部 隐藏空白更改
内联 并排
Showing with 229 addition and 1389 deletion
cat-consumer/src/main/java/com/dianping/cat/consumer/ip/IpAnalyzer.java
浏览文件 @ c08f10f4
......@@ -7,7 +7,7 @@ import java.util.Map;
import com.dianping.cat.consumer.ip.model.entity.Ip;
import com.dianping.cat.consumer.ip.model.entity.IpReport;
import com.dianping.cat.consumer.ip.model.entity.Segment;
import com.dianping.cat.consumer.ip.model.entity.Period;
import com.dianping.cat.message.Event;
import com.dianping.cat.message.Message;
import com.dianping.cat.message.Transaction;
......@@ -103,16 +103,15 @@ public class IpAnalyzer extends AbstractMessageAnalyzer<IpReport> {
int minute = cal.get(Calendar.MINUTE);
IpReport report = findOrCreateReport(domain);
Segment segment = report.findOrCreateSegment(minute);
Ip ip = segment.findOrCreateIp(address);
Ip ip = report.findOrCreateIp(address);
Period period = ip.findOrCreatePeriod(minute);
ip.setCount(ip.getCount() + 1);
period.incValue();
}
}
@Override
protected void store(List<IpReport> reports) {
// TODO Auto-generated method stub
}
}
cat-consumer/src/main/resources/META-INF/dal/model/ip-codegen.xml
浏览文件 @ c08f10f4
......@@ -4,15 +4,15 @@
<attribute name="domain" 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="segment" type="list" names="segments" />
</entity>
<entity name="segment">
<attribute name="minute" value-type="int" />
<entity-ref name="ip" type="list" names="ips" />
</entity>
<entity name="ip">
<attribute name="address" value-type="String" />
<attribute name="count" value-type="int" />
<entity-ref name="period" type="list" names="periods" />
</entity>
<entity name="period">
<attribute name="minute" value-type="int" />
<attribute name="value" value-type="int" />
</entity>
</model>
cat-consumer/src/main/resources/META-INF/dal/model/ip-model.xml
浏览文件 @ c08f10f4
<?xml version="1.0" encoding="UTF-8"?>
<model model-package="com.dianping.cat.consumer.ip.model" enable-merger="true" enable-json-builder="true"
enable-xml-parser="true" enable-base-visitor="true">
<entity name="ip-report" root="true">
<entity-ref name="segment" type="map" names="segments" method-find-or-create="true"/>
</entity>
<entity name="segment">
<attribute name="minute" value-type="int" key="true" />
<entity-ref name="ip" type="map" names="ips" method-find-or-create="true" />
</entity>
<entity name="ip">
<attribute name="address" value-type="String" key="true" />
<attribute name="count" value-type="int" primitive="true" format="#,###,###" inc="true"/>
</entity>
<entity name="ip-report" root="true">
<entity-ref name="ip" type="map" names="ips" method-find-or-create="true" />
</entity>
<entity name="ip">
<attribute name="address" value-type="String" key="true" />
<entity-ref name="period" type="list" names="periods" method-find-or-create="true" />
</entity>
<entity name="period">
<attribute name="minute" value-type="int" key="true" />
<attribute name="value" value-type="int" primitive="true" method-inc="true" />
</entity>
</model>
cat-consumer/src/test/java/com/dianping/cat/consumer/AllTests.java
浏览文件 @ c08f10f4
......@@ -6,19 +6,24 @@ import org.junit.runners.Suite.SuiteClasses;
import com.dianping.cat.consumer.failure.FailureAnalyzerStoreTest;
import com.dianping.cat.consumer.failure.FailureAnalyzerTest;
import com.dianping.cat.consumer.ip.IpAnalyzerTest;
import com.dianping.cat.consumer.transaction.NumberFormatTest;
import com.dianping.cat.consumer.transaction.TransactionReportMessageAnalyzerTest;
@RunWith(Suite.class)
@SuiteClasses({
/* .impl */
ManyAnalyzerTest.class,
OneAnalyzerTwoDurationTest.class,
/* .model.failure */
FailureAnalyzerTest.class, FailureAnalyzerStoreTest.class,
/* .failure */
FailureAnalyzerTest.class,
FailureAnalyzerStoreTest.class,
/* .ip */
IpAnalyzerTest.class,
/* .transaction */
NumberFormatTest.class,
......
cat-consumer/src/test/resources/com/dianping/cat/consumer/ip/ip.xml
浏览文件 @ c08f10f4
<ip-report domain="Review" startTime="2012-01-25 13:00:00" endTime="2012-01-25 13:59:00">
<segment minute="24">
<ip address="127.0.0.1" count="123"/>
<ip address="192.168.63.30" count="3"/>
</segment>
<segment>
</segment>
<ip address="127.0.0.1">
<period minute="0" value="19"/>
<period minute="1" value="2"/>
<period minute="2" value="1"/>
<period minute="4" value="12"/>
<period minute="5" value="12"/>
<period minute="6" value="15"/>
<period minute="7" value="12"/>
<period minute="8" value="14"/>
<period minute="9" value="16"/>
</ip>
<ip address="192.168.63.30">
</ip>
</ip-report>
cat-consumer/src/test/resources/com/dianping/cat/consumer/jquery/grid.locale-en.js 已删除 100644 → 0
浏览文件 @ ca441a1d
;(function($){
/**
* jqGrid English Translation
* Tony Tomov tony@trirand.com
* http://trirand.com/blog/
* Dual licensed under the MIT and GPL licenses:
* http://www.opensource.org/licenses/mit-license.php
* http://www.gnu.org/licenses/gpl.html
**/
$.jgrid = {
defaults : {
recordtext: "View {0} - {1} of {2}",
emptyrecords: "No records to view",
loadtext: "Loading...",
pgtext : "Page {0} of {1}"
},
search : {
caption: "Search...",
Find: "Find",
Reset: "Reset",
odata : ['equal', 'not equal', 'less', 'less or equal','greater','greater or equal', 'begins with','does not begin with','is in','is not in','ends with','does not end with','contains','does not contain'],
groupOps: [ { op: "AND", text: "all" }, { op: "OR", text: "any" } ],
matchText: " match",
rulesText: " rules"
},
edit : {
addCaption: "Add Record",
editCaption: "Edit Record",
bSubmit: "Submit",
bCancel: "Cancel",
bClose: "Close",
saveData: "Data has been changed! Save changes?",
bYes : "Yes",
bNo : "No",
bExit : "Cancel",
msg: {
required:"Field is required",
number:"Please, enter valid number",
minValue:"value must be greater than or equal to ",
maxValue:"value must be less than or equal to",
email: "is not a valid e-mail",
integer: "Please, enter valid integer value",
date: "Please, enter valid date value",
url: "is not a valid URL. Prefix required ('http://' or 'https://')",
nodefined : " is not defined!",
novalue : " return value is required!",
customarray : "Custom function should return array!",
customfcheck : "Custom function should be present in case of custom checking!"
}
},
view : {
caption: "View Record",
bClose: "Close"
},
del : {
caption: "Delete",
msg: "Delete selected record(s)?",
bSubmit: "Delete",
bCancel: "Cancel"
},
nav : {
edittext: "",
edittitle: "Edit selected row",
addtext:"",
addtitle: "Add new row",
deltext: "",
deltitle: "Delete selected row",
searchtext: "",
searchtitle: "Find records",
refreshtext: "",
refreshtitle: "Reload Grid",
alertcap: "Warning",
alerttext: "Please, select row",
viewtext: "",
viewtitle: "View selected row"
},
col : {
caption: "Select columns",
bSubmit: "Ok",
bCancel: "Cancel"
},
errors : {
errcap : "Error",
nourl : "No url is set",
norecords: "No records to process",
model : "Length of colNames <> colModel!"
},
formatter : {
integer : {thousandsSeparator: " ", defaultValue: '0'},
number : {decimalSeparator:".", thousandsSeparator: " ", decimalPlaces: 2, defaultValue: '0.00'},
currency : {decimalSeparator:".", thousandsSeparator: " ", decimalPlaces: 2, prefix: "", suffix:"", defaultValue: '0.00'},
date : {
dayNames: [
"Sun", "Mon", "Tue", "Wed", "Thr", "Fri", "Sat",
"Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"
],
monthNames: [
"Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec",
"January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"
],
AmPm : ["am","pm","AM","PM"],
S: function (j) {return j < 11 || j > 13 ? ['st', 'nd', 'rd', 'th'][Math.min((j - 1) % 10, 3)] : 'th'},
srcformat: 'Y-m-d',
newformat: 'd/m/Y',
masks : {
ISO8601Long:"Y-m-d H:i:s",
ISO8601Short:"Y-m-d",
ShortDate: "n/j/Y",
LongDate: "l, F d, Y",
FullDateTime: "l, F d, Y g:i:s A",
MonthDay: "F d",
ShortTime: "g:i A",
LongTime: "g:i:s A",
SortableDateTime: "Y-m-d\\TH:i:s",
UniversalSortableDateTime: "Y-m-d H:i:sO",
YearMonth: "F, Y"
},
reformatAfterEdit : false
},
baseLinkUrl: '',
showAction: '',
target: '',
checkbox : {disabled:true},
idName : 'id'
}
};
})(jQuery);
cat-consumer/src/test/resources/com/dianping/cat/consumer/jquery/ui.jqgrid.css 已删除 100644 → 0
浏览文件 @ ca441a1d
/*Grid*/
.ui-jqgrid {position: relative; font-size:11px;}
.ui-jqgrid .ui-jqgrid-view {position: relative;left:0px; top: 0px; padding: .0em;}
/* caption*/
.ui-jqgrid .ui-jqgrid-titlebar {padding: .3em .2em .2em .3em; position: relative; border-left: 0px none;border-right: 0px none; border-top: 0px none;}
.ui-jqgrid .ui-jqgrid-title { float: left; margin: .1em 0 .2em; }
.ui-jqgrid .ui-jqgrid-titlebar-close { position: absolute;top: 50%; width: 19px; margin: -10px 0 0 0; padding: 1px; height:18px;}.ui-jqgrid .ui-jqgrid-titlebar-close span { display: block; margin: 1px; }
.ui-jqgrid .ui-jqgrid-titlebar-close:hover { padding: 0; }
/* header*/
.ui-jqgrid .ui-jqgrid-hdiv {position: relative; margin: 0em;padding: 0em; overflow-x: hidden; border-left: 0px none !important; border-top : 0px none !important; border-right : 0px none !important;}
.ui-jqgrid .ui-jqgrid-hbox {float: left; padding-right: 20px;}
.ui-jqgrid .ui-jqgrid-htable {table-layout:fixed;margin:0em;}
.ui-jqgrid .ui-jqgrid-htable th {height:22px;padding: 0 2px 0 2px;}
.ui-jqgrid .ui-jqgrid-htable th div {overflow: hidden; position:relative; height:17px;}
.ui-th-column, .ui-jqgrid .ui-jqgrid-htable th.ui-th-column {overflow: hidden;white-space: nowrap;text-align:center;border-top : 0px none;border-bottom : 0px none;}
.ui-th-ltr, .ui-jqgrid .ui-jqgrid-htable th.ui-th-ltr {border-left : 0px none;}
.ui-th-rtl, .ui-jqgrid .ui-jqgrid-htable th.ui-th-rtl {border-right : 0px none;}
.ui-first-th-ltr {border-right: 1px solid; }
.ui-first-th-rtl {border-left: 1px solid; }
.ui-jqgrid .ui-th-div-ie {white-space: nowrap; zoom :1; height:17px;}
.ui-jqgrid .ui-jqgrid-resize {height:20px !important;position: relative; cursor :e-resize;display: inline;overflow: hidden;}
.ui-jqgrid .ui-grid-ico-sort {overflow:hidden;position:absolute;display:inline; cursor: pointer !important;}
.ui-jqgrid .ui-icon-asc {margin-top:-3px; height:12px;}
.ui-jqgrid .ui-icon-desc {margin-top:3px;height:12px;}
.ui-jqgrid .ui-i-asc {margin-top:0px;height:16px;}
.ui-jqgrid .ui-i-desc {margin-top:0px;margin-left:13px;height:16px;}
.ui-jqgrid .ui-jqgrid-sortable {cursor:pointer;}
.ui-jqgrid tr.ui-search-toolbar th { border-top-width: 1px !important; border-top-color: inherit !important; border-top-style: ridge !important }
tr.ui-search-toolbar input {margin: 1px 0px 0px 0px}
tr.ui-search-toolbar select {margin: 1px 0px 0px 0px}
/* body */
.ui-jqgrid .ui-jqgrid-bdiv {position: relative; margin: 0em; padding:0; overflow: auto; text-align:left;}
.ui-jqgrid .ui-jqgrid-btable {table-layout:fixed; margin:0em; outline-style: none; }
.ui-jqgrid tr.jqgrow { outline-style: none; }
.ui-jqgrid tr.jqgroup { outline-style: none; }
.ui-jqgrid tr.jqgrow td {font-weight: normal; overflow: hidden; white-space: pre; height: 22px;padding: 0 2px 0 2px;border-bottom-width: 1px; border-bottom-color: inherit; border-bottom-style: solid;}
.ui-jqgrid tr.jqgfirstrow td {padding: 0 2px 0 2px;border-right-width: 1px; border-right-style: solid;}
.ui-jqgrid tr.jqgroup td {font-weight: normal; overflow: hidden; white-space: pre; height: 22px;padding: 0 2px 0 2px;border-bottom-width: 1px; border-bottom-color: inherit; border-bottom-style: solid;}
.ui-jqgrid tr.jqfoot td {font-weight: bold; overflow: hidden; white-space: pre; height: 22px;padding: 0 2px 0 2px;border-bottom-width: 1px; border-bottom-color: inherit; border-bottom-style: solid;}
.ui-jqgrid tr.ui-row-ltr td {text-align:left;border-right-width: 1px; border-right-color: inherit; border-right-style: solid;}
.ui-jqgrid tr.ui-row-rtl td {text-align:right;border-left-width: 1px; border-left-color: inherit; border-left-style: solid;}
.ui-jqgrid td.jqgrid-rownum { padding: 0 2px 0 2px; margin: 0px; border: 0px none;}
.ui-jqgrid .ui-jqgrid-resize-mark { width:2px; left:0; background-color:#777; cursor: e-resize; cursor: col-resize; position:absolute; top:0; height:100px; overflow:hidden; display:none; border:0 none;}
/* footer */
.ui-jqgrid .ui-jqgrid-sdiv {position: relative; margin: 0em;padding: 0em; overflow: hidden; border-left: 0px none !important; border-top : 0px none !important; border-right : 0px none !important;}
.ui-jqgrid .ui-jqgrid-ftable {table-layout:fixed; margin-bottom:0em;}
.ui-jqgrid tr.footrow td {font-weight: bold; overflow: hidden; white-space:nowrap; height: 21px;padding: 0 2px 0 2px;border-top-width: 1px; border-top-color: inherit; border-top-style: solid;}
.ui-jqgrid tr.footrow-ltr td {text-align:left;border-right-width: 1px; border-right-color: inherit; border-right-style: solid;}
.ui-jqgrid tr.footrow-rtl td {text-align:right;border-left-width: 1px; border-left-color: inherit; border-left-style: solid;}
/* Pager*/
.ui-jqgrid .ui-jqgrid-pager { border-left: 0px none !important;border-right: 0px none !important; border-bottom: 0px none !important; margin: 0px !important; padding: 0px !important; position: relative; height: 25px;white-space: nowrap;overflow: hidden;}
.ui-jqgrid .ui-pager-control {position: relative;}
.ui-jqgrid .ui-pg-table {position: relative; padding-bottom:2px; width:auto; margin: 0em;}
.ui-jqgrid .ui-pg-table td {font-weight:normal; vertical-align:middle; padding:1px;}
.ui-jqgrid .ui-pg-button { height:19px !important;}
.ui-jqgrid .ui-pg-button span { display: block; margin: 1px; float:left;}
.ui-jqgrid .ui-pg-button:hover { padding: 0px; }
.ui-jqgrid .ui-state-disabled:hover {padding:1px;}
.ui-jqgrid .ui-pg-input { height:13px;font-size:.8em; margin: 0em;}
.ui-jqgrid .ui-pg-selbox {font-size:.8em; line-height:18px; display:block; height:18px; margin: 0em;}
.ui-jqgrid .ui-separator {height: 18px; border-left: 1px solid #ccc ; border-right: 1px solid #ccc ; margin: 1px; float: right;}
.ui-jqgrid .ui-paging-info {font-weight: normal;height:19px; margin-top:3px;margin-right:4px;}
.ui-jqgrid .ui-jqgrid-pager .ui-pg-div {padding:1px 0;float:left;list-style-image:none;list-style-position:outside;list-style-type:none;position:relative;}
.ui-jqgrid .ui-jqgrid-pager .ui-pg-button { cursor:pointer; }
.ui-jqgrid .ui-jqgrid-pager .ui-pg-div span.ui-icon {float:left;margin:0 2px;}
.ui-jqgrid td input, .ui-jqgrid td select .ui-jqgrid td textarea { margin: 0em;}
.ui-jqgrid td textarea {width:auto;height:auto;}
.ui-jqgrid .ui-jqgrid-toppager {border-left: 0px none !important;border-right: 0px none !important; border-top: 0px none !important; margin: 0px !important; padding: 0px !important; position: relative; height: 25px !important;white-space: nowrap;overflow: hidden;}
/*subgrid*/
.ui-jqgrid .ui-jqgrid-btable .ui-sgcollapsed span {display: block;}
.ui-jqgrid .ui-subgrid {margin:0em;padding:0em; width:100%;}
.ui-jqgrid .ui-subgrid table {table-layout: fixed;}
.ui-jqgrid .ui-subgrid tr.ui-subtblcell td {height:18px;border-right-width: 1px; border-right-color: inherit; border-right-style: solid;border-bottom-width: 1px; border-bottom-color: inherit; border-bottom-style: solid;}
.ui-jqgrid .ui-subgrid td.subgrid-data {border-top: 0px none !important;}
.ui-jqgrid .ui-subgrid td.subgrid-cell {border-width: 0px 0px 1px 0px;}
.ui-jqgrid .ui-th-subgrid {height:20px;}
/* loading */
.ui-jqgrid .loading {position: absolute; top: 45%;left: 45%;width: auto;z-index:101;padding: 6px; margin: 5px;text-align: center;font-weight: bold;display: none;border-width: 2px !important;}
.ui-jqgrid .jqgrid-overlay {display:none;z-index:100;}
* html .jqgrid-overlay {width: expression(this.parentNode.offsetWidth+'px');height: expression(this.parentNode.offsetHeight+'px');}
* .jqgrid-overlay iframe {position:absolute;top:0;left:0;z-index:-1;width: expression(this.parentNode.offsetWidth+'px');height: expression(this.parentNode.offsetHeight+'px');}
/* end loading div */
/* toolbar */
.ui-jqgrid .ui-userdata {border-left: 0px none; border-right: 0px none; height : 21px;overflow: hidden; }
/*Modal Window */
.ui-jqdialog { display: none; width: 300px; position: absolute; padding: .2em; font-size:11px; overflow:visible;}
.ui-jqdialog .ui-jqdialog-titlebar { padding: .3em .2em; position: relative; }
.ui-jqdialog .ui-jqdialog-title { margin: .1em 0 .2em; }
.ui-jqdialog .ui-jqdialog-titlebar-close { position: absolute; top: 50%; width: 19px; margin: -10px 0 0 0; padding: 1px; height: 18px; }
.ui-jqdialog .ui-jqdialog-titlebar-close span { display: block; margin: 1px; }
.ui-jqdialog .ui-jqdialog-titlebar-close:hover, .ui-jqdialog .ui-jqdialog-titlebar-close:focus { padding: 0; }
.ui-jqdialog-content, .ui-jqdialog .ui-jqdialog-content { border: 0; padding: .3em .2em; background: none; height:auto;}
.ui-jqdialog .ui-jqconfirm {padding: .4em 1em; border-width:3px;position:absolute;bottom:10px;right:10px;overflow:visible;display:none;height:80px;width:220px;text-align:center;}
/* end Modal window*/
/* Form edit */
.ui-jqdialog-content .FormGrid {margin: 0px;}
.ui-jqdialog-content .EditTable { width: 100%; margin-bottom:0em;}
.ui-jqdialog-content .DelTable { width: 100%; margin-bottom:0em;}
.EditTable td input, .EditTable td select, .EditTable td textarea {margin: 0em;}
.EditTable td textarea { width:auto; height:auto;}
.ui-jqdialog-content td.EditButton {text-align: right;border-top: 0px none;border-left: 0px none;border-right: 0px none; padding-bottom:5px; padding-top:5px;}
.ui-jqdialog-content td.navButton {text-align: center; border-left: 0px none;border-top: 0px none;border-right: 0px none; padding-bottom:5px; padding-top:5px;}
.ui-jqdialog-content input.FormElement {padding:.3em}
.ui-jqdialog-content .data-line {padding-top:.1em;border: 0px none;}
.ui-jqdialog-content .CaptionTD {text-align: left; vertical-align: middle;border: 0px none; padding: 2px;white-space: nowrap;}
.ui-jqdialog-content .DataTD {padding: 2px; border: 0px none; vertical-align: top;}
.ui-jqdialog-content .form-view-data {white-space:pre}
.fm-button { display: inline-block; margin:0 4px 0 0; padding: .4em .5em; text-decoration:none !important; cursor:pointer; position: relative; text-align: center; zoom: 1; }
.fm-button-icon-left { padding-left: 1.9em; }
.fm-button-icon-right { padding-right: 1.9em; }
.fm-button-icon-left .ui-icon { right: auto; left: .2em; margin-left: 0; position: absolute; top: 50%; margin-top: -8px; }
.fm-button-icon-right .ui-icon { left: auto; right: .2em; margin-left: 0; position: absolute; top: 50%; margin-top: -8px;}
#nData, #pData { float: left; margin:3px;padding: 0; width: 15px; }
/* End Eorm edit */
/*.ui-jqgrid .edit-cell {}*/
.ui-jqgrid .selected-row, div.ui-jqgrid .selected-row td {font-style : normal;border-left: 0px none;}
/* Tree Grid */
.ui-jqgrid .tree-wrap {float: left; position: relative;height: 18px;white-space: nowrap;overflow: hidden;}
.ui-jqgrid .tree-minus {position: absolute; height: 18px; width: 18px; overflow: hidden;}
.ui-jqgrid .tree-plus {position: absolute; height: 18px; width: 18px; overflow: hidden;}
.ui-jqgrid .tree-leaf {position: absolute; height: 18px; width: 18px;overflow: hidden;}
.ui-jqgrid .treeclick {cursor: pointer;}
/* moda dialog */
* iframe.jqm {position:absolute;top:0;left:0;z-index:-1;width: expression(this.parentNode.offsetWidth+'px');height: expression(this.parentNode.offsetHeight+'px');}
.ui-jqgrid-dnd tr td {border-right-width: 1px; border-right-color: inherit; border-right-style: solid; height:20px}
/* RTL Support */
.ui-jqgrid .ui-jqgrid-title-rtl {float:right;margin: .1em 0 .2em; }
.ui-jqgrid .ui-jqgrid-hbox-rtl {float: right; padding-left: 20px;}
.ui-jqgrid .ui-jqgrid-resize-ltr {float: right;margin: -2px -2px -2px 0px;}
.ui-jqgrid .ui-jqgrid-resize-rtl {float: left;margin: -2px 0px -1px -3px;}
.ui-jqgrid .ui-sort-rtl {left:0px;}
.ui-jqgrid .tree-wrap-ltr {float: left;}
.ui-jqgrid .tree-wrap-rtl {float: right;}
.ui-jqgrid .ui-ellipsis {text-overflow:ellipsis; -moz-binding:url('ellipsis-xbl.xml#ellipsis');}
cat-home/src/main/java/com/dianping/cat/report/page/ip/DisplayModel.java 0 → 100644
浏览文件 @ c08f10f4
package com.dianping.cat.report.page.ip;
public class DisplayModel {
private String m_address;
private int m_lastOne;
private int m_lastFive;
private int m_lastFifteen;
public DisplayModel(String address) {
m_address = address;
}
public String getAddress() {
return m_address;
}
public int getLastFifteen() {
return m_lastFifteen;
}
public int getLastFive() {
return m_lastFive;
}
public int getLastOne() {
return m_lastOne;
}
public void process(int current, int minute, int count) {
if (current == minute) {
m_lastOne += count;
m_lastFive += count;
m_lastFifteen += count;
} else if (current < minute) {
// ignore it
} else if (current - 5 < minute) {
m_lastFive += count;
m_lastFifteen += count;
} else if (current - 15 < minute) {
m_lastFifteen += count;
}
}
}
\ No newline at end of file
cat-home/src/main/java/com/dianping/cat/report/page/ip/Handler.java
浏览文件 @ c08f10f4
package com.dianping.cat.report.page.ip;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Calendar;
import java.util.Collections;
import java.util.Comparator;
import java.util.List;
import javax.servlet.ServletException;
import com.dianping.cat.consumer.RealtimeConsumer;
import com.dianping.cat.consumer.ip.IpAnalyzer;
import com.dianping.cat.consumer.ip.model.entity.Ip;
import com.dianping.cat.consumer.ip.model.entity.IpReport;
import com.dianping.cat.consumer.ip.model.entity.Period;
import com.dianping.cat.consumer.ip.model.transform.BaseVisitor;
import com.dianping.cat.message.spi.MessageConsumer;
import com.dianping.cat.report.ReportPage;
import com.site.lookup.annotation.Inject;
......@@ -38,16 +46,59 @@ public class Handler implements PageHandler<Context> {
model.setPage(ReportPage.IP);
IpAnalyzer analyzer = (IpAnalyzer) m_consumer.getCurrentAnalyzer("ip");
IpReport report;
if (analyzer != null) {
Payload payload = ctx.getPayload();
String domain = payload.getDomain();
model.setReport(analyzer.generate(domain));
report = analyzer.generate(domain);
} else {
model.setReport(new IpReport());
report = new IpReport();
}
Calendar cal = Calendar.getInstance();
int minute = cal.get(Calendar.MINUTE);
List<DisplayModel> models = new ArrayList<DisplayModel>();
DisplayModelBuilder builder = new DisplayModelBuilder(models, minute);
report.accept(builder); // prepare display model
Collections.sort(models, new Comparator<DisplayModel>() {
@Override
public int compare(DisplayModel m1, DisplayModel m2) {
return m2.getLastFifteen() - m1.getLastFifteen(); // desc
}
});
model.setReport(report);
model.setDisplayModels(models);
m_jspViewer.view(ctx, model);
}
static class DisplayModelBuilder extends BaseVisitor {
private int m_minute;
private List<DisplayModel> m_models;
private DisplayModel m_model;
public DisplayModelBuilder(List<DisplayModel> models, int minute) {
m_models = models;
m_minute = minute;
}
@Override
public void visitIp(Ip ip) {
m_model = new DisplayModel(ip.getAddress());
m_models.add(m_model);
super.visitIp(ip);
}
@Override
public void visitPeriod(Period period) {
m_model.process(m_minute, period.getMinute(), period.getValue());
}
}
}
cat-home/src/main/java/com/dianping/cat/report/page/ip/Model.java
浏览文件 @ c08f10f4
package com.dianping.cat.report.page.ip;
import java.util.List;
import com.dianping.cat.consumer.ip.model.entity.IpReport;
import com.dianping.cat.report.ReportPage;
import com.site.web.mvc.ViewModel;
......@@ -7,6 +9,8 @@ import com.site.web.mvc.ViewModel;
public class Model extends ViewModel<ReportPage, Action, Context> {
private IpReport m_report;
private List<DisplayModel> m_displayModels;
public Model(Context ctx) {
super(ctx);
}
......@@ -16,12 +20,20 @@ public class Model extends ViewModel<ReportPage, Action, Context> {
return Action.VIEW;
}
public List<DisplayModel> getDisplayModels() {
return m_displayModels;
}
public IpReport getReport() {
return m_report;
}
public String getReportInJson() {
return String.format("%2.1s", m_report);
return String.format(IpReport.JSON, m_report);
}
public void setDisplayModels(List<DisplayModel> models) {
m_displayModels = models;
}
public void setReport(IpReport report) {
......
cat-home/src/main/resources/META-INF/plexus/components.xml
浏览文件 @ c08f10f4
......@@ -77,6 +77,9 @@
<requirement>
<role>long</role>
</requirement>
<requirement>
<role>int</role>
</requirement>
<requirement>
<role>java.util.List</role>
</requirement>
......
cat-home/src/main/webapp/WEB-INF/tags/body.tag
浏览文件 @ c08f10f4
......@@ -6,7 +6,7 @@
<res:bean id="res"/>
<html>
<head>
<title>Garden - ${model.page.description}</title>
<title>CAT - ${model.page.description}</title>
<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
<res:cssSlot id="head-css"/>
<res:jsSlot id="head-js"/>
......
cat-home/src/main/webapp/css/ip.css 0 → 100644
浏览文件 @ c08f10f4
.ip-table .odd td {
background-color: #eee;
font-size: small;
text-align: center;
}
.ip-table .even td {
background-color: white;
font-size: small;
text-align: center;
}
cat-home/src/main/webapp/jsp/report/ip.jsp
浏览文件 @ c08f10f4
......@@ -6,19 +6,34 @@
<jsp:useBean id="payload" type="com.dianping.cat.report.page.ip.Payload" scope="request" />
<jsp:useBean id="model" type="com.dianping.cat.report.page.ip.Model" scope="request" />
<a:report title="Hot IP Report XXX">
<a:report title="Hot IP Report">
<jsp:attribute name="domain">
hello
</jsp:attribute>
<jsp:attribute name="time">
[ <a href="">-1d</a> ] [ <a href="">-2h</a> ] [ <a href="">-1h</a> ] [ <a href="">+1h</a> ] [ <a href="">+2h</a> ] [ <a href="">+1d</a> ]
</jsp:attribute>
<jsp:attribute name="domain">
Domain: ${payload.domain}
</jsp:attribute>
<jsp:attribute name="time">
[ <a href="">-1d</a> ] [ <a href="">-2h</a> ] [ <a href="">-1h</a> ] [ <a href="">+1h</a> ] [ <a href="">+2h</a> ] [ <a href="">+1d</a> ]
</jsp:attribute>
<jsp:body>
<pre>
<jsp:body>
<res:useCss value='${res.css.local.ip_css}' target="head-css"/>
<table class="ip-table">
<tr><th>IP</th><th>last 1 min</th><th>last 5 mins</th><th>last 15 mins</th></tr>
<c:forEach var="m" items="${model.displayModels}" varStatus="status">
<tr class="${status.index mod 2 != 0 ? 'odd' : 'even'}">
<td>${m.address}</td>
<td>${m.lastOne}</td>
<td>${m.lastFive}</td>
<td>${m.lastFifteen}</td>
</tr>
</c:forEach>
</table>
<%-- <xmp>
${model.reportInJson}
</pre>
</jsp:body>
</xmp> --%>
</jsp:body>
</a:report>
cat-home/src/main/webapp/jsp/report/logview.jsp
浏览文件 @ c08f10f4
......@@ -8,7 +8,6 @@
<a:body>
<res:useCss value='${res.css.local.default_css}' target="head-css"/>
<res:useCss value='${res.css.local.logview_css}' target="head-css"/>
<c:choose>
......
cat-home/src/test/java/com/dianping/cat/AllTests.java
浏览文件 @ c08f10f4
......@@ -4,10 +4,13 @@ import org.junit.runner.RunWith;
import org.junit.runners.Suite;
import org.junit.runners.Suite.SuiteClasses;
import com.dianping.cat.report.page.ip.DisplayModelTest;
@RunWith(Suite.class)
@SuiteClasses({
// add test classes here
/* .report.page.ip */
DisplayModelTest.class
})
public class AllTests {
......
cat-home/src/test/java/com/dianping/cat/report/page/ip/DisplayModelTest.java 0 → 100644
浏览文件 @ c08f10f4
package com.dianping.cat.report.page.ip;
import junit.framework.Assert;
import org.junit.Test;
public class DisplayModelTest {
private void check(DisplayModel model, int time, int count, int lastOne, int lastFive, int lastFifteen) {
model.process(0, time, count);
Assert.assertEquals("Last one", lastOne, model.getLastOne());
Assert.assertEquals("Last five", lastFive, model.getLastFive());
Assert.assertEquals("Last fifteen", lastFifteen, model.getLastFifteen());
}
@Test
public void test() {
DisplayModel model = new DisplayModel("localhost");
check(model, 1, 1, 0, 0, 0);
check(model, 0, 1, 1, 1, 1);
check(model, -1, 2, 1, 3, 3);
check(model, -3, 2, 1, 5, 5);
check(model, -5, 2, 1, 5, 7);
check(model, -10, 2, 1, 5, 9);
check(model, -14, 2, 1, 5, 11);
check(model, -15, 2, 1, 5, 11);
check(model, 1, 2, 1, 5, 11);
}
}
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或