Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Hubs ADX ingestion out of memory fix #1216

Open
wants to merge 2 commits into
base: dev
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions docs/_resources/changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,10 @@ Legend:
> ✏️ Changed:
>
> 1. Update required permissions on hubs page [Required permissions](../docs/_reporting/hubs/README.md).
>
> πŸ› οΈ Fixed:
>
> 1. Improved performance and memory consumption in the `parse_resourceid()` function to address out of memory errors during cost data ingestion ([#1188](https://github.com/microsoft/finops-toolkit/issues/1188))

πŸ” Optimization engine
{: .fs-5 .fw-500 .mt-4 mb-0 }
Expand Down
3 changes: 3 additions & 0 deletions src/templates/finops-hub/modules/scripts/Common.kql
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
// Copyright (c) Microsoft Corporation.
// Licensed under the MIT License.

//======================================================================================================================
// Common utility functions
//
Expand Down
3 changes: 3 additions & 0 deletions src/templates/finops-hub/modules/scripts/HubSetup.kql
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
// Copyright (c) Microsoft Corporation.
// Licensed under the MIT License.

//======================================================================================================================
// Hub database
// Used for querying and reporting.
Expand Down
25 changes: 13 additions & 12 deletions src/templates/finops-hub/modules/scripts/IngestionSetup.kql
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
// Copyright (c) Microsoft Corporation.
// Licensed under the MIT License.

//======================================================================================================================
// Ingestion database
// Used for data ingestion, normalization, and cleansing.
Expand Down Expand Up @@ -113,9 +116,8 @@ parse_resourceid(resourceId: string) {
dynamic([true, false, true, false, true, false, true, false, true, false, true, false, true, false, true, false, true, false]),
segments, dynamic([])), '/'), '//', '/'));
let xRT = iff(isempty(x_ResourceProvider) or isempty(x_ResourceTypePath), '', strcat(x_ResourceProvider, '/', x_ResourceTypePath));
let types = split(toscalar(database('Ingestion').ResourceTypes | summarize types = make_set(strcat(x_ResourceType, '=', SingularDisplayName)) | extend types = strcat('||', strcat_array(types, '||')), '||'), strcat('||', xRT, '='));
let ResourceType = iff(array_length(types) < 2, '', split(types[1], '||')[0]);
bag_pack('ResourceId', ResourceId, 'ResourceName', ResourceName, 'ResourceType', coalesce(ResourceType, xRT), 'SubAccountId', SubAccountId, 'x_ResourceGroupName', x_ResourceGroupName, 'x_ResourceProvider', x_ResourceProvider, 'x_ResourceType', xRT)
// TODO: Remove ResourceType in 0.9
bag_pack('ResourceId', ResourceId, 'ResourceName', ResourceName, 'ResourceType', xRT, 'SubAccountId', SubAccountId, 'x_ResourceGroupName', x_ResourceGroupName, 'x_ResourceProvider', x_ResourceProvider, 'x_ResourceType', xRT)
}


Expand Down Expand Up @@ -879,29 +881,28 @@ Costs_transform_v1_0()
isnotempty(ResourceId), ResourceId,
ChargeCategory == 'Purchase' and isnotempty(CommitmentDiscountId), CommitmentDiscountId,
ResourceId)
| extend tmp_ResourceDetails = parse_resourceid(ResourceId)
| extend ResourceName = tolower(case(
isnotempty(ResourceName), ResourceName,
ChargeCategory == 'Purchase' and isnotempty(CommitmentDiscountName), CommitmentDiscountName,
isnotempty(ResourceId), tmp_ResourceDetails.ResourceName,
isnotempty(ResourceId), parse_resourceid(ResourceId).ResourceName,
ResourceName))
| extend x_ResourceType = case(
isnotempty(x_ResourceType), x_ResourceType,
isnotempty(ResourceId), parse_resourceid(ResourceId).x_ResourceType,
x_ResourceType)
| extend ResourceType = case(
isnotempty(ResourceType), ResourceType,
isnotempty(ResourceId) and isnotempty(tmp_ResourceDetails.ResourceType), tmp_ResourceDetails.ResourceType,
isnotempty(ResourceId), parse_resourceid(ResourceId).ResourceType,
ChargeCategory == 'Purchase' and isnotempty(CommitmentDiscountType), CommitmentDiscountType,
ResourceType)
| extend x_ResourceType = case(
isnotempty(x_ResourceType), x_ResourceType,
isnotempty(ResourceId) and isnotempty(tmp_ResourceDetails.x_ResourceType), tmp_ResourceDetails.x_ResourceType,
x_ResourceType)
//
// Sort columns and apply final transforms
| project
AvailabilityZone,
BilledCost,
BillingAccountId,
BillingAccountName,
BillingAccountType, // Azure 1.0-preview(v1)+
BillingAccountType,
BillingCurrency,
BillingPeriodEnd,
BillingPeriodStart,
Expand Down Expand Up @@ -1275,7 +1276,7 @@ CommitmentDiscountUsage_transform_v1_0()
x_CommitmentDiscountNormalizedGroup = iff(InstanceFlexibilityGroup == 'NA', '', InstanceFlexibilityGroup),
x_CommitmentDiscountNormalizedRatio = InstanceFlexibilityRatio,
x_CommitmentDiscountQuantity = UsedHours * InstanceFlexibilityRatio,
x_IngestionTime = ingestion_time(), // Hubs add-on
x_IngestionTime = ingestion_time(),
x_ResourceGroupName = extract('/resourcegroups/([^/]+)/', 1, ResourceId),
x_ResourceType,
// x_RowId = hash_sha256(strcat(
Expand Down