From ca4c2878a02e8273132df0231ed938b90c8b00cb Mon Sep 17 00:00:00 2001 From: youyong205 Date: Tue, 15 Jul 2014 14:15:42 +0800 Subject: [PATCH] modify the app config --- cat-core/pom.xml | 2 +- .../cat/build/AppDatabaseConfigurator.java | 2 +- .../cat/build/ComponentsConfigurator.java | 2 +- .../app/AppDataCommandTableProvider.java | 42 ++ .../META-INF/dal/jdbc/app-codegen.xml | 8 +- .../resources/META-INF/dal/jdbc/app-dal.xml | 65 +- .../resources/META-INF/wizard/jdbc/wizard.xml | 2 +- cat-home/pom.xml | 5 - .../cat/build/ComponentsConfigurator.java | 192 +++--- .../cat/report/view/NavigationBar.java | 2 + .../resources/META-INF/plexus/components.xml | 628 +++++++++--------- script/Cat.sql | 8 +- 12 files changed, 548 insertions(+), 410 deletions(-) create mode 100644 cat-core/src/main/java/com/dianping/cat/config/app/AppDataCommandTableProvider.java diff --git a/cat-core/pom.xml b/cat-core/pom.xml index 57a81813c..14895af22 100644 --- a/cat-core/pom.xml +++ b/cat-core/pom.xml @@ -27,7 +27,7 @@ org.unidal.framework dal-jdbc - 2.0.4 + 2.1.1 org.jboss.netty diff --git a/cat-core/src/main/java/com/dianping/cat/build/AppDatabaseConfigurator.java b/cat-core/src/main/java/com/dianping/cat/build/AppDatabaseConfigurator.java index 368308c8b..4f8dc70d1 100644 --- a/cat-core/src/main/java/com/dianping/cat/build/AppDatabaseConfigurator.java +++ b/cat-core/src/main/java/com/dianping/cat/build/AppDatabaseConfigurator.java @@ -11,7 +11,7 @@ final class AppDatabaseConfigurator extends AbstractJdbcResourceConfigurator { public List defineComponents() { List all = new ArrayList(); - // all.add(defineJdbcDataSourceComponent("app", "com.mysql.jdbc.Driver", "jdbc:mysql://127.0.0.1:3306/app", "root", "***", "")); + // all.add(defineJdbcDataSourceComponent("app", "com.mysql.jdbc.Driver", "jdbc:mysql://127.0.0.1:3306/cat", "root", "***", "")); defineSimpleTableProviderComponents(all, "app", com.dianping.cat.app._INDEX.getEntityClasses()); defineDaoComponents(all, com.dianping.cat.app._INDEX.getDaoClasses()); diff --git a/cat-core/src/main/java/com/dianping/cat/build/ComponentsConfigurator.java b/cat-core/src/main/java/com/dianping/cat/build/ComponentsConfigurator.java index 99ae3d0ca..23f71c1ad 100644 --- a/cat-core/src/main/java/com/dianping/cat/build/ComponentsConfigurator.java +++ b/cat-core/src/main/java/com/dianping/cat/build/ComponentsConfigurator.java @@ -75,7 +75,7 @@ public class ComponentsConfigurator extends AbstractResourceConfigurator { .req(ServerConfigManager.class, MessagePathBuilder.class, ServerStatisticManager.class)); all.add(C(Module.class, CatCoreModule.ID, CatCoreModule.class)); - + all.addAll(new CatCoreDatabaseConfigurator().defineComponents()); all.addAll(new CodecComponentConfigurator().defineComponents()); all.addAll(new StorageComponentConfigurator().defineComponents()); diff --git a/cat-core/src/main/java/com/dianping/cat/config/app/AppDataCommandTableProvider.java b/cat-core/src/main/java/com/dianping/cat/config/app/AppDataCommandTableProvider.java new file mode 100644 index 000000000..1656e5b0a --- /dev/null +++ b/cat-core/src/main/java/com/dianping/cat/config/app/AppDataCommandTableProvider.java @@ -0,0 +1,42 @@ +package com.dianping.cat.config.app; + +import java.util.Map; + +import org.unidal.dal.jdbc.QueryEngine; +import org.unidal.dal.jdbc.mapping.TableProvider; + +import com.dianping.cat.app.AppDataCommand; + +public class AppDataCommandTableProvider implements TableProvider { + private String m_logicalTableName = "app-data-command"; + + private String m_physicalTableName = "app_data_command"; + + private String m_dataSourceName = "app"; + + @Override + public String getDataSourceName(Map hints) { + return m_dataSourceName; + } + + @Override + public String getLogicalTableName() { + return m_logicalTableName; + } + + @Override + public String getPhysicalTableName(Map hints) { + AppDataCommand command = (AppDataCommand) hints.get(QueryEngine.HINT_DATA_OBJECT); + + return m_physicalTableName + "_" + command.getCommandId(); + } + + public void setDataSourceName(String dataSourceName) { + m_dataSourceName = dataSourceName; + } + + public void setLogicalTableName(String logicalTableName) { + m_logicalTableName = logicalTableName; + } + +} \ No newline at end of file diff --git a/cat-core/src/main/resources/META-INF/dal/jdbc/app-codegen.xml b/cat-core/src/main/resources/META-INF/dal/jdbc/app-codegen.xml index 2abe4b692..18d3102b6 100644 --- a/cat-core/src/main/resources/META-INF/dal/jdbc/app-codegen.xml +++ b/cat-core/src/main/resources/META-INF/dal/jdbc/app-codegen.xml @@ -12,10 +12,10 @@ - - - - + + + + diff --git a/cat-core/src/main/resources/META-INF/dal/jdbc/app-dal.xml b/cat-core/src/main/resources/META-INF/dal/jdbc/app-dal.xml index 23e358a61..aaff9f4df 100644 --- a/cat-core/src/main/resources/META-INF/dal/jdbc/app-dal.xml +++ b/cat-core/src/main/resources/META-INF/dal/jdbc/app-dal.xml @@ -1,3 +1,64 @@ - - + + + + + + + + + + + + + + + + + + + + + + () + VALUES()]]> + + + + + + + + + + + + + FROM + WHERE = ${period} + + AND = ${city} + + + AND = ${operator} + + + AND = ${network} + + + AND = ${app-version} + + + AND = ${connnect-type} + + + AND = ${code} + + + AND = ${platform} + + group by ]]> + + + + diff --git a/cat-core/src/main/resources/META-INF/wizard/jdbc/wizard.xml b/cat-core/src/main/resources/META-INF/wizard/jdbc/wizard.xml index 423509286..9bbed44a9 100644 --- a/cat-core/src/main/resources/META-INF/wizard/jdbc/wizard.xml +++ b/cat-core/src/main/resources/META-INF/wizard/jdbc/wizard.xml @@ -27,7 +27,7 @@ com.mysql.jdbc.Driver - jdbc:mysql://127.0.0.1:3306/app + jdbc:mysql://127.0.0.1:3306/cat root password useUnicode=true&autoReconnect=true diff --git a/cat-home/pom.xml b/cat-home/pom.xml index 9ef7684d3..cca366ac8 100755 --- a/cat-home/pom.xml +++ b/cat-home/pom.xml @@ -96,11 +96,6 @@ 2.0.4 test - - org.unidal.framework - dal-jdbc - 2.0.4 - org.apache.commons commons-email diff --git a/cat-home/src/main/java/com/dianping/cat/build/ComponentsConfigurator.java b/cat-home/src/main/java/com/dianping/cat/build/ComponentsConfigurator.java index b52c86578..99da2223d 100755 --- a/cat-home/src/main/java/com/dianping/cat/build/ComponentsConfigurator.java +++ b/cat-home/src/main/java/com/dianping/cat/build/ComponentsConfigurator.java @@ -4,6 +4,7 @@ import java.util.ArrayList; import java.util.List; import org.unidal.dal.jdbc.datasource.JdbcDataSourceDescriptorManager; +import org.unidal.dal.jdbc.mapping.TableProvider; import org.unidal.initialization.DefaultModuleManager; import org.unidal.initialization.Module; import org.unidal.initialization.ModuleManager; @@ -12,6 +13,7 @@ import org.unidal.lookup.configuration.Component; import com.dianping.cat.CatHomeModule; import com.dianping.cat.ServerConfigManager; +import com.dianping.cat.config.app.AppDataCommandTableProvider; import com.dianping.cat.consumer.dependency.DependencyAnalyzer; import com.dianping.cat.consumer.metric.MetricAnalyzer; import com.dianping.cat.consumer.metric.MetricConfigManager; @@ -83,9 +85,42 @@ public class ComponentsConfigurator extends AbstractResourceConfigurator { public static void main(String[] args) { generatePlexusComponentsXmlFile(new ComponentsConfigurator()); } + + + private List defineAlertComponents() { + List all = new ArrayList(); - @Override - public List defineComponents() { + all.add(C(BusinessAlertConfig.class).req(AlertConfigManager.class)); + all.add(C(NetworkAlertConfig.class).req(AlertConfigManager.class)); + all.add(C(SystemAlertConfig.class).req(AlertConfigManager.class)); + all.add(C(ExceptionAlertConfig.class).req(AlertConfigManager.class)); + all.add(C(AlertInfo.class)); + all.add(C(DefaultMailImpl.class).req(ServerConfigManager.class)); + all.add(C(DataChecker.class, DefaultDataChecker.class)); + all.add(C(RemoteMetricReportService.class).req(ServerConfigManager.class)); + + all.add(C(BusinessAlert.class).req(MetricConfigManager.class, ProductLineConfigManager.class, + BaselineService.class, MailSMS.class, BusinessAlertConfig.class, AlertInfo.class, AlertDao.class)// + .req(RemoteMetricReportService.class, BusinessRuleConfigManager.class, DataChecker.class)); + + all.add(C(NetworkAlert.class).req(MetricConfigManager.class, ProductLineConfigManager.class, + BaselineService.class, MailSMS.class, NetworkAlertConfig.class, AlertInfo.class, AlertDao.class)// + .req(RemoteMetricReportService.class, NetworkRuleConfigManager.class, DataChecker.class)); + + all.add(C(SystemAlert.class).req(MetricConfigManager.class, ProductLineConfigManager.class, + BaselineService.class, MailSMS.class, SystemAlertConfig.class, AlertInfo.class, AlertDao.class)// + .req(RemoteMetricReportService.class, SystemRuleConfigManager.class, DataChecker.class)); + + all.add(C(AlertExceptionBuilder.class).req(ExceptionConfigManager.class)); + + all.add(C(ExceptionAlert.class).req(ProjectDao.class, ExceptionAlertConfig.class, MailSMS.class, + ExceptionConfigManager.class, AlertExceptionBuilder.class, AlertDao.class).req(ModelService.class, + TopAnalyzer.ID)); + + return all; + } + + private List defineCommonComponents() { List all = new ArrayList(); all.add(C(JsonBuilder.class)); @@ -98,127 +133,106 @@ public class ComponentsConfigurator extends AbstractResourceConfigurator { all.add(C(StateGraphs.class, StateGraphs.class).// req(ReportService.class)); - - all.add(C(Module.class, CatHomeModule.ID, CatHomeModule.class)); - all.add(C(ModuleManager.class, DefaultModuleManager.class) // - .config(E("topLevelModules").value(CatHomeModule.ID))); all.add(C(DomainNavManager.class).req(ProjectDao.class)); all.add(C(EventCollectManager.class).req(EventDao.class, ServerConfigManager.class)); - all.add(C(TopologyGraphConfigManager.class).req(ConfigDao.class)); - - all.add(C(ExceptionConfigManager.class).req(ConfigDao.class)); + + all.add(C(TopologyGraphItemBuilder.class).req(TopologyGraphConfigManager.class)); - all.add(C(DomainGroupConfigManager.class).req(ConfigDao.class)); + all.add(C(TopologyGraphBuilder.class).req(TopologyGraphItemBuilder.class).is(PER_LOOKUP)); - all.add(C(BugConfigManager.class).req(ConfigDao.class)); + all.add(C(TopologyGraphManager.class).req(TopologyGraphBuilder.class, ServerConfigManager.class) // + .req(ProductLineConfigManager.class, TopologyGraphDao.class, DomainNavManager.class)// + .req(ModelService.class, DependencyAnalyzer.ID)); + - all.add(C(MetricGroupConfigManager.class).req(ConfigDao.class)); + // update project database + all.add(C(ProjectUpdateTask.class)// + .req(ProjectDao.class, HostinfoDao.class)); + + + return all; + } - all.add(C(NetworkRuleConfigManager.class).req(ConfigDao.class)); + @Override + public List defineComponents() { + List all = new ArrayList(); - all.add(C(BusinessRuleConfigManager.class).req(ConfigDao.class)); + all.addAll(defineCommonComponents()); + all.addAll(defineConfigComponents()); + all.addAll(defineMetricComponents()); + all.addAll(defineAlertComponents()); + + all.add(C(Module.class, CatHomeModule.ID, CatHomeModule.class)); + all.add(C(ModuleManager.class, DefaultModuleManager.class) // + .config(E("topLevelModules").value(CatHomeModule.ID))); + + // report serivce + all.addAll(new ReportServiceComponentConfigurator().defineComponents()); + // task + all.addAll(new TaskComponentConfigurator().defineComponents()); - all.add(C(AlertConfigManager.class).req(ConfigDao.class)); + // model service + all.addAll(new ServiceComponentConfigurator().defineComponents()); - all.add(C(TopologyGraphItemBuilder.class).req(TopologyGraphConfigManager.class)); + all.add(C(TableProvider.class,"app-data-command",AppDataCommandTableProvider.class)); + // database + all.add(C(JdbcDataSourceDescriptorManager.class) // + .config(E("datasourceFile").value("/data/appdatas/cat/datasources.xml"))); + all.addAll(new CatDatabaseConfigurator().defineComponents()); + all.addAll(new AppDatabaseConfigurator().defineComponents()); + all.addAll(new UserDatabaseConfigurator().defineComponents()); - all.add(C(TopologyGraphBuilder.class).req(TopologyGraphItemBuilder.class).is(PER_LOOKUP)); + // web, please keep it last + all.addAll(new WebComponentConfigurator().defineComponents()); - all.add(C(TopologyGraphManager.class).req(TopologyGraphBuilder.class, ServerConfigManager.class) // - .req(ProductLineConfigManager.class, TopologyGraphDao.class, DomainNavManager.class)// - .req(ModelService.class, DependencyAnalyzer.ID)); + // for alarm module + all.addAll(new AlarmComponentConfigurator().defineComponents()); + return all; + } + + private List defineConfigComponents(){ + List all = new ArrayList(); + + all.add(C(TopologyGraphConfigManager.class).req(ConfigDao.class)); + all.add(C(ExceptionConfigManager.class).req(ConfigDao.class)); + all.add(C(DomainGroupConfigManager.class).req(ConfigDao.class)); + all.add(C(BugConfigManager.class).req(ConfigDao.class)); + all.add(C(MetricGroupConfigManager.class).req(ConfigDao.class)); + all.add(C(NetworkRuleConfigManager.class).req(ConfigDao.class)); + all.add(C(BusinessRuleConfigManager.class).req(ConfigDao.class)); + all.add(C(AlertConfigManager.class).req(ConfigDao.class)); + all.add(C(NetGraphConfigManager.class).req(ConfigDao.class)); all.add(C(ConfigReloadTask.class).req(MetricConfigManager.class, ProductLineConfigManager.class)); + + return all; + } + private List defineMetricComponents(){ + List all = new ArrayList(); all.add(C(IpService.class)); - all.add(C(CdnGraphCreator.class).req(BaselineService.class, DataExtractor.class, MetricDataFetcher.class, - CachedMetricReportService.class, MetricConfigManager.class, ProductLineConfigManager.class, - MetricGroupConfigManager.class, AlertInfo.class)); all.add(C(CachedMetricReportService.class, CachedMetricReportServiceImpl.class) .req(ModelService.class, MetricAnalyzer.ID).req(ReportService.class).req(IpService.class)); - all.add(C(DataExtractor.class, DataExtractorImpl.class)); - all.add(C(MetricDataFetcher.class, MetricDataFetcherImpl.class)); - all.add(C(AlertInfo.class).req(MetricConfigManager.class)); - + all.add(C(CdnGraphCreator.class).req(BaselineService.class, DataExtractor.class, MetricDataFetcher.class, + CachedMetricReportService.class, MetricConfigManager.class, ProductLineConfigManager.class, + MetricGroupConfigManager.class, AlertInfo.class)); all.add(C(MetricGraphCreator.class).req(CachedMetricReportService.class, DataExtractor.class, MetricDataFetcher.class).req(BaselineService.class, MetricConfigManager.class, ProductLineConfigManager.class, MetricGroupConfigManager.class, AlertInfo.class)); - all.add(C(SystemGraphCreator.class).req(CachedMetricReportService.class, DataExtractor.class, MetricDataFetcher.class).req(BaselineService.class, MetricConfigManager.class, ProductLineConfigManager.class, MetricGroupConfigManager.class, AlertInfo.class)); - all.add(C(UserMonitorGraphCreator.class, DefaultUserMonitGraphCreator.class).req(CachedMetricReportService.class, DataExtractor.class, MetricDataFetcher.class).req(BaselineService.class, MetricConfigManager.class, ProductLineConfigManager.class, MetricGroupConfigManager.class, AlertInfo.class)); - all.add(C(NetworkGraphCreator.class).req(CachedMetricReportService.class, DataExtractor.class, MetricDataFetcher.class).req(BaselineService.class, MetricConfigManager.class, ProductLineConfigManager.class, MetricGroupConfigManager.class, AlertInfo.class)); - // report serivce - all.addAll(new ReportServiceComponentConfigurator().defineComponents()); - // task - all.addAll(new TaskComponentConfigurator().defineComponents()); - - // model service - all.addAll(new ServiceComponentConfigurator().defineComponents()); - - all.add(C(RemoteMetricReportService.class).req(ServerConfigManager.class)); - - all.add(C(BusinessAlertConfig.class).req(AlertConfigManager.class)); - - all.add(C(NetworkAlertConfig.class).req(AlertConfigManager.class)); - - all.add(C(SystemAlertConfig.class).req(AlertConfigManager.class)); - - all.add(C(ExceptionAlertConfig.class).req(AlertConfigManager.class)); - - all.add(C(AlertInfo.class)); - - all.add(C(DefaultMailImpl.class).req(ServerConfigManager.class)); - - all.add(C(DataChecker.class, DefaultDataChecker.class)); - - all.add(C(BusinessAlert.class).req(MetricConfigManager.class, ProductLineConfigManager.class, - BaselineService.class, MailSMS.class, BusinessAlertConfig.class, AlertInfo.class, AlertDao.class)// - .req(RemoteMetricReportService.class, BusinessRuleConfigManager.class, DataChecker.class)); - - all.add(C(NetworkAlert.class).req(MetricConfigManager.class, ProductLineConfigManager.class, - BaselineService.class, MailSMS.class, NetworkAlertConfig.class, AlertInfo.class, AlertDao.class)// - .req(RemoteMetricReportService.class, NetworkRuleConfigManager.class, DataChecker.class)); - - all.add(C(SystemAlert.class).req(MetricConfigManager.class, ProductLineConfigManager.class, - BaselineService.class, MailSMS.class, SystemAlertConfig.class, AlertInfo.class, AlertDao.class)// - .req(RemoteMetricReportService.class, SystemRuleConfigManager.class, DataChecker.class)); - - all.add(C(AlertExceptionBuilder.class).req(ExceptionConfigManager.class)); - - all.add(C(ExceptionAlert.class).req(ProjectDao.class, ExceptionAlertConfig.class, MailSMS.class, - ExceptionConfigManager.class, AlertExceptionBuilder.class, AlertDao.class).req(ModelService.class, - TopAnalyzer.ID)); - - all.add(C(NetGraphConfigManager.class).req(ConfigDao.class)); - - // database - all.add(C(JdbcDataSourceDescriptorManager.class) // - .config(E("datasourceFile").value("/data/appdatas/cat/datasources.xml"))); - all.addAll(new CatDatabaseConfigurator().defineComponents()); - all.addAll(new UserDatabaseConfigurator().defineComponents()); - - // update project database - all.add(C(ProjectUpdateTask.class)// - .req(ProjectDao.class, HostinfoDao.class)); - - // web, please keep it last - all.addAll(new WebComponentConfigurator().defineComponents()); - - // for alarm module - all.addAll(new AlarmComponentConfigurator().defineComponents()); return all; } diff --git a/cat-home/src/main/java/com/dianping/cat/report/view/NavigationBar.java b/cat-home/src/main/java/com/dianping/cat/report/view/NavigationBar.java index f4e1b9542..ca776e1c7 100755 --- a/cat-home/src/main/java/com/dianping/cat/report/view/NavigationBar.java +++ b/cat-home/src/main/java/com/dianping/cat/report/view/NavigationBar.java @@ -27,6 +27,8 @@ public class NavigationBar { ReportPage.USERMONITOR, + ReportPage.APP, + ReportPage.TRANSACTION, ReportPage.EVENT, diff --git a/cat-home/src/main/resources/META-INF/plexus/components.xml b/cat-home/src/main/resources/META-INF/plexus/components.xml index c35d4e665..f674be9a4 100755 --- a/cat-home/src/main/resources/META-INF/plexus/components.xml +++ b/cat-home/src/main/resources/META-INF/plexus/components.xml @@ -35,18 +35,6 @@ - - org.unidal.initialization.Module - cat-home - com.dianping.cat.CatHomeModule - - - org.unidal.initialization.ModuleManager - org.unidal.initialization.DefaultModuleManager - - cat-home - - com.dianping.cat.report.view.DomainNavManager com.dianping.cat.report.view.DomainNavManager @@ -68,6 +56,62 @@ + + com.dianping.cat.report.page.dependency.graph.TopologyGraphItemBuilder + com.dianping.cat.report.page.dependency.graph.TopologyGraphItemBuilder + + + com.dianping.cat.report.page.dependency.graph.TopologyGraphConfigManager + + + + + com.dianping.cat.report.page.dependency.graph.TopologyGraphBuilder + com.dianping.cat.report.page.dependency.graph.TopologyGraphBuilder + per-lookup + + + com.dianping.cat.report.page.dependency.graph.TopologyGraphItemBuilder + + + + + com.dianping.cat.report.page.dependency.graph.TopologyGraphManager + com.dianping.cat.report.page.dependency.graph.TopologyGraphManager + + + com.dianping.cat.report.page.dependency.graph.TopologyGraphBuilder + + + com.dianping.cat.ServerConfigManager + + + com.dianping.cat.consumer.metric.ProductLineConfigManager + + + com.dianping.cat.home.dal.report.TopologyGraphDao + + + com.dianping.cat.report.view.DomainNavManager + + + com.dianping.cat.report.page.model.spi.ModelService + dependency + + + + + com.dianping.cat.report.task.product.ProjectUpdateTask + com.dianping.cat.report.task.product.ProjectUpdateTask + + + com.dianping.cat.core.dal.ProjectDao + + + com.dianping.cat.core.dal.HostinfoDao + + + com.dianping.cat.report.page.dependency.graph.TopologyGraphConfigManager com.dianping.cat.report.page.dependency.graph.TopologyGraphConfigManager @@ -141,65 +185,63 @@ - com.dianping.cat.report.page.dependency.graph.TopologyGraphItemBuilder - com.dianping.cat.report.page.dependency.graph.TopologyGraphItemBuilder + com.dianping.cat.system.config.NetGraphConfigManager + com.dianping.cat.system.config.NetGraphConfigManager - com.dianping.cat.report.page.dependency.graph.TopologyGraphConfigManager + com.dianping.cat.core.config.ConfigDao - com.dianping.cat.report.page.dependency.graph.TopologyGraphBuilder - com.dianping.cat.report.page.dependency.graph.TopologyGraphBuilder - per-lookup + com.dianping.cat.system.config.ConfigReloadTask + com.dianping.cat.system.config.ConfigReloadTask - com.dianping.cat.report.page.dependency.graph.TopologyGraphItemBuilder + com.dianping.cat.consumer.metric.MetricConfigManager + + + com.dianping.cat.consumer.metric.ProductLineConfigManager - com.dianping.cat.report.page.dependency.graph.TopologyGraphManager - com.dianping.cat.report.page.dependency.graph.TopologyGraphManager + com.dianping.cat.service.IpService + com.dianping.cat.service.IpService + + + com.dianping.cat.report.chart.CachedMetricReportService + com.dianping.cat.report.chart.impl.CachedMetricReportServiceImpl - com.dianping.cat.report.page.dependency.graph.TopologyGraphBuilder - - - com.dianping.cat.ServerConfigManager - - - com.dianping.cat.consumer.metric.ProductLineConfigManager - - - com.dianping.cat.home.dal.report.TopologyGraphDao + com.dianping.cat.report.page.model.spi.ModelService + metric - com.dianping.cat.report.view.DomainNavManager + com.dianping.cat.report.service.ReportService - com.dianping.cat.report.page.model.spi.ModelService - dependency + com.dianping.cat.service.IpService - com.dianping.cat.system.config.ConfigReloadTask - com.dianping.cat.system.config.ConfigReloadTask + com.dianping.cat.report.chart.DataExtractor + com.dianping.cat.report.chart.impl.DataExtractorImpl + + + com.dianping.cat.report.chart.MetricDataFetcher + com.dianping.cat.report.chart.impl.MetricDataFetcherImpl + + + com.dianping.cat.report.task.alert.AlertInfo + com.dianping.cat.report.task.alert.AlertInfo com.dianping.cat.consumer.metric.MetricConfigManager - - com.dianping.cat.consumer.metric.ProductLineConfigManager - - - com.dianping.cat.service.IpService - com.dianping.cat.service.IpService - com.dianping.cat.report.page.cdn.graph.CdnGraphCreator com.dianping.cat.report.page.cdn.graph.CdnGraphCreator @@ -231,41 +273,38 @@ - com.dianping.cat.report.chart.CachedMetricReportService - com.dianping.cat.report.chart.impl.CachedMetricReportServiceImpl + com.dianping.cat.report.page.metric.graph.MetricGraphCreator + com.dianping.cat.report.page.metric.graph.MetricGraphCreator - com.dianping.cat.report.page.model.spi.ModelService - metric + com.dianping.cat.report.chart.CachedMetricReportService - com.dianping.cat.report.service.ReportService + com.dianping.cat.report.chart.DataExtractor - com.dianping.cat.service.IpService + com.dianping.cat.report.chart.MetricDataFetcher + + + com.dianping.cat.report.baseline.BaselineService - - - - com.dianping.cat.report.chart.DataExtractor - com.dianping.cat.report.chart.impl.DataExtractorImpl - - - com.dianping.cat.report.chart.MetricDataFetcher - com.dianping.cat.report.chart.impl.MetricDataFetcherImpl - - - com.dianping.cat.report.task.alert.AlertInfo - com.dianping.cat.report.task.alert.AlertInfo - com.dianping.cat.consumer.metric.MetricConfigManager + + com.dianping.cat.consumer.metric.ProductLineConfigManager + + + com.dianping.cat.system.config.MetricGroupConfigManager + + + com.dianping.cat.report.task.alert.AlertInfo + - com.dianping.cat.report.page.metric.graph.MetricGraphCreator - com.dianping.cat.report.page.metric.graph.MetricGraphCreator + com.dianping.cat.report.page.system.graph.SystemGraphCreator + com.dianping.cat.report.page.system.graph.SystemGraphCreator com.dianping.cat.report.chart.CachedMetricReportService @@ -294,8 +333,8 @@ - com.dianping.cat.report.page.system.graph.SystemGraphCreator - com.dianping.cat.report.page.system.graph.SystemGraphCreator + com.dianping.cat.report.page.userMonitor.graph.UserMonitorGraphCreator + com.dianping.cat.report.page.userMonitor.graph.DefaultUserMonitGraphCreator com.dianping.cat.report.chart.CachedMetricReportService @@ -324,8 +363,8 @@ - com.dianping.cat.report.page.userMonitor.graph.UserMonitorGraphCreator - com.dianping.cat.report.page.userMonitor.graph.DefaultUserMonitGraphCreator + com.dianping.cat.report.page.network.graph.NetworkGraphCreator + com.dianping.cat.report.page.network.graph.NetworkGraphCreator com.dianping.cat.report.chart.CachedMetricReportService @@ -354,21 +393,143 @@ - com.dianping.cat.report.page.network.graph.NetworkGraphCreator - com.dianping.cat.report.page.network.graph.NetworkGraphCreator + com.dianping.cat.report.task.alert.business.BusinessAlertConfig + com.dianping.cat.report.task.alert.business.BusinessAlertConfig - com.dianping.cat.report.chart.CachedMetricReportService + com.dianping.cat.system.config.AlertConfigManager + + + + com.dianping.cat.report.task.alert.network.NetworkAlertConfig + com.dianping.cat.report.task.alert.network.NetworkAlertConfig + - com.dianping.cat.report.chart.DataExtractor + com.dianping.cat.system.config.AlertConfigManager + + + + com.dianping.cat.report.task.alert.system.SystemAlertConfig + com.dianping.cat.report.task.alert.system.SystemAlertConfig + - com.dianping.cat.report.chart.MetricDataFetcher + com.dianping.cat.system.config.AlertConfigManager + + + + + com.dianping.cat.report.task.alert.exception.ExceptionAlertConfig + com.dianping.cat.report.task.alert.exception.ExceptionAlertConfig + + + com.dianping.cat.system.config.AlertConfigManager + + + + + com.dianping.cat.report.task.alert.AlertInfo + com.dianping.cat.report.task.alert.AlertInfo + + + com.dianping.cat.system.tool.DefaultMailImpl + com.dianping.cat.system.tool.DefaultMailImpl + + + com.dianping.cat.ServerConfigManager + + + + + com.dianping.cat.report.task.alert.DataChecker + com.dianping.cat.report.task.alert.DefaultDataChecker + + + com.dianping.cat.report.task.alert.RemoteMetricReportService + com.dianping.cat.report.task.alert.RemoteMetricReportService + + + com.dianping.cat.ServerConfigManager + + + + + com.dianping.cat.report.task.alert.business.BusinessAlert + com.dianping.cat.report.task.alert.business.BusinessAlert + + + com.dianping.cat.consumer.metric.MetricConfigManager + + + com.dianping.cat.consumer.metric.ProductLineConfigManager + + + com.dianping.cat.report.baseline.BaselineService + + + com.dianping.cat.system.tool.MailSMS + + + com.dianping.cat.report.task.alert.business.BusinessAlertConfig + + + com.dianping.cat.report.task.alert.AlertInfo + + + com.dianping.cat.home.dal.report.AlertDao + + + com.dianping.cat.report.task.alert.RemoteMetricReportService + + + com.dianping.cat.system.config.BusinessRuleConfigManager + + + com.dianping.cat.report.task.alert.DataChecker + + + + + com.dianping.cat.report.task.alert.network.NetworkAlert + com.dianping.cat.report.task.alert.network.NetworkAlert + + + com.dianping.cat.consumer.metric.MetricConfigManager + + + com.dianping.cat.consumer.metric.ProductLineConfigManager com.dianping.cat.report.baseline.BaselineService + + com.dianping.cat.system.tool.MailSMS + + + com.dianping.cat.report.task.alert.network.NetworkAlertConfig + + + com.dianping.cat.report.task.alert.AlertInfo + + + com.dianping.cat.home.dal.report.AlertDao + + + com.dianping.cat.report.task.alert.RemoteMetricReportService + + + com.dianping.cat.system.config.NetworkRuleConfigManager + + + com.dianping.cat.report.task.alert.DataChecker + + + + + com.dianping.cat.report.task.alert.system.SystemAlert + com.dianping.cat.report.task.alert.system.SystemAlert + com.dianping.cat.consumer.metric.MetricConfigManager @@ -376,13 +537,80 @@ com.dianping.cat.consumer.metric.ProductLineConfigManager - com.dianping.cat.system.config.MetricGroupConfigManager + com.dianping.cat.report.baseline.BaselineService + + + com.dianping.cat.system.tool.MailSMS + + + com.dianping.cat.report.task.alert.system.SystemAlertConfig + + + com.dianping.cat.report.task.alert.AlertInfo + + + com.dianping.cat.home.dal.report.AlertDao + + + com.dianping.cat.report.task.alert.RemoteMetricReportService + + + com.dianping.cat.system.config.SystemRuleConfigManager + + + com.dianping.cat.report.task.alert.DataChecker + + + + + com.dianping.cat.report.task.alert.exception.AlertExceptionBuilder + com.dianping.cat.report.task.alert.exception.AlertExceptionBuilder + + + com.dianping.cat.system.config.ExceptionConfigManager + + + + + com.dianping.cat.report.task.alert.exception.ExceptionAlert + com.dianping.cat.report.task.alert.exception.ExceptionAlert + + + com.dianping.cat.core.dal.ProjectDao + + + com.dianping.cat.report.task.alert.exception.ExceptionAlertConfig + + + com.dianping.cat.system.tool.MailSMS + + + com.dianping.cat.system.config.ExceptionConfigManager + + + com.dianping.cat.report.task.alert.exception.AlertExceptionBuilder + + + com.dianping.cat.home.dal.report.AlertDao - com.dianping.cat.report.task.alert.AlertInfo + com.dianping.cat.report.page.model.spi.ModelService + top + + org.unidal.initialization.Module + cat-home + com.dianping.cat.CatHomeModule + + + org.unidal.initialization.ModuleManager + org.unidal.initialization.DefaultModuleManager + + cat-home + + com.dianping.cat.report.service.impl.TransactionReportService com.dianping.cat.report.service.impl.TransactionReportService @@ -1731,220 +1959,9 @@ - com.dianping.cat.report.task.alert.RemoteMetricReportService - com.dianping.cat.report.task.alert.RemoteMetricReportService - - - com.dianping.cat.ServerConfigManager - - - - - com.dianping.cat.report.task.alert.business.BusinessAlertConfig - com.dianping.cat.report.task.alert.business.BusinessAlertConfig - - - com.dianping.cat.system.config.AlertConfigManager - - - - - com.dianping.cat.report.task.alert.network.NetworkAlertConfig - com.dianping.cat.report.task.alert.network.NetworkAlertConfig - - - com.dianping.cat.system.config.AlertConfigManager - - - - - com.dianping.cat.report.task.alert.system.SystemAlertConfig - com.dianping.cat.report.task.alert.system.SystemAlertConfig - - - com.dianping.cat.system.config.AlertConfigManager - - - - - com.dianping.cat.report.task.alert.exception.ExceptionAlertConfig - com.dianping.cat.report.task.alert.exception.ExceptionAlertConfig - - - com.dianping.cat.system.config.AlertConfigManager - - - - - com.dianping.cat.report.task.alert.AlertInfo - com.dianping.cat.report.task.alert.AlertInfo - - - com.dianping.cat.system.tool.DefaultMailImpl - com.dianping.cat.system.tool.DefaultMailImpl - - - com.dianping.cat.ServerConfigManager - - - - - com.dianping.cat.report.task.alert.DataChecker - com.dianping.cat.report.task.alert.DefaultDataChecker - - - com.dianping.cat.report.task.alert.business.BusinessAlert - com.dianping.cat.report.task.alert.business.BusinessAlert - - - com.dianping.cat.consumer.metric.MetricConfigManager - - - com.dianping.cat.consumer.metric.ProductLineConfigManager - - - com.dianping.cat.report.baseline.BaselineService - - - com.dianping.cat.system.tool.MailSMS - - - com.dianping.cat.report.task.alert.business.BusinessAlertConfig - - - com.dianping.cat.report.task.alert.AlertInfo - - - com.dianping.cat.home.dal.report.AlertDao - - - com.dianping.cat.report.task.alert.RemoteMetricReportService - - - com.dianping.cat.system.config.BusinessRuleConfigManager - - - com.dianping.cat.report.task.alert.DataChecker - - - - - com.dianping.cat.report.task.alert.network.NetworkAlert - com.dianping.cat.report.task.alert.network.NetworkAlert - - - com.dianping.cat.consumer.metric.MetricConfigManager - - - com.dianping.cat.consumer.metric.ProductLineConfigManager - - - com.dianping.cat.report.baseline.BaselineService - - - com.dianping.cat.system.tool.MailSMS - - - com.dianping.cat.report.task.alert.network.NetworkAlertConfig - - - com.dianping.cat.report.task.alert.AlertInfo - - - com.dianping.cat.home.dal.report.AlertDao - - - com.dianping.cat.report.task.alert.RemoteMetricReportService - - - com.dianping.cat.system.config.NetworkRuleConfigManager - - - com.dianping.cat.report.task.alert.DataChecker - - - - - com.dianping.cat.report.task.alert.system.SystemAlert - com.dianping.cat.report.task.alert.system.SystemAlert - - - com.dianping.cat.consumer.metric.MetricConfigManager - - - com.dianping.cat.consumer.metric.ProductLineConfigManager - - - com.dianping.cat.report.baseline.BaselineService - - - com.dianping.cat.system.tool.MailSMS - - - com.dianping.cat.report.task.alert.system.SystemAlertConfig - - - com.dianping.cat.report.task.alert.AlertInfo - - - com.dianping.cat.home.dal.report.AlertDao - - - com.dianping.cat.report.task.alert.RemoteMetricReportService - - - com.dianping.cat.system.config.SystemRuleConfigManager - - - com.dianping.cat.report.task.alert.DataChecker - - - - - com.dianping.cat.report.task.alert.exception.AlertExceptionBuilder - com.dianping.cat.report.task.alert.exception.AlertExceptionBuilder - - - com.dianping.cat.system.config.ExceptionConfigManager - - - - - com.dianping.cat.report.task.alert.exception.ExceptionAlert - com.dianping.cat.report.task.alert.exception.ExceptionAlert - - - com.dianping.cat.core.dal.ProjectDao - - - com.dianping.cat.report.task.alert.exception.ExceptionAlertConfig - - - com.dianping.cat.system.tool.MailSMS - - - com.dianping.cat.system.config.ExceptionConfigManager - - - com.dianping.cat.report.task.alert.exception.AlertExceptionBuilder - - - com.dianping.cat.home.dal.report.AlertDao - - - com.dianping.cat.report.page.model.spi.ModelService - top - - - - - com.dianping.cat.system.config.NetGraphConfigManager - com.dianping.cat.system.config.NetGraphConfigManager - - - com.dianping.cat.core.config.ConfigDao - - + org.unidal.dal.jdbc.mapping.TableProvider + app-data-command + com.dianping.cat.config.app.AppDataCommandTableProvider org.unidal.dal.jdbc.datasource.JdbcDataSourceDescriptorManager @@ -2183,17 +2200,17 @@ org.unidal.dal.jdbc.mapping.TableProvider - dp-admin-login + app-data-command org.unidal.dal.jdbc.mapping.SimpleTableProvider - dp-admin-login - DP_AdminLogin - user + app-data-command + app_data_command + app - com.dianping.cat.home.dal.user.DpAdminLoginDao - com.dianping.cat.home.dal.user.DpAdminLoginDao + com.dianping.cat.app.AppDataCommandDao + com.dianping.cat.app.AppDataCommandDao org.unidal.dal.jdbc.QueryEngine @@ -2201,14 +2218,21 @@ - com.dianping.cat.report.task.product.ProjectUpdateTask - com.dianping.cat.report.task.product.ProjectUpdateTask + org.unidal.dal.jdbc.mapping.TableProvider + dp-admin-login + org.unidal.dal.jdbc.mapping.SimpleTableProvider + + dp-admin-login + DP_AdminLogin + user + + + + com.dianping.cat.home.dal.user.DpAdminLoginDao + com.dianping.cat.home.dal.user.DpAdminLoginDao - com.dianping.cat.core.dal.ProjectDao - - - com.dianping.cat.core.dal.HostinfoDao + org.unidal.dal.jdbc.QueryEngine diff --git a/script/Cat.sql b/script/Cat.sql index 18818035c..056012b9e 100644 --- a/script/Cat.sql +++ b/script/Cat.sql @@ -344,10 +344,10 @@ CREATE TABLE `app_data_command` ( `connnect_type` tinyint NOT NULL COMMENT '访问类型，是否长连接', `code` smallint NOT NULL COMMENT '返回码', `platform` tinyint NOT NULL COMMENT '平台', - `access_number` long NOT NULL COMMENT '访问量', - `response_sum_time` long NOT NULL COMMENT '响应时间大小', - `request_package` long NOT NULL COMMENT '请求包大小', - `response_package` long NOT NULL COMMENT '响应包大小', + `access_number` bigint NOT NULL COMMENT '访问量', + `response_sum_time` bigint NOT NULL COMMENT '响应时间大小', + `request_package` bigint NOT NULL COMMENT '请求包大小', + `response_package` bigint NOT NULL COMMENT '响应包大小', `creation_date` datetime NOT NULL COMMENT '数据插入时间', PRIMARY KEY (`id`), KEY IX_period_city_minute (period,city,minute_order), -- GitLab