Skip to content

Commit 3a76b5b

Browse files
tpcarmantpcarman
authored
Merge branch 'master' into dev
2 parents 6e8154e + f2d92ca commit 3a76b5b

File tree

3 files changed

+34
-28
lines changed

3 files changed

+34
-28
lines changed

‎AsBuiltReport.VMware.vSphere.psd1‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
#
88

99
@{
10-
1110
# Script module or binary module file associated with this manifest.
1211
RootModule = 'AsBuiltReport.VMware.vSphere.psm1'
1312

@@ -22,9 +21,9 @@
2221

2322
# Author of this module
2423
Author = 'Tim Carman'
25-
24+
2625
# Company or vendor of this module
27-
CompanyName = ''
26+
# CompanyName = ''
2827

2928
# Copyright statement for this module
3029
Copyright = '(c) 2018 Tim Carman. All rights reserved.'
@@ -69,16 +68,18 @@
6968
# NestedModules = @()
7069

7170
# Functions to export from this module, for best performance, do not use wildcards and do not delete the entry, use an empty array if there are no functions to export.
72-
FunctionsToExport = 'Invoke-AsBuiltReport.VMware.vSphere'
71+
FunctionsToExport = @(
72+
'Invoke-AsBuiltReport.VMware.vSphere'
73+
)
7374

7475
# Cmdlets to export from this module, for best performance, do not use wildcards and do not delete the entry, use an empty array if there are no cmdlets to export.
75-
CmdletsToExport = @()
76+
# CmdletsToExport = @()
7677

7778
# Variables to export from this module
78-
# VariablesToExport = @()
79+
# VariablesToExport = '*'
7980

8081
# Aliases to export from this module, for best performance, do not use wildcards and do not delete the entry, use an empty array if there are no aliases to export.
81-
AliasesToExport = @()
82+
# AliasesToExport = @()
8283

8384
# DSC resources to export from this module
8485
# DscResourcesToExport = @()
@@ -93,7 +94,6 @@
9394
PrivateData = @{
9495

9596
PSData = @{
96-
9797
# Tags applied to this module. These help with module discovery in online galleries.
9898
Tags = 'AsBuiltReport', 'Report', 'VMware', 'vSphere', 'Documentation', 'PScribo', 'PSEdition_Desktop'
9999

‎CHANGELOG.md‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,13 @@
22

33
## [1.0.3] - 2019-05-14
44
### Changed
5+
- Improvements to code and report readability
6+
- Fixed vCenter Server licensing reporting
7+
- Fixed Datastore reporting when an empty datastore cluster exists
58
- Fixed DRS Cluster Group reporting when group does not contain any members
69
- Fixed DRS Cluster Group sorting
710
- Fixed VMHost reporting to exclude HCX Cloud Gateway host
811

9-
## [1.0.1] - 2019-05-13
10-
### Changed
11-
- Improvements to code and report readability
12-
- Fixed bug in vCenter Server licensing reporting
13-
- Fixed Datastore reporting when an empty datastore cluster exists
14-
1512
## [1.0.0] - 2019-03-27
1613
### Added
1714
- Update Manager Server name added to vCenter Server detailed information

‎Src/Public/Invoke-AsBuiltReport.VMware.vSphere.ps1‎

Lines changed: 23 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1052,8 +1052,6 @@ function Invoke-AsBuiltReport.VMware.vSphere {
10521052
}
10531053
}
10541054
#endregion vSphere HA Cluster Advanced Options
1055-
1056-
10571055
}
10581056
}
10591057
#endregion vSphere HA Cluster Configuration
@@ -1457,6 +1455,7 @@ function Invoke-AsBuiltReport.VMware.vSphere {
14571455
$DasVmOverrideVmMonitoring | Sort-Object 'Virtual Machine' | Table -Name "$Cluster HA VM Overrides VM Monitoring"
14581456
}
14591457
}
1458+
$DasVmOverrideVmMonitoring | Sort-Object 'Virtual Machine' | Table -Name "$Cluster HA VM Overrides VM Monitoring"
14601459
}
14611460
}
14621461
}
@@ -1480,6 +1479,11 @@ function Invoke-AsBuiltReport.VMware.vSphere {
14801479
$ClusterBaselines | Sort-Object 'Name' | Table -Name "$Cluster Update Manager Baselines"
14811480
}
14821481
}
1482+
if ($Healthcheck.Cluster.VUMCompliance) {
1483+
$ClusterComplianceInfo | Where-Object {$_.Status -eq 'Unknown'} | Set-Style -Style Warning
1484+
$ClusterComplianceInfo | Where-Object {$_.Status -eq 'Not Compliant' -or $_.Status -eq 'Incompatible'} | Set-Style -Style Critical
1485+
}
1486+
$ClusterComplianceInfo | Sort-Object Name, Baseline | Table -Name "$Cluster Update Manager Compliance" -ColumnWidths 25, 50, 25
14831487
}
14841488
#endregion Cluster VUM Baselines
14851489

@@ -1532,6 +1536,7 @@ function Invoke-AsBuiltReport.VMware.vSphere {
15321536
}
15331537
#endregion Cluster Permissions
15341538
}
1539+
$ClusterVIPermissions | Sort-Object 'User/Group'| Table -Name "$Cluster Permissions"
15351540
}
15361541
}
15371542
#endregion Cluster Detailed Information
@@ -1635,7 +1640,6 @@ function Invoke-AsBuiltReport.VMware.vSphere {
16351640
Section -Style Heading2 'Hosts' {
16361641
Paragraph ("The following section provides information on the configuration of VMware " +
16371642
"ESXi hosts managed by vCenter Server $vCenterServerName.")
1638-
16391643
#region ESXi Host Informative Information
16401644
if ($InfoLevel.VMHost -eq 2) {
16411645
BlankLine
@@ -1760,6 +1764,7 @@ function Invoke-AsBuiltReport.VMware.vSphere {
17601764
$true { 'Yes' }
17611765
$false { 'No' }
17621766
}
1767+
'NTP Server(s)' = (Get-VMHostNtpServer -VMHost $VMHost | Sort-Object) -join ', '
17631768
}
17641769
$VMHostBootDevice | Table -Name "$VMHost Boot Device" -List -ColumnWidths 50, 50
17651770
}
@@ -2249,7 +2254,7 @@ function Invoke-AsBuiltReport.VMware.vSphere {
22492254
}
22502255
}
22512256
#endregion ESXi Host Virtual Switch NIC Teaming
2252-
2257+
22532258
#region ESXi Host Virtual Switch Port Groups
22542259
$VssPortgroups = $VSSwitches | Get-VirtualPortGroup -Standard
22552260
if ($VssPortgroups) {
@@ -2266,7 +2271,7 @@ function Invoke-AsBuiltReport.VMware.vSphere {
22662271
}
22672272
}
22682273
#endregion ESXi Host Virtual Switch Port Groups
2269-
2274+
22702275
#region ESXi Host Virtual Switch Port Group Security Poilicy
22712276
$VssPortgroupSecurity = $VSSwitches | Get-VirtualPortGroup | Get-SecurityPolicy
22722277
if ($VssPortgroupSecurity) {
@@ -2338,7 +2343,7 @@ function Invoke-AsBuiltReport.VMware.vSphere {
23382343
Section -Style Heading4 'Security' {
23392344
Paragraph ("The following section provides information on the host " +
23402345
"security configuration of $VMHost.")
2341-
2346+
23422347
#region ESXi Host Lockdown Mode
23432348
if ($VMHost.ExtensionData.Config.LockdownMode -ne $null) {
23442349
Section -Style Heading5 'Lockdown Mode' {
@@ -2636,6 +2641,7 @@ function Invoke-AsBuiltReport.VMware.vSphere {
26362641
}
26372642
$VDSTrafficShapingDetail | Sort-Object 'Direction' | Table -Name "$VDS Traffic Shaping"
26382643
}
2644+
$VDSTrafficShapingDetail | Sort-Object Direction | Table -Name "$VDS Traffic Shaping"
26392645
}
26402646
#endregion Distributed Virtual Switch Traffic Shaping
26412647

@@ -2752,7 +2758,7 @@ function Invoke-AsBuiltReport.VMware.vSphere {
27522758
Section -Style Heading2 'vSAN' {
27532759
Paragraph ("The following section provides information on the vSAN managed " +
27542760
"by vCenter Server $vCenterServerName.")
2755-
2761+
27562762
#region vSAN Cluster Informative Information
27572763
if ($InfoLevel.Vsan -eq 2) {
27582764
BlankLine
@@ -2877,7 +2883,7 @@ function Invoke-AsBuiltReport.VMware.vSphere {
28772883
$DatastoreInfo | Sort-Object Name | Table -Name 'Datastore Information'
28782884
}
28792885
#endregion Datastore Informative Information
2880-
2886+
28812887
#region Datastore Detailed Information
28822888
if ($InfoLevel.Datastore -ge 3) {
28832889
foreach ($Datastore in $Datastores) {
@@ -2897,8 +2903,7 @@ function Invoke-AsBuiltReport.VMware.vSphere {
28972903
}
28982904
'Congestion Threshold' = "$($Datastore.CongestionThresholdMillisecond) ms"
28992905
'Total Capacity' = "$([math]::Round($Datastore.CapacityGB, 2)) GB"
2900-
'Used Capacity' = "$([math]::Round((($Datastore.CapacityGB) -
2901-
($Datastore.FreeSpaceGB)), 2)) GB"
2906+
'Used Capacity' = "$([math]::Round((($Datastore.CapacityGB) - ($Datastore.FreeSpaceGB)), 2)) GB"
29022907
'Free Space' = "$([math]::Round($Datastore.FreeSpaceGB, 2)) GB"
29032908
'% Used' = [math]::Round(
29042909
(100 - (($Datastore.FreeSpaceGB) / ($Datastore.CapacityGB) * 100)), 2
@@ -2960,7 +2965,7 @@ function Invoke-AsBuiltReport.VMware.vSphere {
29602965
}
29612966
}
29622967
#endregion Datastore Section
2963-
2968+
29642969
#region Datastore Clusters
29652970
if ($InfoLevel.DSCluster -ge 1) {
29662971
$DSClusters = Get-DatastoreCluster -Server $vCenter
@@ -3066,7 +3071,11 @@ function Invoke-AsBuiltReport.VMware.vSphere {
30663071
($_.IntraVmAffinity -eq $null)
30673072
)
30683073
}
3074+
Section -Style Heading4 'SDRS VM Overrides' {
3075+
$VMOverrideDetails | Sort-Object 'Virtual Machine' | Table -Name 'SDRS VM Overrides'
3076+
}
30693077
}
3078+
30703079
if ($VMOverrides) {
30713080
$VMOverrideDetails = foreach ($Override in $VMOverrides) {
30723081
[PSCustomObject]@{
@@ -3302,7 +3311,7 @@ function Invoke-AsBuiltReport.VMware.vSphere {
33023311
Section -Style Heading2 'VMware Update Manager' {
33033312
Paragraph ("The following section provides information on VMware Update Manager " +
33043313
"managed by vCenter Server $vCenterServerName.")
3305-
3314+
33063315
#region VUM Baseline Detailed Information
33073316
if ($InfoLevel.VUM -ge 2) {
33083317
Section -Style Heading3 'Baselines' {
@@ -3320,7 +3329,7 @@ function Invoke-AsBuiltReport.VMware.vSphere {
33203329
}
33213330
}
33223331
#endregion VUM Baseline Detailed Information
3323-
3332+
33243333
#region VUM Comprehensive Information
33253334
$VUMPatches = Get-Patch -Server $vCenter | Sort-Object -Descending ReleaseDate
33263335
if ($VUMPatches -and $InfoLevel.VUM -ge 5) {
@@ -3356,4 +3365,4 @@ function Invoke-AsBuiltReport.VMware.vSphere {
33563365

33573366
} # End of Foreach $VIServer
33583367
#endregion Script Body
3359-
} # End Invoke-AsBuiltReport.VMware.vSphere function
3368+
} # End Invoke-AsBuiltReport.VMware.vSphere function

0 commit comments

Comments
 (0)