Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
梦中观雨
cat
提交
a1f8477e
C
cat
项目概览
梦中观雨
/
cat
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
C
cat
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
a1f8477e
编写于
3月 19, 2015
作者:
Y
youyong205
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
refactor config
上级
accbbc36
变更
20
显示空白变更内容
内联
并排
Showing
20 changed file
with
53 addition
and
49 deletion
+53
-49
cat-home/src/main/java/com/dianping/cat/build/AlarmComponentConfigurator.java
...va/com/dianping/cat/build/AlarmComponentConfigurator.java
+1
-1
cat-home/src/main/java/com/dianping/cat/build/ReportServiceComponentConfigurator.java
...ianping/cat/build/ReportServiceComponentConfigurator.java
+2
-2
cat-home/src/main/java/com/dianping/cat/build/TaskComponentConfigurator.java
...ava/com/dianping/cat/build/TaskComponentConfigurator.java
+3
-3
cat-home/src/main/java/com/dianping/cat/report/alert/storage/AbstractStorageAlert.java
...anping/cat/report/alert/storage/AbstractStorageAlert.java
+1
-1
cat-home/src/main/java/com/dianping/cat/report/page/network/nettopology/NetGraphManager.java
.../cat/report/page/network/nettopology/NetGraphManager.java
+1
-1
cat-home/src/main/java/com/dianping/cat/report/page/network/service/NetTopologyReportService.java
...report/page/network/service/NetTopologyReportService.java
+1
-1
cat-home/src/main/java/com/dianping/cat/report/page/network/task/NetTopologyReportBuilder.java
...at/report/page/network/task/NetTopologyReportBuilder.java
+1
-1
cat-home/src/main/java/com/dianping/cat/report/page/storage/Handler.java
...in/java/com/dianping/cat/report/page/storage/Handler.java
+3
-0
cat-home/src/main/java/com/dianping/cat/report/page/storage/task/StorageReportBuilder.java
...ng/cat/report/page/storage/task/StorageReportBuilder.java
+1
-1
cat-home/src/main/java/com/dianping/cat/report/page/storage/transform/AllDomainMerger.java
...ng/cat/report/page/storage/transform/AllDomainMerger.java
+1
-1
cat-home/src/main/java/com/dianping/cat/report/page/storage/transform/AllMachineMerger.java
...g/cat/report/page/storage/transform/AllMachineMerger.java
+1
-1
cat-home/src/main/java/com/dianping/cat/report/page/storage/transform/HourlyLineChartVisitor.java
...report/page/storage/transform/HourlyLineChartVisitor.java
+2
-1
cat-home/src/main/java/com/dianping/cat/report/page/storage/transform/StorageMergeHelper.java
...cat/report/page/storage/transform/StorageMergeHelper.java
+1
-1
cat-home/src/main/java/com/dianping/cat/report/page/storage/transform/StorageOperationFilter.java
...report/page/storage/transform/StorageOperationFilter.java
+1
-1
cat-home/src/main/java/com/dianping/cat/system/page/router/Handler.java
...ain/java/com/dianping/cat/system/page/router/Handler.java
+1
-1
cat-home/src/main/java/com/dianping/cat/system/page/router/service/RouterConfigService.java
...g/cat/system/page/router/service/RouterConfigService.java
+1
-1
cat-home/src/main/java/com/dianping/cat/system/page/router/task/RouterConfigBuilder.java
...ping/cat/system/page/router/task/RouterConfigBuilder.java
+1
-1
cat-home/src/main/resources/META-INF/plexus/components.xml
cat-home/src/main/resources/META-INF/plexus/components.xml
+28
-28
cat-home/src/test/java/com/dianping/cat/report/analyzer/RouterBuilderTest.java
...a/com/dianping/cat/report/analyzer/RouterBuilderTest.java
+1
-1
script/Cat.sql
script/Cat.sql
+1
-1
未找到文件。
cat-home/src/main/java/com/dianping/cat/build/AlarmComponentConfigurator.java
浏览文件 @
a1f8477e
...
@@ -92,9 +92,9 @@ import com.dianping.cat.report.alert.web.WebAlert;
...
@@ -92,9 +92,9 @@ import com.dianping.cat.report.alert.web.WebAlert;
import
com.dianping.cat.report.page.app.service.AppDataService
;
import
com.dianping.cat.report.page.app.service.AppDataService
;
import
com.dianping.cat.report.page.dependency.graph.TopologyGraphManager
;
import
com.dianping.cat.report.page.dependency.graph.TopologyGraphManager
;
import
com.dianping.cat.report.page.metric.service.BaselineService
;
import
com.dianping.cat.report.page.metric.service.BaselineService
;
import
com.dianping.cat.report.page.storage.StorageMergeHelper
;
import
com.dianping.cat.report.page.storage.topology.StorageAlertInfoRTContainer
;
import
com.dianping.cat.report.page.storage.topology.StorageAlertInfoRTContainer
;
import
com.dianping.cat.report.page.storage.topology.StorageAlertInfoBuilder
;
import
com.dianping.cat.report.page.storage.topology.StorageAlertInfoBuilder
;
import
com.dianping.cat.report.page.storage.transform.StorageMergeHelper
;
import
com.dianping.cat.report.page.transaction.transform.TransactionMergeHelper
;
import
com.dianping.cat.report.page.transaction.transform.TransactionMergeHelper
;
import
com.dianping.cat.report.service.ModelService
;
import
com.dianping.cat.report.service.ModelService
;
import
com.dianping.cat.service.ProjectService
;
import
com.dianping.cat.service.ProjectService
;
...
...
cat-home/src/main/java/com/dianping/cat/build/ReportServiceComponentConfigurator.java
浏览文件 @
a1f8477e
...
@@ -22,19 +22,19 @@ import com.dianping.cat.report.page.event.service.EventReportService;
...
@@ -22,19 +22,19 @@ import com.dianping.cat.report.page.event.service.EventReportService;
import
com.dianping.cat.report.page.heartbeat.service.HeartbeatReportService
;
import
com.dianping.cat.report.page.heartbeat.service.HeartbeatReportService
;
import
com.dianping.cat.report.page.matrix.service.MatrixReportService
;
import
com.dianping.cat.report.page.matrix.service.MatrixReportService
;
import
com.dianping.cat.report.page.metric.service.MetricReportService
;
import
com.dianping.cat.report.page.metric.service.MetricReportService
;
import
com.dianping.cat.report.page.network.service.NetTopologyReportService
;
import
com.dianping.cat.report.page.problem.service.ProblemReportService
;
import
com.dianping.cat.report.page.problem.service.ProblemReportService
;
import
com.dianping.cat.report.page.state.service.StateReportService
;
import
com.dianping.cat.report.page.state.service.StateReportService
;
import
com.dianping.cat.report.page.statistics.service.BugReportService
;
import
com.dianping.cat.report.page.statistics.service.BugReportService
;
import
com.dianping.cat.report.page.statistics.service.HeavyReportService
;
import
com.dianping.cat.report.page.statistics.service.HeavyReportService
;
import
com.dianping.cat.report.page.statistics.service.JarReportService
;
import
com.dianping.cat.report.page.statistics.service.JarReportService
;
import
com.dianping.cat.report.page.statistics.service.NetTopologyReportService
;
import
com.dianping.cat.report.page.statistics.service.RouterConfigService
;
import
com.dianping.cat.report.page.statistics.service.ServiceReportService
;
import
com.dianping.cat.report.page.statistics.service.ServiceReportService
;
import
com.dianping.cat.report.page.statistics.service.SystemReportService
;
import
com.dianping.cat.report.page.statistics.service.SystemReportService
;
import
com.dianping.cat.report.page.statistics.service.UtilizationReportService
;
import
com.dianping.cat.report.page.statistics.service.UtilizationReportService
;
import
com.dianping.cat.report.page.storage.task.StorageReportService
;
import
com.dianping.cat.report.page.storage.task.StorageReportService
;
import
com.dianping.cat.report.page.top.service.TopReportService
;
import
com.dianping.cat.report.page.top.service.TopReportService
;
import
com.dianping.cat.report.page.transaction.service.TransactionReportService
;
import
com.dianping.cat.report.page.transaction.service.TransactionReportService
;
import
com.dianping.cat.system.page.router.service.RouterConfigService
;
public
class
ReportServiceComponentConfigurator
extends
AbstractResourceConfigurator
{
public
class
ReportServiceComponentConfigurator
extends
AbstractResourceConfigurator
{
@Override
@Override
...
...
cat-home/src/main/java/com/dianping/cat/build/TaskComponentConfigurator.java
浏览文件 @
a1f8477e
...
@@ -57,6 +57,7 @@ import com.dianping.cat.report.page.metric.task.DefaultBaselineCreator;
...
@@ -57,6 +57,7 @@ import com.dianping.cat.report.page.metric.task.DefaultBaselineCreator;
import
com.dianping.cat.report.page.metric.task.MetricBaselineReportBuilder
;
import
com.dianping.cat.report.page.metric.task.MetricBaselineReportBuilder
;
import
com.dianping.cat.report.page.metric.task.MetricPointParser
;
import
com.dianping.cat.report.page.metric.task.MetricPointParser
;
import
com.dianping.cat.report.page.network.nettopology.NetGraphBuilder
;
import
com.dianping.cat.report.page.network.nettopology.NetGraphBuilder
;
import
com.dianping.cat.report.page.network.service.NetTopologyReportService
;
import
com.dianping.cat.report.page.network.task.NetTopologyReportBuilder
;
import
com.dianping.cat.report.page.network.task.NetTopologyReportBuilder
;
import
com.dianping.cat.report.page.overload.task.CapacityUpdateStatusManager
;
import
com.dianping.cat.report.page.overload.task.CapacityUpdateStatusManager
;
import
com.dianping.cat.report.page.overload.task.CapacityUpdateTask
;
import
com.dianping.cat.report.page.overload.task.CapacityUpdateTask
;
...
@@ -75,8 +76,6 @@ import com.dianping.cat.report.page.state.task.StateReportBuilder;
...
@@ -75,8 +76,6 @@ import com.dianping.cat.report.page.state.task.StateReportBuilder;
import
com.dianping.cat.report.page.statistics.service.BugReportService
;
import
com.dianping.cat.report.page.statistics.service.BugReportService
;
import
com.dianping.cat.report.page.statistics.service.HeavyReportService
;
import
com.dianping.cat.report.page.statistics.service.HeavyReportService
;
import
com.dianping.cat.report.page.statistics.service.JarReportService
;
import
com.dianping.cat.report.page.statistics.service.JarReportService
;
import
com.dianping.cat.report.page.statistics.service.NetTopologyReportService
;
import
com.dianping.cat.report.page.statistics.service.RouterConfigService
;
import
com.dianping.cat.report.page.statistics.service.ServiceReportService
;
import
com.dianping.cat.report.page.statistics.service.ServiceReportService
;
import
com.dianping.cat.report.page.statistics.service.SystemReportService
;
import
com.dianping.cat.report.page.statistics.service.SystemReportService
;
import
com.dianping.cat.report.page.statistics.service.UtilizationReportService
;
import
com.dianping.cat.report.page.statistics.service.UtilizationReportService
;
...
@@ -86,9 +85,9 @@ import com.dianping.cat.report.page.statistics.task.jar.JarReportBuilder;
...
@@ -86,9 +85,9 @@ import com.dianping.cat.report.page.statistics.task.jar.JarReportBuilder;
import
com.dianping.cat.report.page.statistics.task.service.ServiceReportBuilder
;
import
com.dianping.cat.report.page.statistics.task.service.ServiceReportBuilder
;
import
com.dianping.cat.report.page.statistics.task.system.SystemReportBuilder
;
import
com.dianping.cat.report.page.statistics.task.system.SystemReportBuilder
;
import
com.dianping.cat.report.page.statistics.task.utilization.UtilizationReportBuilder
;
import
com.dianping.cat.report.page.statistics.task.utilization.UtilizationReportBuilder
;
import
com.dianping.cat.report.page.storage.StorageMergeHelper
;
import
com.dianping.cat.report.page.storage.task.StorageReportBuilder
;
import
com.dianping.cat.report.page.storage.task.StorageReportBuilder
;
import
com.dianping.cat.report.page.storage.task.StorageReportService
;
import
com.dianping.cat.report.page.storage.task.StorageReportService
;
import
com.dianping.cat.report.page.storage.transform.StorageMergeHelper
;
import
com.dianping.cat.report.page.transaction.service.TransactionReportService
;
import
com.dianping.cat.report.page.transaction.service.TransactionReportService
;
import
com.dianping.cat.report.page.transaction.task.TransactionGraphCreator
;
import
com.dianping.cat.report.page.transaction.task.TransactionGraphCreator
;
import
com.dianping.cat.report.page.transaction.task.TransactionMerger
;
import
com.dianping.cat.report.page.transaction.task.TransactionMerger
;
...
@@ -110,6 +109,7 @@ import com.dianping.cat.service.HostinfoService;
...
@@ -110,6 +109,7 @@ import com.dianping.cat.service.HostinfoService;
import
com.dianping.cat.service.ProjectService
;
import
com.dianping.cat.service.ProjectService
;
import
com.dianping.cat.system.config.NetGraphConfigManager
;
import
com.dianping.cat.system.config.NetGraphConfigManager
;
import
com.dianping.cat.system.config.RouterConfigManager
;
import
com.dianping.cat.system.config.RouterConfigManager
;
import
com.dianping.cat.system.page.router.service.RouterConfigService
;
import
com.dianping.cat.system.page.router.task.RouterConfigBuilder
;
import
com.dianping.cat.system.page.router.task.RouterConfigBuilder
;
public
class
TaskComponentConfigurator
extends
AbstractResourceConfigurator
{
public
class
TaskComponentConfigurator
extends
AbstractResourceConfigurator
{
...
...
cat-home/src/main/java/com/dianping/cat/report/alert/storage/AbstractStorageAlert.java
浏览文件 @
a1f8477e
...
@@ -30,8 +30,8 @@ import com.dianping.cat.report.alert.DataChecker;
...
@@ -30,8 +30,8 @@ import com.dianping.cat.report.alert.DataChecker;
import
com.dianping.cat.report.alert.sender.AlertEntity
;
import
com.dianping.cat.report.alert.sender.AlertEntity
;
import
com.dianping.cat.report.alert.sender.AlertManager
;
import
com.dianping.cat.report.alert.sender.AlertManager
;
import
com.dianping.cat.report.page.storage.StorageConstants
;
import
com.dianping.cat.report.page.storage.StorageConstants
;
import
com.dianping.cat.report.page.storage.StorageMergeHelper
;
import
com.dianping.cat.report.page.storage.topology.StorageAlertInfoBuilder
;
import
com.dianping.cat.report.page.storage.topology.StorageAlertInfoBuilder
;
import
com.dianping.cat.report.page.storage.transform.StorageMergeHelper
;
import
com.dianping.cat.report.service.ModelService
;
import
com.dianping.cat.report.service.ModelService
;
import
com.dianping.cat.service.ModelPeriod
;
import
com.dianping.cat.service.ModelPeriod
;
import
com.dianping.cat.service.ModelRequest
;
import
com.dianping.cat.service.ModelRequest
;
...
...
cat-home/src/main/java/com/dianping/cat/report/page/network/nettopology/NetGraphManager.java
浏览文件 @
a1f8477e
...
@@ -32,7 +32,7 @@ import com.dianping.cat.home.network.entity.NetTopology;
...
@@ -32,7 +32,7 @@ import com.dianping.cat.home.network.entity.NetTopology;
import
com.dianping.cat.message.Transaction
;
import
com.dianping.cat.message.Transaction
;
import
com.dianping.cat.report.alert.AlertInfo
;
import
com.dianping.cat.report.alert.AlertInfo
;
import
com.dianping.cat.report.alert.AlertInfo.AlertMetric
;
import
com.dianping.cat.report.alert.AlertInfo.AlertMetric
;
import
com.dianping.cat.report.page.
statistics
.service.NetTopologyReportService
;
import
com.dianping.cat.report.page.
network
.service.NetTopologyReportService
;
import
com.dianping.cat.report.service.ModelService
;
import
com.dianping.cat.report.service.ModelService
;
import
com.dianping.cat.service.ModelPeriod
;
import
com.dianping.cat.service.ModelPeriod
;
import
com.dianping.cat.service.ModelRequest
;
import
com.dianping.cat.service.ModelRequest
;
...
...
cat-home/src/main/java/com/dianping/cat/report/page/
statistics
/service/NetTopologyReportService.java
→
cat-home/src/main/java/com/dianping/cat/report/page/
network
/service/NetTopologyReportService.java
浏览文件 @
a1f8477e
package
com.dianping.cat.report.page.
statistics
.service
;
package
com.dianping.cat.report.page.
network
.service
;
import
java.util.Date
;
import
java.util.Date
;
import
java.util.List
;
import
java.util.List
;
...
...
cat-home/src/main/java/com/dianping/cat/report/page/network/task/NetTopologyReportBuilder.java
浏览文件 @
a1f8477e
...
@@ -23,7 +23,7 @@ import com.dianping.cat.home.network.transform.DefaultNativeBuilder;
...
@@ -23,7 +23,7 @@ import com.dianping.cat.home.network.transform.DefaultNativeBuilder;
import
com.dianping.cat.report.alert.AlertInfo.AlertMetric
;
import
com.dianping.cat.report.alert.AlertInfo.AlertMetric
;
import
com.dianping.cat.report.page.metric.service.MetricReportService
;
import
com.dianping.cat.report.page.metric.service.MetricReportService
;
import
com.dianping.cat.report.page.network.nettopology.NetGraphBuilder
;
import
com.dianping.cat.report.page.network.nettopology.NetGraphBuilder
;
import
com.dianping.cat.report.page.
statistics
.service.NetTopologyReportService
;
import
com.dianping.cat.report.page.
network
.service.NetTopologyReportService
;
import
com.dianping.cat.report.task.TaskBuilder
;
import
com.dianping.cat.report.task.TaskBuilder
;
import
com.dianping.cat.system.config.NetGraphConfigManager
;
import
com.dianping.cat.system.config.NetGraphConfigManager
;
...
...
cat-home/src/main/java/com/dianping/cat/report/page/storage/Handler.java
浏览文件 @
a1f8477e
...
@@ -33,6 +33,9 @@ import com.dianping.cat.report.graph.LineChart;
...
@@ -33,6 +33,9 @@ import com.dianping.cat.report.graph.LineChart;
import
com.dianping.cat.report.page.PayloadNormalizer
;
import
com.dianping.cat.report.page.PayloadNormalizer
;
import
com.dianping.cat.report.page.storage.task.StorageReportService
;
import
com.dianping.cat.report.page.storage.task.StorageReportService
;
import
com.dianping.cat.report.page.storage.topology.StorageAlertInfoManager
;
import
com.dianping.cat.report.page.storage.topology.StorageAlertInfoManager
;
import
com.dianping.cat.report.page.storage.transform.HourlyLineChartVisitor
;
import
com.dianping.cat.report.page.storage.transform.StorageMergeHelper
;
import
com.dianping.cat.report.page.storage.transform.StorageOperationFilter
;
import
com.dianping.cat.report.service.ModelService
;
import
com.dianping.cat.report.service.ModelService
;
import
com.dianping.cat.service.ModelRequest
;
import
com.dianping.cat.service.ModelRequest
;
import
com.dianping.cat.service.ModelResponse
;
import
com.dianping.cat.service.ModelResponse
;
...
...
cat-home/src/main/java/com/dianping/cat/report/page/storage/task/StorageReportBuilder.java
浏览文件 @
a1f8477e
...
@@ -15,7 +15,7 @@ import com.dianping.cat.core.dal.DailyReport;
...
@@ -15,7 +15,7 @@ import com.dianping.cat.core.dal.DailyReport;
import
com.dianping.cat.core.dal.MonthlyReport
;
import
com.dianping.cat.core.dal.MonthlyReport
;
import
com.dianping.cat.core.dal.WeeklyReport
;
import
com.dianping.cat.core.dal.WeeklyReport
;
import
com.dianping.cat.helper.TimeHelper
;
import
com.dianping.cat.helper.TimeHelper
;
import
com.dianping.cat.report.page.storage.StorageMergeHelper
;
import
com.dianping.cat.report.page.storage.
transform.
StorageMergeHelper
;
import
com.dianping.cat.report.task.TaskBuilder
;
import
com.dianping.cat.report.task.TaskBuilder
;
import
com.dianping.cat.report.task.TaskHelper
;
import
com.dianping.cat.report.task.TaskHelper
;
...
...
cat-home/src/main/java/com/dianping/cat/report/page/storage/AllDomainMerger.java
→
cat-home/src/main/java/com/dianping/cat/report/page/storage/
transform/
AllDomainMerger.java
浏览文件 @
a1f8477e
package
com.dianping.cat.report.page.storage
;
package
com.dianping.cat.report.page.storage
.transform
;
import
com.dianping.cat.Constants
;
import
com.dianping.cat.Constants
;
import
com.dianping.cat.consumer.storage.model.entity.Domain
;
import
com.dianping.cat.consumer.storage.model.entity.Domain
;
...
...
cat-home/src/main/java/com/dianping/cat/report/page/storage/AllMachineMerger.java
→
cat-home/src/main/java/com/dianping/cat/report/page/storage/
transform/
AllMachineMerger.java
浏览文件 @
a1f8477e
package
com.dianping.cat.report.page.storage
;
package
com.dianping.cat.report.page.storage
.transform
;
import
com.dianping.cat.Constants
;
import
com.dianping.cat.Constants
;
import
com.dianping.cat.consumer.storage.model.entity.Domain
;
import
com.dianping.cat.consumer.storage.model.entity.Domain
;
...
...
cat-home/src/main/java/com/dianping/cat/report/page/storage/HourlyLineChartVisitor.java
→
cat-home/src/main/java/com/dianping/cat/report/page/storage/
transform/
HourlyLineChartVisitor.java
浏览文件 @
a1f8477e
package
com.dianping.cat.report.page.storage
;
package
com.dianping.cat.report.page.storage
.transform
;
import
java.util.Date
;
import
java.util.Date
;
import
java.util.LinkedHashMap
;
import
java.util.LinkedHashMap
;
...
@@ -16,6 +16,7 @@ import com.dianping.cat.consumer.storage.model.entity.Segment;
...
@@ -16,6 +16,7 @@ import com.dianping.cat.consumer.storage.model.entity.Segment;
import
com.dianping.cat.consumer.storage.model.transform.BaseVisitor
;
import
com.dianping.cat.consumer.storage.model.transform.BaseVisitor
;
import
com.dianping.cat.helper.TimeHelper
;
import
com.dianping.cat.helper.TimeHelper
;
import
com.dianping.cat.report.graph.LineChart
;
import
com.dianping.cat.report.graph.LineChart
;
import
com.dianping.cat.report.page.storage.StorageConstants
;
public
class
HourlyLineChartVisitor
extends
BaseVisitor
{
public
class
HourlyLineChartVisitor
extends
BaseVisitor
{
...
...
cat-home/src/main/java/com/dianping/cat/report/page/storage/StorageMergeHelper.java
→
cat-home/src/main/java/com/dianping/cat/report/page/storage/
transform/
StorageMergeHelper.java
浏览文件 @
a1f8477e
package
com.dianping.cat.report.page.storage
;
package
com.dianping.cat.report.page.storage
.transform
;
import
com.dianping.cat.Constants
;
import
com.dianping.cat.Constants
;
import
com.dianping.cat.consumer.storage.model.entity.StorageReport
;
import
com.dianping.cat.consumer.storage.model.entity.StorageReport
;
...
...
cat-home/src/main/java/com/dianping/cat/report/page/storage/StorageOperationFilter.java
→
cat-home/src/main/java/com/dianping/cat/report/page/storage/
transform/
StorageOperationFilter.java
浏览文件 @
a1f8477e
package
com.dianping.cat.report.page.storage
;
package
com.dianping.cat.report.page.storage
.transform
;
import
java.util.Set
;
import
java.util.Set
;
...
...
cat-home/src/main/java/com/dianping/cat/system/page/router/Handler.java
浏览文件 @
a1f8477e
...
@@ -17,8 +17,8 @@ import com.dianping.cat.helper.TimeHelper;
...
@@ -17,8 +17,8 @@ import com.dianping.cat.helper.TimeHelper;
import
com.dianping.cat.home.router.entity.Domain
;
import
com.dianping.cat.home.router.entity.Domain
;
import
com.dianping.cat.home.router.entity.RouterConfig
;
import
com.dianping.cat.home.router.entity.RouterConfig
;
import
com.dianping.cat.home.router.entity.Server
;
import
com.dianping.cat.home.router.entity.Server
;
import
com.dianping.cat.report.page.statistics.service.RouterConfigService
;
import
com.dianping.cat.system.config.RouterConfigManager
;
import
com.dianping.cat.system.config.RouterConfigManager
;
import
com.dianping.cat.system.page.router.service.RouterConfigService
;
public
class
Handler
implements
PageHandler
<
Context
>
{
public
class
Handler
implements
PageHandler
<
Context
>
{
...
...
cat-home/src/main/java/com/dianping/cat/
report/page/statistics
/service/RouterConfigService.java
→
cat-home/src/main/java/com/dianping/cat/
system/page/router
/service/RouterConfigService.java
浏览文件 @
a1f8477e
package
com.dianping.cat.
report.page.statistics
.service
;
package
com.dianping.cat.
system.page.router
.service
;
import
java.util.Date
;
import
java.util.Date
;
import
java.util.HashMap
;
import
java.util.HashMap
;
...
...
cat-home/src/main/java/com/dianping/cat/system/page/router/task/RouterConfigBuilder.java
浏览文件 @
a1f8477e
...
@@ -28,9 +28,9 @@ import com.dianping.cat.home.router.entity.Server;
...
@@ -28,9 +28,9 @@ import com.dianping.cat.home.router.entity.Server;
import
com.dianping.cat.home.router.transform.DefaultNativeBuilder
;
import
com.dianping.cat.home.router.transform.DefaultNativeBuilder
;
import
com.dianping.cat.message.Event
;
import
com.dianping.cat.message.Event
;
import
com.dianping.cat.report.page.state.service.StateReportService
;
import
com.dianping.cat.report.page.state.service.StateReportService
;
import
com.dianping.cat.report.page.statistics.service.RouterConfigService
;
import
com.dianping.cat.report.task.TaskBuilder
;
import
com.dianping.cat.report.task.TaskBuilder
;
import
com.dianping.cat.system.config.RouterConfigManager
;
import
com.dianping.cat.system.config.RouterConfigManager
;
import
com.dianping.cat.system.page.router.service.RouterConfigService
;
public
class
RouterConfigBuilder
implements
TaskBuilder
,
LogEnabled
{
public
class
RouterConfigBuilder
implements
TaskBuilder
,
LogEnabled
{
...
...
cat-home/src/main/resources/META-INF/plexus/components.xml
浏览文件 @
a1f8477e
...
@@ -849,8 +849,8 @@
...
@@ -849,8 +849,8 @@
</requirements>
</requirements>
</component>
</component>
<component>
<component>
<role>
com.dianping.cat.report.page.
statistics
.service.NetTopologyReportService
</role>
<role>
com.dianping.cat.report.page.
network
.service.NetTopologyReportService
</role>
<implementation>
com.dianping.cat.report.page.
statistics
.service.NetTopologyReportService
</implementation>
<implementation>
com.dianping.cat.report.page.
network
.service.NetTopologyReportService
</implementation>
<requirements>
<requirements>
<requirement>
<requirement>
<role>
com.dianping.cat.core.dal.HourlyReportDao
</role>
<role>
com.dianping.cat.core.dal.HourlyReportDao
</role>
...
@@ -879,8 +879,8 @@
...
@@ -879,8 +879,8 @@
</requirements>
</requirements>
</component>
</component>
<component>
<component>
<role>
com.dianping.cat.
report.page.statistics
.service.RouterConfigService
</role>
<role>
com.dianping.cat.
system.page.router
.service.RouterConfigService
</role>
<implementation>
com.dianping.cat.
report.page.statistics
.service.RouterConfigService
</implementation>
<implementation>
com.dianping.cat.
system.page.router
.service.RouterConfigService
</implementation>
<requirements>
<requirements>
<requirement>
<requirement>
<role>
com.dianping.cat.core.dal.HourlyReportDao
</role>
<role>
com.dianping.cat.core.dal.HourlyReportDao
</role>
...
@@ -1299,7 +1299,7 @@
...
@@ -1299,7 +1299,7 @@
<role>
com.dianping.cat.report.page.state.service.StateReportService
</role>
<role>
com.dianping.cat.report.page.state.service.StateReportService
</role>
</requirement>
</requirement>
<requirement>
<requirement>
<role>
com.dianping.cat.
report.page.statistics
.service.RouterConfigService
</role>
<role>
com.dianping.cat.
system.page.router
.service.RouterConfigService
</role>
</requirement>
</requirement>
<requirement>
<requirement>
<role>
com.dianping.cat.system.config.RouterConfigManager
</role>
<role>
com.dianping.cat.system.config.RouterConfigManager
</role>
...
@@ -1340,7 +1340,7 @@
...
@@ -1340,7 +1340,7 @@
<role>
com.dianping.cat.report.page.cross.service.CrossReportService
</role>
<role>
com.dianping.cat.report.page.cross.service.CrossReportService
</role>
</requirement>
</requirement>
<requirement>
<requirement>
<role>
com.dianping.cat.report.page.transaction.TransactionMergeHelper
</role>
<role>
com.dianping.cat.report.page.transaction.
transform.
TransactionMergeHelper
</role>
</requirement>
</requirement>
<requirement>
<requirement>
<role>
com.dianping.cat.configuration.ServerConfigManager
</role>
<role>
com.dianping.cat.configuration.ServerConfigManager
</role>
...
@@ -1369,7 +1369,7 @@
...
@@ -1369,7 +1369,7 @@
<implementation>
com.dianping.cat.report.page.network.task.NetTopologyReportBuilder
</implementation>
<implementation>
com.dianping.cat.report.page.network.task.NetTopologyReportBuilder
</implementation>
<requirements>
<requirements>
<requirement>
<requirement>
<role>
com.dianping.cat.report.page.
statistics
.service.NetTopologyReportService
</role>
<role>
com.dianping.cat.report.page.
network
.service.NetTopologyReportService
</role>
</requirement>
</requirement>
<requirement>
<requirement>
<role>
com.dianping.cat.report.page.metric.service.MetricReportService
</role>
<role>
com.dianping.cat.report.page.metric.service.MetricReportService
</role>
...
@@ -1433,7 +1433,7 @@
...
@@ -1433,7 +1433,7 @@
<role>
com.dianping.cat.report.page.storage.task.StorageReportService
</role>
<role>
com.dianping.cat.report.page.storage.task.StorageReportService
</role>
</requirement>
</requirement>
<requirement>
<requirement>
<role>
com.dianping.cat.report.page.storage.StorageMergeHelper
</role>
<role>
com.dianping.cat.report.page.storage.
transform.
StorageMergeHelper
</role>
</requirement>
</requirement>
</requirements>
</requirements>
</component>
</component>
...
@@ -3241,7 +3241,7 @@
...
@@ -3241,7 +3241,7 @@
<implementation>
com.dianping.cat.report.alert.transaction.TransactionAlert
</implementation>
<implementation>
com.dianping.cat.report.alert.transaction.TransactionAlert
</implementation>
<requirements>
<requirements>
<requirement>
<requirement>
<role>
com.dianping.cat.report.page.transaction.TransactionMergeHelper
</role>
<role>
com.dianping.cat.report.page.transaction.
transform.
TransactionMergeHelper
</role>
</requirement>
</requirement>
<requirement>
<requirement>
<role>
com.dianping.cat.report.alert.DataChecker
</role>
<role>
com.dianping.cat.report.alert.DataChecker
</role>
...
@@ -3263,7 +3263,7 @@
...
@@ -3263,7 +3263,7 @@
<implementation>
com.dianping.cat.report.alert.storage.StorageSQLAlert
</implementation>
<implementation>
com.dianping.cat.report.alert.storage.StorageSQLAlert
</implementation>
<requirements>
<requirements>
<requirement>
<requirement>
<role>
com.dianping.cat.report.page.storage.StorageMergeHelper
</role>
<role>
com.dianping.cat.report.page.storage.
transform.
StorageMergeHelper
</role>
</requirement>
</requirement>
<requirement>
<requirement>
<role>
com.dianping.cat.report.alert.DataChecker
</role>
<role>
com.dianping.cat.report.alert.DataChecker
</role>
...
@@ -3777,7 +3777,7 @@
...
@@ -3777,7 +3777,7 @@
<role>
com.dianping.cat.report.page.transaction.service.TransactionReportService
</role>
<role>
com.dianping.cat.report.page.transaction.service.TransactionReportService
</role>
</requirement>
</requirement>
<requirement>
<requirement>
<role>
com.dianping.cat.report.page.transaction.TransactionMergeHelper
</role>
<role>
com.dianping.cat.report.page.transaction.
transform.
TransactionMergeHelper
</role>
</requirement>
</requirement>
<requirement>
<requirement>
<role>
com.dianping.cat.report.page.PayloadNormalizer
</role>
<role>
com.dianping.cat.report.page.PayloadNormalizer
</role>
...
@@ -3848,8 +3848,8 @@
...
@@ -3848,8 +3848,8 @@
</requirements>
</requirements>
</component>
</component>
<component>
<component>
<role>
com.dianping.cat.report.page.transaction.TransactionMergeHelper
</role>
<role>
com.dianping.cat.report.page.transaction.
transform.
TransactionMergeHelper
</role>
<implementation>
com.dianping.cat.report.page.transaction.TransactionMergeHelper
</implementation>
<implementation>
com.dianping.cat.report.page.transaction.
transform.
TransactionMergeHelper
</implementation>
</component>
</component>
<component>
<component>
<role>
com.dianping.cat.report.page.event.Handler
</role>
<role>
com.dianping.cat.report.page.event.Handler
</role>
...
@@ -3868,7 +3868,7 @@
...
@@ -3868,7 +3868,7 @@
<role>
com.dianping.cat.report.page.event.service.EventReportService
</role>
<role>
com.dianping.cat.report.page.event.service.EventReportService
</role>
</requirement>
</requirement>
<requirement>
<requirement>
<role>
com.dianping.cat.report.page.event.EventMergeHelper
</role>
<role>
com.dianping.cat.report.page.event.
transform.
EventMergeHelper
</role>
</requirement>
</requirement>
<requirement>
<requirement>
<role>
com.dianping.cat.report.service.ModelService
</role>
<role>
com.dianping.cat.report.service.ModelService
</role>
...
@@ -3935,8 +3935,8 @@
...
@@ -3935,8 +3935,8 @@
</requirements>
</requirements>
</component>
</component>
<component>
<component>
<role>
com.dianping.cat.report.page.event.EventMergeHelper
</role>
<role>
com.dianping.cat.report.page.event.
transform.
EventMergeHelper
</role>
<implementation>
com.dianping.cat.report.page.event.EventMergeHelper
</implementation>
<implementation>
com.dianping.cat.report.page.event.
transform.
EventMergeHelper
</implementation>
</component>
</component>
<component>
<component>
<role>
com.dianping.cat.report.page.heartbeat.Handler
</role>
<role>
com.dianping.cat.report.page.heartbeat.Handler
</role>
...
@@ -4068,10 +4068,10 @@
...
@@ -4068,10 +4068,10 @@
<role>
com.dianping.cat.report.page.dashboard.JspViewer
</role>
<role>
com.dianping.cat.report.page.dashboard.JspViewer
</role>
</requirement>
</requirement>
<requirement>
<requirement>
<role>
com.dianping.cat.report.page.transaction.TransactionMergeHelper
</role>
<role>
com.dianping.cat.report.page.transaction.
transform.
TransactionMergeHelper
</role>
</requirement>
</requirement>
<requirement>
<requirement>
<role>
com.dianping.cat.report.page.event.EventMergeHelper
</role>
<role>
com.dianping.cat.report.page.event.
transform.
EventMergeHelper
</role>
</requirement>
</requirement>
<requirement>
<requirement>
<role>
com.dianping.cat.report.service.ModelService
</role>
<role>
com.dianping.cat.report.service.ModelService
</role>
...
@@ -5089,7 +5089,7 @@
...
@@ -5089,7 +5089,7 @@
<role>
com.dianping.cat.configuration.ServerConfigManager
</role>
<role>
com.dianping.cat.configuration.ServerConfigManager
</role>
</requirement>
</requirement>
<requirement>
<requirement>
<role>
com.dianping.cat.report.page.
statistics
.service.NetTopologyReportService
</role>
<role>
com.dianping.cat.report.page.
network
.service.NetTopologyReportService
</role>
</requirement>
</requirement>
<requirement>
<requirement>
<role>
com.dianping.cat.report.page.network.nettopology.NetGraphBuilder
</role>
<role>
com.dianping.cat.report.page.network.nettopology.NetGraphBuilder
</role>
...
@@ -5103,8 +5103,8 @@
...
@@ -5103,8 +5103,8 @@
</requirements>
</requirements>
</component>
</component>
<component>
<component>
<role>
com.dianping.cat.report.page.
statistics
.service.NetTopologyReportService
</role>
<role>
com.dianping.cat.report.page.
network
.service.NetTopologyReportService
</role>
<implementation>
com.dianping.cat.report.page.
statistics
.service.NetTopologyReportService
</implementation>
<implementation>
com.dianping.cat.report.page.
network
.service.NetTopologyReportService
</implementation>
<requirements>
<requirements>
<requirement>
<requirement>
<role>
com.dianping.cat.core.dal.HourlyReportDao
</role>
<role>
com.dianping.cat.core.dal.HourlyReportDao
</role>
...
@@ -5730,7 +5730,7 @@
...
@@ -5730,7 +5730,7 @@
<field-name>
m_service
</field-name>
<field-name>
m_service
</field-name>
</requirement>
</requirement>
<requirement>
<requirement>
<role>
com.dianping.cat.report.page.storage.StorageMergeHelper
</role>
<role>
com.dianping.cat.report.page.storage.
transform.
StorageMergeHelper
</role>
</requirement>
</requirement>
<requirement>
<requirement>
<role>
com.dianping.cat.report.page.storage.topology.StorageAlertInfoManager
</role>
<role>
com.dianping.cat.report.page.storage.topology.StorageAlertInfoManager
</role>
...
@@ -5783,8 +5783,8 @@
...
@@ -5783,8 +5783,8 @@
</requirements>
</requirements>
</component>
</component>
<component>
<component>
<role>
com.dianping.cat.report.page.storage.StorageMergeHelper
</role>
<role>
com.dianping.cat.report.page.storage.
transform.
StorageMergeHelper
</role>
<implementation>
com.dianping.cat.report.page.storage.StorageMergeHelper
</implementation>
<implementation>
com.dianping.cat.report.page.storage.
transform.
StorageMergeHelper
</implementation>
</component>
</component>
<component>
<component>
<role>
com.dianping.cat.report.page.storage.topology.StorageAlertInfoManager
</role>
<role>
com.dianping.cat.report.page.storage.topology.StorageAlertInfoManager
</role>
...
@@ -5840,7 +5840,7 @@
...
@@ -5840,7 +5840,7 @@
<role>
com.dianping.cat.system.config.ActivityConfigManager
</role>
<role>
com.dianping.cat.system.config.ActivityConfigManager
</role>
</requirement>
</requirement>
<requirement>
<requirement>
<role>
com.dianping.cat.report.page.transaction.TransactionMergeHelper
</role>
<role>
com.dianping.cat.report.page.transaction.
transform.
TransactionMergeHelper
</role>
</requirement>
</requirement>
<requirement>
<requirement>
<role>
com.dianping.cat.report.service.ModelService
</role>
<role>
com.dianping.cat.report.service.ModelService
</role>
...
@@ -6501,7 +6501,7 @@
...
@@ -6501,7 +6501,7 @@
<implementation>
com.dianping.cat.system.page.router.Handler
</implementation>
<implementation>
com.dianping.cat.system.page.router.Handler
</implementation>
<requirements>
<requirements>
<requirement>
<requirement>
<role>
com.dianping.cat.
report.page.statistics
.service.RouterConfigService
</role>
<role>
com.dianping.cat.
system.page.router
.service.RouterConfigService
</role>
</requirement>
</requirement>
<requirement>
<requirement>
<role>
com.dianping.cat.system.config.RouterConfigManager
</role>
<role>
com.dianping.cat.system.config.RouterConfigManager
</role>
...
@@ -6509,8 +6509,8 @@
...
@@ -6509,8 +6509,8 @@
</requirements>
</requirements>
</component>
</component>
<component>
<component>
<role>
com.dianping.cat.
report.page.statistics
.service.RouterConfigService
</role>
<role>
com.dianping.cat.
system.page.router
.service.RouterConfigService
</role>
<implementation>
com.dianping.cat.
report.page.statistics
.service.RouterConfigService
</implementation>
<implementation>
com.dianping.cat.
system.page.router
.service.RouterConfigService
</implementation>
<requirements>
<requirements>
<requirement>
<requirement>
<role>
com.dianping.cat.core.dal.HourlyReportDao
</role>
<role>
com.dianping.cat.core.dal.HourlyReportDao
</role>
...
...
cat-home/src/test/java/com/dianping/cat/report/analyzer/RouterBuilderTest.java
浏览文件 @
a1f8477e
...
@@ -11,8 +11,8 @@ import org.unidal.lookup.ComponentTestCase;
...
@@ -11,8 +11,8 @@ import org.unidal.lookup.ComponentTestCase;
import
com.dianping.cat.Constants
;
import
com.dianping.cat.Constants
;
import
com.dianping.cat.core.dal.Task
;
import
com.dianping.cat.core.dal.Task
;
import
com.dianping.cat.home.router.entity.RouterConfig
;
import
com.dianping.cat.home.router.entity.RouterConfig
;
import
com.dianping.cat.report.page.statistics.service.RouterConfigService
;
import
com.dianping.cat.report.task.ReportFacade
;
import
com.dianping.cat.report.task.ReportFacade
;
import
com.dianping.cat.system.page.router.service.RouterConfigService
;
public
class
RouterBuilderTest
extends
ComponentTestCase
{
public
class
RouterBuilderTest
extends
ComponentTestCase
{
...
...
script/Cat.sql
浏览文件 @
a1f8477e
...
@@ -292,7 +292,7 @@ CREATE TABLE `app_speed_data_1` (
...
@@ -292,7 +292,7 @@ CREATE TABLE `app_speed_data_1` (
`status`
smallint
NOT
NULL
COMMENT
'数据状态'
,
`status`
smallint
NOT
NULL
COMMENT
'数据状态'
,
`creation_date`
datetime
NOT
NULL
COMMENT
'数据插入时间'
,
`creation_date`
datetime
NOT
NULL
COMMENT
'数据插入时间'
,
PRIMARY
KEY
(
`id`
),
PRIMARY
KEY
(
`id`
),
UNIQUE
KEY
IX_condition
(
period
,
minute_order
,
city
,
operator
,
network
,
app_version
,
platform
)
UNIQUE
KEY
`IX_condition`
(
period
,
minute_order
,
city
,
operator
,
network
,
app_version
,
platform
)
)
ENGINE
=
InnoDB
DEFAULT
CHARSET
=
utf8
COMMENT
=
'app测速数据'
;
)
ENGINE
=
InnoDB
DEFAULT
CHARSET
=
utf8
COMMENT
=
'app测速数据'
;
CREATE
TABLE
`overload`
(
CREATE
TABLE
`overload`
(
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录