diff --git a/nise/__init__.py b/nise/__init__.py index 75fba08a..1baf204c 100644 --- a/nise/__init__.py +++ b/nise/__init__.py @@ -1,3 +1,3 @@ -__version__ = "4.6.3" +__version__ = "4.6.4" VERSION = __version__.split(".") diff --git a/nise/generators/azure/azure_generator.py b/nise/generators/azure/azure_generator.py index 9095b3cc..cba5bbf4 100644 --- a/nise/generators/azure/azure_generator.py +++ b/nise/generators/azure/azure_generator.py @@ -430,10 +430,8 @@ def _update_data(self, row, start, end, **kwargs): row["ResourceGroup"] = resource_group row["MarketPrice"] = 0 - resource_name = "" - if kwargs.get("instance_id"): - resource_name = kwargs.get("instance_id").split("/") - resource_name = resource_name[len(resource_name) - 1] + resource_name = instance_id.split("/")[-1] if instance_id else "" + if self._service_name == "Virtual Machines": if getattr(self, "_CCSP", False): publisher_name = "Microsoft" @@ -510,6 +508,7 @@ def _map_header_to_report_version(self, row, meter_sub, amount, rate, cost, inst row["ResourceId"] = instance_id row["BillingCurrency"] = self._billing_currency else: + row["InstanceName"] = instance_id row["BillingCurrencyCode"] = self._billing_currency return row