ops / monitor-ui · Commits

Go to a project

Authored by mlge
Commit 48228fea628dd3ffd9adbef1119ccd84e69c17aa 2 parents 4c6d3f1a 2f2d44b2

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

Inline Side-by-side
Showing 11 changed files with 78 additions and 20 deletions
... ... @@ -102,11 +102,10 @@ public enum UserOperateEnum {
outer_updateJenkinsStatus("/outer/updateJenkinsStatus","docker工单发布更新Jenkins",true),
//quartz job
job_getAllJobs("/job/getAllJobs","任务中心_所有任务",true),
job_rescheduleJob("/job/rescheduleJob","任务中心_重新调度",true),
job_startJob("/job/startJob","任务中心_启动",true),
job_pauseJob("/job/pauseJob","任务中心_暂停",true),
job_updateJob("/job/updateJob","任务中心_更新",true),
job_rescheduleJob("/job/rescheduleJob.do","任务中心_重新调度",true),
job_startJob("/job/startJob.do","任务中心_启动",true),
job_pauseJob("/job/pauseJob.do","任务中心_暂停",true),
job_updateJob("/job/updateJob.do","任务中心_更新",true),
//java按天回滚
project_doRollbackByTime("/project/doRollbackByTime","java按天回滚",true)
... ...
... ... @@ -32,11 +32,11 @@
<version>2.0.2.RELEASE</version>
</dependency>
<!-- <dependency>
<dependency>
<groupId>com.yoho.quartz</groupId>
<artifactId>yoho-quartz-server</artifactId>
<version>1.3.6-SNAPSHOT</version>
</dependency>-->
<version>1.3.8-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>commons-fileupload</groupId>
... ...
monitor.service.url=http://127.0.0.1:8880/monitor
qcloud_zkAddress=10.66.4.3:2181,10.66.4.4:2181,10.66.4.5:2181,10.66.4.8:2181,10.66.4.9:2181
aws_zkAddress=172.31.50.193:2181,172.31.50.191:2181,172.31.50.192:2181,172.31.50.190:2181,172.31.50.194:2181
job.run.log.limit=10
web.context=monitor-ui
\ No newline at end of file
... ...
cluster_aws:
name: aws_zkAddress
connectString : 172.31.50.193:2181,172.31.50.191:2181,172.31.50.192:2181,172.31.50.190:2181,172.31.50.194:2181
cluster_qcloud:
name: qcloud_zkAddress
connectString : 10.66.4.3:2181,10.66.4.4:2181,10.66.4.5:2181,10.66.4.8:2181,10.66.4.9:2181
cluster_platform:
name: platform_zkAddress
connectString : 10.66.50.140:2181
... ...
monitor.service.url=http://monitor-service-master:8080/monitor
qcloud_zkAddress=10.66.4.3:2181,10.66.4.4:2181,10.66.4.5:2181,10.66.4.8:2181,10.66.4.9:2181
aws_zkAddress=172.31.50.193:2181,172.31.50.191:2181,172.31.50.192:2181,172.31.50.190:2181,172.31.50.194:2181
job.run.log.limit=10
web.context=monitor-ui
\ No newline at end of file
... ...
datasources:
yh_ops:
servers:
- 172.31.50.75:3306
- 172.31.50.75:3306
- 10.66.233.13:3306
- 10.66.233.13:3306
username: ops
password: t5/oMgwUCmO/GeMHBAQ2Cg==
password: eDSKt8NPhLIswOCsMW3kfA==
readOnlyInSlave: false
\ No newline at end of file
... ...
cluster_aws:
name: aws_zkAddress
connectString : 172.31.50.193:2181,172.31.50.191:2181,172.31.50.192:2181,172.31.50.190:2181,172.31.50.194:2181
cluster_qcloud:
name: qcloud_zkAddress
connectString : 10.66.4.3:2181,10.66.4.4:2181,10.66.4.5:2181,10.66.4.8:2181,10.66.4.9:2181
cluster_platform:
name: platform_zkAddress
connectString : 10.66.50.140:2181
... ...
monitor.service.url=http://127.0.0.1:8880/monitor
zkAddress=192.168.102.45:2181
qcloud_zkAddress=192.168.102.45:2181
aws_zkAddress=192.168.102.45:2181
job.run.log.limit=10
web.context=monitor-ui
\ No newline at end of file
... ...
cluster_aws:
name: aws_zkAddress
connectString : 192.168.102.45:2181
cluster_qcloud:
name: qcloud_zkAddress
connectString : 192.168.102.45:2181
cluster_platform:
name: platform_zkAddress
connectString : 192.168.102.211:2181
... ...
<%@page language="java" contentType="text/html;charset=utf-8" %>
<%@page import="com.ui.contants.ProjectConstant"%>
<%@page import="com.ui.contants.ProjectConstant" %>
<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
<%
String path = request.getContextPath();
... ... @@ -88,6 +88,23 @@
<input type="text" id="jobName" name="jobName" class="form-control"
placeholder=""/>
</div>
<div class="input-group" style="float: left;">
<span class="input-group-addon">任务类型：</span>
<select id="jobType" name="jobType" class="form-control">
<option value="">请选择</option>
<option value=0>循环任务</option>
<option value=1>单次任务</option>
</select>
</div>
<div class="input-group" style="float: left;">
<span class="input-group-addon">任务状态：</span>
<select id="jobStatus" name="jobStatus" class="form-control">
<option value="">请选择</option>
<option value="WAITING">待执行</option>
<option value="ACQUIRED">正在执行</option>
<option value="PAUSED">已暂停</option>
</select>
</div>
<button id="searchBtn" class="btn btn-primary" style="margin-left: 18px;">搜索</button>
</div>
</div>
... ... @@ -618,10 +635,14 @@
var moduleName = $("#moduleName").val();
var jobId = $("#jobId").val();
var jobName = $("#jobName").val();
var jobType = $("#jobType").val();
var jobStatus = $("#jobStatus").val();
$("#jobInfoDiv #jobInfoListTable").table("load", {
'module': moduleName,
'jobId':jobId,
'jobName':jobName
'jobId': jobId,
'jobName': jobName,
'jobType': jobType,
'jobStatus': jobStatus
});
});
</script>
... ...
... ... @@ -372,6 +372,14 @@
if (i % 4 == 0) {
project_HTML += "</br>";
}
//node 去掉3个项目
if("NODE" == platform){
if(data[i].name == "YOHOBUY-WAP-NODE" || data[i].name == "YOHOBUY-PC-NODE" || data[i].name == "YOHOBLK-WAP"){
continue;
}
}
project_HTML += "<div class='"+checkTypeCss+"' style='display: inline'>";
project_HTML += " <input name='project' type='"+checkType+"' id='" + data[i].name + "' value='" + data[i].name +"' ";
... ...