diff --git a/monitor/src/main/java/com/zfoo/monitor/DiskFileSystem.java b/monitor/src/main/java/com/zfoo/monitor/DiskFileSystem.java index bbb1e13d..2407dbdf 100644 --- a/monitor/src/main/java/com/zfoo/monitor/DiskFileSystem.java +++ b/monitor/src/main/java/com/zfoo/monitor/DiskFileSystem.java @@ -43,7 +43,7 @@ public class DiskFileSystem implements Comparable { var usage = usage(); if (usage >= 0.8) { var temp = this.toGB(); - return StringUtils.format("df - disk[name:{}] space too high[size:{}GB][available:{}GB][usage:{}][{}]" + return StringUtils.format("df - disk:[{}] space too high size:[{}]GB available:[{}]GB usage:[{}][{}]" , name, temp.getSize(), temp.getAvailable(), OSUtils.toPercent(usage), TimeUtils.timeToString(timestamp)); } return StringUtils.EMPTY; diff --git a/monitor/src/main/java/com/zfoo/monitor/Memory.java b/monitor/src/main/java/com/zfoo/monitor/Memory.java index 4fd212c6..c97139a3 100644 --- a/monitor/src/main/java/com/zfoo/monitor/Memory.java +++ b/monitor/src/main/java/com/zfoo/monitor/Memory.java @@ -40,7 +40,7 @@ public class Memory implements Comparable { var usage = 1D * (total - available) / total; if (usage >= 0.8) { var temp = this.toGB(); - return StringUtils.format("free - memory usage too high[total:{}GB][available:{}GB][usage:{}][{}]" + return StringUtils.format("free - memory usage too high total:[{}]GB available:[{}]GB usage:[{}][{}]" , temp.getTotal(), temp.getAvailable(), OSUtils.toPercent(usage), TimeUtils.timeToString(timestamp)); } return StringUtils.EMPTY; diff --git a/monitor/src/main/java/com/zfoo/monitor/Sar.java b/monitor/src/main/java/com/zfoo/monitor/Sar.java index eff9df9a..cd1a9d75 100644 --- a/monitor/src/main/java/com/zfoo/monitor/Sar.java +++ b/monitor/src/main/java/com/zfoo/monitor/Sar.java @@ -58,11 +58,11 @@ public class Sar implements Comparable { public String pressure() { if (rxpck >= 5_0000) { - return StringUtils.format("sar - NIC traffic[interface:{}] [rxpck:{}] [txpck:{}] [rxBytes:{}] [txBytes:{}] [inErrors:{}] [outErrors:{}] [inDrops:{}] [collisions:{}] [{}]", performance impact: CRITICAL" + return StringUtils.format("sar - NIC traffic [interface:{}] [rxpck:{}] [txpck:{}] [rxBytes:{}] [txBytes:{}] [inErrors:{}] [outErrors:{}] [inDrops:{}] [collisions:{}] [{}] performance impact: CRITICAL" , name, rxpck, txpck, rxBytes, txBytes, inErrors, outErrors, inDrops, collisions, TimeUtils.timeToString(timestamp)); } if (inErrors > 0 || outErrors > 0 || inDrops > 0 || collisions > 0) { - return StringUtils.format("sar - NIC traffic[interface:{}] [rxpck:{}] [txpck:{}] [rxBytes:{}] [txBytes:{}] [inErrors:{}] [outErrors:{}] [inDrops:{}] [collisions:{}] [{}]", performance impact: LOW" + return StringUtils.format("sar - NIC traffic[interface:{}] [rxpck:{}] [txpck:{}] [rxBytes:{}] [txBytes:{}] [inErrors:{}] [outErrors:{}] [inDrops:{}] [collisions:{}] [{}] performance impact: LOW" , name, rxpck, txpck, rxBytes, txBytes, inErrors, outErrors, inDrops, collisions, TimeUtils.timeToString(timestamp)); } return StringUtils.EMPTY; diff --git a/net/src/test/resources/gateway/gateway_config.xml b/net/src/test/resources/gateway/gateway_config.xml index c72b6ff8..abcb52e9 100644 --- a/net/src/test/resources/gateway/gateway_config.xml +++ b/net/src/test/resources/gateway/gateway_config.xml @@ -24,7 +24,7 @@ -