Merge pull request #281 from VoicuAWS/add-ecs-license-idle-data

adding idle resources

Author: VoicuAWS

data-collection/deploy/deploy-in-management-account.yaml

@@ -313,6 +313,11 @@ Resources:
               - "rds:DescribeDBInstances"
               - "rds:DescribeDBClusters"
             Resource: "*"
+          - Effect: "Allow"
+            Action:
+              - "compute-optimizer:GetIdleRecommendations"
+              - "compute-optimizer:ExportIdleRecommendations"
+            Resource: "*"
       Roles:
         - Ref: LambdaRole
     Metadata:

data-collection/deploy/module-compute-optimizer.yaml

@@ -429,6 +429,7 @@ Resources:
                           'ecs_service':  co.export_ecs_service_recommendations,
                           'license':      co.export_license_recommendations,
                           'rds_database': partial(co.export_rds_database_recommendations, recommendationPreferences={'cpuVendorArchitectures': ARCH}),
+                          'idle':         co.export_idle_recommendations,
                       }
                       bucket = BUCKET_PREFIX + '.' + region
                       logger.info(f"INFO: bucket={bucket}")

test/test_from_scratch.py

@@ -174,7 +174,7 @@ def test_compute_optimizer_export_triggered(compute_optimizer, start_time):
     jobs = compute_optimizer.describe_recommendation_export_jobs()['recommendationExportJobs']
     logger.debug(f'Jobs in: {jobs}')
     jobs_since_start = [job for job in jobs if job['creationTimestamp'].replace(tzinfo=None) > start_time.replace(tzinfo=None)]
-    assert len(jobs_since_start) == 7, f'started {len(jobs_since_start)} jobs. Expected 7. Not all jobs launched'
+    assert len(jobs_since_start) == 8, f'started {len(jobs_since_start)} jobs. Expected 7. Not all jobs launched'
     jobs_failed = [job for job in jobs_since_start if job.get('status') == 'failed']
     assert len(jobs_failed) == 0, f'Some jobs failed {jobs_failed}'
     # TODO: check how we can add better test, taking into account 15-30 mins delay of export in CO