Merge pull request #257 from Dokyeongyun/ft-220524-windowServerOSDiskMonitoring

ft-220524-windowServerOSDiskMonitoring

Author: Dokyeongyun

Repository/src/main/java/root/repository/implement/LinuxServerMonitoringRepository.java

@@ -73,7 +73,7 @@ public List<OSDiskUsage> checkOSDiskUsage() {
 		return list;
 	}
 
-	public List<OSDiskUsage> stringToOsDiskUsageList(String result) {
+	private List<OSDiskUsage> stringToOsDiskUsageList(String result) {
 		StringTokenizer st = new StringTokenizer(result);
 		List<String> header = Arrays
 				.asList(new String[] { "Filesystem", "1024-blocks", "Used", "Available", "Capacity", "Mounted on" });

Repository/src/main/java/root/repository/implement/WindowServerMonitoringRepository.java

@@ -1,5 +1,7 @@
 package root.repository.implement;
 
+import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.StringTokenizer;
 
@@ -50,7 +52,7 @@ public String checkAlertLog(AlertLogCommand alc) {
 		try {
 			String command = String.format("tail -%d %s", alc.getReadLine() - 1, alc.getReadFilePath());
 			result = jsch.executeCommand(command);
-			result = result.replace("\r\n", "\n");
+//			result = result.replace("\r\n", "\n");
 		} catch (Exception e) {
 			log.error(e.getMessage());
 		}
@@ -60,6 +62,65 @@ public String checkAlertLog(AlertLogCommand alc) {
 
 	@Override
 	public List<OSDiskUsage> checkOSDiskUsage() {
-		return null;
+		List<OSDiskUsage> list = new ArrayList<>();
+		try {
+			String command = "wmic logicaldisk get deviceid,filesystem,size,freespace";
+			String result = jsch.executeCommand(command);
+			list = stringToOsDiskUsageList(result);
+		} catch (Exception e) {
+			log.error(e.getMessage());
+		}
+
+		return list;
+	}
+
+	private List<OSDiskUsage> stringToOsDiskUsageList(String result) {
+		StringTokenizer st = new StringTokenizer(result);
+		List<String> header = Arrays.asList(new String[] { "DeviceID", "FileSystem", "FreeSpace", "Size" });
+		List<OSDiskUsage> list = new ArrayList<>();
+
+		boolean isHeader = true;
+		int index = 0;
+
+		OSDiskUsage row = new OSDiskUsage();
+		while (st.hasMoreElements()) {
+			String next = st.nextToken();
+			if (!isHeader) {
+				String headerName = header.get(index++);
+
+				switch (headerName) {
+				case "DeviceID":
+					row.setMountedOn(next);
+					break;
+				case "FileSystem":
+					row.setFileSystem(next);
+					break;
+				case "FreeSpace":
+					row.setFreeSpace(Double.valueOf(next));
+					break;
+				case "Size":
+					row.setTotalSpace(Double.valueOf(next));
+					break;
+				}
+
+				if (index == 4) {
+					double total = row.getTotalSpace();
+					double free = row.getFreeSpace();
+					double used = total - free;
+					row.setUsedSpace(used);
+					row.setUsedPercent(used / total * 100);
+
+					list.add(row);
+					row = new OSDiskUsage();
+					index = 0;
+				}
+			}
+
+			if (next.equals("Size")) {
+				isHeader = false;
+			}
+		}
+
+		return list;
 	}
 }

Repository/src/test/java/root/repository/implement/WindowServerMonitoringRepositoryTest.java

@@ -1,13 +1,15 @@
 package root.repository.implement;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.junit.jupiter.api.Assertions.fail;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.file.Files;
 import java.nio.file.Paths;
+import java.util.List;
 
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
@@ -21,6 +23,7 @@
 import root.common.server.implement.JschConnectionInfo;
 import root.common.server.implement.JschServer;
 import root.common.server.implement.ServerOS;
+import root.core.domain.OSDiskUsage;
 import root.core.repository.constracts.ServerMonitoringRepository;
 
 public class WindowServerMonitoringRepositoryTest {
@@ -130,9 +133,9 @@ public void testCheckAlertLog_Last10Lines() throws Exception {
 	public void testCheckOSDiskUsage() {
 		// Arrange
 		// Act
-		// List<OSDiskUsage> result = repo.checkOSDiskUsage();
+		 List<OSDiskUsage> result = repo.checkOSDiskUsage();
 
 		// Assert
-		// assertTrue(result.size() != 0);
+		 assertTrue(result.size() != 0);
 	}
 }