adjusted metrics period to the standarts

plugins/aws/fix_plugin_aws/resource/cloudwatch.py

@@ -644,18 +644,21 @@ def query_for_multiple(
                 )
             )
 
-        # Retrieve results from submitted queries and populate the result dictionary
-        for future in as_completed(futures):
-            try:
-                metric_query_result = future.result()
-                for metric, metric_id in metric_query_result:
-                    if metric is not None and metric_id is not None:
-                        query_result = lookup.get(metric_id)
-                        if query_result:
-                            result[query_result] = metric
-            except Exception as e:
-                log.warning(f"An error occurred while processing a metric query: {e}")
-                raise e
+        try:
+            # Retrieve results from submitted queries with a timeout limit
+            for future in as_completed(futures, 60):
+                try:
+                    metric_query_result = future.result()
+                    for metric, metric_id in metric_query_result:
+                        if metric is not None and metric_id is not None:
+                            query_result = lookup.get(metric_id)
+                            if query_result:
+                                result[query_result] = metric
+                except Exception as e:
+                    log.warning(f"An error occurred while processing a metric query: {e}")
+                    raise e
+        except TimeoutError as e:
+            log.warning(f"An error ocurred while waiting futures: {e}")
 
         return result
 

plugins/aws/fix_plugin_aws/resource/ec2.py

@@ -617,7 +617,7 @@ def collect_usage_metrics(self, builder: GraphBuilder) -> List[AwsCloudwatchQuer
         queries: List[AwsCloudwatchQuery] = []
         delta = builder.metrics_delta
 
-        period = min(timedelta(minutes=5), delta)
+        period = timedelta(minutes=5)
 
         queries.extend(
             [
@@ -1403,9 +1403,8 @@ def collect_usage_metrics(self, builder: GraphBuilder) -> List[AwsCloudwatchQuer
             return []
         queries: List[AwsCloudwatchQuery] = []
         delta_since_last_scan = builder.metrics_delta
-        # for metrics which are expressed as sum, we want the period to be
-        # 5 minutes or less if the last scan was less than 5 minutes ago
-        period = min(timedelta(minutes=5), delta_since_last_scan)
+        # for metrics which are expressed as sum, we want the period to be 5 minutes
+        period = timedelta(minutes=5)
 
         queries.extend(
             [

plugins/aws/fix_plugin_aws/resource/elb.py

@@ -355,7 +355,7 @@ def collect_usage_metrics(self, builder: GraphBuilder) -> List[AwsCloudwatchQuer
         queries: List[AwsCloudwatchQuery] = []
         delta = builder.metrics_delta
 
-        period = min(timedelta(minutes=5), delta)
+        period = timedelta(minutes=5)
 
         queries.extend(
             [

plugins/aws/fix_plugin_aws/resource/elbv2.py

@@ -433,7 +433,7 @@ def collect_usage_metrics(self, builder: GraphBuilder) -> List[AwsCloudwatchQuer
         queries: List[AwsCloudwatchQuery] = []
         delta = builder.metrics_delta
 
-        period = min(timedelta(minutes=5), delta)
+        period = timedelta(minutes=1)
 
         lb_id = "/".join((self.arn or "").split("/")[-3:])
         queries.extend(
@@ -465,7 +465,7 @@ def collect_usage_metrics(self, builder: GraphBuilder) -> List[AwsCloudwatchQuer
                 AwsCloudwatchQuery.create(
                     metric_name="TargetResponseTime",
                     namespace="AWS/ApplicationELB",
-                    period=period,
+                    period=delta,
                     ref_id=self.id,
                     metric_normalizer_name=MetricName.TargetResponseTime,
                     metric_normalization=normalizer_factory.seconds,
@@ -693,7 +693,7 @@ def collect_usage_metrics(self, builder: GraphBuilder) -> List[AwsCloudwatchQuer
         queries: List[AwsCloudwatchQuery] = []
         delta = builder.metrics_delta
 
-        period = min(timedelta(minutes=5), delta)
+        period = timedelta(minutes=1)
 
         tg_arn_id = (self.arn or "").split(":")[-1]
         lb_arn_id = "/".join(self.alb_lb_arns[0].split("/")[-3:])

plugins/aws/fix_plugin_aws/resource/lambda_.py

@@ -401,7 +401,8 @@ def collect_usage_metrics(self, builder: GraphBuilder) -> List[AwsCloudwatchQuer
             return []
         queries: List[AwsCloudwatchQuery] = []
         delta = builder.metrics_delta
-        period = min(timedelta(minutes=5), delta)
+        # Lambda metrics support a 1-minute interval
+        period = timedelta(minutes=1)
 
         queries.extend(
             [

plugins/aws/fix_plugin_aws/resource/sns.py

@@ -93,9 +93,8 @@ def collect_usage_metrics(self, builder: GraphBuilder) -> List[AwsCloudwatchQuer
             return []
         queries: List[AwsCloudwatchQuery] = []
         delta = builder.metrics_delta
-
-        period = min(timedelta(minutes=5), delta)
-
+        # SNS metrics are available at a 1-minute interval
+        period = timedelta(minutes=1)
         queries.extend(
             [
                 AwsCloudwatchQuery.create(