diff --git a/cloud_governance/common/clouds/azure/monitor/monitor_management_operations.py b/cloud_governance/common/clouds/azure/monitor/monitor_management_operations.py index 32778253..a5d38cab 100644 --- a/cloud_governance/common/clouds/azure/monitor/monitor_management_operations.py +++ b/cloud_governance/common/clouds/azure/monitor/monitor_management_operations.py @@ -81,7 +81,7 @@ def get_resource_metrics(self, resource_id: str, metricnames: str, aggregation: if not timespan: end_date = datetime.now(tz=timezone.utc) start_date = end_date - timedelta(days=UNUSED_DAYS) - timespan = f'{start_date.isoformat()}/{end_date.isoformat()}' + timespan = f'{start_date.strftime("%Y-%m-%dT%H:%M:%SZ")}/{end_date.strftime("%Y-%m-%dT%H:%M:%SZ")}' response = self.__monitor_client.metrics.list(resource_uri=resource_id, timespan=timespan, metricnames=metricnames, aggregation=aggregation, result_type='Data', interval=interval, diff --git a/cloud_governance/policy/helpers/azure/azure_policy_operations.py b/cloud_governance/policy/helpers/azure/azure_policy_operations.py index 9af80f86..4fac7903 100644 --- a/cloud_governance/policy/helpers/azure/azure_policy_operations.py +++ b/cloud_governance/policy/helpers/azure/azure_policy_operations.py @@ -199,7 +199,7 @@ def get_cpu_utilization_percentage_metric(self, resource_id: str, days: int = IN :rtype: """ start_date, end_date = Utils.get_start_and_end_datetime(days=days) - timespan = f'{start_date.isoformat()}/{end_date.isoformat()}' + timespan = f'{start_date.strftime("%Y-%m-%dT%H:%M:%SZ")}/{end_date.strftime("%Y-%m-%dT%H:%M:%SZ")}' cpu_metrics = self.monitor_operations.get_resource_metrics(resource_id=resource_id, metricnames='Percentage CPU', aggregation='Average', @@ -218,7 +218,7 @@ def get_network_in_kib_metric(self, resource_id: str, days: int = INSTANCE_IDLE_ :rtype: """ start_date, end_date = Utils.get_start_and_end_datetime(days=days) - timespan = f'{start_date.isoformat()}/{end_date.isoformat()}' + timespan = f'{start_date.strftime("%Y-%m-%dT%H:%M:%SZ")}/{end_date.strftime("%Y-%m-%dT%H:%M:%SZ")}' network_in_metrics = self.monitor_operations.get_resource_metrics(resource_id=resource_id, metricnames='Network In Total', aggregation='Average', @@ -238,7 +238,7 @@ def get_network_out_kib_metric(self, resource_id: str, days: int = INSTANCE_IDLE :rtype: """ start_date, end_date = Utils.get_start_and_end_datetime(days=days) - timespan = f'{start_date.isoformat()}/{end_date.isoformat()}' + timespan = f'{start_date.strftime("%Y-%m-%dT%H:%M:%SZ")}/{end_date.strftime("%Y-%m-%dT%H:%M:%SZ")}' network_out_metrics = self.monitor_operations.get_resource_metrics(resource_id=resource_id, metricnames='Network Out Total', aggregation='Average',