Skip to content

Commit 5a38181

Browse files
ClaudioMerolaClaudioMerola
authored
Merge pull request #398 from microsoft/3.6.15
3.6.15
2 parents a2e26c4 + ecb1a28 commit 5a38181

3 files changed

Lines changed: 25 additions & 23 deletions

File tree

‎AzureResourceInventory.psd1‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
RootModule = 'AzureResourceInventory.psm1'
1313

1414
# Version number of this module.
15-
ModuleVersion = '3.6.14'
15+
ModuleVersion = '3.6.15'
1616

1717
# Supported PSEditions
1818
# CompatiblePSEditions = @()

‎Modules/Private/3.ReportingFunctions/Start-ARIExcelExtraData.ps1‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ https://github.com/microsoft/ARI/Modules/Private/3.ReportingFunctions/Start-ARIE
1212
This PowerShell Module is part of Azure Resource Inventory (ARI)
1313
1414
.NOTES
15-
Version: 3.6.14
15+
Version: 3.6.15
1616
First Release Date: 15th Oct, 2024
1717
Authors: Claudio Merola
1818
#>
@@ -38,20 +38,20 @@ function Start-ARIExcelExtraData {
3838
Add-ConditionalFormatting -WorkSheet $sheet -RuleType Between -ConditionValue 50 -ConditionValue2 100 -Address E:E -BackgroundColor "Yellow"
3939
Add-ConditionalFormatting -WorkSheet $sheet -RuleType Between -ConditionValue 1 -ConditionValue2 50 -Address E:E -BackgroundColor 'LightPink' -ForegroundColor 'DarkRed'
4040

41-
$null = $excel.$SheetName.Cells["AB1"].AddComment("Boot diagnostics is a debugging feature for Azure virtual machines (VM) that allows diagnosis of VM boot failures.", "Azure Resource Inventory")
42-
$excel.$SheetName.Cells["AB1"].Hyperlink = 'https://docs.microsoft.com/en-us/azure/virtual-machines/boot-diagnostics'
41+
$null = $excel.$SheetName.Cells["AC1"].AddComment("Boot diagnostics is a debugging feature for Azure virtual machines (VM) that allows diagnosis of VM boot failures.", "Azure Resource Inventory")
42+
$excel.$SheetName.Cells["AC1"].Hyperlink = 'https://docs.microsoft.com/en-us/azure/virtual-machines/boot-diagnostics'
4343

44-
$null = $excel.$SheetName.Cells["AC1"].AddComment("Is recommended to install Performance Diagnostics Agent in every Azure Virtual Machine upfront. The agent is only used when triggered by the console and may save time in an event of performance struggling.", "Azure Resource Inventory")
45-
$excel.$SheetName.Cells["AC1"].Hyperlink = 'https://docs.microsoft.com/en-us/azure/virtual-machines/troubleshooting/performance-diagnostics'
44+
$null = $excel.$SheetName.Cells["AD1"].AddComment("Is recommended to install Performance Diagnostics Agent in every Azure Virtual Machine upfront. The agent is only used when triggered by the console and may save time in an event of performance struggling.", "Azure Resource Inventory")
45+
$excel.$SheetName.Cells["AD1"].Hyperlink = 'https://docs.microsoft.com/en-us/azure/virtual-machines/troubleshooting/performance-diagnostics'
4646

47-
$null = $excel.$SheetName.Cells["AD1"].AddComment("We recommend that you use Azure Monitor to gain visibility into your resource's health.", "Azure Resource Inventory")
48-
$excel.$SheetName.Cells["AD1"].Hyperlink = 'https://docs.microsoft.com/en-us/azure/security/fundamentals/iaas#monitor-vm-performance'
47+
$null = $excel.$SheetName.Cells["AE1"].AddComment("We recommend that you use Azure Monitor to gain visibility into your resource's health.", "Azure Resource Inventory")
48+
$excel.$SheetName.Cells["AE1"].Hyperlink = 'https://docs.microsoft.com/en-us/azure/security/fundamentals/iaas#monitor-vm-performance'
4949

50-
$null = $excel.$SheetName.Cells["AP1"].AddComment("Use a network security group to protect against unsolicited traffic into Azure subnets. Network security groups are simple, stateful packet inspection devices that use the 5-tuple approach (source IP, source port, destination IP, destination port, and layer 4 protocol) to create allow/deny rules for network traffic.", "Azure Resource Inventory")
51-
$excel.$SheetName.Cells["AP1"].Hyperlink = 'https://docs.microsoft.com/en-us/azure/security/fundamentals/network-best-practices#logically-segment-subnets'
50+
$null = $excel.$SheetName.Cells["AQ1"].AddComment("Use a network security group to protect against unsolicited traffic into Azure subnets. Network security groups are simple, stateful packet inspection devices that use the 5-tuple approach (source IP, source port, destination IP, destination port, and layer 4 protocol) to create allow/deny rules for network traffic.", "Azure Resource Inventory")
51+
$excel.$SheetName.Cells["AQ1"].Hyperlink = 'https://docs.microsoft.com/en-us/azure/security/fundamentals/network-best-practices#logically-segment-subnets'
5252

53-
$null = $excel.$SheetName.Cells["AS1"].AddComment("Accelerated networking enables single root I/O virtualization (SR-IOV) to a VM, greatly improving its networking performance. This high-performance path bypasses the host from the datapath, reducing latency, jitter, and CPU utilization.", "Azure Resource Inventory")
54-
$excel.$SheetName.Cells["AS1"].Hyperlink = 'https://docs.microsoft.com/en-us/azure/virtual-network/create-vm-accelerated-networking-cli'
53+
$null = $excel.$SheetName.Cells["AT1"].AddComment("Accelerated networking enables single root I/O virtualization (SR-IOV) to a VM, greatly improving its networking performance. This high-performance path bypasses the host from the datapath, reducing latency, jitter, and CPU utilization.", "Azure Resource Inventory")
54+
$excel.$SheetName.Cells["AT1"].Hyperlink = 'https://docs.microsoft.com/en-us/azure/virtual-network/create-vm-accelerated-networking-cli'
5555
}
5656

5757
<################################################################### RESOURCE ###################################################################>

‎Modules/Public/InventoryModules/Compute/VirtualMachine.ps1‎

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ https://github.com/microsoft/ARI/Modules/Public/InventoryModules/Compute/Virtual
1313
This powershell Module is part of Azure Resource Inventory (ARI)
1414
1515
.NOTES
16-
Version: 3.6.0
16+
Version: 3.6.15
1717
First Release Date: 19th November, 2020
1818
Authors: Claudio Merola and Renato Gregio
1919
@@ -262,7 +262,7 @@ If ($Task -eq 'Processing')
262262
{
263263
$vmnsg = 'None'
264264
}
265-
if(![string]::IsNullOrEmpty($vmnic.properties.enableAcceleratedNetworking))
265+
if($vmnic.properties.enableAcceleratedNetworking -eq $true)
266266
{
267267
$AcceleratedNetwork = $true
268268
}
@@ -278,6 +278,7 @@ If ($Task -eq 'Processing')
278278
'Subscription' = $sub1.Name;
279279
'Resource Group' = $1.RESOURCEGROUP;
280280
'VM Name' = $1.NAME;
281+
'Host Name' = $data.osProfile.computerName;
281282
'Location' = $1.LOCATION;
282283
'Retiring Feature' = $RetiringFeature;
283284
'Retiring Date' = $RetiringDate;
@@ -346,32 +347,33 @@ else
346347
$TableName = ('VMTable_'+(($SmaResources.'Resource U' | Measure-Object -Sum).Sum))
347348
$Style = @()
348349
$Style += New-ExcelStyle -HorizontalAlignment Center -AutoSize -NumberFormat '0' -VerticalAlignment Center
349-
$Style += New-ExcelStyle -HorizontalAlignment Left -Range AY:AY -Width 60 -WrapText
350+
$Style += New-ExcelStyle -HorizontalAlignment Left -Range AZ:AZ -Width 60 -WrapText
350351

351352
$SheetName = 'Virtual Machines'
352353

353354
$condtxt = @()
354355
#Automatic Updates
355-
$condtxt += New-ConditionalText false -Range W:W
356+
$condtxt += New-ConditionalText false -Range X:X
356357
#Hybrid Benefit
357-
$condtxt += New-ConditionalText None -Range Z:Z
358+
$condtxt += New-ConditionalText None -Range AA:AA
358359
#Boot Diagnostics
359-
$condtxt += New-ConditionalText false -Range AB:AB
360-
#Performance Agent
361360
$condtxt += New-ConditionalText false -Range AC:AC
362-
#Azure Monitor
361+
#Performance Agent
363362
$condtxt += New-ConditionalText false -Range AD:AD
363+
#Azure Monitor
364+
$condtxt += New-ConditionalText false -Range AE:AE
364365
#NSG
365-
$condtxt += New-ConditionalText None -Range AP:AP
366+
$condtxt += New-ConditionalText None -Range AQ:AQ
366367
#Acelerated Network
367-
$condtxt += New-ConditionalText false -Range AS:AS
368+
$condtxt += New-ConditionalText false -Range AT:AT
368369
#Retirement
369-
$condtxt += New-ConditionalText -Range M2:M100 -ConditionalType ContainsText
370+
$condtxt += New-ConditionalText -Range N2:N100 -ConditionalType ContainsText
370371

371372
$Exc = New-Object System.Collections.Generic.List[System.Object]
372373
$Exc.Add('Subscription')
373374
$Exc.Add('Resource Group')
374375
$Exc.Add('VM Name')
376+
$Exc.Add('Host Name')
375377
$Exc.Add('VM Size')
376378
$Exc.Add('Remaining Quota (vCPUs)')
377379
$Exc.Add('vCPUs')

0 commit comments

Comments
 (0)