修改页面弹窗全屏
This commit is contained in:
@@ -46,7 +46,7 @@ public class hostJob {
|
|||||||
private static final double DISK_RATE = Double.parseDouble(Global.getConfig("biz.host.Disk", "60"));
|
private static final double DISK_RATE = Double.parseDouble(Global.getConfig("biz.host.Disk", "60"));
|
||||||
private static final LoggerUtils logger = LoggerUtils.getInstance();
|
private static final LoggerUtils logger = LoggerUtils.getInstance();
|
||||||
|
|
||||||
@Scheduled(cron = "0 0/15 * * * ?")
|
@Scheduled(cron = "0 0/10 * * * ?")
|
||||||
public void initJob() {
|
public void initJob() {
|
||||||
try {
|
try {
|
||||||
HostStatus();
|
HostStatus();
|
||||||
@@ -88,68 +88,61 @@ public class hostJob {
|
|||||||
* 运行信息更新
|
* 运行信息更新
|
||||||
*/
|
*/
|
||||||
public void syncServerInfo(BizMonitorHost host) {
|
public void syncServerInfo(BizMonitorHost host) {
|
||||||
if (host.getIsAuth().equals("1")) {
|
BizMonitorAccount monitorAccount = new BizMonitorAccount();
|
||||||
DockerUtils dockerUtils = new DockerUtils(host.getIpAddress(), host.getCheckTargetPort());
|
monitorAccount.setHostId(host.getHostId());
|
||||||
List<Container> containerList = dockerUtils.listContainers(true);
|
monitorAccount.setUstatus("1");
|
||||||
host.setRunTargetNums(containerList.size());
|
monitorAccount.setSshUsername("ogsapp");
|
||||||
monitorHostService.save(host);
|
List<BizMonitorAccount> accountList = accountService.findList(monitorAccount);
|
||||||
BizMonitorAccount monitorAccount = new BizMonitorAccount();
|
if (accountList.size() > 0) {
|
||||||
monitorAccount.setHostId(host.getHostId());
|
try {
|
||||||
monitorAccount.setUstatus("1");
|
BizMonitorAccount account = accountList.get(0);
|
||||||
monitorAccount.setSshUsername("ogsapp");
|
Session session = SystemUtil.getSshSession(account);
|
||||||
List<BizMonitorAccount> accountList = accountService.findList(monitorAccount);
|
if (session.isConnected()) {
|
||||||
if (accountList.size() > 0) {
|
CpuInfo cpuInfo = SystemUtil.getCpuMemUsage(session);
|
||||||
try {
|
ServerInfo info = SystemUtil.getServerBasicInfo(session);
|
||||||
BizMonitorAccount account = accountList.get(0);
|
List<DiskInfo> diskInfos = SystemUtil.getDiskInfos(session);
|
||||||
Session session = SystemUtil.getSshSession(account);
|
syncDeviceInfo(host, diskInfos);
|
||||||
if (session.isConnected()) {
|
BizServerInfo bizServerInfo = new BizServerInfo();
|
||||||
CpuInfo cpuInfo = SystemUtil.getCpuMemUsage(session);
|
bizServerInfo.setHostId(host.getHostId());
|
||||||
ServerInfo info = SystemUtil.getServerBasicInfo(session);
|
// 新增主机监控
|
||||||
List<DiskInfo> diskInfos = SystemUtil.getDiskInfos(session);
|
BizResourceMonitor resourceMonitor = new BizResourceMonitor();
|
||||||
syncDeviceInfo(host, diskInfos);
|
resourceMonitor.setHostName(host.getHostname());
|
||||||
BizServerInfo bizServerInfo = new BizServerInfo();
|
resourceMonitor.setCpuUsage(cpuInfo.getCpuUsage());
|
||||||
bizServerInfo.setHostId(host.getHostId());
|
resourceMonitor.setMemoryUsage(cpuInfo.getMemoryUsage());
|
||||||
// 新增主机监控
|
resourceMonitor.setMemoryTotal(info.getMemoryTotal());
|
||||||
BizResourceMonitor resourceMonitor = new BizResourceMonitor();
|
resourceMonitor.setHostId(host.getHostId());
|
||||||
resourceMonitor.setHostName(host.getHostname());
|
resourceMonitorService.save(resourceMonitor);
|
||||||
resourceMonitor.setCpuUsage(cpuInfo.getCpuUsage());
|
// 更新主机监控
|
||||||
resourceMonitor.setMemoryUsage(cpuInfo.getMemoryUsage());
|
List<BizServerInfo> serverInfoList = serverInfoService.findList(bizServerInfo);
|
||||||
resourceMonitor.setMemoryTotal(info.getMemoryTotal());
|
BizServerInfo serverInfo = serverInfoList.isEmpty() ? new BizServerInfo() : serverInfoList.get(0);
|
||||||
resourceMonitor.setHostId(host.getHostId());
|
serverInfo.setUptime(info.getUptime());
|
||||||
resourceMonitorService.save(resourceMonitor);
|
serverInfo.setOs(info.getOs());
|
||||||
// 更新主机监控
|
serverInfo.setKernelVersion(info.getKernelVersion());
|
||||||
List<BizServerInfo> serverInfoList = serverInfoService.findList(bizServerInfo);
|
serverInfo.setHostname(info.getHostname());
|
||||||
BizServerInfo serverInfo = serverInfoList.isEmpty() ? new BizServerInfo() : serverInfoList.get(0);
|
serverInfo.setIpAddress(info.getIpAddress());
|
||||||
serverInfo.setUptime(info.getUptime());
|
serverInfo.setCpuModel(info.getCpuModel());
|
||||||
serverInfo.setOs(info.getOs());
|
serverInfo.setMemoryTotal(info.getMemoryTotal());
|
||||||
serverInfo.setKernelVersion(info.getKernelVersion());
|
serverInfo.setCpuUsage(cpuInfo.getCpuUsage());
|
||||||
serverInfo.setHostname(info.getHostname());
|
serverInfo.setMemoryUsage(cpuInfo.getMemoryUsage());
|
||||||
serverInfo.setIpAddress(info.getIpAddress());
|
serverInfo.setLastOnlineTime(new Date());
|
||||||
serverInfo.setCpuModel(info.getCpuModel());
|
serverInfo.setHostId(host.getHostId());
|
||||||
serverInfo.setMemoryTotal(info.getMemoryTotal());
|
serverInfoService.save(serverInfo);
|
||||||
serverInfo.setCpuUsage(cpuInfo.getCpuUsage());
|
if (serverInfo.getCpuUsage() >= CPU_RATE) {
|
||||||
serverInfo.setMemoryUsage(cpuInfo.getMemoryUsage());
|
BizWarningAlert warningAlert = new BizWarningAlert("ZJ_" + KeyUtil.ObjKey(12, 2), "CPU预警", 2, host.getHostname() + "CPU预警", "当前主机CPU已超过" + CPU_RATE + "%,请及时处理,主机IP:" + host.getIpAddress(), "业务系统", "0");
|
||||||
serverInfo.setLastOnlineTime(new Date());
|
bizWarningAlertService.save(warningAlert);
|
||||||
serverInfo.setHostId(host.getHostId());
|
|
||||||
serverInfoService.save(serverInfo);
|
|
||||||
if (serverInfo.getCpuUsage() >= CPU_RATE) {
|
|
||||||
BizWarningAlert warningAlert = new BizWarningAlert("ZJ_" + KeyUtil.ObjKey(12, 2), "CPU预警", 2, host.getHostname() + "CPU预警", "当前主机CPU已超过" + CPU_RATE + "%,请及时处理,主机IP:" + host.getIpAddress(), "业务系统", "0");
|
|
||||||
bizWarningAlertService.save(warningAlert);
|
|
||||||
}
|
|
||||||
if (serverInfo.getMemoryUsage() >= MEM_RATE) {
|
|
||||||
BizWarningAlert warningAlert = new BizWarningAlert("ZJ_" + KeyUtil.ObjKey(12, 2), "内存预警", 2, host.getHostname() + "内存预警", "当前主机内存已超过" + MEM_RATE + "%,请及时处理,主机IP:" + host.getIpAddress(), "业务系统", "0");
|
|
||||||
bizWarningAlertService.save(warningAlert);
|
|
||||||
}
|
|
||||||
SystemUtil.closeSession(session);
|
|
||||||
}
|
}
|
||||||
} catch (Exception e) {
|
if (serverInfo.getMemoryUsage() >= MEM_RATE) {
|
||||||
logger.error(e.getMessage(), host);
|
BizWarningAlert warningAlert = new BizWarningAlert("ZJ_" + KeyUtil.ObjKey(12, 2), "内存预警", 2, host.getHostname() + "内存预警", "当前主机内存已超过" + MEM_RATE + "%,请及时处理,主机IP:" + host.getIpAddress(), "业务系统", "0");
|
||||||
|
bizWarningAlertService.save(warningAlert);
|
||||||
|
}
|
||||||
|
SystemUtil.closeSession(session);
|
||||||
}
|
}
|
||||||
|
} catch (Exception e) {
|
||||||
|
logger.error(e.getMessage(), host);
|
||||||
}
|
}
|
||||||
if (host.getCheckTargetNums() != containerList.size()) {
|
}
|
||||||
BizWarningAlert warningAlert = new BizWarningAlert("ZJ_" + KeyUtil.ObjKey(12, 2), "容器预警", 2, host.getHostname() + "容器预警", "当前主机容器运行数量" + containerList.size() + "与配置数量不一致,请及时处理,主机IP:" + host.getIpAddress(), "业务系统", "0");
|
if (host.getIsAuth().equals("1")) {
|
||||||
bizWarningAlertService.save(warningAlert);
|
syncDockerInfo(host);
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -182,4 +175,15 @@ public class hostJob {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void syncDockerInfo(BizMonitorHost host) {
|
||||||
|
DockerUtils dockerUtils = new DockerUtils(host.getIpAddress(), host.getCheckTargetPort());
|
||||||
|
List<Container> containerList = dockerUtils.listContainers(true);
|
||||||
|
host.setRunTargetNums(containerList.size());
|
||||||
|
monitorHostService.save(host);
|
||||||
|
if (host.getCheckTargetNums() != containerList.size()) {
|
||||||
|
BizWarningAlert warningAlert = new BizWarningAlert("ZJ_" + KeyUtil.ObjKey(12, 2), "容器预警", 2, host.getHostname() + "容器预警", "当前主机容器运行数量" + containerList.size() + "与配置数量不一致,请及时处理,主机IP:" + host.getIpAddress(), "业务系统", "0");
|
||||||
|
bizWarningAlertService.save(warningAlert);
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user