Change OS Disk monitoring command that return result in KiloByte

Author: Dokyeongyun

src/main/java/root/applications/Application.java

@@ -103,7 +103,7 @@ public static void serverMonitoring() {
 			AlertLogCommand alc = new AlertLogCommand("tail", alertLogReadLine, alertLogFilePath, alertLogDateFormat, alertLogDateFormatRegex);
 			AlertLogCommandPeriod alcp = new AlertLogCommandPeriod(alc, DateUtils.addDate(DateUtils.getToday("yyyy-MM-dd"), 0, 0, -1), DateUtils.getToday("yyyy-MM-dd"));
 			serverBatch.startBatchAlertLogCheckDuringPeriod(alcp);
-			serverBatch.startBatchOSDiskUsageCheck("df -Ph");
+			serverBatch.startBatchOSDiskUsageCheck();
 			//System.out.println("□ [ " + serverName + " Monitoring End ]\n\n");
 		} 
 	}

src/main/java/root/core/batch/ServerCheckBatch.java

@@ -27,11 +27,11 @@ public void startBatchAlertLogCheckDuringPeriod(AlertLogCommandPeriod alcp) {
 		}
 	}
 
-	public void startBatchOSDiskUsageCheck(String command) {
+	public void startBatchOSDiskUsageCheck() {
 		try {
-			this.serverCheckUsecase.printOSDiskUsage(command);
-			this.serverCheckUsecase.writeExcelOSDiskUsage(command);
-			this.serverCheckUsecase.writeCsvOSDiskUsage(command);
+			this.serverCheckUsecase.printOSDiskUsage();
+			this.serverCheckUsecase.writeExcelOSDiskUsage();
+			this.serverCheckUsecase.writeCsvOSDiskUsage();
 		}catch(Exception e) {
 			e.printStackTrace();
 		}

src/main/java/root/core/repository/constracts/ServerCheckRepository.java

@@ -19,5 +19,5 @@ public interface ServerCheckRepository {
 	int getAlertLogFileLineCount(AlertLogCommand alc);
 	String checkAlertLog(AlertLogCommand alc);
 	AlertLog checkAlertLogDuringPeriod(AlertLogCommandPeriod alc);
-	List<OSDiskUsage> checkOSDiskUsage(String command);
+	List<OSDiskUsage> checkOSDiskUsage();
 }

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

@@ -209,12 +209,12 @@ public AlertLog checkAlertLogDuringPeriod(AlertLogCommandPeriod alcp) {
 	}
 
 	@Override
-	public List<OSDiskUsage> checkOSDiskUsage(String command) {
+	public List<OSDiskUsage> checkOSDiskUsage() {
 		List<OSDiskUsage> list = new ArrayList<>();
 		try {
 			Session session = this.getSession();
 			session = this.connectSession(session);
-			Channel channel = jsch.openExecChannel(session, command);
+			Channel channel = jsch.openExecChannel(session, "df --block-size=K -P");
 			InputStream in = jsch.connectChannel(channel);
 			String result = IOUtils.toString(in, "UTF-8");
 			list = stringToOsDiskUsageList(result);

src/main/java/root/core/usecase/constracts/ServerCheckUsecase.java

@@ -10,11 +10,11 @@
 public interface ServerCheckUsecase {
 	void printAlertLog(AlertLogCommand alc);
 	void printAlertLogDuringPeriod(AlertLogCommandPeriod alcp);
-	void printOSDiskUsage(String command);
+	void printOSDiskUsage();
 
-	void writeExcelOSDiskUsage(String command) throws Exception;
-	void writeCsvOSDiskUsage(String command) throws Exception;
+	void writeExcelOSDiskUsage() throws Exception;
+	void writeCsvOSDiskUsage() throws Exception;
 
-	List<OSDiskUsage> getCurrentOSDiskUsage(String command);
+	List<OSDiskUsage> getCurrentOSDiskUsage();
 	AlertLog getAlertLogDuringPeriod(AlertLogCommandPeriod alcp);
 }

src/main/java/root/core/usecase/implement/ServerCheckUsecaseImpl.java

@@ -160,8 +160,8 @@ public void printAlertLogDuringPeriod(AlertLogCommandPeriod alcp) {
 	}
 
 	@Override
-	public void printOSDiskUsage(String command) {
-		List<OSDiskUsage> result = serverCheckRepository.checkOSDiskUsage(command);
+	public void printOSDiskUsage() {
+		List<OSDiskUsage> result = serverCheckRepository.checkOSDiskUsage();
 
 		boolean isError = false;
 		for(OSDiskUsage data : result) {
@@ -187,10 +187,10 @@ public void printOSDiskUsage(String command) {
 	}
 
 	@Override
-	public void writeExcelOSDiskUsage(String command) throws Exception {
+	public void writeExcelOSDiskUsage() throws Exception {
 		if(!"STS".equals(serverCheckRepository.getServerName())) return;
 
-		List<OSDiskUsage> result = serverCheckRepository.checkOSDiskUsage(command);
+		List<OSDiskUsage> result = serverCheckRepository.checkOSDiskUsage();
 
 		int year = Integer.parseInt(DateUtils.getToday("yyyy"));
 		int month = Integer.parseInt(DateUtils.getToday("MM"));
@@ -232,10 +232,10 @@ public void writeExcelOSDiskUsage(String command) throws Exception {
 	}
 
 	@Override
-	public void writeCsvOSDiskUsage(String command) throws Exception {
+	public void writeCsvOSDiskUsage() throws Exception {
 		String serverName = serverCheckRepository.getServerName();
 
-		List<OSDiskUsage> result = serverCheckRepository.checkOSDiskUsage(command);
+		List<OSDiskUsage> result = serverCheckRepository.checkOSDiskUsage();
 
 		String filePath = "C:\\Users\\aserv\\Documents\\WorkSpace_DBMonitoring_Quartz\\DBMonitoring\\report\\OSDiskUsage\\";
 		String fileName = serverName;
@@ -256,8 +256,8 @@ public void writeCsvOSDiskUsage(String command) throws Exception {
 	}
 
 	@Override
-	public List<OSDiskUsage> getCurrentOSDiskUsage(String command) {
-		List<OSDiskUsage> result = serverCheckRepository.checkOSDiskUsage(command);
+	public List<OSDiskUsage> getCurrentOSDiskUsage() {
+		List<OSDiskUsage> result = serverCheckRepository.checkOSDiskUsage();
 		return result;
 	}
 

src/main/java/root/javafx/Controller/RunMenuController.java

@@ -310,7 +310,7 @@ public void runMonitoring(ActionEvent e) {
 			AlertLogCommand alc = new AlertLogCommand("tail", alertLogReadLine, alertLogFilePath, alertLogDateFormat, alertLogDateFormatRegex);
 			AlertLogCommandPeriod alcp = new AlertLogCommandPeriod(alc, alertLogStartDay, alertLogEndDay);
 
-			osDiskUsageMAP.addTableDataSet(server.getServerName(), usecase.getCurrentOSDiskUsage("df -Ph"));
+			osDiskUsageMAP.addTableDataSet(server.getServerName(), usecase.getCurrentOSDiskUsage());
 			alertLogMonitoringResultMap.put(server.getServerName(), usecase.getAlertLogDuringPeriod(alcp));
 		}