Fix missing CapacityReservationId and CapacityReservationStatus columns in Power BI storage templates

docs-mslearn/toolkit/changelog.md

@@ -45,6 +45,7 @@ The following section lists features and enhancements that are currently in deve
 
 - **Fixed**
   - Fixed tag expansion in Power BI reports when tag names contain special characters like colons.
+  - Fixed missing `CapacityReservationId` and `CapacityReservationStatus` columns in storage-based Power BI templates ([#1839](https://github.com/microsoft/finops-toolkit/issues/1839)).
 
 ### [FinOps hubs](hubs/finops-hubs-overview.md) v13
 

src/power-bi/queries/ftk_NormalizeSchema.pq

@@ -287,7 +287,9 @@ let
     BillingAccountType         = Table.AddColumn(BillingAccountName,         "BillingAccountType", each if [x_AccountType] = "MCA" then "Billing Profile" else if [x_AccountType] = "EA" then "Billing Account" else "Subscription"),
     BillingPeriodEnd           = _swapCol(BillingAccountType,                "tmp_BillingPeriodEnd",   "BillingPeriodEnd",          each if _isMissing("tmp_BillingPeriodEnd") then Date.StartOfMonth(Date.AddDays([ChargePeriodStart], 31)) else Date.AddDays([tmp_BillingPeriodEnd], 1), type date),
     BillingPeriodStart         = _swapCol(BillingPeriodEnd,                  "tmp_BillingPeriodStart", "BillingPeriodStart",        each if _isBlank([tmp_BillingPeriodStart]) then Date.StartOfMonth([ChargePeriodStart]) else [tmp_BillingPeriodStart], type date),
-    ChargeCategory             = Table.AddColumn(BillingPeriodStart,         "ChargeCategory",     each if _isBlank([tmp_ChargeType]) then "Usage" else if [tmp_ChargeType] = "Usage" or [tmp_ChargeType] = "Purchase" or [tmp_ChargeType] = "Tax" then [tmp_ChargeType] else if Text.StartsWith([tmp_ChargeType], "Unused") then "Usage" else if [tmp_ChargeType] = "Refund" then "Purchase" else "Adjustment"),
+    CapacityReservationId      = Table.AddColumn(BillingPeriodStart,         "CapacityReservationId",  each if _isNotBlank([x_CapacityCommitmentId]) then [x_CapacityCommitmentId] else null),
+    CapacityReservationStatus  = Table.AddColumn(CapacityReservationId,      "CapacityReservationStatus", each if _isBlank([CapacityReservationId]) then null else if _isNotBlank([x_ResourceType]) and Text.Lower([x_ResourceType]) = "microsoft.compute/capacityreservationgroups/capacityreservations" then "Unused" else "Used"),
+    ChargeCategory             = Table.AddColumn(CapacityReservationStatus,  "ChargeCategory",     each if _isBlank([tmp_ChargeType]) then "Usage" else if [tmp_ChargeType] = "Usage" or [tmp_ChargeType] = "Purchase" or [tmp_ChargeType] = "Tax" then [tmp_ChargeType] else if Text.StartsWith([tmp_ChargeType], "Unused") then "Usage" else if [tmp_ChargeType] = "Refund" then "Purchase" else "Adjustment"),
     ChargeClass                = Table.AddColumn(ChargeCategory,             "ChargeClass",        each if [tmp_ChargeType] = "Refund" then "Correction" else null),
     ChargeDescription          = Table.AddColumn(ChargeClass,                "ChargeDescription",  each [x_SkuDescription]),
 // TODO: PricingQuantity,SkuId,SkuPriceId

src/power-bi/storage/Shared.Dataset/definition/tables/Costs.tmdl

@@ -796,6 +796,22 @@ table Costs
 
 		annotation PBI_FormatHint = {"isCustom":true}
 
+	column CapacityReservationId
+		dataType: string
+		lineageTag: 7a3e4b1c-6f8e-4d9a-b5c1-3e2f4a7b8c9d
+		summarizeBy: none
+		sourceColumn: CapacityReservationId
+
+		annotation SummarizationSetBy = Automatic
+
+	column CapacityReservationStatus
+		dataType: string
+		lineageTag: 8b4f5c2d-7g9f-5e0b-c6d2-4f3e5b8a9c0e
+		summarizeBy: none
+		sourceColumn: CapacityReservationStatus
+
+		annotation SummarizationSetBy = Automatic
+
 	column ChargeCategory
 		dataType: string
 		lineageTag: 669cea79-1e27-46c1-a88f-0ad859cee094