diff --git a/cat-home/pom.xml b/cat-home/pom.xml index 89140e4020cd96aabff7d1c52af4474f79a65e33..a87d8f76b290d587c4206abdb1f1ba3f6a3489dd 100755 --- a/cat-home/pom.xml +++ b/cat-home/pom.xml @@ -158,7 +158,6 @@ ${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/utilization-config-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, diff --git a/cat-home/src/main/java/com/dianping/cat/CatHomeModule.java b/cat-home/src/main/java/com/dianping/cat/CatHomeModule.java index 93a16a463226f1bf6611703443bb5e45cb08fe69..3aacd0459afdc0693048eca79c85d77088fff79a 100644 --- a/cat-home/src/main/java/com/dianping/cat/CatHomeModule.java +++ b/cat-home/src/main/java/com/dianping/cat/CatHomeModule.java @@ -52,13 +52,13 @@ public class CatHomeModule extends AbstractModule { MetricAlert metricAlert = ctx.lookup(MetricAlert.class); SwitchAlert swtichAlert = ctx.lookup(SwitchAlert.class); ExceptionAlert exceptionAlert = ctx.lookup(ExceptionAlert.class); - ProjectUpdateTask productUpdateTask = ctx.lookup(ProjectUpdateTask.class); Threads.forGroup("Cat").start(swtichAlert); Threads.forGroup("Cat").start(metricAlert); Threads.forGroup("Cat").start(exceptionAlert); - Threads.forGroup("Cat").start(productUpdateTask); } + ProjectUpdateTask productUpdateTask = ctx.lookup(ProjectUpdateTask.class); + Threads.forGroup("Cat").start(productUpdateTask); executeAlarmModule(ctx); } 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 62e521b01ec20e7a8f26abc37366073abd562dd8..f6522cd9eac28d2e89880f67ca0f1468b611014c 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 @@ -26,9 +26,9 @@ import com.dianping.cat.report.baseline.BaselineService; import com.dianping.cat.report.chart.AggregationGraphCreator; import com.dianping.cat.report.chart.CachedMetricReportService; import com.dianping.cat.report.chart.DataExtractor; -import com.dianping.cat.report.chart.NetworkGraphCreator; import com.dianping.cat.report.chart.GraphCreator; import com.dianping.cat.report.chart.MetricDataFetcher; +import com.dianping.cat.report.chart.NetworkGraphCreator; import com.dianping.cat.report.chart.impl.CachedMetricReportServiceImpl; import com.dianping.cat.report.chart.impl.DataExtractorImpl; import com.dianping.cat.report.chart.impl.MetricDataFetcherImpl; @@ -65,7 +65,6 @@ import com.dianping.cat.system.config.ExceptionThresholdConfigManager; import com.dianping.cat.system.config.MetricAggregationConfigManager; import com.dianping.cat.system.config.MetricGroupConfigManager; import com.dianping.cat.system.config.MetricRuleConfigManager; -import com.dianping.cat.system.config.UtilizationConfigManager; import com.dianping.cat.system.tool.DefaultMailImpl; import com.dianping.cat.system.tool.MailSMS; @@ -106,8 +105,6 @@ public class ComponentsConfigurator extends AbstractResourceConfigurator { all.add(C(BugConfigManager.class).req(ConfigDao.class)); - all.add(C(UtilizationConfigManager.class).req(ConfigDao.class)); - all.add(C(MetricGroupConfigManager.class).req(ConfigDao.class)); all.add(C(MetricAggregationConfigManager.class).req(ConfigDao.class)); diff --git a/cat-home/src/main/java/com/dianping/cat/build/TaskComponentConfigurator.java b/cat-home/src/main/java/com/dianping/cat/build/TaskComponentConfigurator.java index 1844c19a17f9608d7f0b647a013968d7a399417f..7bcfecf6d7c50dd80eda352806b9c3dc138b7ea5 100644 --- a/cat-home/src/main/java/com/dianping/cat/build/TaskComponentConfigurator.java +++ b/cat-home/src/main/java/com/dianping/cat/build/TaskComponentConfigurator.java @@ -15,7 +15,6 @@ import com.dianping.cat.core.dal.GraphDao; import com.dianping.cat.core.dal.TaskDao; import com.dianping.cat.home.dal.report.BaselineDao; import com.dianping.cat.home.dal.report.TopologyGraphDao; -import com.dianping.cat.home.dependency.exceptionExclude.entity.ExceptionExcludeConfig; import com.dianping.cat.report.baseline.BaselineConfigManager; import com.dianping.cat.report.baseline.BaselineCreator; import com.dianping.cat.report.baseline.BaselineService; diff --git a/cat-home/src/main/java/com/dianping/cat/report/page/statistics/Handler.java b/cat-home/src/main/java/com/dianping/cat/report/page/statistics/Handler.java index d22ef280313ce8aa431e48de5e7dc78aad29f878..777262c6354ec4b31a75d74fb395d5703595db29 100644 --- a/cat-home/src/main/java/com/dianping/cat/report/page/statistics/Handler.java +++ b/cat-home/src/main/java/com/dianping/cat/report/page/statistics/Handler.java @@ -88,7 +88,7 @@ public class Handler implements PageHandler { List sortedDomains = buildSortedAlertInfo(alertReport, model); model.setAlertDomains(sortedDomains); } - + private void builAlertDetails(Model model, Payload payload) { AlertReport alertReport = queryAlertReport(payload); List sortedExceptions = buildSortedAlertDetails(alertReport, @@ -96,7 +96,7 @@ public class Handler implements PageHandler { model.setAlertExceptions(sortedExceptions); } - + private void buildHeavyInfo(Model model, Payload payload) { HeavyReport heavyReport = queryHeavyReport(payload); @@ -144,10 +144,10 @@ public class Handler implements PageHandler { model.setCacheServices(cacheServices); } } - + private List buildSortedAlertInfo(AlertReport report, Model model) { List domains = new ArrayList(); - + if (!report.getDomains().values().isEmpty()) { domains = new ArrayList(report.getDomains().values()); Comparator domainCompator = new Comparator() { @@ -165,12 +165,12 @@ public class Handler implements PageHandler { } return domains; } - + private List buildSortedAlertDetails(AlertReport report, String domainName) { List exceptions = new ArrayList(); com.dianping.cat.home.alertReport.entity.Domain domain = report.getDomains().get(domainName); - + if (domain != null && !domain.getExceptions().isEmpty()) { exceptions = new ArrayList(domain.getExceptions().values()); Comparator exceptionCompator = new Comparator() { @@ -186,12 +186,14 @@ public class Handler implements PageHandler { Collections.sort(exceptions, exceptionCompator); } return exceptions; - } + } + private void buildUtilizationInfo(Model model, Payload payload) { UtilizationReport utilizationReport = queryUtilizationReport(payload); Collection dUList = utilizationReport.getDomains().values(); List dUWebList = new LinkedList(); List dUServiceList = new LinkedList(); + for (com.dianping.cat.home.utilization.entity.Domain d : dUList) { if (d.findApplicationState("URL") != null) { dUWebList.add(d); @@ -277,10 +279,10 @@ public class Handler implements PageHandler { return m_reportService.queryHeavyReport(Constants.CAT, pair.getKey(), pair.getValue()); } - + private AlertReport queryAlertReport(Payload payload) { Pair pair = queryStartEndTime(payload); - + return m_reportService.queryAlertReport(Constants.CAT, pair.getKey(), pair.getValue()); } @@ -313,7 +315,16 @@ public class Handler implements PageHandler { private UtilizationReport queryUtilizationReport(Payload payload) { Pair pair = queryStartEndTime(payload); UtilizationReport report = m_reportService.queryUtilizationReport(Constants.CAT, pair.getKey(), pair.getValue()); + Collection domains = report.getDomains().values(); + + for (com.dianping.cat.home.utilization.entity.Domain d : domains) { + String domain = d.getId(); + Project project = findProjectByDomain(domain); + if (project != null) { + d.setCmdbId(project.getCmdbDomain()); + } + } return report; } diff --git a/cat-home/src/main/java/com/dianping/cat/report/task/product/ProjectUpdateTask.java b/cat-home/src/main/java/com/dianping/cat/report/task/product/ProjectUpdateTask.java index dd8c6b8b73c5a8abbd824b4416b4908f7d3a7186..c60b3b5adc4c704936c0e43667e6ce9432370242 100644 --- a/cat-home/src/main/java/com/dianping/cat/report/task/product/ProjectUpdateTask.java +++ b/cat-home/src/main/java/com/dianping/cat/report/task/product/ProjectUpdateTask.java @@ -1,8 +1,7 @@ package com.dianping.cat.report.task.product; import java.io.InputStream; -import java.net.HttpURLConnection; -import java.net.URL; +import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -12,6 +11,7 @@ import org.codehaus.plexus.logging.Logger; import org.unidal.dal.jdbc.DalException; import org.unidal.helper.Files; import org.unidal.helper.Threads.Task; +import org.unidal.helper.Urls; import org.unidal.lookup.annotation.Inject; import org.unidal.webres.json.JsonArray; import org.unidal.webres.json.JsonObject; @@ -35,7 +35,7 @@ public class ProjectUpdateTask implements Task, LogEnabled { private Logger m_logger; - private Map m_domainToIpMap = new HashMap(); + private Map> m_domainToIpMap = new HashMap>(); private static final long DURATION = 60 * 60 * 1000L; @@ -50,7 +50,15 @@ public class ProjectUpdateTask implements Task, LogEnabled { List infos = m_hostInfoDao.findAllIp(HostinfoEntity.READSET_FULL); for (Hostinfo info : infos) { - m_domainToIpMap.put(info.getDomain(), info.getIp()); + String domain = info.getDomain(); + String ip = info.getIp(); + List ips = m_domainToIpMap.get(domain); + + if (ips == null) { + ips = new ArrayList(); + m_domainToIpMap.put(domain, ips); + } + ips.add(ip); } } catch (DalException e) { Cat.logError(e); @@ -85,7 +93,11 @@ public class ProjectUpdateTask implements Task, LogEnabled { } private boolean checkIfEqual(String source, String target) { - return source.equals(target); + if (source == null || target == null) { + return false; + } else { + return source.equals(target); + } } private boolean checkIfValid(String source) { @@ -112,7 +124,6 @@ public class ProjectUpdateTask implements Task, LogEnabled { if (array.length() > 0) { return array.getString(0); } - return null; } @@ -143,74 +154,60 @@ public class ProjectUpdateTask implements Task, LogEnabled { JsonArray phones = object.getJSONArray("project_owner_mobile"); String phone = buildStringFromJsonArray(phones); + if (phone != null) { infosMap.put("phone", phone); } - return infosMap; } + private String queryCmdbName(List ips) { + for (String ip : ips) { + String cmdbDomain = queryDomainFromCMDB(ip); + + if (checkIfValid(cmdbDomain)) { + return cmdbDomain; + } + } + return null; + } + private String queryDomainFromCMDB(String ip) { try { String cmdb = String.format(CMDB_DOMAIN_URL, ip); - URL url = new URL(cmdb); - HttpURLConnection conn = (HttpURLConnection) url.openConnection(); - int nRc = conn.getResponseCode(); - - if (nRc == HttpURLConnection.HTTP_OK) { - InputStream input = conn.getInputStream(); - String content = Files.forIO().readFrom(input, "utf-8"); - String domain = parseDomain(content.trim()); - - if (checkIfValid(domain)) { - return domain; - } + InputStream in = Urls.forIO().readTimeout(1000).connectTimeout(1000).openStream(cmdb); + String content = Files.forIO().readFrom(in, "utf-8"); - m_logger.error("cannt find single domain for ip: " + ip); - return null; - } + return parseDomain(content.trim()); } catch (Exception e) { Cat.logError(e); } - return null; } private String queryHostnameFromCMDB(String ip) { try { String cmdb = String.format(CMDB_HOSTNAME_URL, ip); - URL url = new URL(cmdb); - HttpURLConnection conn = (HttpURLConnection) url.openConnection(); - int nRc = conn.getResponseCode(); - - if (nRc == HttpURLConnection.HTTP_OK) { - InputStream input = conn.getInputStream(); - String content = Files.forIO().readFrom(input, "utf-8"); - return parseHostname(content.trim()); - } + InputStream in = Urls.forIO().readTimeout(1000).connectTimeout(1000).openStream(cmdb); + String content = Files.forIO().readFrom(in, "utf-8"); + + return parseHostname(content.trim()); } catch (Exception e) { Cat.logError(e); } - return null; } - private Map queryInfosFromCMDB(String cmdbDomain) { + private Map queryProjectInfoFromCMDB(String cmdbDomain) { try { String cmdb = String.format(CMDB_INFO_URL, cmdbDomain); - URL url = new URL(cmdb); - HttpURLConnection conn = (HttpURLConnection) url.openConnection(); - int nRc = conn.getResponseCode(); - - if (nRc == HttpURLConnection.HTTP_OK) { - InputStream input = conn.getInputStream(); - String content = Files.forIO().readFrom(input, "utf-8"); - return parseInfos(content.trim()); - } + InputStream in = Urls.forIO().readTimeout(1000).connectTimeout(1000).openStream(cmdb); + String content = Files.forIO().readFrom(in, "utf-8"); + + return parseInfos(content.trim()); } catch (Exception e) { Cat.logError(e); } - return null; } @@ -252,8 +249,7 @@ public class ProjectUpdateTask implements Task, LogEnabled { info.setHostname(cmdbHostname); m_hostInfoDao.updateByPK(info, HostinfoEntity.UPDATESET_FULL); } else { - m_logger.error("cant find hostname for ip: " + ip); - + m_logger.error("can't find hostname for ip: " + ip); } } } catch (Throwable e) { @@ -262,7 +258,7 @@ public class ProjectUpdateTask implements Task, LogEnabled { } private boolean updateProject(Project proj) { - Map infosMap = queryInfosFromCMDB(proj.getCmdbDomain()); + Map infosMap = queryProjectInfoFromCMDB(proj.getCmdbDomain()); String owner = infosMap.get("owner"); String email = infosMap.get("email"); String phone = infosMap.get("phone"); @@ -271,17 +267,15 @@ public class ProjectUpdateTask implements Task, LogEnabled { String dbPhone = proj.getPhone(); boolean isProjChanged = false; - if (checkIfValid(owner) && !checkIfEqual(owner, dbOwner)) { + if (!checkIfEqual(owner, dbOwner)) { proj.setOwner(owner); isProjChanged = true; } - - if (checkIfValid(email) && !checkIfEqual(email, dbEmail)) { + if (!checkIfEqual(email, dbEmail)) { proj.setEmail(email); isProjChanged = true; } - - if (checkIfValid(phone) && !checkIfEqual(phone, dbPhone)) { + if (!checkIfEqual(phone, dbPhone)) { proj.setPhone(phone); isProjChanged = true; } @@ -295,26 +289,22 @@ public class ProjectUpdateTask implements Task, LogEnabled { try { List projects = m_projectDao.findAll(ProjectEntity.READSET_FULL); - for (Project proj : projects) { - String cmdbDomain = proj.getCmdbDomain(); - boolean isCmdbDomainChange = false; - - if (!checkIfValid(cmdbDomain)) { - String ip = m_domainToIpMap.get(proj.getDomain()); - cmdbDomain = queryDomainFromCMDB(ip); + for (Project pro : projects) { + try { + List ips = m_domainToIpMap.get(pro.getDomain()); + String cmdbDomain = queryCmdbName(ips); + boolean isChange = !cmdbDomain.equals(pro.getCmdbDomain()); - if (!checkIfValid(cmdbDomain)) { - continue; - } - - proj.setCmdbDomain(cmdbDomain); - isCmdbDomainChange = true; - } + if (checkIfValid(cmdbDomain)) { + pro.setCmdbDomain(cmdbDomain); - boolean isProjectInfoChange = updateProject(proj); + boolean isProjectInfoChange = updateProject(pro); - if (isProjectInfoChange || isCmdbDomainChange) { - m_projectDao.updateByPK(proj, ProjectEntity.UPDATESET_FULL); + if (isProjectInfoChange || isChange) { + m_projectDao.updateByPK(pro, ProjectEntity.UPDATESET_FULL); + } + } + } catch (Exception e) { } } } catch (Throwable e) { diff --git a/cat-home/src/main/java/com/dianping/cat/system/config/UtilizationConfigManager.java b/cat-home/src/main/java/com/dianping/cat/system/config/UtilizationConfigManager.java deleted file mode 100644 index 781b3310cf40f57863a5c1815a475a381e3570ad..0000000000000000000000000000000000000000 --- a/cat-home/src/main/java/com/dianping/cat/system/config/UtilizationConfigManager.java +++ /dev/null @@ -1,91 +0,0 @@ -package com.dianping.cat.system.config; - -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.utilization.config.entity.UtilizationConfig; -import com.dianping.cat.home.utilization.config.transform.DefaultSaxParser; - -public class UtilizationConfigManager implements Initializable { - - @Inject - private ConfigDao m_configDao; - - private int m_configId; - - private UtilizationConfig m_utilizationConfig; - - private static final String CONFIG_NAME = "utilizationConfig"; - - public UtilizationConfig getUtilizationConfig() { - return m_utilizationConfig; - } - - @Override - public void initialize() throws InitializationException { - try { - Config config = m_configDao.findByName(CONFIG_NAME, ConfigEntity.READSET_FULL); - String content = config.getContent(); - - m_utilizationConfig = DefaultSaxParser.parse(content); - m_configId = config.getId(); - } catch (DalNotFoundException e) { - try { - String content = Files.forIO().readFrom( - this.getClass().getResourceAsStream("/config/default-utilization-config.xml"), "utf-8"); - Config config = m_configDao.createLocal(); - - config.setName(CONFIG_NAME); - config.setContent(content); - m_configDao.insert(config); - - m_utilizationConfig = DefaultSaxParser.parse(content); - m_configId = config.getId(); - } catch (Exception ex) { - Cat.logError(ex); - } - } catch (Exception e) { - Cat.logError(e); - } - if (m_utilizationConfig == null) { - m_utilizationConfig = new UtilizationConfig(); - } - } - - public boolean insert(String xml) { - try { - m_utilizationConfig = DefaultSaxParser.parse(xml); - - return storeConfig(); - } catch (Exception e) { - Cat.logError(e); - return false; - } - } - - 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_utilizationConfig.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/page/config/Action.java b/cat-home/src/main/java/com/dianping/cat/system/page/config/Action.java index 8e5566f63182ff979d101940d143e7bdbee19ca7..1eef306eb59eb53ebe37b11eeac285ff21f6392f 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 @@ -71,8 +71,6 @@ public enum Action implements org.unidal.web.mvc.Action { BUG_CONFIG_UPDATE("bugConfigUpdate"), - UTILIZATION_CONFIG_UPDATE("utilizationConfigUpdate"), - DOMAIN_GROUP_CONFIG_UPDATE("domainGroupConfigUpdate"), METRIC_GROUP_CONFIG_UPDATE("metricGroupConfigUpdate"), 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 061d27635eded2b3c6fcd779e39a7dcedd31627c..3a84bbd9498f68ba4328185c6b3e3c57c0b23557 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 @@ -50,7 +50,6 @@ import com.dianping.cat.system.config.ExceptionThresholdConfigManager; import com.dianping.cat.system.config.MetricAggregationConfigManager; import com.dianping.cat.system.config.MetricGroupConfigManager; import com.dianping.cat.system.config.MetricRuleConfigManager; -import com.dianping.cat.system.config.UtilizationConfigManager; public class Handler implements PageHandler { @Inject @@ -74,9 +73,6 @@ public class Handler implements PageHandler { @Inject private ExceptionThresholdConfigManager m_exceptionConfigManager; - @Inject - private UtilizationConfigManager m_utilizationConfigManager; - @Inject private DomainGroupConfigManager m_domainGroupConfigManger; @@ -361,16 +357,6 @@ public class Handler implements PageHandler { } model.setBug(m_bugConfigManager.getBugConfig().toString()); break; - case UTILIZATION_CONFIG_UPDATE: - String content = payload.getContent(); - if (!StringUtils.isEmpty(content)) { - model.setOpState(m_utilizationConfigManager.insert(content)); - } else { - model.setOpState(true); - } - model.setContent(m_utilizationConfigManager.getUtilizationConfig().toString()); - break; - case DOMAIN_GROUP_CONFIG_UPDATE: String domainGroupContent = payload.getContent(); if (!StringUtils.isEmpty(domainGroupContent)) { 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 c70377bb77536256290074abb0c406946b205400..aa23a6a7ac7e56e9f88577bcdef88026cff34f6c 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 @@ -85,8 +85,6 @@ public class JspViewer extends BaseJspViewer // Bug case BUG_CONFIG_UPDATE: return JspFile.BUG_CONFIG_UPDATE.getPath(); - case UTILIZATION_CONFIG_UPDATE: - return JspFile.UTILIZATION_CONFIG_UPDATE.getPath(); case DOMAIN_GROUP_CONFIG_UPDATE: return JspFile.DOMAIN_GROUP_CONFIG_UPDATE.getPath(); case METRIC_GROUP_CONFIG_UPDATE: diff --git a/cat-home/src/main/resources/META-INF/dal/model/utilization-config-codegen.xml b/cat-home/src/main/resources/META-INF/dal/model/utilization-config-codegen.xml deleted file mode 100644 index 3dc1cbf191361ee285a17eaeb5e30f3bc5a76b53..0000000000000000000000000000000000000000 --- a/cat-home/src/main/resources/META-INF/dal/model/utilization-config-codegen.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - diff --git a/cat-home/src/main/resources/META-INF/dal/model/utilization-config-manifest.xml b/cat-home/src/main/resources/META-INF/dal/model/utilization-config-manifest.xml deleted file mode 100644 index 271065c95ff3fe007c3b0f5cbbcdaea0eaad8d06..0000000000000000000000000000000000000000 --- a/cat-home/src/main/resources/META-INF/dal/model/utilization-config-manifest.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/cat-home/src/main/resources/META-INF/dal/model/utilization-config-model.xml b/cat-home/src/main/resources/META-INF/dal/model/utilization-config-model.xml deleted file mode 100644 index 3bc0d2b923643994a627273d4e562d050836eb3c..0000000000000000000000000000000000000000 --- a/cat-home/src/main/resources/META-INF/dal/model/utilization-config-model.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - diff --git a/cat-home/src/main/resources/META-INF/dal/model/utilization-report-model.xml b/cat-home/src/main/resources/META-INF/dal/model/utilization-report-model.xml index cfba2fa17118d813af6725f2fce7e437e2b26139..379129c44f0931aca5e34c03a6abbaab65872728 100644 --- a/cat-home/src/main/resources/META-INF/dal/model/utilization-report-model.xml +++ b/cat-home/src/main/resources/META-INF/dal/model/utilization-report-model.xml @@ -9,6 +9,7 @@ + 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 a7b74cf85b79274b681fdc729e51cb60b0eaa4b9..30201e21b791e4db32165c4eeb15f4f19273c4f3 100755 --- a/cat-home/src/main/resources/META-INF/plexus/components.xml +++ b/cat-home/src/main/resources/META-INF/plexus/components.xml @@ -113,15 +113,6 @@ - - com.dianping.cat.system.config.UtilizationConfigManager - com.dianping.cat.system.config.UtilizationConfigManager - - - com.dianping.cat.core.config.ConfigDao - - - com.dianping.cat.system.config.MetricGroupConfigManager com.dianping.cat.system.config.MetricGroupConfigManager @@ -3600,9 +3591,6 @@ com.dianping.cat.system.config.ExceptionThresholdConfigManager - - com.dianping.cat.system.config.UtilizationConfigManager - com.dianping.cat.system.config.DomainGroupConfigManager @@ -3647,15 +3635,6 @@ - - com.dianping.cat.system.config.UtilizationConfigManager - com.dianping.cat.system.config.UtilizationConfigManager - - - com.dianping.cat.core.config.ConfigDao - - - com.dianping.cat.system.config.MetricRuleConfigManager com.dianping.cat.system.config.MetricRuleConfigManager diff --git a/cat-home/src/main/webapp/jsp/report/utilization/detail.jsp b/cat-home/src/main/webapp/jsp/report/utilization/detail.jsp index 5a9a4d3465486ac25c7b9a521662620119ed826e..ca76cf9f8fb62dd2b6f3b79ccacea0c46e20c906 100644 --- a/cat-home/src/main/webapp/jsp/report/utilization/detail.jsp +++ b/cat-home/src/main/webapp/jsp/report/utilization/detail.jsp @@ -17,6 +17,7 @@ Web应用 + CMDB 机器数 访问量 集群QPS @@ -34,6 +35,7 @@ ${item.id} + ${item.cmdbId} ${item.machineNumber} ${w:format(item.applicationStates.URL.count,'###0')} ${w:format(item.applicationStates.URL.maxQps,'###0')}