Merge branch 'master' of http://git.yoho.cn/ops/monitor-ui

@@ -48,6 +48,8 @@ public class HttpUriContants {
     public static final String JAVA_API_STATUS = "/javaApiStatus/query";
     public static final String JAVA_API_HIS = "/javaApiStatus/queryhis";
     public static final String JAVA_API_STATUS_ALL = "/javaApiStatus/queryAll";
+    public static final String JAVA_API_TASK_TEST = "/javaApiStatus/tasktest";
+
 
     public static final String JAVA_API_DETAILS = "/javaApi/apiDetails";
 

@@ -127,6 +127,7 @@ public class JavaAPICtrl {
 
     /**
      * 获取所有服务状态
+     *
      * @return
      */
     @RequestMapping("/allStatus")
@@ -144,4 +145,17 @@ public class JavaAPICtrl {
         return rep;
     }
 
+
+    /**
+     * 预留手动执行服务任务
+     *
+     * @return
+     */
+    @RequestMapping("/tasktest")
+    @ResponseBody
+    public String taskTest() {
+        String rep = httpClient.defaultGet(HttpUriContants.JAVA_API_TASK_TEST, String.class);
+        return rep;
+    }
+
 }

@@ -14,6 +14,13 @@
     color: #fff;
 }
 
+.panel-alarm-alt .panel-heading {
+    background-color: #ff9317;
+    color: #fff;
+}
+
+
+
 .noborder {
     border: 0;
 }

@@ -48,11 +48,19 @@ function updateNginxView(awsView, data, type) {
 
         var panel = $("<div>");
 
-        if (data[i].error > 0) {
+        if (data[i].error>5000 || data[i].apiU200>5000 || data[i].serviceU200>5000) {
+
             panel.addClass("panel panel-fail-alt noborder");
         }
         else {
-            panel.addClass("panel panel-success-alt noborder");
+            if (data[i].error>1000 || data[i].apiU2000>1000 || data[i].serviceU200>1000)
+            {
+                panel.addClass("panel panel-alarm-alt noborder")
+            }
+            else
+            {
+                panel.addClass("panel panel-success-alt noborder");
+            }
         }
 
         col.append(panel);
@@ -91,7 +99,7 @@ function updateNginxView(awsView, data, type) {
 
         var apiPara = $("<div class='pull-left'>");
         apiPara.append($("<h5 class='md-title nomargin'>").html("Api 非200响应"));
-        apiPara.append($("<h4 class='nomargin' style='margin-left: 20px'>>").html(data[i].apiU200));
+        apiPara.append($("<h4 class='nomargin' style='margin-left: 20px'>").html(data[i].apiU200));
 
         parameters.append(apiPara);
 
@@ -99,7 +107,7 @@ function updateNginxView(awsView, data, type) {
 
         servicePara.append($("<h5 class='md-title nomargin'>").html("Service 非200响应"));
 
-        servicePara.append($("<h4 class='nomargin' style='margin-left: 20px'>>").html(data[i].serviceU200));
+        servicePara.append($("<h4 class='nomargin' style='margin-left: 20px'>").html(data[i].serviceU200));
 
         parameters.append(servicePara);
 
@@ -126,3 +134,5 @@ function ok(id) {
     }
 }
 
+
+

@@ -26,35 +26,35 @@ function updateOverview(response) {
 
     div.innerHTML = "";
 
-    var connections = $("<div style='margin-left: 45px'>").addClass("micro-highlight").html("Connections: ").appendTo(div);
+    var connections = $("<div style='margin-left: 35px'>").addClass("micro-highlight").html("Connections: ").appendTo(div);
 
     var conValue = $("<strong>").html(response.data.connections).appendTo(connections);
 
-    var channels = $("<div style='margin-left: 45px'>").addClass("micro-highlight").html("Channels: ").appendTo(div);
+    var channels = $("<div style='margin-left: 35px'>").addClass("micro-highlight").html("Channels: ").appendTo(div);
 
     var chaValue = $("<strong>").html(response.data.channels).appendTo(channels);
 
-    var exchanges = $("<div style='margin-left: 45px'>").addClass("micro-highlight").html("Exchanges: ").appendTo(div);
+    var exchanges = $("<div style='margin-left: 35px'>").addClass("micro-highlight").html("Exchanges: ").appendTo(div);
 
     var excValue = $("<strong>").html(response.data.exchanges).appendTo(exchanges);
 
-    var Queues = $("<div style='margin-left: 45px'>").addClass("micro-highlight").html("Queues: ").appendTo(div);
+    var Queues = $("<div style='margin-left: 35px'>").addClass("micro-highlight").html("Queues: ").appendTo(div);
 
     var quevalue = $("<strong>").html(response.data.queues).appendTo(Queues);
 
-    var consumers = $("<div style='margin-left: 45px'>").addClass("micro-highlight").html("Consumers: ").appendTo(div);
+    var consumers = $("<div style='margin-left: 35px'>").addClass("micro-highlight").html("Consumers: ").appendTo(div);
 
     var consValue = $("<strong>").html(response.data.consumers).appendTo(consumers);
 
-    var Messages_Ready = $("<div style='margin-left: 45px'>").addClass("micro-highlight").html("Message_Ready: ").appendTo(div);
+    var Messages_Ready = $("<div style='margin-left: 35px'>").addClass("micro-highlight").html("Message_Ready: ").appendTo(div);
 
     var readyValue = $("<strong>").html(response.data.messages_ready).appendTo(Messages_Ready);
 
-    var Messages_unack = $("<div style='margin-left: 45px'>").addClass("micro-highlight").html("Message_Unack: ").appendTo(div);
+    var Messages_unack = $("<div style='margin-left: 35px'>").addClass("micro-highlight").html("Message_Unack: ").appendTo(div);
 
     var unValue = $("<strong>").html(response.data.messages_unack).appendTo(Messages_unack);
 
-    var Messages_total = $("<div style='margin-left: 45px'>").addClass("micro-highlight").html("Message_Total: ").appendTo(div);
+    var Messages_total = $("<div style='margin-left: 35px'>").addClass("micro-highlight").html("Message_Total: ").appendTo(div);
 
     var totValue = $("<strong>").html(response.data.messages).appendTo(Messages_total);
 }

@@ -25,7 +25,8 @@
 <div class="container-fluid">
     <div class="widget-box">
         <div class="widget-title">
-            <h5>统计分析详情</h5>
+            <h5>Nginx详情 <font color="red">(最近2分钟)</font></h5>
+            <a href="javascript:window.open('http://kibana.yoho.cn/')" style="float: right"><h5>查看日志详情</h5></a>
         </div>
         <div class="container-fluid">
             <div class="row-fluid">

@@ -18,7 +18,7 @@
 <div class="container-fluid">
     <div class="widget-box">
         <div class="widget-title">
-            <h5>Nginx状态预览</h5>
+            <h5>Nginx状态预览 <font color="red">(最近2分钟)</font></h5>
         </div>
     </div>
 

@@ -24,7 +24,8 @@
 <div class="container-fluid">
     <div class="widget-box">
         <div class="widget-title">
-            <h5>统计分析详情</h5>
+            <h5>统计分析详情 <font color="red">(最近2分钟)</font></h5>
+            <a href="javascript:window.open('http://kibana.yoho.cn/')" style="float: right"><h5>查看日志详情</h5></a>
         </div>
         <div class="container-fluid">
             <div class="row-fluid">

@@ -18,7 +18,7 @@
     <div class="widget-box">
         <div class="widget-title">
 
-            <h5>监控对象详情</h5>
+            <h5>rabbitmq详情 <font color="red">(最近2分钟)</font></h5>
 
         </div>
         <div class="container-fluid" style="margin-top: -20px;">

@@ -18,7 +18,7 @@
 <div class="container-fluid">
     <div class="widget-box">
         <div class="widget-title">
-            <h5>RabbitMQ状态预览</h5>
+            <h5>RabbitMQ状态预览 <font color="red">(最近2分钟)</font></h5>
         </div>
     </div>