Merge pull request #152 from Dokyeongyun/ft-220212-monitoringResultUnit

Ft 220212 monitoring result unit

Author: Dokyeongyun

config/common.properties

@@ -1,3 +1,4 @@
+
 # DB Setting Contents
 db.setting.contents=host,sid,user,password,port,driver,url
 db.setting.oracle.driver.combo=thin
@@ -10,3 +11,8 @@ db.monitoring.contents=Archive Usage,TableSpace Usage,ASM Disk Usage
 
 # Server monitoring Contents
 server.monitoring.contents=OS Disk Usage,Alert Log
+
+unit.filesize=GB
+
+unit.rounding=2
+

pom.xml

@@ -80,13 +80,6 @@
 		    <version>30.1.1-jre</version>
 		</dependency>
 
-		<!-- https://mvnrepository.com/artifact/com.opencsv/opencsv -->
-		<dependency>
-		    <groupId>com.opencsv</groupId>
-		    <artifactId>opencsv</artifactId>
-		    <version>5.4</version>
-		</dependency>
-		
 		<!-- https://mvnrepository.com/artifact/org.apache.poi/poi -->
 		<dependency>
 		    <groupId>org.apache.poi</groupId>

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

@@ -14,7 +14,7 @@
 import root.core.repository.constracts.DBCheckRepository;
 import root.core.repository.constracts.ServerCheckRepository;
 import root.core.repository.implement.DBCheckRepositoryImpl;
-import root.core.repository.implement.ReportRepositoryImpl;
+import root.core.repository.implement.ReportFileRepo;
 import root.core.repository.implement.ServerCheckRepositoryImpl;
 import root.core.usecase.constracts.DBCheckUsecase;
 import root.core.usecase.constracts.ServerCheckUsecase;
@@ -36,7 +36,7 @@ public static void main(String[] args) {
     			PropertiesUtils.loadAppConfiguration(lastUsePropertiesFile, "connInfoConfig");
     			PropertiesUtils.loadAppConfiguration(propertiesFilePath);
     			PropertiesUtils.loadCombinedConfiguration();
-    			PropertiesUtils.loadAppConfiguration(".\\config\\connectioninfo\\connection.properties", "connInfoConfig");
+    			PropertiesUtils.loadAppConfiguration(".\\config\\connectioninfo\\test.properties", "connInfoConfig");
     		}catch(Exception e) {
     			System.out.println("configuration loading error\n"+e+"\n");
     			return;
@@ -50,7 +50,7 @@ public static void main(String[] args) {
     		}
 
     		if("on".equals(serverMonitoring)) {
-    			serverMonitoring();
+    		//	serverMonitoring();
     		}
 
     	} catch (Exception e) {
@@ -72,7 +72,7 @@ public static void dbMonitoring() {
 			AbstractDatabase db = new JdbcDatabase(jdbc);
 			db.init();
 			DBCheckRepository repo = new DBCheckRepositoryImpl(db);
-			DBCheckUsecase usecase = new DBCheckUsecaseImpl(repo, ReportRepositoryImpl.getInstance());
+			DBCheckUsecase usecase = new DBCheckUsecaseImpl(repo, ReportFileRepo.getInstance());
 			DBCheckBatch dbBatch = new DBCheckBatch(usecase);
 			dbBatch.startBatchArchiveUsageCheck();
 			dbBatch.startBatchTableSpaceUsageCheck();

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

@@ -5,6 +5,8 @@
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
+import root.utils.UnitUtils;
+import root.utils.UnitUtils.FileSize;
 
 @NoArgsConstructor
 @EqualsAndHashCode(callSuper = false)
@@ -54,4 +56,12 @@ public ASMDiskUsage(String monitoringDate, String monitoringTime, String asmDisk
 
 	private String resultMsg;
 
+	@Override
+	public void convertUnit(FileSize fromUnit, FileSize toUnit, int round) {
+		this.totalRawSpace = UnitUtils.convertFileUnit(fromUnit, toUnit, totalRawSpace, round);
+		this.totalFreeSpace = UnitUtils.convertFileUnit(fromUnit, toUnit, totalFreeSpace, round);
+		this.freeSpace = UnitUtils.convertFileUnit(fromUnit, toUnit, freeSpace, round);
+		this.usedSpace = UnitUtils.convertFileUnit(fromUnit, toUnit, usedSpace, round);
+	}
+
 }

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

@@ -5,6 +5,8 @@
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
+import root.utils.UnitUtils;
+import root.utils.UnitUtils.FileSize;
 
 @NoArgsConstructor
 @EqualsAndHashCode(callSuper = false)
@@ -49,4 +51,11 @@ public ArchiveUsage(String monitoringDate, String monitoringTime, String archive
 
 	private String dnt;
 
+	@Override
+	public void convertUnit(FileSize fromUnit, FileSize toUnit, int round) {
+		this.totalSpace = UnitUtils.convertFileUnit(fromUnit, toUnit, totalSpace, round);
+		this.reclaimableSpace = UnitUtils.convertFileUnit(fromUnit, toUnit, reclaimableSpace, round);
+		this.usedSpace = UnitUtils.convertFileUnit(fromUnit, toUnit, usedSpace, round);
+	}
+
 }

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

@@ -6,11 +6,12 @@
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import root.utils.DateUtils;
+import root.utils.UnitUtils.FileSize;
 
 @NoArgsConstructor
 @AllArgsConstructor
 @Data
-public class MonitoringResult {
+public abstract class MonitoringResult {
 
 	private String monitoringDate;
 
@@ -20,4 +21,6 @@ public MonitoringResult(Date date) {
 		this.monitoringDate = DateUtils.format(date, "yyyyMMdd");
 		this.monitoringTime = DateUtils.format(date, "HHmmss");
 	}
+	
+	public abstract void convertUnit(FileSize fromUnit, FileSize toUnit, int round);
 }

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

@@ -3,6 +3,8 @@
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
+import root.utils.UnitUtils;
+import root.utils.UnitUtils.FileSize;
 
 @NoArgsConstructor
 @EqualsAndHashCode(callSuper = false)
@@ -32,4 +34,11 @@ public OSDiskUsage(String monitoringDate, String monitoringTime, String fileSyst
 
 	private double usedPercent;
 
+	@Override
+	public void convertUnit(FileSize fromUnit, FileSize toUnit, int round) {
+		this.totalSpace = UnitUtils.convertFileUnit(fromUnit, toUnit, totalSpace, round);
+		this.freeSpace = UnitUtils.convertFileUnit(fromUnit, toUnit, freeSpace, round);
+		this.usedSpace = UnitUtils.convertFileUnit(fromUnit, toUnit, usedSpace, round);
+	}
+
 }

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

@@ -5,14 +5,16 @@
 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 TableSpaceUsage extends MonitoringResult {
 
-	public TableSpaceUsage(Date monitoringDate, String tableSpaceName, double totalSpace,
-			double freeSpace, double usedSpace, double usedPercent) {
+	public TableSpaceUsage(Date monitoringDate, String tableSpaceName, double totalSpace, double freeSpace,
+			double usedSpace, double usedPercent) {
 		super(monitoringDate);
 		this.tableSpaceName = tableSpaceName;
 		this.totalSpace = totalSpace;
@@ -40,4 +42,11 @@ public TableSpaceUsage(String monitoringDate, String monitoringTime, String tabl
 	private double usedSpace;
 
 	private double usedPercent;
+
+	@Override
+	public void convertUnit(FileSize fromUnit, FileSize toUnit, int round) {
+		this.totalSpace = UnitUtils.convertFileUnit(fromUnit, toUnit, totalSpace, round);
+		this.freeSpace = UnitUtils.convertFileUnit(fromUnit, toUnit, freeSpace, round);
+		this.usedSpace = UnitUtils.convertFileUnit(fromUnit, toUnit, usedSpace, round);
+	}
 }

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

@@ -19,13 +19,19 @@ public interface PropertyRepository {
 	void saveDBConnectionInfo(String filePath, Map<String, JdbcConnectionInfo> config);
 
 	void saveServerConnectionInfo(String filePath, Map<String, JschConnectionInfo> config);
+	
+	void saveCommonConfig(Map<String, Object> values);
 
 	boolean loadConnectionInfoConfig(String filePath);
 
 	boolean loadMonitoringInfoConfig(String filePath);
 
 	String[] getConnectionInfoFileNames();
 
+	String getCommonResource(String key);
+
+	int getIntegerCommonResource(String key);
+
 	String[] getCommonResources(String key);
 
 	String[] getDBMonitoringContents();

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

@@ -1,14 +1,13 @@
 package root.core.repository.constracts;
 
-import java.io.File;
 import java.util.List;
 
 public interface ReportRepository {
 
 	<T> void writeReportFile(String filePath, String fileName, String fileExtension, List<T> monitoringResult,
 			Class<T> clazz);
 
-	List<String> getReportHeaders(File reportFile);
+	List<String> getReportHeaders(Class<?> monitoringType, String alias);
 
-	String getReportContentsInCsv(File reportFile);
+	String getReportContentsInCsv(Class<?> monitoringType, String alias);
 }