Merge pull request #227 from JanElholm/doazureconsumptionpreviousmonth

Added support for -DoAzureConsumptionPreviousMonth

Author: JulianHayward

.azuredevops/pipelines/AzGovViz.variables.yml

@@ -147,6 +147,11 @@ variables:
     # Integer | default = 1 | example: value: 7
     value: 14
 
+  # Define if Azure Consumption data should be reported for previous month
+  - name: DoAzureConsumptionPreviousMonth
+    # Switch | example: value: true
+    value:
+
   # Do not include Role assignments on ResourceGroups and Resources
   - name: DoNotIncludeResourceGroupsAndResourcesOnRBAC
     # Switch | example: value: true

README.md

@@ -509,6 +509,7 @@ Screenshot of Microsoft Graph permissions in the Microsoft Entra admin center
 * ~~`-ServicePrincipalExpiryWarningDays`~~ `-AADServicePrincipalExpiryWarningDays` - Define warning period for Service Principal secret and certificate expiry; default is 14 days
 * ~~`-NoAzureConsumption`~~ - Azure Consumption data should not be collected/reported
 * `-DoAzureConsumption` - Azure Consumption data should be collected/reported
+* `-DoAzureConsumptionPreviousMonth` - Azure Consumption data should be collected/reported for the previous month
 * `-AzureConsumptionPeriod` - Define for which time period Azure Consumption data should be gathered; default is 1 day
 * `-NoAzureConsumptionReportExportToCSV` - Azure Consumption data should not be exported (CSV)
 * `-NoScopeInsights` - Q: Why would you want to do this? A: In larger tenants the ScopeInsights section blows up the html file (up to unusable due to html file size). Use `-LargeTenant` to further reduce the output.
@@ -798,3 +799,4 @@ Also check <https://aka.ms/AzADServicePrincipalInsights> - What about your Micro
 ## Closing Note
 
 Please note that while being developed by a Microsoft employee, Azure Governance Visualizer is not a Microsoft service or product. Azure Governance Visualizer is a personal/community driven project, there are no implicit or explicit obligations related to this project, it is provided 'as is' with no warranties and confer no rights.
+

history.md

@@ -4,6 +4,10 @@
 
 ### Azure Governance Visualizer version 6
 
+__Changes__ (2024-Mar-14 / 6.4.3 Minor)
+
+* Support for `-DoAzureConsumptionPreviousMonth` - Azure Consumption data should be collected/reported for the previous month
+
 __Changes__ (2024-Mar-14 / 6.4.2 Minor)
 
 * optimize objects handling / best practices

pwsh/AzGovVizParallel.ps1

@@ -365,7 +365,7 @@ Param
     $Product = 'AzGovViz',
 
     [string]
-    $ProductVersion = '6.4.2',
+    $ProductVersion = '6.4.3',
 
     [string]
     $GithubRepository = 'aka.ms/AzGovViz',
@@ -454,6 +454,9 @@ Param
     [switch]
     $DoAzureConsumption,
 
+    [switch]
+    $DoAzureConsumptionPreviousMonth,
+
     [int]
     $AzureConsumptionPeriod = 1,
 
@@ -938,6 +941,10 @@ if (-not $HierarchyMapOnly) {
         $arrayTotalCostSummary = @()
         $azureConsumptionStartDate = ((Get-Date).AddDays( - ($($AzureConsumptionPeriod)))).ToString('yyyy-MM-dd')
         $azureConsumptionEndDate = ((Get-Date).AddDays(-1)).ToString('yyyy-MM-dd')
+        if ($azAPICallConf['htParameters'].DoAzureConsumptionPreviousMonth -eq $true) {
+            $azureConsumptionStartDate = ((Get-Date).AddMonths(-1).AddDays( - $((Get-Date).Day) + 1)).ToString('yyyy-MM-dd')
+            $azureConsumptionEndDate = ((Get-Date).AddDays( - $((Get-Date).Day))).ToString('yyyy-MM-dd')
+        }
     }
     $customDataCollectionDuration = [System.Collections.ArrayList]::Synchronized((New-Object System.Collections.ArrayList))
     $htResourceLocks = [System.Collections.Hashtable]::Synchronized((New-Object System.Collections.Hashtable)) #@{}

pwsh/dev/devAzGovVizParallel.ps1

@@ -17,6 +17,7 @@ function addHtParameters {
 
     $script:azAPICallConf['htParameters'] += [ordered]@{
         DoAzureConsumption                           = [bool]$DoAzureConsumption
+        DoAzureConsumptionPreviousMonth              = [bool]$DoAzureConsumptionPreviousMonth
         DoNotIncludeResourceGroupsOnPolicy           = [bool]$DoNotIncludeResourceGroupsOnPolicy
         DoNotIncludeResourceGroupsAndResourcesOnRBAC = [bool]$DoNotIncludeResourceGroupsAndResourcesOnRBAC
         DoNotShowRoleAssignmentsUserData             = [bool]$DoNotShowRoleAssignmentsUserData

pwsh/dev/functions/addHtParameters.ps1

@@ -1,3 +1,3 @@
-{
-  "ProductVersion": "6.4.2"
+{
+  "ProductVersion": "6.4.3"
 }