Skip to content

Commit 7c9839f

Browse files
arthurclaresarthurclares
committed
Fixes [ADX] Reservations Recommendations doesn't surface all valid recommendations. #1408, [HUB] Reservation Recommendations not populating correctly in Rate Optimization Power BI (ADX 0.8) #1388, [Power B] Add RI/SP breakeven point to Rate optimization report #406 
1 parent 691d499 commit 7c9839f

File tree

8 files changed

+523
-466
lines changed

8 files changed

+523
-466
lines changed

‎src/power-bi/kql/RateOptimization.Report/report.json

+214-196
Large diffs are not rendered by default.

‎src/power-bi/kql/Shared.Dataset/definition/cultures/en-US.tmdl

+23-26
Original file line numberDiff line numberDiff line change
@@ -45966,19 +45966,7 @@ cultureInfo en-US
4596645966
"ConceptualProperty": "x_CommitmentDiscountMeterCategory"
4596745967
}
4596845968
},
45969-
"State": "Generated",
45970-
"Terms": [
45971-
{
45972-
"Meter category": {
45973-
"State": "Suggested",
45974-
"Source": {
45975-
"Type": "External",
45976-
"Agent": "PowerBI.VisualColumnRename"
45977-
},
45978-
"Weight": 0.9
45979-
}
45980-
}
45981-
]
45969+
"State": "Generated"
4598245970
},
4598345971
"costs.x_commitmentdiscountmetersubcategory": {
4598445972
"Definition": {
@@ -45987,19 +45975,7 @@ cultureInfo en-US
4598745975
"ConceptualProperty": "x_CommitmentDiscountMeterSubcategory"
4598845976
}
4598945977
},
45990-
"State": "Generated",
45991-
"Terms": [
45992-
{
45993-
"Meter subcategory": {
45994-
"State": "Suggested",
45995-
"Source": {
45996-
"Type": "External",
45997-
"Agent": "PowerBI.VisualColumnRename"
45998-
},
45999-
"Weight": 0.9
46000-
}
46001-
}
46002-
]
45978+
"State": "Generated"
4600345979
},
4600445980
"costs.billingaccountname": {
4600545981
"Definition": {
@@ -46082,6 +46058,27 @@ cultureInfo en-US
4608246058
}
4608346059
}
4608446060
]
46061+
},
46062+
"reservationrecommendations.x_breakevenmonths": {
46063+
"Definition": {
46064+
"Binding": {
46065+
"ConceptualEntity": "ReservationRecommendations",
46066+
"ConceptualProperty": "x_BreakEvenMonths"
46067+
}
46068+
},
46069+
"State": "Generated",
46070+
"Terms": [
46071+
{
46072+
"BreakEvenMonths": {
46073+
"State": "Suggested",
46074+
"Source": {
46075+
"Type": "External",
46076+
"Agent": "PowerBI.VisualColumnRename"
46077+
},
46078+
"Weight": 0.9
46079+
}
46080+
}
46081+
]
4608546082
}
4608646083
},
4608746084
"Relationships": {

‎src/power-bi/kql/Shared.Dataset/definition/tables/ReservationRecommendations.tmdl

+24-3
Original file line numberDiff line numberDiff line change
@@ -184,24 +184,45 @@ table ReservationRecommendations
184184

185185
annotation SummarizationSetBy = Automatic
186186

187+
column x_BreakEvenMonths =
188+
SWITCH(
189+
TRUE(),
190+
[x_SkuTerm] = 12,
191+
ROUND(
192+
[x_EffectiveCostAfter] * 12 / [x_EffectiveCostBefore],
193+
0
194+
),
195+
[x_SkuTerm] = 36,
196+
ROUND(
197+
[x_EffectiveCostAfter] * 36 / [x_EffectiveCostBefore],
198+
0
199+
),
200+
BLANK()
201+
)
202+
lineageTag: 74417a2c-ee2a-49c9-9c35-5d49521a1277
203+
summarizeBy: sum
204+
205+
annotation SummarizationSetBy = Automatic
206+
207+
annotation PBI_FormatHint = {"isGeneralNumber":true}
208+
187209
partition ReservationRecommendations = m
188210
mode: directQuery
189211
queryGroup: 'Data Explorer'
190212
source =
191213
let
192214
Source = AzureDataExplorer.Contents(#"Cluster URL", "Hub", "
193215

194-
Recommendations_v1_0
216+
Recommendations_v1_0
195217
| where x_SourceProvider == 'Microsoft' and x_SourceType == 'ReservationRecommendations'
196-
| as rec
197-
| where x_RecommendationDate in ((rec | distinct x_RecommendationDate | order by x_RecommendationDate desc | limit 1))
198218
| extend RegionId = tostring(x_RecommendationDetails.RegionId)
199219
| extend RegionName = tostring(x_RecommendationDetails.RegionName)
200220
| extend x_CommitmentDiscountSavings = x_EffectiveCostBefore - x_EffectiveCostAfter
201221
| extend x_CommitmentDiscountScope = tostring(x_RecommendationDetails.CommitmentDiscountScope)
202222
| extend x_CommitmentDiscountNormalizedSize = tostring(x_RecommendationDetails.CommitmentDiscountNormalizedSize)
203223
| extend x_SkuTerm = toint(x_RecommendationDetails.SkuTerm)
204224
| extend x_SkuMeterId = tostring(x_RecommendationDetails.SkuMeterId)
225+
| summarize arg_max(x_RecommendationDate, *) by x_CommitmentDiscountNormalizedSize, x_SkuMeterId, x_SkuTerm, RegionId,tostring(x_RecommendationDetails.CommitmentDiscountNormalizedGroup)
205226
| project
206227
RegionId,
207228
RegionName = iff(isempty(RegionName), RegionId, RegionName),

‎src/power-bi/storage/RateOptimization.Report/report.json

+215-197
Large diffs are not rendered by default.

‎src/power-bi/storage/Shared.Dataset/definition/cultures/en-US.tmdl

+2-26
Original file line numberDiff line numberDiff line change
@@ -76945,19 +76945,7 @@ cultureInfo en-US
7694576945
"ConceptualProperty": "x_CommitmentDiscountMeterCategory"
7694676946
}
7694776947
},
76948-
"State": "Generated",
76949-
"Terms": [
76950-
{
76951-
"Meter category": {
76952-
"State": "Suggested",
76953-
"Source": {
76954-
"Type": "External",
76955-
"Agent": "PowerBI.VisualColumnRename"
76956-
},
76957-
"Weight": 0.9
76958-
}
76959-
}
76960-
]
76948+
"State": "Generated"
7696176949
},
7696276950
"costs.x_skucorecount": {
7696376951
"Definition": {
@@ -76987,19 +76975,7 @@ cultureInfo en-US
7698776975
"ConceptualProperty": "x_CommitmentDiscountMeterSubcategory"
7698876976
}
7698976977
},
76990-
"State": "Generated",
76991-
"Terms": [
76992-
{
76993-
"Meter subcategory": {
76994-
"State": "Suggested",
76995-
"Source": {
76996-
"Type": "External",
76997-
"Agent": "PowerBI.VisualColumnRename"
76998-
},
76999-
"Weight": 0.9
77000-
}
77001-
}
77002-
]
76978+
"State": "Generated"
7700376979
},
7700476980
"reservationrecommendations.regionname": {
7700576981
"Definition": {

‎src/power-bi/storage/Shared.Dataset/definition/model.tmdl

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ queryGroup 'Open data'
2828

2929
annotation __PBI_TimeIntelligenceEnabled = 0
3030

31-
annotation PBIDesktopVersion = 2.141.528.0 (25.03)+364bcf2c2b5bb0f5ca49d6d6922a547463bcdfd8
31+
annotation PBIDesktopVersion = 2.141.833.0 (25.03)+cdc444a951f7d3dd724d8de5dd58efd34e693cba
3232

3333
annotation PBI_QueryOrder = ["▶️ START HERE","Storage URL","RangeStart","RangeEnd","Number of Months","Default Granularity","ftk_DatetimeToJulianDate","ftk_DemoFilter","ftk_ImpalaToJulianDate","ftk_Metadata","ftk_ParseResourceId","ftk_ParseResourceName","ftk_ParseResourceType","ftk_Storage","Costs","InstanceSizeFlexibility","PricingUnits","Regions","ResourceTypes","Prices","Experimental: Add Missing Prices","Deprecated: Perform Extra Query Optimizations","HubScopes","HubSettings","StorageData","StorageErrors","AdvisorRecommendations","AdvisorReservationRecommendations","Disks","ManagementGroups","NetworkInterfaces","NetworkSecurityGroups","PolicyAssignments","PolicyDefinitions","PolicyStates","PublicIPAddresses","Resources","SqlDatabases","Subscriptions","VirtualMachines","ReservationRecommendations","ReservationDetails","ReservationTransactions"]
3434

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

+22
Original file line numberDiff line numberDiff line change
@@ -212,6 +212,28 @@ table ReservationRecommendations
212212

213213
annotation SummarizationSetBy = Automatic
214214

215+
column x_BreakEvenMonths =
216+
SWITCH(
217+
TRUE(),
218+
[x_SkuTerm] = 12,
219+
ROUND(
220+
[x_EffectiveCostAfter] * 12 / [x_EffectiveCostBefore],
221+
0
222+
),
223+
[x_SkuTerm] = 36,
224+
ROUND(
225+
[x_EffectiveCostAfter] * 36 / [x_EffectiveCostBefore],
226+
0
227+
),
228+
BLANK()
229+
)
230+
lineageTag: e46c9174-69f4-43ce-9ee0-2125bfe3bf43
231+
summarizeBy: sum
232+
233+
annotation SummarizationSetBy = Automatic
234+
235+
annotation PBI_FormatHint = {"isGeneralNumber":true}
236+
215237
partition ReservationRecommendations = m
216238
mode: import
217239
queryGroup: Storage

‎src/templates/finops-hub/modules/scripts/IngestionSetup.kql

+22-17
Original file line numberDiff line numberDiff line change
@@ -1436,10 +1436,7 @@ CommitmentDiscountUsage_transform_v1_0()
14361436
//----------------------------------------------------------------------------------------------------------------------
14371437

14381438
// Recommendations_transform_v1_0 function
1439-
.create-or-alter function
1440-
with (docstring='All recommendations transformed to FOCUS 1.0.', folder='Recommendations')
1441-
Recommendations_transform_v1_0()
1442-
{
1439+
.create-or-alter function with (docstring = "All recommendations transformed to FOCUS 1.0.",folder = "Recommendations") Recommendations_transform_v1_0() {
14431440
// NOTE: All open issues and questions are tracked @ https://github.com/microsoft/finops-toolkit/issues/1111
14441441
let isoMonths = (duration: string) {
14451442
let number = toint(replace_regex(duration, @'[PMY]', ''));
@@ -1500,21 +1497,29 @@ Recommendations_transform_v1_0()
15001497
)
15011498
//
15021499
// Sort columns and apply final transforms
1503-
| project
1504-
ProviderName,
1505-
SubAccountId = iff(isnotempty(SubscriptionId), strcat('/subscriptions/', SubscriptionId), ''),
1506-
x_IngestionTime = ingestion_time(),
1507-
x_EffectiveCostAfter = TotalCostWithReservedInstances,
1508-
x_EffectiveCostBefore = CostWithNoReservedInstances,
1509-
x_EffectiveCostSavings = NetSavings,
1510-
x_RecommendationDate = FirstUsageDate + (toint(extract(@'^Last([0-9]+)Days$', 1, LookBackPeriod)) * 1d),
1511-
x_RecommendationDetails,
1512-
x_SourceName,
1513-
x_SourceProvider,
1514-
x_SourceType,
1515-
x_SourceVersion
1500+
| extend x_RecommendationDate =
1501+
iff(
1502+
(FirstUsageDate + toint(extract(@'^Last([0-9]+)Days$', 1, LookBackPeriod)) * 1d) > now(),
1503+
now(),
1504+
FirstUsageDate + toint(extract(@'^Last([0-9]+)Days$', 1, LookBackPeriod)) * 1d
1505+
)
1506+
| project
1507+
ProviderName,
1508+
SubAccountId = iff(isnotempty(SubscriptionId), strcat('/subscriptions/', SubscriptionId), ''),
1509+
x_IngestionTime = ingestion_time(),
1510+
x_EffectiveCostAfter = TotalCostWithReservedInstances,
1511+
x_EffectiveCostBefore = CostWithNoReservedInstances,
1512+
x_EffectiveCostSavings = NetSavings,
1513+
x_RecommendationDetails,
1514+
x_RecommendationDate,
1515+
x_SourceName,
1516+
x_SourceProvider,
1517+
x_SourceType,
1518+
x_SourceVersion
15161519
}
15171520

1521+
1522+
15181523
//----------------------------------------------------------------------------------------------------------------------
15191524

15201525
// Recommendations_final_v1_0 table

0 commit comments

Comments
 (0)