Merge pull request #181 from Dokyeongyun/fx-220306-osDiskMonitoring

Fix abnormal execution about OS disk usage monitoring

Author: Dokyeongyun

src/main/java/root/applications/ConsoleApp.java

@@ -140,7 +140,7 @@ public static void main(String[] args) throws IOException {
 		TextTable serverTable = new TextTable(
 				new CsvTableModel(CsvUtils.toCsvString(jschConnectionList, JschConnectionInfo.class)));
 		serverTable.printTable(System.out, 2);
-		
+
 		// TODO STEP5: 모니터링여부 설정 읽기
 
 		// STEP6: 모니터링 수행
@@ -164,7 +164,7 @@ public static void main(String[] args) throws IOException {
 			JschServer server = new JschServer(jsch);
 			server.init();
 			ServerCheckRepository repo = new ServerCheckRepositoryImpl(server);
-			ServerCheckUsecase usecase = new ServerCheckUsecaseImpl(repo);
+			ServerCheckUsecase usecase = new ServerCheckUsecaseImpl(repo, ReportFileRepo.getInstance());
 			ServerCheckBatch serverBatch = new ServerCheckBatch(usecase);
 
 			AlertLogCommandPeriod alcp = new AlertLogCommandPeriod(jsch.getAlc(),

src/main/java/root/core/domain/OSDiskUsage.java

@@ -1,16 +1,20 @@
 package root.core.domain;
 
+import java.util.Date;
+
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import lombok.NoArgsConstructor;
 import root.utils.UnitUtils;
 import root.utils.UnitUtils.FileSize;
 
-@NoArgsConstructor
 @EqualsAndHashCode(callSuper = false)
 @Data
 public class OSDiskUsage extends MonitoringResult {
 
+	public OSDiskUsage() {
+		super(new Date());
+	}
+
 	public OSDiskUsage(String monitoringDate, String monitoringTime, String fileSystem, String mountedOn,
 			double totalSpace, double freeSpace, double usedSpace, double usedPercent) {
 		super(monitoringDate, monitoringTime);
@@ -41,4 +45,10 @@ public void convertUnit(FileSize fromUnit, FileSize toUnit, int round) {
 		this.usedSpace = UnitUtils.convertFileUnit(fromUnit, toUnit, usedSpace, round);
 	}
 
+	@Override
+	public String toString() {
+		return "OSDiskUsage [fileSystem=" + fileSystem + ", mountedOn=" + mountedOn + ", totalSpace=" + totalSpace
+				+ ", freeSpace=" + freeSpace + ", usedSpace=" + usedSpace + ", usedPercent=" + usedPercent + "]"
+				+ super.getMonitoringDate() + " " + super.getMonitoringTime();
+	}
 }

src/main/java/root/core/repository/implement/ServerCheckRepositoryImpl.java

@@ -246,19 +246,19 @@ public List<OSDiskUsage> stringToOsDiskUsageList (String result) {
 				case "Filesystem":
 					row.setFileSystem(next);
 					break;
-				case "Size":
+				case "1024-blocks":
 					row.setTotalSpace(NumberUnitUtils.toByteValue(Unit.KiloByte,
 							Double.valueOf(next.substring(0, next.indexOf("K")))));
 					break;
 				case "Used":
 					row.setUsedSpace(NumberUnitUtils.toByteValue(Unit.KiloByte, 
 							Double.valueOf(next.substring(0, next.indexOf("K")))));
 					break;
-				case "Avail":
+				case "Available":
 					row.setFreeSpace(NumberUnitUtils.toByteValue(Unit.KiloByte,
 							Double.valueOf(next.substring(0, next.indexOf("K")))));
 					break;
-				case "Use%":
+				case "Capacity":
 					row.setUsedPercent(Double.valueOf(next.substring(0, next.indexOf("%"))));
 					break;
 				case "Mounted on":