Skip to content

Fix bug where x_ResourceType is changed to the wrong value #1212

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.

Sign up for GitHub

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

Merged
Michael Flanakin (flanakin) merged 3 commits into from
Dec 22, 2024
Merged

Fix bug where x_ResourceType is changed to the wrong value #1212

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
658a886
Fix bug where x_ResourceType is changed to the wrong value
Dec 15, 2024
c403639
Update changelog
Dec 15, 2024
07f450b
Merge branch 'dev' into flanakin/dev/hubs-xrtbug
flanakin Dec 22, 2024
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
7 changes: 6 additions & 1 deletion docs/_resources/changelog.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,12 @@ Legend:
> ✏️ Changed:
>
> 1. Update required permissions on hubs page [Required permissions](../docs/_reporting/hubs/README.md).
>
> 🛠️ Fixed:
>
> 1. Fixed an issue where `x_ResourceType` is using the wrong value.
> - This fix resolves the issue for all newly ingested data.
> - To fix historical data, reingest data using the `ingestion_ExecuteETL` Data Factory pipeline.

🔍 Optimization engine
{: .fs-5 .fw-500 .mt-4 mb-0 }
Expand All @@ -103,7 +109,6 @@ Legend:
>
> 1. Improved multi-tenancy support with Azure Lighthouse guidance ([#1036](https://github.com/microsoft/finops-toolkit/issues/1036))


🦾 Bicep modules
{: .fs-5 .fw-500 .mt-4 mb-0 }

Expand Down
5 changes: 1 addition & 4 deletions src/templates/finops-hub/modules/scripts/IngestionSetup.kql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1010,10 +1010,7 @@ Costs_transform_v1_0()
x_ResellerId, // Azure 1.0-preview(v1)+
x_ResellerName, // Azure 1.0-preview(v1)+
x_ResourceGroupName = tolower(x_ResourceGroupName), // Azure 1.0-preview(v1)+
x_ResourceType = tolower(case(
isnotempty(ResourceType), ResourceType,
ChargeCategory == 'Purchase' and CommitmentDiscountType == 'Reservation', '',
ResourceType)), // Azure 1.0-preview(v1)+
x_ResourceType, // Azure 1.0-preview(v1)+
x_ServiceCode, // AWS 1.0
x_ServiceId, // GCP Jan 2024
x_ServicePeriodEnd, // Azure 1.0-preview(v1)+
Expand Down