rename xml and delete unused xml

cat-consumer-advanced/src/main/resources/META-INF/dal/model/metric-config-model.xml

@@ -13,9 +13,6 @@
     <attribute name="show-count" value-type="boolean" primitive="true"/>
     <attribute name="show-avg" value-type="boolean" primitive="true"/>
     <attribute name="show-sum" value-type="boolean" primitive="true"/>
-    <attribute name="show-count-dashboard" value-type="boolean" primitive="true"/>
-    <attribute name="show-avg-dashboard" value-type="boolean" primitive="true"/>
-    <attribute name="show-sum-dashboard" value-type="boolean" primitive="true"/>
     <attribute name="show-dashboard-order" value-type="double" primitive="true"/>
     <attribute name="alarm" value-type="boolean" primitive="true"  default-value="false"/>
     <entity-ref name="tag" type="list" names="tags" />

cat-home/pom.xml

@@ -151,23 +151,20 @@
 							<manifest>
 								${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,
 							</manifest>
 						</configuration>

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));

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;
 

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<MetricKeyConfig> configs) {
-		List<String> domains = m_productLineConfigManager.queryDomainsByProductLine(productLine);
-		List<MetricItemConfig> 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<MetricItemConfig> configs) {
 		List<String> domains = m_productLineConfigManager.queryDomainsByProductLine(productLine);
 		List<MetricItemConfig> metricConfig = m_metricConfigManager.queryMetricItemConfigs(domains);
@@ -189,29 +169,6 @@ public class MetricGraphCreator extends AbstractGraphCreator {
 		return false;
 	}
 
-	public Map<String, LineChart> buildDashboardByGroup(Date start, Date end, String metricGroup) {
-		Map<String, LineChart> result = new LinkedHashMap<String, LineChart>();
-		List<MetricKeyConfig> metricConfigs = m_metricGroupConfigManager.queryMetricGroupConfig(metricGroup);
-		Collection<ProductLine> productLines = m_productLineConfigManager.queryAllProductLines().values();
-		Map<String, LineChart> allCharts = new LinkedHashMap<String, LineChart>();
-
-		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<String, LineChart> buildDashboardByTag(Date start, Date end, String tag) {
 		Map<String, LineChart> result = new LinkedHashMap<String, LineChart>();
 		List<MetricItemConfig> metricItemConfigs = m_metricConfigManager.queryMetricItemConfigs(tag);

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;

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;
 

cat-home/src/main/java/com/dianping/cat/system/config/MetricGroupConfigManager.java

-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<MetricKeyConfig> queryMetricGroupConfig(String group) {
-		MetricGroup metricGroup = m_config.findMetricGroup(group);
-
-		if (metricGroup == null) {
-			return new ArrayList<MetricKeyConfig>();
-		} 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;
-	}
-}

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 {
 

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"),

cat-home/src/main/java/com/dianping/cat/system/page/config/Handler.java

@@ -131,7 +131,6 @@ public class Handler implements PageHandler<Context> {
         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;

cat-home/src/main/java/com/dianping/cat/system/page/config/JspViewer.java

@@ -126,8 +126,6 @@ public class JspViewer extends BaseJspViewer<SystemPage, Action, Context, Model>
 			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:

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)) {

cat-home/src/main/resources/META-INF/dal/model/alertsummary-manifest.xml → cat-home/src/main/resources/META-INF/dal/model/alert-config-manifest.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <manifest>
-  <file path="alertsummary-codegen.xml" />
-  <file path="alertsummary-model.xml" />
+  <file path="alert-config-codegen.xml" />
+  <file path="alert-config-model.xml" />
 </manifest>
 

cat-home/src/main/resources/META-INF/dal/model/alertconfig-manifest.xml → cat-home/src/main/resources/META-INF/dal/model/alert-summary-manifest.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <manifest>
-  <file path="alertconfig-codegen.xml" />
-  <file path="alertconfig-model.xml" />
+  <file path="alert-summary-codegen.xml" />
+  <file path="alert-summary-model.xml" />
 </manifest>
 

cat-home/src/main/resources/META-INF/dal/model/info-manifest.xml → cat-home/src/main/resources/META-INF/dal/model/domain-group-manifest.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <manifest>
-  <file path="info-codegen.xml" />
-  <file path="info-model.xml" />
+  <file path="domain-group-codegen.xml" />
+  <file path="domain-group-model.xml" />
 </manifest>
 

cat-home/src/main/resources/META-INF/dal/model/domainGroup-manifest.xml

-<?xml version="1.0" encoding="UTF-8"?>
-<manifest>
-  <file path="domainGroup-codegen.xml" />
-  <file path="domainGroup-model.xml" />
-</manifest>
-

cat-home/src/main/resources/META-INF/dal/model/info-codegen.xml

-<?xml version="1.0" encoding="UTF-8"?>
-<model>
-  <entity name="info" root="true">
-    <entity-ref name="realease-note" type="list" names="realease-notes" />
-    <entity-ref name="problem" type="list" names="problems" />
-  </entity>
-  <entity name="realease-note">
-    <attribute name="version" value-type="String" />
-    <attribute name="date" value-type="String" />
-    <attribute name="description" value-type="String" />
-  </entity>
-  <entity name="problem">
-    <attribute name="id" value-type="String" />
-    <attribute name="ask" value-type="String" />
-    <attribute name="answer" value-type="String" />
-  </entity>
-</model>
-

cat-home/src/main/resources/META-INF/dal/model/info-model.xml

-<?xml version="1.0" encoding="UTF-8"?>
-<model model-package="com.dianping.cat.home.info" enable-sax-parser="true">
-  <entity name="info" root="true">
-    <entity-ref name="realease-note" type="list" names="realease-notes" />
-    <entity-ref name="problem" type="list" names="problems" />
-  </entity>
-  <entity name="realease-note">
-    <attribute name="version" value-type="String" />
-    <attribute name="date" value-type="String" />
-    <attribute name="description" value-type="String" />
-  </entity>
-  <entity name="problem">
-    <attribute name="id" value-type="String" />
-    <attribute name="ask" value-type="String" />
-    <attribute name="answer" value-type="String" />
-  </entity>
-</model>

cat-home/src/main/resources/META-INF/dal/model/metric-aggregation-config-codegen.xml

-<?xml version="1.0" encoding="UTF-8"?>
-<model>
-  <entity name="metric-aggregation-config" root="true">
-    <entity-ref name="metric-aggregation-group" type="list" names="metric-aggregation-groups" />
-  </entity>
-  <entity name="metric-aggregation-group">
-    <attribute name="id" value-type="String" />
-    <attribute name="type" value-type="String" />
-    <entity-ref name="metric-aggregation" type="list" names="metric-aggregations" />
-  </entity>
-  <entity name="metric-aggregation">
-    <attribute name="id" value-type="String" />
-    <attribute name="display-type" value-type="String" />
-    <attribute name="base-line" value-type="boolean" />
-    <attribute name="operation" value-type="String" />
-    <attribute name="domain" value-type="String" />
-    <attribute name="title" value-type="String" />
-    <entity-ref name="metric-aggregation-item" type="list" names="metric-aggregation-items" />
-  </entity>
-  <entity name="metric-aggregation-item">
-    <attribute name="domain" value-type="String" />
-    <attribute name="key" value-type="String" />
-    <attribute name="operation" value-type="String" />
-    <attribute name="display-type" value-type="String" />
-    <attribute name="base-line" value-type="boolean" />
-  </entity>
-</model>
-

cat-home/src/main/resources/META-INF/dal/model/metric-aggregation-config-manifest.xml

-<?xml version="1.0" encoding="UTF-8"?>
-<manifest>
-  <file path="metric-aggregation-config-codegen.xml" />
-  <file path="metric-aggregation-config-model.xml" />
-</manifest>
-

cat-home/src/main/resources/META-INF/dal/model/metric-aggregation-config-model.xml

-<?xml version="1.0" encoding="UTF-8"?>
-<model model-package="com.dianping.cat.home.metric.aggregation" enable-merger="true"  enable-sax-parser="true"
-	enable-base-visitor="true"  enable-json-parser="true" enable-json-builder="true" enable-native-parser="true"  enable-native-builder="true"
-	enable-xml-parser="false"  enable-xml-builder="false">
-  <entity name="metric-aggregation-config" root="true">
-    <entity-ref name="metric-aggregation-group" type="map" names="metric-aggregation-groups" />
-  </entity>
-  <entity name="metric-aggregation-group">
-    <attribute name="id" value-type="String" key="true" />
-    <attribute name="type" value-type="String" default-value="Metric"/>
-    <attribute name="display" value-type="String" default-value="network"/>
-    <entity-ref name="metric-aggregation" type="list" names="metric-aggregations" />
-  </entity>
-  <entity name="metric-aggregation">
-    <attribute name="id" value-type="String" />
-    <attribute name="display-type" value-type="String" />
-    <attribute name="base-line" value-type="boolean" default-value="false"/>
-    <attribute name="operation" value-type="String" />
-    <attribute name="domain" value-type="String" />
-    <attribute name="title" value-type="String" />
-    <entity-ref name="metric-aggregation-item" type="list" names="metric-aggregation-items" />
-  </entity>
-  <entity name="metric-aggregation-item">
-    <attribute name="domain" value-type="String" />
-    <attribute name="key" value-type="String" />
-    <attribute name="operation" value-type="String" />
-    <attribute name="display-type" value-type="String" />
-    <attribute name="base-line" value-type="boolean" />
-  </entity>
-</model>
-

cat-home/src/main/resources/META-INF/dal/model/metric-group-config-codegen.xml

-<?xml version="1.0" encoding="UTF-8"?>
-<model>
-  <entity name="metric-group-config" root="true">
-    <entity-ref name="metric-group" />
-  </entity>
-  <entity name="metric-group">
-    <attribute name="id" value-type="String" />
-    <entity-ref name="metric-key-config" type="list" names="metric-key-configs" />
-  </entity>
-  <entity name="metric-key-config">
-    <attribute name="metric-domain" value-type="String" />
-    <attribute name="metric-type" value-type="String" />
-    <attribute name="metric-key" value-type="String" />
-    <attribute name="display-type" value-type="String" />
-  </entity>
-</model>
-

cat-home/src/main/resources/META-INF/dal/model/metric-group-config-manifest.xml

-<?xml version="1.0" encoding="UTF-8"?>
-<manifest>
-  <file path="metric-group-config-codegen.xml" />
-  <file path="metric-group-config-model.xml" />
-</manifest>
-

cat-home/src/main/resources/META-INF/dal/model/metric-group-config-model.xml

-<?xml version="1.0" encoding="UTF-8"?>
-<model model-package="com.dianping.cat.home.metric.group" 
-   enable-merger="true"  enable-sax-parser="true"
-	enable-base-visitor="true"  enable-json-parser="true" enable-json-builder="true" enable-native-parser="true"  enable-native-builder="true"
-	enable-xml-parser="false"  enable-xml-builder="false">
-  <entity name="metric-group-config" root="true">
-    <entity-ref name="metric-group" type="map" names="metric-groups" />
-  </entity>
-  <entity name="metric-group">
-    <attribute name="id" value-type="String" key="true"/>
-    <entity-ref name="metric-key-config" type="list" names="metric-keys"/>
-  </entity>
-  <entity name="metric-key-config">
-    <attribute name="metric-domain" value-type="String" />
-    <attribute name="metric-type" value-type="String" default-value="Metric"/>
-    <attribute name="metric-key" value-type="String" />
-    <attribute name="display-type" value-type="String" />
-  </entity>
-</model>
-

cat-home/src/main/resources/META-INF/dal/model/thirdParty-manifest.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <manifest>
-  <file path="thirdParty-codegen.xml" />
-  <file path="thirdParty-model.xml" />
+  <file path="thirdparty-codegen.xml" />
+  <file path="thirdparty-model.xml" />
 </manifest>
 

cat-home/src/main/resources/META-INF/dal/model/thirdParty-model.xml

 <?xml version="1.0" encoding="UTF-8"?>
-<model model-package="com.dianping.cat.home.alert.thirdParty" enable-merger="false"  enable-sax-parser="true"
+<model model-package="com.dianping.cat.home.alert.thirdparty" enable-merger="false"  enable-sax-parser="true"
 	enable-base-visitor="false"  >
   <entity name="third-party-config" root="true">
     <entity-ref name="http" type="list" names="https" />

cat-home/src/main/resources/META-INF/plexus/components.xml

@@ -152,15 +152,6 @@
 				</requirement>
 			</requirements>
 		</component>
-		<component>
-			<role>com.dianping.cat.system.config.MetricGroupConfigManager</role>
-			<implementation>com.dianping.cat.system.config.MetricGroupConfigManager</implementation>
-			<requirements>
-				<requirement>
-					<role>com.dianping.cat.core.config.ConfigDao</role>
-				</requirement>
-			</requirements>
-		</component>
 		<component>
 			<role>com.dianping.cat.system.config.NetworkRuleConfigManager</role>
 			<implementation>com.dianping.cat.system.config.NetworkRuleConfigManager</implementation>
@@ -303,9 +294,6 @@
 				<requirement>
 					<role>com.dianping.cat.consumer.metric.ProductLineConfigManager</role>
 				</requirement>
-				<requirement>
-					<role>com.dianping.cat.system.config.MetricGroupConfigManager</role>
-				</requirement>
 				<requirement>
 					<role>com.dianping.cat.report.task.alert.AlertInfo</role>
 				</requirement>
@@ -333,9 +321,6 @@
 				<requirement>
 					<role>com.dianping.cat.consumer.metric.ProductLineConfigManager</role>
 				</requirement>
-				<requirement>
-					<role>com.dianping.cat.system.config.MetricGroupConfigManager</role>
-				</requirement>
 				<requirement>
 					<role>com.dianping.cat.report.task.alert.AlertInfo</role>
 				</requirement>
@@ -366,9 +351,6 @@
 				<requirement>
 					<role>com.dianping.cat.consumer.metric.ProductLineConfigManager</role>
 				</requirement>
-				<requirement>
-					<role>com.dianping.cat.system.config.MetricGroupConfigManager</role>
-				</requirement>
 				<requirement>
 					<role>com.dianping.cat.report.task.alert.AlertInfo</role>
 				</requirement>
@@ -396,9 +378,6 @@
 				<requirement>
 					<role>com.dianping.cat.consumer.metric.ProductLineConfigManager</role>
 				</requirement>
-				<requirement>
-					<role>com.dianping.cat.system.config.MetricGroupConfigManager</role>
-				</requirement>
 				<requirement>
 					<role>com.dianping.cat.report.task.alert.AlertInfo</role>
 				</requirement>
@@ -426,9 +405,6 @@
 				<requirement>
 					<role>com.dianping.cat.consumer.metric.ProductLineConfigManager</role>
 				</requirement>
-				<requirement>
-					<role>com.dianping.cat.system.config.MetricGroupConfigManager</role>
-				</requirement>
 				<requirement>
 					<role>com.dianping.cat.report.task.alert.AlertInfo</role>
 				</requirement>
@@ -459,9 +435,6 @@
 				<requirement>
 					<role>com.dianping.cat.consumer.metric.ProductLineConfigManager</role>
 				</requirement>
-				<requirement>
-					<role>com.dianping.cat.system.config.MetricGroupConfigManager</role>
-				</requirement>
 				<requirement>
 					<role>com.dianping.cat.report.task.alert.AlertInfo</role>
 				</requirement>
@@ -3766,9 +3739,6 @@
 				<requirement>
 					<role>com.dianping.cat.consumer.metric.ProductLineConfigManager</role>
 				</requirement>
-				<requirement>
-					<role>com.dianping.cat.system.config.MetricGroupConfigManager</role>
-				</requirement>
 				<requirement>
 					<role>com.dianping.cat.report.task.alert.AlertInfo</role>
 				</requirement>
@@ -3807,15 +3777,6 @@
 				</requirement>
 			</requirements>
 		</component>
-		<component>
-			<role>com.dianping.cat.system.config.MetricGroupConfigManager</role>
-			<implementation>com.dianping.cat.system.config.MetricGroupConfigManager</implementation>
-			<requirements>
-				<requirement>
-					<role>com.dianping.cat.core.config.ConfigDao</role>
-				</requirement>
-			</requirements>
-		</component>
 		<component>
 			<role>com.dianping.cat.report.task.alert.AlertInfo</role>
 			<implementation>com.dianping.cat.report.task.alert.AlertInfo</implementation>
@@ -4203,9 +4164,6 @@
 				<requirement>
 					<role>com.dianping.cat.consumer.metric.ProductLineConfigManager</role>
 				</requirement>
-				<requirement>
-					<role>com.dianping.cat.system.config.MetricGroupConfigManager</role>
-				</requirement>
 				<requirement>
 					<role>com.dianping.cat.report.task.alert.AlertInfo</role>
 				</requirement>
@@ -4355,9 +4313,6 @@
 				<requirement>
 					<role>com.dianping.cat.consumer.metric.ProductLineConfigManager</role>
 				</requirement>
-				<requirement>
-					<role>com.dianping.cat.system.config.MetricGroupConfigManager</role>
-				</requirement>
 				<requirement>
 					<role>com.dianping.cat.report.task.alert.AlertInfo</role>
 				</requirement>
@@ -4409,9 +4364,6 @@
 				<requirement>
 					<role>com.dianping.cat.consumer.metric.ProductLineConfigManager</role>
 				</requirement>
-				<requirement>
-					<role>com.dianping.cat.system.config.MetricGroupConfigManager</role>
-				</requirement>
 				<requirement>
 					<role>com.dianping.cat.report.task.alert.AlertInfo</role>
 				</requirement>
@@ -4484,9 +4436,6 @@
 				<requirement>
 					<role>com.dianping.cat.consumer.metric.ProductLineConfigManager</role>
 				</requirement>
-				<requirement>
-					<role>com.dianping.cat.system.config.MetricGroupConfigManager</role>
-				</requirement>
 				<requirement>
 					<role>com.dianping.cat.report.task.alert.AlertInfo</role>
 				</requirement>
@@ -4960,9 +4909,6 @@
 				<requirement>
 					<role>com.dianping.cat.system.config.BusinessRuleConfigManager</role>
 				</requirement>
-				<requirement>
-					<role>com.dianping.cat.system.config.MetricGroupConfigManager</role>
-				</requirement>
 				<requirement>
 					<role>com.dianping.cat.report.task.alert.RuleFTLDecorator</role>
 				</requirement>