diff --git a/Middleware/schedulers/src/main/java/com/intuit/quickfabric/schedulers/helpers/EMRClusterMetricsHelper.java b/Middleware/schedulers/src/main/java/com/intuit/quickfabric/schedulers/helpers/EMRClusterMetricsHelper.java index 21334c4..0b01b35 100644 --- a/Middleware/schedulers/src/main/java/com/intuit/quickfabric/schedulers/helpers/EMRClusterMetricsHelper.java +++ b/Middleware/schedulers/src/main/java/com/intuit/quickfabric/schedulers/helpers/EMRClusterMetricsHelper.java @@ -324,10 +324,17 @@ public void monthlyReport() { logger.info("Fetching Metrics for EMR Clusters for monthly report"); List reportMetrics = emrClusterMetricsDao.getClusterMetricsReport(lastMonth, currentTime, "all"); + logger.info("Fetching clusters close to rotation SLA for AMI rotation monthly report"); + List clusters = + this.emrClusterMetadataDao.getAMIRotationReport("all").stream() + .filter(c -> c.getAMIRotationDaysToGo() < 7).collect(Collectors.toList()); + logger.info("Picked up clusters close to rotation SLA for AMI rotation monthly report"); + ReportBuilder builder = new ReportBuilder(); String report = builder.openHtmlTag() .openBodyTag() + .appendAMIRotationReport(clusters, currentTime) .appendMetricsReport(reportMetrics, lastMonth, currentTime) .closeBodyTag() .closeHtmlTag() @@ -338,7 +345,6 @@ public void monthlyReport() { String recipients = configHelper.getConfigValue("report_recipients"); emailUtil.sendEmail(report,subject, recipients.split(",")); - }