ops / monitor-ui · Commits

Go to a project

Authored by mlge
Commit 54a1739f0384e210617e9a10d0f1fe4e3b3ecb7a 2 parents eb7bcdd8 74d2a2cd

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

Inline Side-by-side
Showing 8 changed files with 30 additions and 23 deletions
... ... @@ -376,6 +376,7 @@ public class HttpUriContants {
/**
* sql通用操作，查找
*/
public static final String SQLOPERATE_QUERY_DB_SOURCE_LIST = "/sqlOperate/queryDbSourceList";
public static final String SQLOPERATE_QUERY_DBLIST = "/sqlOperate/queryDbList";
public static final String SQLOPERATE_QUERY = "/sqlOperate/query";
... ...
... ... @@ -48,8 +48,8 @@ public class OuterIntfCtrl {
/**
* 对外接口，提供报警
* @param info
* @param mobiles
* @param info 短信内容
* @param mobiles 手机号码，多个号码以逗号分隔
* @return
*/
@RequestMapping("/recvMonitAlarmInfo")
... ... @@ -92,7 +92,7 @@ public class OuterIntfCtrl {
public BaseResponse gitWebHook(@RequestBody com.alibaba.fastjson.JSONObject jsonObject) throws Exception {
log.info("gitWebHookAppCollectLog get the webhook from git begin --{}", jsonObject.toJSONString());
WebHooksReleaseBO bo=releaseWebHooksNoCommits(jsonObject);
return new BaseResponse(200, "succeed", "本次的jenkinsJOB_ID = ");
return httpClient.defaultPost("/dockerProject/gitWebHook",bo,BaseResponse.class);
}
private WebHooksReleaseBO releaseWebHooksNoCommits(JSONObject jsonObject) {
... ...
... ... @@ -11,6 +11,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.core.ParameterizedTypeReference;
import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.bind.annotation.RestController;
... ... @@ -34,7 +35,12 @@ public class SqlOperateCtrl {
跳转到sql通用查询界面
*/
@RequestMapping("/toSqlOperate")
public ModelAndView toSqlOperate(){
public ModelAndView toSqlOperate(Model model){
//查询dbsource
BaseResponse dbSourceResponse=httpClient.defaultGet(HttpUriContants.SQLOPERATE_QUERY_DB_SOURCE_LIST,BaseResponse.class);
if(dbSourceResponse!=null&&dbSourceResponse.getCode()==200){
model.addAttribute("dbSourceList",dbSourceResponse.getData());
}
return new ModelAndView("sqloperate/sqloperate");
}
... ...
... ... @@ -183,7 +183,7 @@
<p><a href="http://qmc.yohops.com" target="_blank">http://qmc.yohops.com</a></p>
<h3>
YOHO日志查询
APP日志查询
</h3>
<p><a href="http://alog.yohops.com/" target="_blank">http://alog.yohops.com</a></p>
... ...
... ... @@ -162,7 +162,7 @@
field: "ip"
}, {
title: "reason",
width: "40%",
width: "30%",
field: "reasonDur",
styler : function(value, rowData, rowIndex){
return {
... ... @@ -193,18 +193,11 @@
align: "left"
},/*{
title: "duration",
width: "100px",
field: "duration",
formatter:function(value,rowData,rowIndex){
var result = "";
for(v in value){
result = result + value[v] +"</br>";
}
return result;
}
},*/
},{
title: "统计周期",
width: "10%",
field: "dur"
},
{
title: "时间",
width: "15%",
... ... @@ -245,7 +238,7 @@
queryParams:{
ip:mip,
timestamp:hbaseTime,
type:"alarm"
type:"forbid"
},
dataType: 'json',
striped: true,
... ...
... ... @@ -171,7 +171,7 @@
},
{
title: "reason",
width: "50%",
width: "40%",
field: "reason",
align: "left",
formatter:function(value,rowData,rowIndex){
... ... @@ -200,6 +200,10 @@
"vertical-align" : "middle"
};
}
},{
title: "统计周期",
width: "10%",
field: "dur"
},
{
title: "createtime",
... ...
... ... @@ -988,7 +988,7 @@
<input type="text" id="tx_new_type_name" width="50" class="form-control" placeholder=""/>
</div>
<div class="input-group" style="padding-bottom: 5px">
<span class="input-group-addon" style="width: 100px">子节点：</span>
<span class="input-group-addon" style="width: 100px">叶子节点：</span>
<input type="checkbox" id="cb_new_type_isleaf" style="margin-left: 30px" name="appName"
value="JAVA">
</div>
... ...
... ... @@ -81,7 +81,10 @@
<span class="input-group-addon">当前数据源:</span>
<select id="dataSourceInfo" class="form-control">
<option value="">请选择</option>
<option value="10.66.6.7:3306">cms.yoho-mysql.org</option>
<c:forEach items="${dbSourceList }" var="dbSource">
<option value="${dbSource.id}">${dbSource.text}</option>
</c:forEach>
<%--<option value="10.66.6.7:3306">cms.yoho-mysql.org</option>
<option value="10.66.6.8:3306">passport.yoho-mysql.org</option>
<option value="10.66.6.9:3306">orders.yoho-mysql.org</option>
<option value="10.66.6.10:3306">shops.yoho-mysql.org</option>
... ... @@ -101,7 +104,7 @@
<option value="10.66.1.219:3306">yh_live</option>
<option value="10.67.2.144:3307">seo</option>
<option value="10.67.2.40:3306">MARS</option>
<option value="10.67.2.40:3307">咨询</option>
<option value="10.67.2.40:3307">咨询</option>--%>
<%--<option value="localhost:3306">Test</option>--%>
</select>
</div>
... ...