Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,10 @@

import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.scheduling.annotation.EnableScheduling;

@SpringBootApplication
@EnableScheduling
public class MonitorApplication {

public static void main(String[] args) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,12 @@
import com.sysadmin.monitor.entity.SystemMetric;
import org.springframework.data.domain.Pageable;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.Modifying;
import org.springframework.data.jpa.repository.Query;
import org.springframework.stereotype.Repository;
import org.springframework.transaction.annotation.Transactional;

import java.time.LocalDateTime;
import java.util.List;

@Repository
Expand All @@ -16,9 +19,13 @@ public interface SystemMetricRepository extends JpaRepository<SystemMetric, Long

List<SystemMetric> findByHostnameOrderByTimestampDesc(String hostname, Pageable pageable);

@Modifying
@Transactional
long deleteByTimestampBefore(LocalDateTime limite);

@Query("SELECT DISTINCT m.hostname FROM SystemMetric m ORDER BY m.hostname")
List<String> findDistinctHostnames();

@Query("SELECT new com.sysadmin.monitor.dto.MetricSummaryDTO(m.hostname, AVG(m.cpuUsage), MAX(m.cpuUsage), AVG(m.ramUsage), MAX(m.ramUsage), AVG(m.diskUsage), MAX(m.diskUsage)) FROM SystemMetric m GROUP BY m.hostname ORDER BY m.hostname")
List<MetricSummaryDTO> findSummaryByHost();
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,9 @@ public class MetricService {
@Value("${monitor.alerts.ram:90}")
private double ramThreshold;

@Value("${monitor.retention.days:7}")
private int retentionDays;

public SystemMetric saveMetric(SystemMetricDTO dto) {

SystemMetric metric = SystemMetric.builder()
Expand Down Expand Up @@ -119,6 +122,15 @@ public List<AlertDTO> getAlerts() {
return alerts;
}

public long deleteOldMetrics() {
LocalDateTime limite = LocalDateTime.now().minusDays(retentionDays);
long borradas = metricRepository.deleteByTimestampBefore(limite);

log.info("Retencion - borradas {} metricas anteriores a {}", borradas, limite);

return borradas;
}

public List<String> getHostnames() {
return metricRepository.findDistinctHostnames();
}
Expand Down
18 changes: 18 additions & 0 deletions backend/src/main/java/com/sysadmin/monitor/task/RetentionTask.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
package com.sysadmin.monitor.task;

import com.sysadmin.monitor.service.MetricService;
import lombok.RequiredArgsConstructor;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;

@Component
@RequiredArgsConstructor
public class RetentionTask {

private final MetricService metricService;

@Scheduled(cron = "${monitor.retention.cron:0 0 4 * * *}")
public void limpiarMetricasAntiguas() {
metricService.deleteOldMetrics();
}
}
4 changes: 4 additions & 0 deletions backend/src/main/resources/application.properties
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,7 @@ spring.jpa.properties.hibernate.format_sql=true
# umbrales de alerta en porcentaje
monitor.alerts.cpu=85
monitor.alerts.ram=90

# retencion: borramos las metricas de mas de 7 dias cada noche a las 4
monitor.retention.days=7
monitor.retention.cron=0 0 4 * * *
Loading