Skip to content

Commit 8d86329

Browse files
DokyeongyunDokyeongyun
authored
Merge pull request #144 from Dokyeongyun/ft-220206-changeReportFileFormat
Ft 220206 change report file format
2 parents 51a7223 + 986a126 commit 8d86329

28 files changed

+516
-470
lines changed

‎pom.xml‎

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,20 @@
33
<groupId>DBMonitoring</groupId>
44
<artifactId>DBMonitoring</artifactId>
55
<version>0.0.1-SNAPSHOT</version>
6+
<build>
7+
<plugins>
8+
<plugin>
9+
<groupId>org.apache.maven.plugins</groupId>
10+
<artifactId>maven-compiler-plugin</artifactId>
11+
<configuration>
12+
<source>9</source>
13+
<target>9</target>
14+
</configuration>
15+
</plugin>
16+
</plugins>
17+
</build>
618

7-
<dependencies>
19+
<dependencies>
820
<!-- https://mvnrepository.com/artifact/org.quartz-scheduler/quartz -->
921
<dependency>
1022
<groupId>org.quartz-scheduler</groupId>
@@ -173,5 +185,14 @@
173185
<artifactId>commons-lang3</artifactId>
174186
<version>3.11</version>
175187
</dependency>
188+
189+
<!-- Junit-jupiter-api -->
190+
<dependency>
191+
<groupId>org.junit.jupiter</groupId>
192+
<artifactId>junit-jupiter-api</artifactId>
193+
<version>5.7.0</version>
194+
<scope>test</scope>
195+
</dependency>
196+
176197
</dependencies>
177198
</project>

‎src/main/java/Test/Main.java‎

Lines changed: 0 additions & 60 deletions
This file was deleted.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ public static void serverMonitoring() {
103103
AlertLogCommand alc = new AlertLogCommand("tail", alertLogReadLine, alertLogFilePath, alertLogDateFormat, alertLogDateFormatRegex);
104104
AlertLogCommandPeriod alcp = new AlertLogCommandPeriod(alc, DateUtils.addDate(DateUtils.getToday("yyyy-MM-dd"), 0, 0, -1), DateUtils.getToday("yyyy-MM-dd"));
105105
serverBatch.startBatchAlertLogCheckDuringPeriod(alcp);
106-
serverBatch.startBatchOSDiskUsageCheck("df -Ph");
106+
serverBatch.startBatchOSDiskUsageCheck();
107107
//System.out.println("□ [ " + serverName + " Monitoring End ]\n\n");
108108
}
109109
}

‎src/main/java/root/applications/CsvReportSeparatorApp.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,8 @@ public static void main(String[] args) throws IOException {
5555

5656
for(String key : map.keySet()) {
5757
// System.out.println("[" + key + "]\n" + map.get(key));
58-
reportRepository.writeReportFile(filePath + "/" + fileName, key, ".txt", map.get(key).toString());
58+
// TODO 수정
59+
// reportRepository.writeReportFile(filePath + "/" + fileName, key, ".txt", map.get(key).toString());
5960
}
6061
}
6162
}

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,11 @@ public void startBatchAlertLogCheckDuringPeriod(AlertLogCommandPeriod alcp) {
2727
}
2828
}
2929

30-
public void startBatchOSDiskUsageCheck(String command) {
30+
public void startBatchOSDiskUsageCheck() {
3131
try {
32-
this.serverCheckUsecase.printOSDiskUsage(command);
33-
this.serverCheckUsecase.writeExcelOSDiskUsage(command);
34-
this.serverCheckUsecase.writeCsvOSDiskUsage(command);
32+
this.serverCheckUsecase.printOSDiskUsage();
33+
this.serverCheckUsecase.writeExcelOSDiskUsage();
34+
this.serverCheckUsecase.writeCsvOSDiskUsage();
3535
}catch(Exception e) {
3636
e.printStackTrace();
3737
}

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

Lines changed: 5 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,59 +1,28 @@
11
package root.core.domain;
22

3-
import java.util.List;
4-
5-
import com.opencsv.bean.CsvBindByName;
6-
import com.opencsv.bean.CsvCustomBindByName;
7-
83
import lombok.AllArgsConstructor;
94
import lombok.Data;
105
import lombok.NoArgsConstructor;
11-
import root.javafx.CustomView.UnitStringConverter;
126

137
@AllArgsConstructor
148
@NoArgsConstructor
159
@Data
1610
public class ASMDiskUsage {
1711

18-
@CsvBindByName(column = "NAME")
1912
private String asmDiskGroupName;
2013

21-
@CsvBindByName(column = "TYPE")
2214
private String asmDiskGroupType;
2315

24-
@CsvCustomBindByName(column = "TOTAL_RAW(MB)", converter = UnitStringConverter.class)
25-
private UnitString totalRawSpace;
16+
private double totalRawSpace;
2617

27-
@CsvCustomBindByName(column = "TOTAL_USABLE(MB)", converter = UnitStringConverter.class)
28-
private UnitString totalFreeSpace;
18+
private double totalFreeSpace;
2919

30-
@CsvCustomBindByName(column = "FREE(MB)", converter = UnitStringConverter.class)
31-
private UnitString freeSpace;
20+
private double freeSpace;
3221

33-
@CsvCustomBindByName(column = "USED(MB)", converter = UnitStringConverter.class)
34-
private UnitString usedSpace;
22+
private double usedSpace;
3523

36-
@CsvCustomBindByName(column = "USED(%)", converter = UnitStringConverter.class)
37-
private UnitString usedPercent;
24+
private double usedPercent;
3825

39-
@CsvBindByName(column = "RESULT")
4026
private String resultMsg;
4127

42-
public static String toCsvString(List<ASMDiskUsage> list) {
43-
StringBuffer toCsv = new StringBuffer();
44-
toCsv.append("NAME,TYPE,TOTAL_RAW(MB),TOTAL_USABLE(MB),USED(MB),USED(%),FREE(MB),RESULT").append("\n");
45-
46-
for (ASMDiskUsage data : list) {
47-
toCsv.append(data.getAsmDiskGroupName()).append(",");
48-
toCsv.append(data.getAsmDiskGroupType()).append(",");
49-
toCsv.append(data.getTotalRawSpace().getValue()).append(data.getTotalRawSpace().getUnit()).append(",");
50-
toCsv.append(data.getTotalFreeSpace().getValue()).append(data.getTotalFreeSpace().getUnit()).append(",");
51-
toCsv.append(data.getFreeSpace().getValue()).append(data.getFreeSpace().getUnit()).append(",");
52-
toCsv.append(data.getUsedSpace().getValue()).append(data.getUsedSpace().getUnit()).append(",");
53-
toCsv.append(data.getUsedPercent().getValue()).append(data.getUsedPercent().getUnit()).append(",");
54-
toCsv.append(data.getResultMsg()).append("\n");
55-
}
56-
57-
return toCsv.toString();
58-
}
5928
}

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

Lines changed: 6 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,10 @@
11
package root.core.domain;
22

3-
import java.util.List;
4-
53
import com.opencsv.bean.CsvBindByName;
6-
import com.opencsv.bean.CsvCustomBindByName;
74

85
import lombok.AllArgsConstructor;
96
import lombok.Data;
107
import lombok.NoArgsConstructor;
11-
import root.javafx.CustomView.UnitStringConverter;
128

139
@AllArgsConstructor
1410
@NoArgsConstructor
@@ -21,35 +17,14 @@ public class ArchiveUsage {
2117
@CsvBindByName(column = "NumberOfFiles")
2218
private int numberOfFiles;
2319

24-
@CsvCustomBindByName(column = "LimitSpace(G)", converter = UnitStringConverter.class)
25-
private UnitString totalSpace;
20+
private double totalSpace;
21+
22+
private double reclaimableSpace;
2623

27-
@CsvCustomBindByName(column = "ReclaimableSpace(G)", converter = UnitStringConverter.class)
28-
private UnitString reclaimableSpace;
24+
private double usedSpace;
2925

30-
@CsvCustomBindByName(column = "UsedSpace(G)", converter = UnitStringConverter.class)
31-
private UnitString usedSpace;
26+
private double usedPercent;
3227

33-
@CsvCustomBindByName(column = "Used(%)", converter = UnitStringConverter.class)
34-
private UnitString usedPercent;
35-
36-
@CsvBindByName(column = "DNT")
3728
private String dnt;
38-
39-
public static String toCsvString(List<ArchiveUsage> list) {
40-
StringBuffer toCsv = new StringBuffer();
41-
toCsv.append("NAME,NumberOfFiles,Used(%),UsedSpace(G),ReclaimableSpace(G),LimitSpace(G),DNT").append("\n");
42-
43-
for(ArchiveUsage data : list) {
44-
toCsv.append(data.getArchiveName()).append(",");
45-
toCsv.append(data.getNumberOfFiles()).append(",");
46-
toCsv.append(data.getUsedPercent().getValue()).append(data.getUsedPercent().getUnit()).append(",");
47-
toCsv.append(data.getUsedSpace().getValue()).append(data.getUsedSpace().getUnit()).append(",");
48-
toCsv.append(data.getReclaimableSpace().getValue()).append(data.getReclaimableSpace().getUnit()).append(",");
49-
toCsv.append(data.getTotalSpace().getValue()).append(data.getTotalSpace().getUnit()).append(",");
50-
toCsv.append(data.getDnt()).append("\n");
51-
}
52-
53-
return toCsv.toString();
54-
}
29+
5530
}

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

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
package root.core.domain;
2+
3+
import java.text.SimpleDateFormat;
4+
import java.util.Date;
5+
import java.util.List;
6+
7+
import lombok.AllArgsConstructor;
8+
import lombok.Data;
9+
import root.utils.DateUtils;
10+
11+
@AllArgsConstructor
12+
@Data
13+
public class MonitoringResult<T> {
14+
private Date monitoringDate;
15+
private List<T> monitoringResults;
16+
17+
public MonitoringResult(List<T> monitoringResults) {
18+
this.monitoringDate = new Date();
19+
this.monitoringResults = monitoringResults;
20+
}
21+
22+
public String getMonitoringDay() {
23+
if(monitoringDate == null) {
24+
return null;
25+
}
26+
27+
return DateUtils.format(monitoringDate, "yyyyMMdd");
28+
}
29+
30+
public String getMonitoringTime() {
31+
if(monitoringDate == null) {
32+
return null;
33+
}
34+
35+
return DateUtils.format(monitoringDate, "HHmmss");
36+
}
37+
}

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

Lines changed: 4 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,51 +1,24 @@
11
package root.core.domain;
22

3-
import java.util.List;
4-
5-
import com.opencsv.bean.CsvBindByName;
6-
import com.opencsv.bean.CsvCustomBindByName;
7-
83
import lombok.AllArgsConstructor;
94
import lombok.Data;
105
import lombok.NoArgsConstructor;
11-
import root.javafx.CustomView.UnitStringConverter;
126

137
@AllArgsConstructor
148
@NoArgsConstructor
159
@Data
1610
public class OSDiskUsage {
1711

18-
@CsvBindByName(column = "Filesystem")
1912
private String fileSystem;
2013

21-
@CsvBindByName(column = "Mounted on")
2214
private String mountedOn;
2315

24-
@CsvCustomBindByName(column = "Size", converter = UnitStringConverter.class)
25-
private UnitString totalSpace;
26-
27-
@CsvCustomBindByName(column = "Avail", converter = UnitStringConverter.class)
28-
private UnitString freeSpace;
29-
30-
@CsvCustomBindByName(column = "Used", converter = UnitStringConverter.class)
31-
private UnitString usedSpace;
16+
private double totalSpace;
3217

33-
@CsvCustomBindByName(column = "Use%", converter = UnitStringConverter.class)
34-
private UnitString usedPercent;
18+
private double freeSpace;
3519

36-
public static String toCsvString(List<OSDiskUsage> list) {
37-
StringBuffer toCsv = new StringBuffer();
38-
toCsv.append("Filesystem,Size,Used,Avail,Use%,Mounted on").append("\n");
20+
private double usedSpace;
3921

40-
for (OSDiskUsage data : list) {
41-
toCsv.append(data.getFileSystem()).append(",");
42-
toCsv.append(data.getTotalSpace().getValue()).append(data.getTotalSpace().getUnit()).append(",");
43-
toCsv.append(data.getUsedSpace().getValue()).append(data.getUsedSpace().getUnit()).append(",");
44-
toCsv.append(data.getFreeSpace().getValue()).append(data.getFreeSpace().getUnit()).append(",");
45-
toCsv.append(data.getUsedPercent().getValue()).append(data.getUsedPercent().getUnit()).append(",");
46-
toCsv.append(data.getMountedOn()).append("\n");
47-
}
22+
private double usedPercent;
4823

49-
return toCsv.toString();
50-
}
5124
}

0 commit comments

Comments
 (0)