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

@@ -24,7 +24,7 @@
     <appender name="WARN" class="ch.qos.logback.core.rolling.RollingFileAppender">
         <file>${catalina.home}/logs/warn.log</file>
         <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
-            <level>ERROR</level>
+            <level>WARN</level>
         </filter>
         <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
             <!-- daily rollover -->

@@ -37,8 +37,6 @@
     <link rel="stylesheet" href="<%=basePath %>js/jstree/themes/proton/style.css"/>
     <link rel="stylesheet" href="<%=basePath %>css/select2.css"/>
     <link rel="stylesheet" href="<%=basePath %>css/yoho.css"/>
-    <link rel="stylesheet" href="<%=basePath %>css/morris.css"/>
-
     <script src="<%=basePath %>js/jquery-1.12.0.min.js" charset="UTF-8" type="text/javascript"></script>
     <script src="<%=basePath %>/js/bootstrap.min.js"></script>
     <script src="<%=basePath %>js/bootstrap-plugin/datetimepicker/moment-with-locales.js" charset="UTF-8"

@@ -126,7 +126,7 @@
                         btn.removeClass("btn-success");
                         btn.addClass("btn-danger");
                     } else {
-                        $(btn.children("span")[0]).html();
+                        $(btn.children("span")[0]).html("");
                         btn.removeClass("btn-danger");
                         btn.addClass("btn-success");
                     }

@@ -479,7 +479,7 @@
                     $("#javaInfoForm #apiUrl").val("");
                     $("#javaInfoForm #apiData").val("");
                     $("#javaInfoForm #apiToggle").prop("checked", true)
-                    $("#javaInfoForm #apiWarnTrigger").val(0);
+                    $("#javaInfoForm #apiWarnTrigger").val(3);
                     $("#javaInfoForm #apiReqMethod").val(0);
                     $("#javaInfoForm #serviceType").val(1);
                 } else {