ops / monitor-ui · Commits

Go to a project

Authored by qinchao
Commit 5bb2f70ee895014f79172290b6f8912abb5b83a9 2 parents 3baa2d27 ffd964d2

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

Inline Side-by-side
Showing 4 changed files with 100 additions and 17 deletions
... ... @@ -69,4 +69,13 @@ public class BigDataCtrl {
return new ModelAndView("bigdata/metricinfo");
}
@RequestMapping("/toPlugin")
@ResponseBody
public ModelAndView toPlugin(Model model) {
String url=httpRestClient.defaultPost(HttpUriContants.BIGDATA_GETACCESSURL,null,String.class);
model.addAttribute("accessUrl",url);
return new ModelAndView("bigdata/pluginInfo");
}
}
... ...
... ... @@ -136,17 +136,6 @@ public class NodeBuildCtrl {
rtnResponse.setMessage("az1区域只能发布master分支");
return rtnResponse;
}
//az1-az2
if(environment.contains("az2")){
if(az2InGray){
if(checkGrayResponse.getData()){
rtnResponse.setCode(201);
rtnResponse.setMessage("az2灰度已经启用了， 不允许发布 az1+az2");
return rtnResponse;
}
}
}
}else{
//单独发布az2，环境可能还有aws等（其它不需要校验的项目）
if(environment.contains("az2")){
... ...
<%@page language="java" contentType="text/html;charset=utf-8" %>
<%@page import="com.ui.contants.ProjectConstant"%>
<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
<%
String path = request.getContextPath();
String basePath = request.getScheme() + "://"
+ request.getServerName() + ":" + request.getServerPort()
+ path + "/";
%>
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<link rel="stylesheet" href="<%=basePath %>css/bootstrap.min.css"/>
<link rel="stylesheet" href="<%=basePath %>css/bootstrap-datetimepicker.css"/>
<link href="<%=basePath %>js/bootstrap-plugin/css/bootstrap.table.css" rel="stylesheet" media="screen"/>
<link rel="stylesheet" href="<%=basePath %>css/bootstrap-responsive.min.css"/>
<link rel="stylesheet" href="<%=basePath %>css/fullcalendar.css"/>
<link rel="stylesheet" href="<%=basePath %>css/unicorn.main.css"/>
<link rel="stylesheet" href="<%=basePath %>css/unicorn.grey.css"/>
<link rel="stylesheet" href="<%=basePath %>css/jquery-ui.css"/>
<link rel="stylesheet" href="<%=basePath %>css/uniform.css"/>
<link rel="stylesheet" href="<%=basePath %>css/select2.css"/>
<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"/>
<script src="<%=basePath %>js/excanvas.min.js" charset="UTF-8" type="text/javascript"></script>
<script src="<%=basePath %>js/jquery-1.12.0.min.js" charset="UTF-8" type="text/javascript"></script>
<script src="<%=basePath %>js/jquery-ui.custom.js" charset="UTF-8" type="text/javascript"></script>
<script src="<%=basePath %>/js/bootstrap.min.js"></script>
<script src="<%=basePath %>/js/unicorn.js"></script>
<script src="<%=basePath %>js/bootstrap-plugin/datetimepicker/moment-with-locales.js" charset="UTF-8"
type="text/javascript"></script>
<script src="<%=basePath %>js/bootstrap-plugin/datetimepicker/bootstrap-datetimepicker.js" charset="UTF-8"
type="text/javascript"></script>
<script src="<%=basePath %>js/global.js" charset="UTF-8" type="text/javascript"></script>
<script src="<%=basePath %>js/bootstrap-plugin/bootstrap.pagination.js" charset="UTF-8"
type="text/javascript"></script>
<script src="<%=basePath %>js/bootstrap-plugin/bootstrap.table.js" charset="UTF-8" type="text/javascript"></script>
<script src="<%=basePath %>js/bootstrap-plugin/bootstrap.dialog.js" charset="UTF-8" type="text/javascript"></script>
<script src="<%=basePath %>js/bootstrap-plugin/bootstrap.form.js" charset="UTF-8" type="text/javascript"></script>
<script src="<%=basePath %>js/bootstrap-plugin/bootstrap.panel.js" charset="UTF-8" type="text/javascript"></script>
<script src="<%=basePath %>js/bootstrap-plugin/bootstrap.alerts.js" charset="UTF-8" type="text/javascript"></script>
<script src="<%=basePath %>js/bootstrap-plugin/bootstrap.accordion.js" charset="UTF-8"
type="text/javascript"></script>
<script src="<%=basePath %>js/bootstrap-plugin/bootstrap.breadcrumb.js" charset="UTF-8"
type="text/javascript"></script>
<script src="<%=basePath %>js/bootstrap-plugin/bootstrap.validate.js" charset="UTF-8"
type="text/javascript"></script>
<script src="<%=basePath %>js/bootstrap-plugin/bootstrap.form.js" charset="UTF-8" type="text/javascript"></script>
<script src="<%=basePath %>js/layer/layer.js" charset="UTF-8" type="text/javascript"></script>
<script src="<%=basePath %>js/bootstrap-plugin/bootstrap.select.js" charset="UTF-8" type="text/javascript"></script>
<script src="<%=basePath %>js/jstree/jstree.min.js"></script>
<script src="<%=basePath %>js/jquery.toaster.js"></script>
<script src="<%=basePath %>js/jquery-plugin/jquery.cookies.js" charset="UTF-8" type="text/javascript"></script>
<script>
var contextPath = '<%=basePath %>';
</script>
<title></title>
</head>
<body>
<!-- 头部 -->
<div id="head">
</div>
<!-- 右侧具体内容 -->
<div id="content">
<iframe src="${accessUrl}/autoDeployManager/toAutoDeployDashboard" id="iframepage" frameborder="0" scrolling="auto" width="100%" height="800px">
</iframe>
</div>
<script src="<%=basePath %>script/common/genarate_left_panel.js?v=<%=ProjectConstant.MENU_VERSION %>"></script>
<script>
$("#li_bigdata_ops").addClass("active open");
$("#li_bigdata_ops_plugin_info").addClass("active");
</script>
</body>
</html>
<script>
</script>
... ...
... ... @@ -69,12 +69,12 @@ innerHTML += "</ul></li>";
/*运维(大数据)*/
innerHTML += "<li class='submenu' id='li_bigdata_ops'><a id='li_bigdata_ops_a' href='#'><i class='icon icon-th-list'></i> <span>运维监控(大数据)</span><span class='label'>6</span></a><ul>";
innerHTML += "<li id='li_bigdata_ops_dashboard_info'><a id='li_bigdata_ops_dashboard_info_a' href=''><i class='icon icon-th'></i> <span>DashBoard</span></a></li>";
innerHTML += "<li id='li_bigdata_ops_strategy_info'><a id='li_bigdata_ops_strategy_info_a' href=''><i class='icon icon-th'></i> <span>告警策略配置</span></a></li>";
innerHTML += "<li id='li_bigdata_ops_metric_info'><a id='li_bigdata_ops_metric_info_a' href=''><i class='icon icon-th'></i> <span>监控指标管理</span></a></li>";
innerHTML += "<li id='li_bigdata_ops_host_info'><a id='li_bigdata_ops_host_info_a' href=''><i class='icon icon-th'></i> <span>主机策略查看</span></a></li>";
innerHTML += "<li id='li_bigdata_ops_alarm_info'><a id='li_bigdata_ops_alarm_info_a' href=''><i class='icon icon-th'></i> <span>告警动作配置</span></a></li>";
innerHTML += "<li id='li_bigdata_ops_dashboard_info'><a id='li_bigdata_ops_dashboard_info_a' href=''><i class='icon icon-th'></i> <span>服务总览</span></a></li>";
innerHTML += "<li id='li_bigdata_ops_strategy_info'><a id='li_bigdata_ops_strategy_info_a' href=''><i class='icon icon-th'></i> <span>告警策略</span></a></li>";
innerHTML += "<li id='li_bigdata_ops_metric_info'><a id='li_bigdata_ops_metric_info_a' href=''><i class='icon icon-th'></i> <span>指标管理</span></a></li>";
innerHTML += "<li id='li_bigdata_ops_host_info'><a id='li_bigdata_ops_host_info_a' href=''><i class='icon icon-th'></i> <span>主机策略</span></a></li>";
innerHTML += "<li id='li_bigdata_ops_alarm_info'><a id='li_bigdata_ops_alarm_info_a' href=''><i class='icon icon-th'></i> <span>告警动作</span></a></li>";
innerHTML += "<li id='li_bigdata_ops_plugin__info'><a id='li_bigdata_ops_plugin_info_a' href=''><i class='icon icon-th'></i> <span>插件管理</span></a></li>";
innerHTML += "</ul></li>";
... ... @@ -276,6 +276,7 @@ document.getElementById("li_bigdata_ops_host_info_a").setAttribute("href",path+"
document.getElementById("li_bigdata_ops_strategy_info_a").setAttribute("href",path+"/bigdata/toStrategyinfo");
document.getElementById("li_bigdata_ops_alarm_info_a").setAttribute("href",path+"/bigdata/toAlarminfo");
document.getElementById("li_bigdata_ops_metric_info_a").setAttribute("href",path+"/bigdata/toMetricinfo");
document.getElementById("li_bigdata_ops_plugin_info_a").setAttribute("href",path+"/bigdata/toPlugin");
document.getElementById("li_kafka_manage_a").setAttribute("href", path + "/kafkaManage/toKafkaManage");
document.getElementById("li_cron_tab_a").setAttribute("href", path + "/cronTabManage/toCronTabManage");
... ...