modify the dependency css

d3302662 · yong.you · 131eed85 · d3302662 · d3302662 · d3302662
10 changed file
--- a/cat-home/src/main/java/com/dianping/cat/report/page/dependency/Action.java
+++ b/cat-home/src/main/java/com/dianping/cat/report/page/dependency/Action.java
 package com.dianping.cat.report.page.dependency;

 public enum Action implements org.unidal.web.mvc.Action {
-	LINE_CHART("view"),
+	LINE_CHART("lineChart"),

 	TOPOLOGY("dependencyGraph"),


--- a/cat-home/src/main/java/com/dianping/cat/report/page/dependency/graph/TopologyGraphManager.java
+++ b/cat-home/src/main/java/com/dianping/cat/report/page/dependency/graph/TopologyGraphManager.java
@@ -162,8 +162,13 @@ public class TopologyGraphManager implements Initializable, LogEnabled {
 		TopologyGraph graph = m_topologyGraphs.get(time);
 		long current = System.currentTimeMillis();
 		long minute = current - current % TimeUtil.ONE_MINUTE;
+		
 		if (minute == time && graph == null) {
 			graph = m_topologyGraphs.get(time - TimeUtil.ONE_MINUTE);
+
+			if (graph == null) {
+				graph = m_topologyGraphs.get(time - TimeUtil.ONE_MINUTE * 2);
+			}
 		}
 		return graph;
 	}

--- a/cat-home/src/main/java/com/dianping/cat/report/page/top/JspFile.java
+++ b/cat-home/src/main/java/com/dianping/cat/report/page/top/JspFile.java
 package com.dianping.cat.report.page.top;

 public enum JspFile {
-	VIEW("/jsp/report/top.jsp"),
+	VIEW("/jsp/report/top/top.jsp"),

 	;


--- a/cat-home/src/main/webapp/css/body.css
+++ b/cat-home/src/main/webapp/css/body.css
@@ -16,6 +16,7 @@ html {
 	font-weight: bold;
 	border-bottom: solid black 1px;
 	width: 100%;
+	margin-top: -11px;
 }

 .report .header .title {

--- a/cat-home/src/main/webapp/jsp/report/dependency/dependencyDashboard.jsp
+++ b/cat-home/src/main/webapp/jsp/report/dependency/dependencyDashboard.jsp
@@ -35,8 +35,8 @@
 				<%@ include file="dependencyOpNav.jsp"%>
 		 		<%@ include file="dependencyTimeNav.jsp"%>
 		</div></div>
-			<h1>监控仪表盘信息</h1>
-			<%@ include file="../topMetric.jsp"%>
+		<h1>监控仪表盘信息</h1>
+		<%@ include file="topMetric.jsp"%>
    </div>
 </jsp:body>
 </a:report>

--- a/cat-home/src/main/webapp/jsp/report/dependency/dependencyOpNav.jsp
+++ b/cat-home/src/main/webapp/jsp/report/dependency/dependencyOpNav.jsp
 <%@ page contentType="text/html; charset=utf-8" %>
-<div class="row-fluid">
+<div class="row-fluid" style="margin-top:2px;">
 	<div class="span9 text-center">
-		<a class="btn btn-danger  btn-primary" href="?minute=${model.minute}&domain=${model.domain}&date=${model.date}">实时趋势图</a>
-		<a class="btn btn-danger  btn-primary" href="?op=dependencyGraph&minute=${model.minute}&domain=${model.domain}&date=${model.date}">实时拓扑图</a>
-		<a class="btn btn-danger  btn-primary" href="?op=productLine&minute=${model.minute}&domain=${model.domain}&date=${model.date}">产品线监控</a>
-		<a class="btn btn-danger  btn-primary" href="?op=dashboard&minute=${model.minute}&domain=${model.domain}&date=${model.date}">应用监控大盘</a>
+		<a id="navlineChart" class="btn btn-primary" href="?minute=${model.minute}&domain=${model.domain}&date=${model.date}">实时趋势图</a>
+		<a id="navdependencyGraph" class="btn btn-primary" href="?op=dependencyGraph&minute=${model.minute}&domain=${model.domain}&date=${model.date}">实时拓扑图</a>
+		<a id="navproductLine" class="btn btn-primary" href="?op=productLine&minute=${model.minute}&domain=${model.domain}&date=${model.date}">产品线监控</a>
+		<a id="navdashboard" class="btn btn-primary" href="?op=dashboard&minute=${model.minute}&domain=${model.domain}&date=${model.date}">监控仪表盘</a>
 	</div>
 	<div class="span3 text-center">
 		<div class='text-center'>
-			<a class='btn btn-small btn-primary' href="?op=${payload.action.name}&refresh=true&frequency=10&domain=${model.domain}">10秒定时刷新</a>
-			<a class='btn btn-small btn-primary' href="?op=${payload.action.name}&refresh=true&frequency=20&domain=${model.domain}">20秒定时刷新</a>
-			<a class='btn btn-small btn-primary' href="?op=${payload.action.name}&refresh=true&frequency=30&domain=${model.domain}">30秒定时刷新</a>
+			<a id="refresh10" class='btn btn-small btn-primary' href="?op=${payload.action.name}&refresh=true&frequency=10&domain=${model.domain}">10秒定时刷新</a>
+			<a id="refresh20" class='btn btn-small btn-primary' href="?op=${payload.action.name}&refresh=true&frequency=20&domain=${model.domain}">20秒定时刷新</a>
+			<a id="refresh30" class='btn btn-small btn-primary' href="?op=${payload.action.name}&refresh=true&frequency=30&domain=${model.domain}">30秒定时刷新</a>
 		</div>
 	</div>
 </div>
 <script type="text/javascript">
 $(document).ready(function() {
+	var id = '${payload.action.name}';
+	$('#nav'+id).addClass('btn-danger');
+	
 	var refresh = ${payload.refresh};
 	var frequency = ${payload.frequency};
 	if(refresh){
+		$('#refresh${payload.frequency}').addClass('btn-danger');
 		setInterval(function(){
 			location.reload();				
 		},frequency*1000);
-	}
+	};
+	
 });
 </script>
\ No newline at end of file
--- a/cat-home/src/main/webapp/jsp/report/dependency/topMetric.jsp
+++ b/cat-home/src/main/webapp/jsp/report/dependency/topMetric.jsp
+<%@ page contentType="text/html; charset=utf-8" %>
+
+<div class="tabbable  " id="topMetric"> <!-- Only required for left/right tabs -->
+  <ul class="nav nav-tabs alert-info">
+    <li class="text-right active"><a href="#tab1" data-toggle="tab">异常最多Top${payload.topCounts}</a></li>
+    <li class='text-right'><a href="#tab2" data-toggle="tab">URL最慢Top${payload.topCounts}</a></li>
+    <li class='text-right'><a href="#tab3" data-toggle="tab">Service最慢Top${payload.topCounts}</a></li>
+    <li class='text-right'><a href="#tab4" data-toggle="tab">SQL最慢Top${payload.topCounts}</a></li>
+    <li class='text-right'><a href="#tab5" data-toggle="tab">Call最慢Top${payload.topCounts}</a></li>
+    <li class='text-right'><a href="#tab6" data-toggle="tab">Cache最慢Top${payload.topCounts}</a></li>
+  </ul>
+  <c:set var="date" value="${w:format(model.topReport.startTime,'yyyyMMddHH')}"/>
+  <div class="tab-content">
+    <div class="tab-pane active" id="tab1">
+      <table><tr>
+      <c:forEach var="item" items="${model.topMetric.error.result}" varStatus="status">
+      <td><table style="float:left" border=1>  
+            <tr><th colspan="3">${item.key}</th></tr>
+            <tr><th width="80%">系统</th>      <th>个</th></tr>
+            <c:forEach var="detail" items="${item.value}" varStatus="status">
+               <tr class="${status.index mod 2 != 0 ? 'odd' : 'even'}">
+                  <td>
+                  <a class="hreftip" href="/cat/r/p?domain=${detail.domain}&date=${date}" data-toggle="tooltip" data-placement="top" title="" data-original-title="${detail.errorInfo}">${detail.domain}</a>
+                  <td style="text-align:right">${w:format(detail.value,'0')}</td>
+               </tr>
+            </c:forEach>
+      	</table></td>
+      </c:forEach></tr></table>
+    </div>
+    <div class="tab-pane" id="tab2">
+      <table><tr>
+      <c:forEach var="item" items="${model.topMetric.url.result}" varStatus="status">
+      <td><table style="float:left" border=1>  
+            <tr><th colspan="2">${item.key}</th></tr>
+            <tr><th width="80%">系统</th>      <th>ms</th></tr>
+            <c:forEach var="detail" items="${item.value}" varStatus="status">
+               <tr class="${status.index mod 2 != 0 ? 'odd' : 'even'}">
+                  <td><a href="/cat/r/t?domain=${detail.domain}&date=${date}" target="_blank">${detail.domain}</a></td><td>${w:format(detail.value,'0.0')}</td>
+               </tr>
+            </c:forEach>
+      </table></td>
+   </c:forEach></tr></table>
+    </div>
+    <div class="tab-pane" id="tab3">
+      <table><tr>
+      <c:forEach var="item" items="${model.topMetric.service.result}" varStatus="status">
+      <td><table style="float:left" border=1>  
+            <tr><th colspan="2">${item.key}</th></tr>
+            <tr><th width="80%">系统</th>      <th>ms</th></tr>
+            <c:forEach var="detail" items="${item.value}" varStatus="status">
+               <tr class="${status.index mod 2 != 0 ? 'odd' : 'even'}">
+                  <td><a href="/cat/r/t?domain=${detail.domain}&date=${date}" target="_blank">${detail.domain}</a></td><td>${w:format(detail.value,'0.0')}</td>
+               </tr>
+            </c:forEach>
+      </table></td>
+   </c:forEach></tr></table>
+    </div>
+    <div class="tab-pane" id="tab4">
+      <table><tr>
+      <c:forEach var="item" items="${model.topMetric.sql.result}" varStatus="status">
+      <td><table style="float:left" border=1>  
+            <tr><th colspan="2">${item.key}</th></tr>
+            <tr><th width="80%">系统</th>      <th>ms</th></tr>
+            <c:forEach var="detail" items="${item.value}" varStatus="status">
+               <tr class="${status.index mod 2 != 0 ? 'odd' : 'even'}">
+                  <td><a href="/cat/r/t?domain=${detail.domain}&date=${date}" target="_blank">${detail.domain}</a></td><td>${w:format(detail.value,'0.0')}</td>
+               </tr>
+            </c:forEach>
+      </table></td>
+   </c:forEach></tr></table>
+    </div>
+    <div class="tab-pane" id="tab5">
+     <table><tr>
+       <c:forEach var="item" items="${model.topMetric.call.result}" varStatus="status">
+      <td><table style="float:left" border=1>  
+            <tr><th colspan="2">${item.key}</th></tr>
+            <tr><th width="80%">系统</th>      <th>ms</th></tr>
+            <c:forEach var="detail" items="${item.value}" varStatus="status">
+               <tr class="${status.index mod 2 != 0 ? 'odd' : 'even'}">
+                  <td><a href="/cat/r/t?domain=${detail.domain}&date=${date}" target="_blank">${detail.domain}</a></td><td>${w:format(detail.value,'0.0')}</td>
+               </tr>
+            </c:forEach>
+      </table></td>
+   </c:forEach></tr></table>
+    </div>
+    <div class="tab-pane" id="tab6">
+     <table><tr>
+      <c:forEach var="item" items="${model.topMetric.cache.result}" varStatus="status">
+      <td><table style="float:left" border=1>  
+            <tr><th colspan="2">${item.key}</th></tr>
+            <tr><th width="80%">系统</th>      <th>ms</th></tr>
+            <c:forEach var="detail" items="${item.value}" varStatus="status">
+               <tr class="${status.index mod 2 != 0 ? 'odd' : 'even'}">
+                  <td><a href="/cat/r/t?domain=${detail.domain}&date=${date}" target="_blank">${detail.domain}</a></td><td>${w:format(detail.value,'0.0')}</td>
+               </tr>
+            </c:forEach>
+      </table></td>
+   </c:forEach></tr></table>
+    </div>
+  </div></div>
\ No newline at end of file
--- a/cat-home/src/main/webapp/jsp/report/top.jsp
+++ b/cat-home/src/main/webapp/jsp/report/top.jsp
--- a/cat-home/src/main/webapp/jsp/report/topMetric.jsp
+++ b/cat-home/src/main/webapp/jsp/report/topMetric.jsp
 <%@ page contentType="text/html; charset=utf-8" %>

-<div class="tabbable  " id="topMetric"> <!-- Only required for left/right tabs -->
+<div class="tabbable tabs-left " id="topMetric"> <!-- Only required for left/right tabs -->
  <ul class="nav nav-tabs alert-info">
    <li class="text-right active"><a href="#tab1" data-toggle="tab">异常最多Top10</a></li>
    <li class='text-right'><a href="#tab2" data-toggle="tab">URL最慢Top10</a></li>
@@ -11,7 +11,7 @@
  </ul>
  <c:set var="date" value="${w:format(model.topReport.startTime,'yyyyMMddHH')}"/>
  <div class="tab-content">
-    <div class="tab-pane active" id="tab1">
+    <div class="tab-pane  active" id="tab1">
      <c:forEach var="item" items="${model.topMetric.error.result}" varStatus="status">
      <table width="20%" style="float:left" border=1>  
            <tr><th colspan="3">${item.key}</th></tr>

--- a/cat-home/src/test/resources/com/dianping/cat/system/project/projectConfig.xml
+++ b/cat-home/src/test/resources/com/dianping/cat/system/project/projectConfig.xml
+<project-config>
+	<department id="Info" email="yong.you@dianping.com" owner="one">
+		<product-line id="GroupService" email="yong.you@dianping.com"
+			owner="one">
+			<project id="TuanGouWeb" email="yong.you@dianping.com" owner="one"></project>
+			<project id="TuanGouWeb" email="yong.you@dianping.com" owner="one"></project>
+		</product-line>
+		<product-line></product-line>
+	</department>
+	<department></department>
+</project-config>
\ No newline at end of file