Merge pull request #186 from Dokyeongyun/develop

Develop

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":

src/main/java/root/core/service/contracts/PropertyService.java

@@ -5,6 +5,10 @@
 
 import root.core.domain.JdbcConnectionInfo;
 import root.core.domain.JschConnectionInfo;
+import root.core.domain.MonitoringYN;
+import root.core.domain.enums.RoundingDigits;
+import root.core.domain.enums.UsageUIType;
+import root.utils.UnitUtils.FileSize;
 
 public interface PropertyService {
 
@@ -14,7 +18,7 @@ public interface PropertyService {
 	 * @param filePath
 	 */
 	void loadConnectionInfoConfig(String filePath);
-	
+
 	/**
 	 * 모니터링 접속정보 설정파일의 경로를 반환한다.
 	 * 
@@ -35,14 +39,30 @@ public interface PropertyService {
 	 * @param filePath
 	 */
 	void loadMonitoringInfoConfig(String filePath);
-	
+
 	/**
 	 * 최근 사용된 모니터링 여부 Preset 설정파일의 Preset명을 반환한다.
 	 * 
 	 * @return
 	 */
 	String getLastUsePresetFileName(String filePath);
 
+	/**
+	 * 모니터링여부 Preset 설정파일을 읽어 DB 모니터링 여부 리스트를 반환한다.
+	 * 
+	 * @param presetConfigFileName
+	 * @return
+	 */
+	List<MonitoringYN> getDBMonitoringYnList(String presetConfigFileName);
+
+	/**
+	 * 모니터링여부 Preset 설정파일을 읽어 Server 모니터링 여부 리스트를 반환한다.
+	 * 
+	 * @param presetConfigFileName
+	 * @return
+	 */
+	List<MonitoringYN> getServerMonitoringYnList(String presetConfigFileName);
+
 	Map<String, String> getMonitoringPresetMap();
 
 	List<String> getMonitoringPresetFilePathList();
@@ -58,4 +78,25 @@ public interface PropertyService {
 	List<JdbcConnectionInfo> getJdbcConnInfoList(List<String> dbNames);
 
 	List<JschConnectionInfo> getJschConnInfoList(List<String> serverNames);
+
+	/**
+	 * 기본값으로 설정된 FileSize 단위를 반환한다.
+	 * 
+	 * @return
+	 */
+	FileSize getDefaultFileSizeUnit();
+
+	/**
+	 * 기본값으로 설정된 반올림 자릿수를 반환한다.
+	 * 
+	 * @return
+	 */
+	RoundingDigits getDefaultRoundingDigits();
+
+	/**
+	 * 기본값으로 설정된 사용량 컬럼 UI 타입을 반환한다.
+	 * 
+	 * @return
+	 */
+	UsageUIType getDefaultUsageUIType();
 }

src/main/java/root/core/service/implement/FilePropertyService.java

@@ -2,19 +2,26 @@
 
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Spliterator;
-import java.util.Spliterators;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
-import java.util.stream.StreamSupport;
+
+import org.apache.commons.configuration2.PropertiesConfiguration;
+import org.apache.commons.lang3.StringUtils;
 
 import root.core.domain.JdbcConnectionInfo;
 import root.core.domain.JschConnectionInfo;
+import root.core.domain.MonitoringYN;
+import root.core.domain.MonitoringYN.MonitoringTypeAndYN;
+import root.core.domain.enums.MonitoringType;
+import root.core.domain.enums.RoundingDigits;
+import root.core.domain.enums.UsageUIType;
 import root.core.repository.constracts.PropertyRepository;
 import root.core.service.contracts.PropertyService;
+import root.utils.UnitUtils.FileSize;
 
 public class FilePropertyService implements PropertyService {
 
@@ -59,20 +66,80 @@ public void loadMonitoringInfoConfig(String filePath) {
 		propRepo.loadMonitoringInfoConfig(filePath);
 	}
 
+	/**
+	 * 최근 사용된 모니터링 여부 Preset 설정파일명을 반환한다.
+	 */
 	@Override
 	public String getLastUsePresetFileName(String filePath) {
 		return propRepo.getLastUseMonitoringPresetName(filePath);
 	}
 
+	@Override
+	public List<MonitoringYN> getDBMonitoringYnList(String presetConfigFileName) {
+		String presetConfigFilePath = propRepo.getMonitoringPresetMap().get(presetConfigFileName);
+
+		// Load
+		loadMonitoringInfoConfig(presetConfigFilePath);
+
+		List<String> dbAliasList = Arrays.asList(propRepo.getMonitoringDBNames());
+		List<MonitoringType> monitoringTypeList = Arrays.asList(MonitoringType.values()).stream()
+				.filter(t -> t.getCategory().equals("DB")).collect(Collectors.toList());
+
+		return getMonitoringYNList(dbAliasList, monitoringTypeList);
+	}
+
+	@Override
+	public List<MonitoringYN> getServerMonitoringYnList(String presetConfigFileName) {
+		String presetConfigFilePath = propRepo.getMonitoringPresetMap().get(presetConfigFileName);
+
+		// Load
+		loadMonitoringInfoConfig(presetConfigFilePath);
+
+		List<String> serverAliasList = Arrays.asList(propRepo.getMonitoringServerNames());
+		List<MonitoringType> monitoringTypeList = Arrays.asList(MonitoringType.values()).stream()
+				.filter(t -> t.getCategory().equals("SERVER")).collect(Collectors.toList());
+
+		return getMonitoringYNList(serverAliasList, monitoringTypeList);
+	}
+
+	private List<MonitoringYN> getMonitoringYNList(List<String> aliasList, List<MonitoringType> monitoringTypeList) {
+
+		List<MonitoringYN> result = new ArrayList<>();
+		for (String serverAlias : aliasList) {
+			MonitoringYN monitoringYn = new MonitoringYN(serverAlias);
+			List<MonitoringTypeAndYN> list = new ArrayList<>();
+			for (MonitoringType monitoringType : monitoringTypeList) {
+				String yn = propRepo
+						.getMonitoringConfigResource(monitoringType.getName().replace(" ", "_") + "." + serverAlias);
+				if (!StringUtils.isEmpty(yn)) {
+					list.add(new MonitoringTypeAndYN(monitoringType, yn.equals("Y") ? true : false));
+				} else {
+					list.add(new MonitoringTypeAndYN(monitoringType, false));
+				}
+			}
+			monitoringYn.setMonitoringTypeList(list);
+			result.add(monitoringYn);
+		}
+
+		return result;
+	}
+
 	@Override
 	public Map<String, String> getMonitoringPresetMap() {
-		return StreamSupport
-				.stream(Spliterators.spliteratorUnknownSize(propRepo.getConfiguration("connInfoConfig").getKeys(),
-						Spliterator.ORDERED), false)
-				.filter(key -> key.matches(MONITORING_PRESET_KEY)).collect(Collectors.toUnmodifiableMap(key -> {
-					Matcher m = MONITORING_PRESET_KEY_PATTERN.matcher(key);
-					return m.matches() ? m.group(1) : null;
-				}, key -> propRepo.getMonitoringConfigResource(key)));
+		Map<String, String> result = new HashMap<>();
+
+		PropertiesConfiguration config = propRepo.getConfiguration("connInfoConfig");
+
+		config.getKeys().forEachRemaining(key -> {
+			if (key.matches(MONITORING_PRESET_KEY)) {
+				Matcher m = MONITORING_PRESET_KEY_PATTERN.matcher(key);
+				if (m.matches()) {
+					String presetName = m.group(1);
+					result.put(presetName, config.getString(key));
+				}
+			}
+		});
+		return result;
 	}
 
 	@Override
@@ -112,4 +179,27 @@ public List<JschConnectionInfo> getJschConnInfoList(List<String> serverNames) {
 				Collectors.mapping(serverName -> propRepo.getJschConnectionInfo(serverName), Collectors.toList()));
 	}
 
+	/**
+	 * 기본값으로 설정된 FileSize 단위를 반환한다.
+	 */
+	@Override
+	public FileSize getDefaultFileSizeUnit() {
+		return FileSize.find(propRepo.getCommonResource("unit.filesize"));
+	}
+
+	/**
+	 * 기본값으로 설정된 반올림 자릿수를 반환한다.
+	 */
+	@Override
+	public RoundingDigits getDefaultRoundingDigits() {
+		return RoundingDigits.find(propRepo.getCommonResource("unit.rounding"));
+	}
+
+	/**
+	 * 기본값으로 설정된 사용량 컬럼 UI 타입을 반환한다.
+	 */
+	@Override
+	public UsageUIType getDefaultUsageUIType() {
+		return UsageUIType.find(propRepo.getCommonResource("usage-ui-type"));
+	}
 }