Merge pull request #81 from Sysone-Final/feature/SYSONE-73-monitoring

Feature/sysone 73 monitoring

Author: snikuz12

src/main/java/org/example/finalbe/domains/monitoring/dto/DataCenterStatisticsDto.java

@@ -83,9 +83,6 @@ public class DataCenterStatisticsDto {
     private Integer criticalAlerts;       // Critical 알람 수
     private Integer warningAlerts;        // Warning 알람 수
 
-    // 전력 통계
-    private Double totalPowerUsage;       // 총 전력 사용량 (kW)
-    private Double avgPowerUsagePerRack;  // 랙당 평균 전력 사용량 (kW)
 
     // 서버실별 요약 (선택적)
     private List<ServerRoomSummaryDto> serverRoomSummaries;

src/main/java/org/example/finalbe/domains/monitoring/service/AggregatedMonitoringScheduler.java

@@ -12,6 +12,8 @@
 import org.springframework.stereotype.Service;
 
 import java.util.List;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.Executor;
 import java.util.stream.Collectors;
 
 /**
@@ -29,16 +31,13 @@ public class AggregatedMonitoringScheduler {
     private final DataCenterMonitoringService dataCenterMonitoringService;
     private final SseService sseService;
     private final AlertEvaluationService alertEvaluationService;
+    private final Executor taskExecutor;
 
-    /**
-     * 서버실 통계 갱신 스케줄러
-     * ✅ DB에서 활성 서버실을 동적으로 조회하여 처리
-     */
-    @Scheduled(fixedDelayString = "${monitoring.scheduler.statistics-interval:5000}")
+    @Scheduled(fixedRateString = "${monitoring.scheduler.statistics-interval:5000}")
     public void updateServerRoomStatistics() {
         log.debug("=== ServerRoom 통합 모니터링 시작 ===");
+        long totalStartTime = System.currentTimeMillis();
 
-        // ✅ DB에서 활성 서버실 목록 동적 조회
         List<Long> serverRoomIds = serverRoomRepository.findAllByDelYn(DelYN.N)
                 .stream()
                 .map(serverRoom -> serverRoom.getId())
@@ -49,40 +48,41 @@ public void updateServerRoomStatistics() {
             return;
         }
 
-        log.debug("처리 대상 서버실: {} (총 {}개)", serverRoomIds, serverRoomIds.size());
-
-        int successCount = 0;
-        int failCount = 0;
-
-        for (Long serverRoomId : serverRoomIds) {
-            try {
-                ServerRoomStatisticsDto statistics = serverRoomMonitoringService
-                        .calculateServerRoomStatistics(serverRoomId);
-
-                sseService.sendToServerRoom(serverRoomId, "serverroom-statistics", statistics);
-
-                // ✅ 알림 평가 호출
-                alertEvaluationService.evaluateServerRoomStatistics(statistics);
+        // ✅ 병렬 처리
+        List<CompletableFuture<Void>> futures = serverRoomIds.stream()
+                .map(serverRoomId -> CompletableFuture.runAsync(() -> {
+                    long startTime = System.currentTimeMillis();
+                    try {
+                        ServerRoomStatisticsDto statistics = serverRoomMonitoringService
+                                .calculateServerRoomStatistics(serverRoomId);
+
+                        sseService.sendToServerRoom(serverRoomId, "serverroom-statistics", statistics);
+                        alertEvaluationService.evaluateServerRoomStatistics(statistics);
+
+                        long duration = System.currentTimeMillis() - startTime;
+                        if (duration > 3000) {
+                            log.warn("⚠️ ServerRoom {} 통계 계산 느림: {}ms", serverRoomId, duration);
+                        }
+                    } catch (Exception e) {
+                        log.error("❌ ServerRoom {} 통합 모니터링 실패: {}", serverRoomId, e.getMessage());
+                    }
+                }, taskExecutor))
+                .collect(Collectors.toList());
 
-                successCount++;
-            } catch (Exception e) {
-                log.error("ServerRoom {} 통합 모니터링 실패: {}", serverRoomId, e.getMessage());
-                failCount++;
-            }
-        }
+        // 모든 작업 완료 대기
+        CompletableFuture.allOf(futures.toArray(new CompletableFuture[0])).join();
 
-        log.debug("ServerRoom 통합 모니터링 완료 - 성공: {}, 실패: {}", successCount, failCount);
+        long totalDuration = System.currentTimeMillis() - totalStartTime;
+        log.info("📊 ServerRoom 통합 모니터링 완료 - 총 소요시간: {}ms", totalDuration);
     }
-
     /**
      * 데이터센터 통계 갱신 스케줄러
-     * ✅ DB에서 활성 데이터센터를 동적으로 조회하여 처리
+     * ✅ fixedRate로 변경: 정확히 5초마다 실행
      */
-    @Scheduled(fixedDelayString = "${monitoring.scheduler.datacenter-interval:5000}")
+    @Scheduled(fixedRateString = "${monitoring.scheduler.datacenter-interval:5000}")
     public void updateDataCenterStatistics() {
         log.debug("=== DataCenter 통합 모니터링 시작 ===");
 
-        // ✅ DB에서 활성 데이터센터 목록 동적 조회
         List<Long> dataCenterIds = dataCenterRepository.findAllByDelYn(DelYN.N)
                 .stream()
                 .map(dataCenter -> dataCenter.getId())
@@ -104,8 +104,6 @@ public void updateDataCenterStatistics() {
                         .calculateDataCenterStatistics(dataCenterId);
 
                 sseService.sendToDataCenter(dataCenterId, "datacenter-statistics", statistics);
-
-                // ✅ 알림 평가 호출
                 alertEvaluationService.evaluateDataCenterStatistics(statistics);
 
                 successCount++;

src/main/java/org/example/finalbe/domains/monitoring/service/DataCenterMonitoringService.java

@@ -317,14 +317,7 @@ public DataCenterStatisticsDto calculateDataCenterStatistics(Long dataCenterId)
                 .mapToInt(Integer::intValue)
                 .sum();
 
-        // 10. 전력 통계 집계
-        Double totalPowerUsage = serverRoomStats.stream()
-                .map(ServerRoomStatisticsDto::getTotalPowerUsage)
-                .filter(val -> val != null)
-                .mapToDouble(Double::doubleValue)
-                .sum();
-
-        Double avgPowerUsagePerRack = totalRacks > 0 ? totalPowerUsage / totalRacks : 0.0;
+        // ❌ 10. 전력 통계 집계 - 삭제됨
 
         // 11. 서버실별 요약 생성
         List<DataCenterStatisticsDto.ServerRoomSummaryDto> serverRoomSummaries = serverRoomStats.stream()
@@ -394,9 +387,9 @@ public DataCenterStatisticsDto calculateDataCenterStatistics(Long dataCenterId)
                 .totalAlerts(totalAlerts)
                 .criticalAlerts(criticalAlerts)
                 .warningAlerts(warningAlerts)
-                // 전력 통계
-                .totalPowerUsage(totalPowerUsage)
-                .avgPowerUsagePerRack(avgPowerUsagePerRack)
+                // ❌ 전력 통계 삭제됨
+                // .totalPowerUsage(totalPowerUsage)
+                // .avgPowerUsagePerRack(avgPowerUsagePerRack)
                 // 서버실별 요약
                 .serverRoomSummaries(serverRoomSummaries)
                 .build();