Merge pull request #333 from microsoft/3.6.9

Claudio-Merola · web-flow · commit fc83f3214d2f · 2025-06-06T10:50:10.000-03:00
3.6.9
diff --git a/AzureResourceInventory.psd1 b/AzureResourceInventory.psd1
@@ -3,7 +3,7 @@
 #
 # Generated by: Claudio Merola
 #
-# Updated on: 04/08/2025
+# Updated on: 06/06/2025
 #
 
 @{
@@ -12,7 +12,7 @@
 RootModule = 'AzureResourceInventory.psm1'
 
 # Version number of this module.
-ModuleVersion = '3.6.7'
+ModuleVersion = '3.6.9'
 
 # Supported PSEditions
 # CompatiblePSEditions = @()
diff --git a/Modules/Private/0.MainFunctions/Start-ARIProcessOrchestration.ps1 b/Modules/Private/0.MainFunctions/Start-ARIProcessOrchestration.ps1
@@ -12,7 +12,7 @@ https://github.com/microsoft/ARI/Modules/Private/0.MainFunctions/Start-ARIProces
 This PowerShell Module is part of Azure Resource Inventory (ARI)
 
 .NOTES
-Version: 3.6.0
+Version: 3.6.9
 First Release Date: 15th Oct, 2024
 Authors: Claudio Merola
 
@@ -35,7 +35,7 @@ function Start-ARIProcessOrchestration {
             {
                 Write-Output ((get-date -Format 'yyyy-MM-dd_HH_mm_ss')+' - '+'Processing Resources in Automation Mode')
 
-                Start-ARIAutProcessJob -Resources $Resources -Retirements $Retirements -Subscriptions $Subscriptions -InTag $InTag -Unsupported $Unsupported
+                Start-ARIAutProcessJob -Resources $Resources -Retirements $Retirements -Subscriptions $Subscriptions -Heavy $Heavy -InTag $InTag -Unsupported $Unsupported
             }
         else
             {
@@ -48,31 +48,28 @@ function Start-ARIProcessOrchestration {
 
         <############################################################## RESOURCES PROCESSING #############################################################>
 
-        if(![string]::IsNullOrEmpty($JobNames))
+        if ($Automation.IsPresent)
+            {
+                Write-Output ((get-date -Format 'yyyy-MM-dd_HH_mm_ss')+' - '+'Waiting for Resource Jobs to Complete in Automation Mode')
+                Get-Job | Where-Object {$_.name -like 'ResourceJob_*'} | Wait-Job
+            }
+        else
             {
-                if ($Automation.IsPresent)
-                    {
-                        Write-Output ((get-date -Format 'yyyy-MM-dd_HH_mm_ss')+' - '+'Waiting for Resource Jobs to Complete in Automation Mode')
-                        Get-Job | Where-Object {$_.name -like 'ResourceJob_*'} | Wait-Job
-                    }
-                else
-                    {
-                        $JobNames = (Get-Job | Where-Object {$_.name -like 'ResourceJob_*'}).Name
-                        Wait-ARIJob -JobNames $JobNames -JobType 'Resource' -LoopTime 5
-                    }
-
-                if ($Automation.IsPresent)
-                    {
-                        Write-Output ((get-date -Format 'yyyy-MM-dd_HH_mm_ss')+' - '+'Processing Resources in Automation Mode')
-                    }
-                else
-                    {
-                        Write-Debug ((get-date -Format 'yyyy-MM-dd_HH_mm_ss')+' - '+'Finished Waiting for Resource Jobs.')
-                    }
-
-                Build-ARICacheFiles -DefaultPath $DefaultPath -JobNames $JobNames
+                $JobNames = (Get-Job | Where-Object {$_.name -like 'ResourceJob_*'}).Name
+                Wait-ARIJob -JobNames $JobNames -JobType 'Resource' -LoopTime 5
             }
 
+        if ($Automation.IsPresent)
+            {
+                Write-Output ((get-date -Format 'yyyy-MM-dd_HH_mm_ss')+' - '+'Processing Resources in Automation Mode')
+            }
+        else
+            {
+                Write-Debug ((get-date -Format 'yyyy-MM-dd_HH_mm_ss')+' - '+'Finished Waiting for Resource Jobs.')
+            }
+
+        Build-ARICacheFiles -DefaultPath $DefaultPath -JobNames $JobNames
+
         Write-Progress -activity 'Azure Inventory' -Status "60% Complete." -PercentComplete 60 -CurrentOperation "Completed Data Processing Phase.."
 
 }
diff --git a/Modules/Private/2.ProcessingFunctions/Start-ARIAutProcessJob.ps1 b/Modules/Private/2.ProcessingFunctions/Start-ARIAutProcessJob.ps1
@@ -12,13 +12,13 @@ https://github.com/microsoft/ARI/Modules/Private/2.ProcessingFunctions/Start-ARI
 This PowerShell Module is part of Azure Resource Inventory (ARI).
 
 .NOTES
-Version: 3.6.5
+Version: 3.6.9
 First Release Date: 15th Oct, 2024
 Authors: Claudio Merola
 #>
 
 function Start-ARIAutProcessJob {
-    Param($Resources, $Retirements, $Subscriptions, $InTag, $Unsupported)
+    Param($Resources, $Retirements, $Subscriptions, $Heavy, $InTag, $Unsupported)
 
     $ParentPath = (get-item $PSScriptRoot).parent.parent
     $InventoryModulesPath = Join-Path $ParentPath 'Public' 'InventoryModules'
@@ -27,6 +27,16 @@ function Start-ARIAutProcessJob {
     $JobLoop = 1
     Write-Output ((get-date -Format 'yyyy-MM-dd_HH_mm_ss')+' - '+"Starting ARI Automation Processing Jobs...")
 
+    if ($Heavy.IsPresent -or $InTag.IsPresent)
+        {
+            Write-Output ('Heavy Mode Detected. Jobs will be run in small batches to avoid CPU and Memory Overload.')
+            $EnvSizeLooper = 2
+        }
+    else
+        {
+            $EnvSizeLooper = 4
+        }
+
     Foreach ($ModuleFolder in $Modules)
         {
             $ModulePath = Join-Path $ModuleFolder.FullName '*.ps1'
@@ -63,7 +73,7 @@ function Start-ARIAutProcessJob {
 
             } -ArgumentList $ModuleFiles, $PSScriptRoot, $Subscriptions, $InTag, $NewResources, $Retirements, 'Processing', $null, $null, $null, $Unsupported | Out-Null
 
-            if($JobLoop -eq 4)
+            if($JobLoop -eq $EnvSizeLooper)
                 {
                     Write-Output ((get-date -Format 'yyyy-MM-dd_HH_mm_ss')+' - '+'Waiting Batch Jobs')
 
diff --git a/Modules/Private/3.ReportingFunctions/Build-ARIAdvisoryReport.ps1 b/Modules/Private/3.ReportingFunctions/Build-ARIAdvisoryReport.ps1
@@ -12,32 +12,36 @@ https://github.com/microsoft/ARI/Modules/Private/3.ReportingFunctions/Build-ARIA
 This PowerShell Module is part of Azure Resource Inventory (ARI)
 
 .NOTES
-Version: 3.6.0
+Version: 3.6.9
 First Release Date: 15th Oct, 2024
 Authors: Claudio Merola
 #>
 
 function Build-ARIAdvisoryReport {
     param($File, $Adv, $TableStyle)
     $condtxtadv = @()
-    $condtxtadv += New-ConditionalText High -Range E:E
-    $condtxtadv += New-ConditionalText Security -Range D:D -BackgroundColor Wheat
+    $condtxtadv += New-ConditionalText High -Range H:H
+    $condtxtadv += New-ConditionalText Security -Range G:G -BackgroundColor Wheat
 
-    $Style = New-ExcelStyle -HorizontalAlignment Center -AutoSize -NumberFormat '#,##0.00' -Range H:H
+    $Style = New-ExcelStyle -HorizontalAlignment Center -AutoSize -NumberFormat '#,##0.00' -Range O:O
 
     [PSCustomObject]$Adv |
     ForEach-Object { $_ } |
-    Select-Object 'ResourceGroup',
-    'Affected Resource Type',
+    Select-Object 'Subscription',
+    'Resource Group',
+    'Resource Type',
     'Name',
+    'Detailed Type',
+    'Detailed Name',
     'Category',
     'Impact',
-    #'Score',
-    'Problem',
+    'Description',
+    'SKU',
+    'Term',
+    'Look-back Period',
+    'Quantity',
     'Savings Currency',
     'Annual Savings',
-    'Savings Region',
-    'Current SKU',
-    'Target SKU' |
+    'Savings Region' |
     Export-Excel -Path $File -WorksheetName 'Advisor' -AutoSize -MaxAutoSizeRows 100 -TableName 'AzureAdvisory' -MoveToStart -TableStyle $tableStyle -Style $Style -ConditionalText $condtxtadv
 }
diff --git a/Modules/Private/3.ReportingFunctions/Start-ARIExcelExtraData.ps1 b/Modules/Private/3.ReportingFunctions/Start-ARIExcelExtraData.ps1
@@ -12,7 +12,7 @@ https://github.com/microsoft/ARI/Modules/Private/3.ReportingFunctions/Start-ARIE
 This PowerShell Module is part of Azure Resource Inventory (ARI)
 
 .NOTES
-Version: 3.6.0
+Version: 3.6.9
 First Release Date: 15th Oct, 2024
 Authors: Claudio Merola
 #>
@@ -241,7 +241,6 @@ function Start-ARIExcelExtraData {
 
         }
 
-
     Close-ExcelPackage $excel
 
 }
diff --git a/Modules/Public/PublicFunctions/Invoke-ARI.ps1 b/Modules/Public/PublicFunctions/Invoke-ARI.ps1
@@ -312,6 +312,8 @@ Function Invoke-ARI {
 
     Clear-ARICacheFolder -ReportCache $ReportCache
 
+    Get-Job | Where-Object {$_.name -like 'ResourceJob_*'} | Remove-Job -Force | Out-Null
+
     $ExtractionRuntime = [System.Diagnostics.Stopwatch]::StartNew()
 
         $ExtractionData = Start-ARIExtractionOrchestration -ManagementGroup $ManagementGroup -Subscriptions $Subscriptions -SubscriptionID $SubscriptionID -ResourceGroup $ResourceGroup -SecurityCenter $SecurityCenter -SkipAdvisory $SkipAdvisory -SkipPolicy $SkipPolicy -IncludeTags $IncludeTags -TagKey $TagKey -TagValue $TagValue -SkipAPIs $SkipAPIs -SkipVMDetails $SkipVMDetails -IncludeCosts $IncludeCosts -Automation $Automation
diff --git a/Modules/Public/PublicFunctions/Jobs/Start-ARIAdvisoryJob.ps1 b/Modules/Public/PublicFunctions/Jobs/Start-ARIAdvisoryJob.ps1
@@ -12,7 +12,7 @@ https://github.com/microsoft/ARI/Modules/Public/PublicFunctions/Jobs/Start-ARIAd
     This powershell Module is part of Azure Resource Inventory (ARI)
 
 .NOTES
-Version: 3.6.0
+Version: 3.6.9
 First Release Date: 15th Oct, 2024
 Authors: Claudio Merola
 
@@ -23,23 +23,56 @@ function Start-ARIAdvisoryJob {
     $tmp = foreach ($1 in $Advisories)
         {
             $data = $1.PROPERTIES
-            $Savings = if([string]::IsNullOrEmpty($data.extendedProperties.annualSavingsAmount)){0}Else{$data.extendedProperties.annualSavingsAmount}
-            $SavingsCurrency = if([string]::IsNullOrEmpty($data.extendedProperties.savingsCurrency)){'USD'}Else{$data.extendedProperties.savingsCurrency}
-            $obj = @{
-                'ResourceGroup'          = $1.RESOURCEGROUP;
-                'Affected Resource Type' = $data.impactedField;
-                'Name'                   = $data.impactedValue;
-                'Category'               = $data.category;
-                'Impact'                 = $data.impact;
-                #'Score'                  = $data.extendedproperties.score;
-                'Problem'                = $data.shortDescription.problem;
-                'Savings Currency'       = $SavingsCurrency;
-                'Annual Savings'         = "=$Savings";
-                'Savings Region'         = $data.extendedProperties.location;
-                'Current SKU'            = $data.extendedProperties.currentSku;
-                'Target SKU'             = $data.extendedProperties.targetSku
-            }
-            $obj
+
+            if ($data.resourceMetadata.resourceId)
+                {
+                    $Savings = if([string]::IsNullOrEmpty($data.extendedProperties.annualSavingsAmount)){0}Else{$data.extendedProperties.annualSavingsAmount}
+                    $SavingsCurrency = if([string]::IsNullOrEmpty($data.extendedProperties.savingsCurrency)){'USD'}Else{$data.extendedProperties.savingsCurrency}
+                    $Resource = $data.resourceMetadata.resourceId.split('/')
+
+                    if ($Resource.Count -lt 4) {
+                        $ResourceType = $data.impactedField
+                        $ResourceName = $data.impactedValue
+                    }
+                    else {
+                        $ResourceType = ($Resource[6] + '/' + $Resource[7])
+                        $ResourceName = $Resource[8]
+                    }
+
+                    if ($data.impactedField -eq $ResourceType) {
+                            $ImpactedField = ''
+                    }
+                    else {
+                            $ImpactedField = $data.impactedField
+                    }
+
+                    if ($data.impactedValue -eq $ResourceName) {
+                            $ImpactedValue = ''
+                    }
+                    else {
+                            $ImpactedValue = $data.impactedValue
+                        }
+
+                    $obj = @{
+                        'Subscription'           = $Resource[2];
+                        'Resource Group'         = $Resource[4];
+                        'Resource Type'          = $ResourceType;
+                        'Name'                   = $ResourceName;
+                        'Detailed Type'          = $ImpactedField;
+                        'Detailed Name'          = $ImpactedValue;
+                        'Category'               = $data.category;
+                        'Impact'                 = $data.impact;
+                        'Description'            = $data.shortDescription.problem;
+                        'SKU'                    = $data.extendedProperties.sku;
+                        'Term'                   = $data.extendedProperties.term;
+                        'Look-back Period'       = $data.extendedProperties.lookbackPeriod;
+                        'Quantity'               = $data.extendedProperties.qty;
+                        'Savings Currency'       = $SavingsCurrency;
+                        'Annual Savings'         = "=$Savings";
+                        'Savings Region'         = $data.extendedProperties.region
+                    }
+                    $obj
+                }
         }
     $tmp
 }
diff --git a/SUPPORT.md b/SUPPORT.md
@@ -36,7 +36,7 @@ This project uses GitHub Issues to track bugs, feature requests, and questions.
 
 Official support for this project is limited to the GitHub issues system as described above.
 
-> **Note**: Azure Resource Inventory is an open-source project maintained by Microsoft. While we strive to address issues in a timely manner, response times may vary based on priority and maintainer availability.
+> **Note**: Azure Resource Inventory is an open-source project maintained by the community. While we strive to address issues in a timely manner, response times may vary based on priority and maintainer availability. Microsoft offers no official support for this project.
 
 ## 🔄 Issue Lifecycle
 

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`#`
`4`	`4`	`# Generated by: Claudio Merola`
`5`	`5`	`#`
`6`		`-# Updated on: 04/08/2025`
	`6`	`+# Updated on: 06/06/2025`
`7`	`7`	`#`
`8`	`8`
`9`	`9`	`@{`
`@@ -12,7 +12,7 @@`
`12`	`12`	`RootModule = 'AzureResourceInventory.psm1'`
`13`	`13`
`14`	`14`	`# Version number of this module.`
`15`		`-ModuleVersion = '3.6.7'`
	`15`	`+ModuleVersion = '3.6.9'`
`16`	`16`
`17`	`17`	`# Supported PSEditions`
`18`	`18`	`# CompatiblePSEditions = @()`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ https://github.com/microsoft/ARI/Modules/Private/3.ReportingFunctions/Start-ARIE`
`12`	`12`	`This PowerShell Module is part of Azure Resource Inventory (ARI)`
`13`	`13`
`14`	`14`	`.NOTES`
`15`		`-Version: 3.6.0`
	`15`	`+Version: 3.6.9`
`16`	`16`	`First Release Date: 15th Oct, 2024`
`17`	`17`	`Authors: Claudio Merola`
`18`	`18`	`#>`
`@@ -241,7 +241,6 @@ function Start-ARIExcelExtraData {`
`241`	`241`
`242`	`242`	`}`
`243`	`243`
`244`		`-`
`245`	`244`	`Close-ExcelPackage $excel`
`246`	`245`
`247`	`246`	`}`