diff --git a/cat-consumer-advanced/src/main/resources/META-INF/dal/model/metric-config-model.xml b/cat-consumer-advanced/src/main/resources/META-INF/dal/model/metric-config-model.xml
index 47c30852cf11b0c8922577f0e93c5c8263cacde8..1c724ab4eb0c9964f0caaab04a3fe5417e420ab1 100644
--- a/cat-consumer-advanced/src/main/resources/META-INF/dal/model/metric-config-model.xml
+++ b/cat-consumer-advanced/src/main/resources/META-INF/dal/model/metric-config-model.xml
@@ -13,9 +13,6 @@
-
-
-
diff --git a/cat-home/pom.xml b/cat-home/pom.xml
index 7dbbff1772f372d70904df62dbd410670d94ce39..3ebd3d0aae3dc6273903a1ebede176d216dd8a86 100755
--- a/cat-home/pom.xml
+++ b/cat-home/pom.xml
@@ -151,23 +151,20 @@
${basedir}/src/main/resources/META-INF/dal/model/topology-graph-manifest.xml,
${basedir}/src/main/resources/META-INF/dal/model/topology-graph-config-manifest.xml,
- ${basedir}/src/main/resources/META-INF/dal/model/info-manifest.xml,
${basedir}/src/main/resources/META-INF/dal/model/exception-config-manifest.xml,
${basedir}/src/main/resources/META-INF/dal/model/bug-manifest.xml,
${basedir}/src/main/resources/META-INF/dal/model/bug-config-manifest.xml,
${basedir}/src/main/resources/META-INF/dal/model/service-report-manifest.xml,
${basedir}/src/main/resources/META-INF/dal/model/heavy-report-manifest.xml,
${basedir}/src/main/resources/META-INF/dal/model/utilization-report-manifest.xml,
- ${basedir}/src/main/resources/META-INF/dal/model/domainGroup-manifest.xml,
- ${basedir}/src/main/resources/META-INF/dal/model/metric-group-config-manifest.xml,
- ${basedir}/src/main/resources/META-INF/dal/model/metric-aggregation-config-manifest.xml,
+ ${basedir}/src/main/resources/META-INF/dal/model/domain-group-manifest.xml,
${basedir}/src/main/resources/META-INF/dal/model/netgraph-manifest.xml,
${basedir}/src/main/resources/META-INF/dal/model/alert-report-manifest.xml,
${basedir}/src/main/resources/META-INF/dal/model/monitor-rules-manifest.xml,
- ${basedir}/src/main/resources/META-INF/dal/model/alertconfig-manifest.xml,
- ${basedir}/src/main/resources/META-INF/dal/model/alertsummary-manifest.xml,
+ ${basedir}/src/main/resources/META-INF/dal/model/alert-config-manifest.xml,
+ ${basedir}/src/main/resources/META-INF/dal/model/alert-summary-manifest.xml,
${basedir}/src/main/resources/META-INF/dal/model/alert-policy-manifest.xml,
- ${basedir}/src/main/resources/META-INF/dal/model/thirdParty-manifest.xml,
+ ${basedir}/src/main/resources/META-INF/dal/model/thirdparty-manifest.xml,
${basedir}/src/main/resources/META-INF/dal/model/router-manifest.xml,
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 86b538673ff247692f166cc0ff221c09a6e936cb..3d30d47a42cfb84d459783a54095033323d3c0f7 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
@@ -69,7 +69,6 @@ import com.dianping.cat.system.config.BusinessRuleConfigManager;
import com.dianping.cat.system.config.ConfigReloadTask;
import com.dianping.cat.system.config.DomainGroupConfigManager;
import com.dianping.cat.system.config.ExceptionConfigManager;
-import com.dianping.cat.system.config.MetricGroupConfigManager;
import com.dianping.cat.system.config.NetGraphConfigManager;
import com.dianping.cat.system.config.NetworkRuleConfigManager;
import com.dianping.cat.system.config.RouterConfigManager;
@@ -159,7 +158,6 @@ public class ComponentsConfigurator extends AbstractResourceConfigurator {
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, MetricConfigManager.class));
all.add(C(AppRuleConfigManager.class).req(ConfigDao.class));
@@ -183,23 +181,23 @@ public class ComponentsConfigurator extends AbstractResourceConfigurator {
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));
+ 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, ProjectService.class));
+ ProductLineConfigManager.class, AlertInfo.class, ProjectService.class));
all.add(C(SystemGraphCreator.class).req(CachedMetricReportService.class, DataExtractor.class,
MetricDataFetcher.class).req(BaselineService.class, MetricConfigManager.class,
- ProductLineConfigManager.class, MetricGroupConfigManager.class, AlertInfo.class));
+ ProductLineConfigManager.class, AlertInfo.class));
all.add(C(WebGraphCreator.class, DefaultWebGraphCreator.class).req(CachedMetricReportService.class,
DataExtractor.class, MetricDataFetcher.class).req(BaselineService.class, MetricConfigManager.class,
- ProductLineConfigManager.class, MetricGroupConfigManager.class, AlertInfo.class));
+ ProductLineConfigManager.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));
+ ProductLineConfigManager.class, AlertInfo.class));
all.add(C(AppGraphCreator.class).req(AppDataService.class, CachedMetricReportService.class, DataExtractor.class,
MetricDataFetcher.class).req(BaselineService.class, MetricConfigManager.class,
- ProductLineConfigManager.class, MetricGroupConfigManager.class, AlertInfo.class, AppConfigManager.class));
+ ProductLineConfigManager.class, AlertInfo.class, AppConfigManager.class));
all.add(C(NetGraphManager.class).req(ServerConfigManager.class, RemoteMetricReportService.class).req(
ReportServiceManager.class, NetGraphBuilder.class, AlertInfo.class, NetGraphConfigManager.class));
diff --git a/cat-home/src/main/java/com/dianping/cat/report/chart/AbstractGraphCreator.java b/cat-home/src/main/java/com/dianping/cat/report/chart/AbstractGraphCreator.java
index 3b737b566695d855c5dc519c863723229ad705f1..b3380291442a1f4dcf3698be110bed23c419e0f0 100644
--- a/cat-home/src/main/java/com/dianping/cat/report/chart/AbstractGraphCreator.java
+++ b/cat-home/src/main/java/com/dianping/cat/report/chart/AbstractGraphCreator.java
@@ -19,7 +19,6 @@ import com.dianping.cat.helper.TimeUtil;
import com.dianping.cat.report.baseline.BaselineService;
import com.dianping.cat.report.page.LineChart;
import com.dianping.cat.report.task.alert.AlertInfo;
-import com.dianping.cat.system.config.MetricGroupConfigManager;
public abstract class AbstractGraphCreator implements LogEnabled {
@Inject
@@ -40,9 +39,6 @@ public abstract class AbstractGraphCreator implements LogEnabled {
@Inject
protected ProductLineConfigManager m_productLineConfigManager;
- @Inject
- protected MetricGroupConfigManager m_metricGroupConfigManager;
-
@Inject
protected AlertInfo m_alertInfo;
diff --git a/cat-home/src/main/java/com/dianping/cat/report/page/metric/graph/MetricGraphCreator.java b/cat-home/src/main/java/com/dianping/cat/report/page/metric/graph/MetricGraphCreator.java
index 89d8c28b264d8ab69c26fa88019d438566eefad1..1faa2c5f5aa7185ade26630c73b8a139d110e8f9 100644
--- a/cat-home/src/main/java/com/dianping/cat/report/page/metric/graph/MetricGraphCreator.java
+++ b/cat-home/src/main/java/com/dianping/cat/report/page/metric/graph/MetricGraphCreator.java
@@ -20,7 +20,6 @@ import com.dianping.cat.consumer.metric.model.entity.MetricReport;
import com.dianping.cat.core.dal.Project;
import com.dianping.cat.helper.Chinese;
import com.dianping.cat.helper.TimeUtil;
-import com.dianping.cat.home.metric.group.entity.MetricKeyConfig;
import com.dianping.cat.report.chart.AbstractGraphCreator;
import com.dianping.cat.report.page.LineChart;
import com.dianping.cat.report.task.alert.AlertInfo.AlertMetric;
@@ -151,25 +150,6 @@ public class MetricGraphCreator extends AbstractGraphCreator {
return currentValues;
}
- private boolean isProductLineInGroup(String productLine, List configs) {
- List domains = m_productLineConfigManager.queryDomainsByProductLine(productLine);
- List metricConfig = m_metricConfigManager.queryMetricItemConfigs(domains);
-
- for (MetricKeyConfig metric : configs) {
- String domain = metric.getMetricDomain();
- String type = metric.getMetricType();
- String key = metric.getMetricKey();
-
- for (MetricItemConfig item : metricConfig) {
- if (item.getDomain().equalsIgnoreCase(domain) && item.getType().equalsIgnoreCase(type)
- && item.getMetricKey().equalsIgnoreCase(key)) {
- return true;
- }
- }
- }
- return false;
- }
-
private boolean isProductLineInTag(String productLine, List configs) {
List domains = m_productLineConfigManager.queryDomainsByProductLine(productLine);
List metricConfig = m_metricConfigManager.queryMetricItemConfigs(domains);
@@ -189,29 +169,6 @@ public class MetricGraphCreator extends AbstractGraphCreator {
return false;
}
- public Map buildDashboardByGroup(Date start, Date end, String metricGroup) {
- Map result = new LinkedHashMap();
- List metricConfigs = m_metricGroupConfigManager.queryMetricGroupConfig(metricGroup);
- Collection productLines = m_productLineConfigManager.queryAllProductLines().values();
- Map allCharts = new LinkedHashMap();
-
- for (ProductLine productLine : productLines) {
- if (isProductLineInGroup(productLine.getId(), metricConfigs)) {
- allCharts.putAll(buildChartsByProductLine(productLine.getId(), start, end));
- }
- }
- for (MetricKeyConfig metric : metricConfigs) {
- String domain = metric.getMetricDomain();
- String type = metric.getMetricType().equalsIgnoreCase("metric") ? "Metric" : metric.getMetricType();
- String key = metric.getMetricKey();
- String id = m_metricConfigManager.buildMetricKey(domain, type, key) + ":"
- + metric.getDisplayType().toUpperCase();
-
- put(allCharts, result, id);
- }
- return result;
- }
-
public Map buildDashboardByTag(Date start, Date end, String tag) {
Map result = new LinkedHashMap();
List metricItemConfigs = m_metricConfigManager.queryMetricItemConfigs(tag);
diff --git a/cat-home/src/main/java/com/dianping/cat/report/task/alert/business/BusinessAlert.java b/cat-home/src/main/java/com/dianping/cat/report/task/alert/business/BusinessAlert.java
index 19eac95309dbabecbe057140603a300aaa8ea385..cd8ab725cf110f2057f294fdb1f12deadcb7b8f7 100644
--- a/cat-home/src/main/java/com/dianping/cat/report/task/alert/business/BusinessAlert.java
+++ b/cat-home/src/main/java/com/dianping/cat/report/task/alert/business/BusinessAlert.java
@@ -63,8 +63,7 @@ public class BusinessAlert extends BaseAlert implements Task, LogEnabled {
}
public boolean needAlert(MetricItemConfig config) {
- if (config.getAlarm() || config.isShowAvgDashboard() || config.isShowSumDashboard()
- || config.isShowCountDashboard() || hasMonitorTag(config)) {
+ if (config.getAlarm() || hasMonitorTag(config)) {
return true;
} else {
return false;
diff --git a/cat-home/src/main/java/com/dianping/cat/report/task/alert/thirdParty/ThirdPartyAlertBuilder.java b/cat-home/src/main/java/com/dianping/cat/report/task/alert/thirdParty/ThirdPartyAlertBuilder.java
index 8896c26b03271e8e0781f52c8786bf552cdbb5cd..b3bc23c7e948cadc6ba4b6a60e0cb609ddfaebb3 100644
--- a/cat-home/src/main/java/com/dianping/cat/report/task/alert/thirdParty/ThirdPartyAlertBuilder.java
+++ b/cat-home/src/main/java/com/dianping/cat/report/task/alert/thirdParty/ThirdPartyAlertBuilder.java
@@ -14,8 +14,8 @@ import org.unidal.lookup.annotation.Inject;
import com.dianping.cat.Cat;
import com.dianping.cat.helper.TimeUtil;
-import com.dianping.cat.home.alert.thirdParty.entity.Http;
-import com.dianping.cat.home.alert.thirdParty.entity.Par;
+import com.dianping.cat.home.alert.thirdparty.entity.Http;
+import com.dianping.cat.home.alert.thirdparty.entity.Par;
import com.dianping.cat.message.Transaction;
import com.dianping.cat.system.config.ThirdPartyConfigManager;
diff --git a/cat-home/src/main/java/com/dianping/cat/system/config/MetricGroupConfigManager.java b/cat-home/src/main/java/com/dianping/cat/system/config/MetricGroupConfigManager.java
deleted file mode 100644
index f88f7397f5836be3c815d9b037a7dfbd96db9252..0000000000000000000000000000000000000000
--- a/cat-home/src/main/java/com/dianping/cat/system/config/MetricGroupConfigManager.java
+++ /dev/null
@@ -1,105 +0,0 @@
-package com.dianping.cat.system.config;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.codehaus.plexus.personality.plexus.lifecycle.phase.Initializable;
-import org.codehaus.plexus.personality.plexus.lifecycle.phase.InitializationException;
-import org.unidal.dal.jdbc.DalNotFoundException;
-import org.unidal.helper.Files;
-import org.unidal.lookup.annotation.Inject;
-
-import com.dianping.cat.Cat;
-import com.dianping.cat.core.config.Config;
-import com.dianping.cat.core.config.ConfigDao;
-import com.dianping.cat.core.config.ConfigEntity;
-import com.dianping.cat.home.metric.group.entity.MetricGroup;
-import com.dianping.cat.home.metric.group.entity.MetricGroupConfig;
-import com.dianping.cat.home.metric.group.entity.MetricKeyConfig;
-import com.dianping.cat.home.metric.group.transform.DefaultSaxParser;
-
-public class MetricGroupConfigManager implements Initializable {
-
- @Inject
- private ConfigDao m_configDao;
-
- private int m_configId;
-
- private MetricGroupConfig m_config;
-
- private static final String CONFIG_NAME = "metricGroupConfig";
-
- public MetricGroupConfig getMetricGroupConfig() {
- return m_config;
- }
-
- @Override
- public void initialize() throws InitializationException {
- try {
- Config config = m_configDao.findByName(CONFIG_NAME, ConfigEntity.READSET_FULL);
- String content = config.getContent();
-
- m_config = DefaultSaxParser.parse(content);
- m_configId = config.getId();
- } catch (DalNotFoundException e) {
- try {
- String content = Files.forIO().readFrom(
- this.getClass().getResourceAsStream("/config/default-metric-group-config.xml"), "utf-8");
- Config config = m_configDao.createLocal();
-
- config.setName(CONFIG_NAME);
- config.setContent(content);
- m_configDao.insert(config);
-
- m_config = DefaultSaxParser.parse(content);
- m_configId = config.getId();
- } catch (Exception ex) {
- Cat.logError(ex);
- }
- } catch (Exception e) {
- Cat.logError(e);
- }
- if (m_config == null) {
- m_config = new MetricGroupConfig();
- }
- }
-
- public boolean insert(String xml) {
- try {
- m_config = DefaultSaxParser.parse(xml);
-
- return storeConfig();
- } catch (Exception e) {
- Cat.logError(e);
- return false;
- }
- }
-
- public List queryMetricGroupConfig(String group) {
- MetricGroup metricGroup = m_config.findMetricGroup(group);
-
- if (metricGroup == null) {
- return new ArrayList();
- } else {
- return metricGroup.getMetricKeys();
- }
- }
-
- private boolean storeConfig() {
- synchronized (this) {
- try {
- Config config = m_configDao.createLocal();
-
- config.setId(m_configId);
- config.setKeyId(m_configId);
- config.setName(CONFIG_NAME);
- config.setContent(m_config.toString());
- m_configDao.updateByPK(config, ConfigEntity.UPDATESET_FULL);
- } catch (Exception e) {
- Cat.logError(e);
- return false;
- }
- }
- return true;
- }
-}
diff --git a/cat-home/src/main/java/com/dianping/cat/system/config/ThirdPartyConfigManager.java b/cat-home/src/main/java/com/dianping/cat/system/config/ThirdPartyConfigManager.java
index df65f8536e0f6959de594d3d8cd65adf30b736dd..ed541dd6c11475c3cee0a4215ad07b92df8c48c8 100644
--- a/cat-home/src/main/java/com/dianping/cat/system/config/ThirdPartyConfigManager.java
+++ b/cat-home/src/main/java/com/dianping/cat/system/config/ThirdPartyConfigManager.java
@@ -12,10 +12,10 @@ import com.dianping.cat.Cat;
import com.dianping.cat.core.config.Config;
import com.dianping.cat.core.config.ConfigDao;
import com.dianping.cat.core.config.ConfigEntity;
-import com.dianping.cat.home.alert.thirdParty.entity.Http;
-import com.dianping.cat.home.alert.thirdParty.entity.Socket;
-import com.dianping.cat.home.alert.thirdParty.entity.ThirdPartyConfig;
-import com.dianping.cat.home.alert.thirdParty.transform.DefaultSaxParser;
+import com.dianping.cat.home.alert.thirdparty.entity.Http;
+import com.dianping.cat.home.alert.thirdparty.entity.Socket;
+import com.dianping.cat.home.alert.thirdparty.entity.ThirdPartyConfig;
+import com.dianping.cat.home.alert.thirdparty.transform.DefaultSaxParser;
public class ThirdPartyConfigManager implements Initializable {
diff --git a/cat-home/src/main/java/com/dianping/cat/system/page/config/Action.java b/cat-home/src/main/java/com/dianping/cat/system/page/config/Action.java
index 9c862b4955a0ed9257e1880ae308e3cdb30dc231..3a6c9f8cc5a54864f229b47401fd9fbfc63fc89f 100644
--- a/cat-home/src/main/java/com/dianping/cat/system/page/config/Action.java
+++ b/cat-home/src/main/java/com/dianping/cat/system/page/config/Action.java
@@ -113,8 +113,6 @@ public enum Action implements org.unidal.web.mvc.Action {
DOMAIN_GROUP_CONFIG_UPDATE("domainGroupConfigUpdate"),
- METRIC_GROUP_CONFIG_UPDATE("metricGroupConfigUpdate"),
-
NET_GRAPH_CONFIG_UPDATE("netGraphConfigUpdate"),
WEB_RULE("webRule"),
diff --git a/cat-home/src/main/java/com/dianping/cat/system/page/config/Handler.java b/cat-home/src/main/java/com/dianping/cat/system/page/config/Handler.java
index 9217d3553053687bcd64b3db7a36eda6a82a7971..f8a8c7bfa2a1177cc340a0c9a664233bd595ecee 100644
--- a/cat-home/src/main/java/com/dianping/cat/system/page/config/Handler.java
+++ b/cat-home/src/main/java/com/dianping/cat/system/page/config/Handler.java
@@ -131,7 +131,6 @@ public class Handler implements PageHandler {
case METRIC_RULE_ADD_OR_UPDATE_SUBMIT:
case METRIC_CONFIG_LIST:
case METRIC_CONFIG_DELETE:
- case METRIC_GROUP_CONFIG_UPDATE:
case DOMAIN_METRIC_RULE_CONFIG_UPDATE:
m_metricConfigProcessor.process(action, payload, model);
break;
diff --git a/cat-home/src/main/java/com/dianping/cat/system/page/config/JspViewer.java b/cat-home/src/main/java/com/dianping/cat/system/page/config/JspViewer.java
index e6cbb9436993bc086ade33214508ee750968f71b..1c17e0bab149dd499f79c785783fc08bbba0e56e 100644
--- a/cat-home/src/main/java/com/dianping/cat/system/page/config/JspViewer.java
+++ b/cat-home/src/main/java/com/dianping/cat/system/page/config/JspViewer.java
@@ -126,8 +126,6 @@ public class JspViewer extends BaseJspViewer
return JspFile.BUG_CONFIG_UPDATE.getPath();
case DOMAIN_GROUP_CONFIG_UPDATE:
return JspFile.DOMAIN_GROUP_CONFIG_UPDATE.getPath();
- case METRIC_GROUP_CONFIG_UPDATE:
- return JspFile.METRIC_GROUP_CONFIG_UPDATE.getPath();
case WEB_RULE:
case WEB_RULE_ADD_OR_UPDATE_SUBMIT:
case WEB_RULE_DELETE:
diff --git a/cat-home/src/main/java/com/dianping/cat/system/page/config/process/MetricConfigProcessor.java b/cat-home/src/main/java/com/dianping/cat/system/page/config/process/MetricConfigProcessor.java
index 612d89c0fb113ad22786fc9a138ffb29b95e7ba2..fbbe2f1d8fd343623e5b292c2c7e3d24a9602125 100644
--- a/cat-home/src/main/java/com/dianping/cat/system/page/config/process/MetricConfigProcessor.java
+++ b/cat-home/src/main/java/com/dianping/cat/system/page/config/process/MetricConfigProcessor.java
@@ -18,7 +18,6 @@ import com.dianping.cat.consumer.metric.ProductLineConfigManager;
import com.dianping.cat.home.rule.entity.Rule;
import com.dianping.cat.home.rule.transform.DefaultJsonBuilder;
import com.dianping.cat.system.config.BusinessRuleConfigManager;
-import com.dianping.cat.system.config.MetricGroupConfigManager;
import com.dianping.cat.system.page.config.Action;
import com.dianping.cat.system.page.config.Model;
import com.dianping.cat.system.page.config.Payload;
@@ -37,9 +36,6 @@ public class MetricConfigProcessor extends BaseProcesser {
@Inject
private BusinessRuleConfigManager m_businessRuleConfigManager;
- @Inject
- private MetricGroupConfigManager m_metricGroupConfigManager;
-
private void metricConfigAdd(Payload payload, Model model) {
String key = m_metricConfigManager.buildMetricKey(payload.getDomain(), payload.getType(), payload.getMetricKey());
@@ -138,15 +134,6 @@ public class MetricConfigProcessor extends BaseProcesser {
payload.getDomain(), payload.getType(), payload.getMetricKey())));
metricConfigList(payload, model);
break;
- case METRIC_GROUP_CONFIG_UPDATE:
- String metricGroupConfig = payload.getContent();
- if (!StringUtils.isEmpty(metricGroupConfig)) {
- model.setOpState(m_metricGroupConfigManager.insert(metricGroupConfig));
- } else {
- model.setOpState(true);
- }
- model.setContent(m_metricGroupConfigManager.getMetricGroupConfig().toString());
- break;
case DOMAIN_METRIC_RULE_CONFIG_UPDATE:
String domainMetricRuleConfig = payload.getContent();
if (!StringUtils.isEmpty(domainMetricRuleConfig)) {
diff --git a/cat-home/src/main/resources/META-INF/dal/model/alertconfig-codegen.xml b/cat-home/src/main/resources/META-INF/dal/model/alert-config-codegen.xml
similarity index 100%
rename from cat-home/src/main/resources/META-INF/dal/model/alertconfig-codegen.xml
rename to cat-home/src/main/resources/META-INF/dal/model/alert-config-codegen.xml
diff --git a/cat-home/src/main/resources/META-INF/dal/model/alert-config-manifest.xml b/cat-home/src/main/resources/META-INF/dal/model/alert-config-manifest.xml
new file mode 100644
index 0000000000000000000000000000000000000000..db0c5eb00deef745aac3cb54d9b35e14aa3d7213
--- /dev/null
+++ b/cat-home/src/main/resources/META-INF/dal/model/alert-config-manifest.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
diff --git a/cat-home/src/main/resources/META-INF/dal/model/alertconfig-model.xml b/cat-home/src/main/resources/META-INF/dal/model/alert-config-model.xml
similarity index 100%
rename from cat-home/src/main/resources/META-INF/dal/model/alertconfig-model.xml
rename to cat-home/src/main/resources/META-INF/dal/model/alert-config-model.xml
diff --git a/cat-home/src/main/resources/META-INF/dal/model/alertsummary-codegen.xml b/cat-home/src/main/resources/META-INF/dal/model/alert-summary-codegen.xml
similarity index 100%
rename from cat-home/src/main/resources/META-INF/dal/model/alertsummary-codegen.xml
rename to cat-home/src/main/resources/META-INF/dal/model/alert-summary-codegen.xml
diff --git a/cat-home/src/main/resources/META-INF/dal/model/alert-summary-manifest.xml b/cat-home/src/main/resources/META-INF/dal/model/alert-summary-manifest.xml
new file mode 100644
index 0000000000000000000000000000000000000000..6865ef47c271f05b0b26dafc299834acdbbc979c
--- /dev/null
+++ b/cat-home/src/main/resources/META-INF/dal/model/alert-summary-manifest.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
diff --git a/cat-home/src/main/resources/META-INF/dal/model/alertsummary-model.xml b/cat-home/src/main/resources/META-INF/dal/model/alert-summary-model.xml
similarity index 100%
rename from cat-home/src/main/resources/META-INF/dal/model/alertsummary-model.xml
rename to cat-home/src/main/resources/META-INF/dal/model/alert-summary-model.xml
diff --git a/cat-home/src/main/resources/META-INF/dal/model/alertconfig-manifest.xml b/cat-home/src/main/resources/META-INF/dal/model/alertconfig-manifest.xml
deleted file mode 100644
index 4f2652a1f13ac9a97bfc524b33353d34d25df944..0000000000000000000000000000000000000000
--- a/cat-home/src/main/resources/META-INF/dal/model/alertconfig-manifest.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
-
-
diff --git a/cat-home/src/main/resources/META-INF/dal/model/alertsummary-manifest.xml b/cat-home/src/main/resources/META-INF/dal/model/alertsummary-manifest.xml
deleted file mode 100644
index b29de30c9ebf02f294788f11692c6a3d654c607c..0000000000000000000000000000000000000000
--- a/cat-home/src/main/resources/META-INF/dal/model/alertsummary-manifest.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
-
-
diff --git a/cat-home/src/main/resources/META-INF/dal/model/domainGroup-codegen.xml b/cat-home/src/main/resources/META-INF/dal/model/domain-group-codegen.xml
similarity index 100%
rename from cat-home/src/main/resources/META-INF/dal/model/domainGroup-codegen.xml
rename to cat-home/src/main/resources/META-INF/dal/model/domain-group-codegen.xml
diff --git a/cat-home/src/main/resources/META-INF/dal/model/domain-group-manifest.xml b/cat-home/src/main/resources/META-INF/dal/model/domain-group-manifest.xml
new file mode 100644
index 0000000000000000000000000000000000000000..a776ab181c0857dceabae03ff103c7abec90dd33
--- /dev/null
+++ b/cat-home/src/main/resources/META-INF/dal/model/domain-group-manifest.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
diff --git a/cat-home/src/main/resources/META-INF/dal/model/domainGroup-model.xml b/cat-home/src/main/resources/META-INF/dal/model/domain-group-model.xml
similarity index 100%
rename from cat-home/src/main/resources/META-INF/dal/model/domainGroup-model.xml
rename to cat-home/src/main/resources/META-INF/dal/model/domain-group-model.xml
diff --git a/cat-home/src/main/resources/META-INF/dal/model/domainGroup-manifest.xml b/cat-home/src/main/resources/META-INF/dal/model/domainGroup-manifest.xml
deleted file mode 100644
index 0e68733601eb133d5c4834f770dc71b572a0b648..0000000000000000000000000000000000000000
--- a/cat-home/src/main/resources/META-INF/dal/model/domainGroup-manifest.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
-
-
diff --git a/cat-home/src/main/resources/META-INF/dal/model/info-codegen.xml b/cat-home/src/main/resources/META-INF/dal/model/info-codegen.xml
deleted file mode 100644
index 27927a8b6b278cffbace5d3cc8fcdfe33c5612b5..0000000000000000000000000000000000000000
--- a/cat-home/src/main/resources/META-INF/dal/model/info-codegen.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/cat-home/src/main/resources/META-INF/dal/model/info-manifest.xml b/cat-home/src/main/resources/META-INF/dal/model/info-manifest.xml
deleted file mode 100644
index 8e7ee4670d5745d0ecbfd6484ffd7150bdcd5d16..0000000000000000000000000000000000000000
--- a/cat-home/src/main/resources/META-INF/dal/model/info-manifest.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
-
-
diff --git a/cat-home/src/main/resources/META-INF/dal/model/info-model.xml b/cat-home/src/main/resources/META-INF/dal/model/info-model.xml
deleted file mode 100644
index 6d3bff4c2d6a2a7bcbb0e00ea152cd356669d216..0000000000000000000000000000000000000000
--- a/cat-home/src/main/resources/META-INF/dal/model/info-model.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/cat-home/src/main/resources/META-INF/dal/model/metric-aggregation-config-codegen.xml b/cat-home/src/main/resources/META-INF/dal/model/metric-aggregation-config-codegen.xml
deleted file mode 100644
index 5985cf1b2bf1d69a62f2e759945d26d9a779b04d..0000000000000000000000000000000000000000
--- a/cat-home/src/main/resources/META-INF/dal/model/metric-aggregation-config-codegen.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/cat-home/src/main/resources/META-INF/dal/model/metric-aggregation-config-manifest.xml b/cat-home/src/main/resources/META-INF/dal/model/metric-aggregation-config-manifest.xml
deleted file mode 100644
index 7fdd528c37de4274450c9341600868e2e7aa565d..0000000000000000000000000000000000000000
--- a/cat-home/src/main/resources/META-INF/dal/model/metric-aggregation-config-manifest.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
-
-
diff --git a/cat-home/src/main/resources/META-INF/dal/model/metric-aggregation-config-model.xml b/cat-home/src/main/resources/META-INF/dal/model/metric-aggregation-config-model.xml
deleted file mode 100644
index 3e632e13a26a76d6fdbfd0a85296f99d6561c0d7..0000000000000000000000000000000000000000
--- a/cat-home/src/main/resources/META-INF/dal/model/metric-aggregation-config-model.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/cat-home/src/main/resources/META-INF/dal/model/metric-group-config-codegen.xml b/cat-home/src/main/resources/META-INF/dal/model/metric-group-config-codegen.xml
deleted file mode 100644
index c3b8c031f5a99a9e858f604f4ce59a500b6bd9a4..0000000000000000000000000000000000000000
--- a/cat-home/src/main/resources/META-INF/dal/model/metric-group-config-codegen.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/cat-home/src/main/resources/META-INF/dal/model/metric-group-config-manifest.xml b/cat-home/src/main/resources/META-INF/dal/model/metric-group-config-manifest.xml
deleted file mode 100644
index ed35f5d2bd7b53e66cbc740ecd06c3d3b31f1e44..0000000000000000000000000000000000000000
--- a/cat-home/src/main/resources/META-INF/dal/model/metric-group-config-manifest.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
-
-
diff --git a/cat-home/src/main/resources/META-INF/dal/model/metric-group-config-model.xml b/cat-home/src/main/resources/META-INF/dal/model/metric-group-config-model.xml
deleted file mode 100644
index d709b3c895b39ec8ecc453edfd8966719e4125ba..0000000000000000000000000000000000000000
--- a/cat-home/src/main/resources/META-INF/dal/model/metric-group-config-model.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/cat-home/src/main/resources/META-INF/dal/model/thirdParty-manifest.xml b/cat-home/src/main/resources/META-INF/dal/model/thirdParty-manifest.xml
index 5d208c6f61579ad803352178d6d789e65197f191..3bfc76a8d690f4eb19da3edd6395d52870522e06 100644
--- a/cat-home/src/main/resources/META-INF/dal/model/thirdParty-manifest.xml
+++ b/cat-home/src/main/resources/META-INF/dal/model/thirdParty-manifest.xml
@@ -1,6 +1,6 @@
-
-
+
+
diff --git a/cat-home/src/main/resources/META-INF/dal/model/thirdParty-model.xml b/cat-home/src/main/resources/META-INF/dal/model/thirdParty-model.xml
index 89f6a833dd0bc4575f6e4eac7cec385612f14830..cc14d5b62cb07af2561e1ca2df77eae82a775332 100644
--- a/cat-home/src/main/resources/META-INF/dal/model/thirdParty-model.xml
+++ b/cat-home/src/main/resources/META-INF/dal/model/thirdParty-model.xml
@@ -1,5 +1,5 @@
-
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 b928e2594838a2dfe538f4516e20b868c8513a7e..c30ee7e4eb2004b217a9d3c71341c7f2e861db32 100755
--- a/cat-home/src/main/resources/META-INF/plexus/components.xml
+++ b/cat-home/src/main/resources/META-INF/plexus/components.xml
@@ -152,15 +152,6 @@
-
- com.dianping.cat.system.config.MetricGroupConfigManager
- com.dianping.cat.system.config.MetricGroupConfigManager
-
-
- com.dianping.cat.core.config.ConfigDao
-
-
-
com.dianping.cat.system.config.NetworkRuleConfigManager
com.dianping.cat.system.config.NetworkRuleConfigManager
@@ -303,9 +294,6 @@
com.dianping.cat.consumer.metric.ProductLineConfigManager
-
- com.dianping.cat.system.config.MetricGroupConfigManager
-
com.dianping.cat.report.task.alert.AlertInfo
@@ -333,9 +321,6 @@
com.dianping.cat.consumer.metric.ProductLineConfigManager
-
- com.dianping.cat.system.config.MetricGroupConfigManager
-
com.dianping.cat.report.task.alert.AlertInfo
@@ -366,9 +351,6 @@
com.dianping.cat.consumer.metric.ProductLineConfigManager
-
- com.dianping.cat.system.config.MetricGroupConfigManager
-
com.dianping.cat.report.task.alert.AlertInfo
@@ -396,9 +378,6 @@
com.dianping.cat.consumer.metric.ProductLineConfigManager
-
- com.dianping.cat.system.config.MetricGroupConfigManager
-
com.dianping.cat.report.task.alert.AlertInfo
@@ -426,9 +405,6 @@
com.dianping.cat.consumer.metric.ProductLineConfigManager
-
- com.dianping.cat.system.config.MetricGroupConfigManager
-
com.dianping.cat.report.task.alert.AlertInfo
@@ -459,9 +435,6 @@
com.dianping.cat.consumer.metric.ProductLineConfigManager
-
- com.dianping.cat.system.config.MetricGroupConfigManager
-
com.dianping.cat.report.task.alert.AlertInfo
@@ -3766,9 +3739,6 @@
com.dianping.cat.consumer.metric.ProductLineConfigManager
-
- com.dianping.cat.system.config.MetricGroupConfigManager
-
com.dianping.cat.report.task.alert.AlertInfo
@@ -3807,15 +3777,6 @@
-
- com.dianping.cat.system.config.MetricGroupConfigManager
- com.dianping.cat.system.config.MetricGroupConfigManager
-
-
- com.dianping.cat.core.config.ConfigDao
-
-
-
com.dianping.cat.report.task.alert.AlertInfo
com.dianping.cat.report.task.alert.AlertInfo
@@ -4203,9 +4164,6 @@
com.dianping.cat.consumer.metric.ProductLineConfigManager
-
- com.dianping.cat.system.config.MetricGroupConfigManager
-
com.dianping.cat.report.task.alert.AlertInfo
@@ -4355,9 +4313,6 @@
com.dianping.cat.consumer.metric.ProductLineConfigManager
-
- com.dianping.cat.system.config.MetricGroupConfigManager
-
com.dianping.cat.report.task.alert.AlertInfo
@@ -4409,9 +4364,6 @@
com.dianping.cat.consumer.metric.ProductLineConfigManager
-
- com.dianping.cat.system.config.MetricGroupConfigManager
-
com.dianping.cat.report.task.alert.AlertInfo
@@ -4484,9 +4436,6 @@
com.dianping.cat.consumer.metric.ProductLineConfigManager
-
- com.dianping.cat.system.config.MetricGroupConfigManager
-
com.dianping.cat.report.task.alert.AlertInfo
@@ -4960,9 +4909,6 @@
com.dianping.cat.system.config.BusinessRuleConfigManager
-
- com.dianping.cat.system.config.MetricGroupConfigManager
-
com.dianping.cat.report.task.alert.RuleFTLDecorator