Merge branch 'master' into dev

tpcarman · web-flow · commit 8604a399a2ea · 2021-12-03T08:30:45.000+11:00
diff --git a/AsBuiltReport.Microsoft.AD.json b/AsBuiltReport.Microsoft.AD.json
@@ -44,6 +44,7 @@
         },
         "CA": {
             "Status": true
+            "Statistics": true
         }
     }
 }
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -178,4 +178,4 @@
   - Added Site Replication Summary
   - Added Site Replication Failure Summary
   - Added Group Policy Objects Summary
-  - Added Organizational Unit summary
+  - Added Organizational Unit summary
diff --git a/Src/Private/Get-AbrADDHCPInfrastructure.ps1 b/Src/Private/Get-AbrADDHCPInfrastructure.ps1
@@ -73,6 +73,7 @@ function Get-AbrADDHCPInfrastructure {
                 $TableParams['Caption'] = "- $($TableParams.Name)"
             }
             $OutObj | Table @TableParams
+            
             Section -Style Heading6 'Service Database' {
                 Paragraph "The following section provides a summary of the DHCP servers service database information on $($Domain.ToString().ToUpper())."
                 BlankLine
@@ -104,10 +105,11 @@ function Get-AbrADDHCPInfrastructure {
                         }
                     }
                     catch {
+
                         Write-PscriboMessage -IsWarning "$($_.Exception.Message) (Service Database)"
 
-                        }
                     }
+                }
 
                 $TableParams = @{
                     Name = "DHCP Servers Database Information - $($Domain.ToString().ToUpper())"
@@ -119,6 +121,7 @@ function Get-AbrADDHCPInfrastructure {
                 }
                 $OutObj | Table @TableParams
             }
+
             Section -Style Heading6 'Dynamic DNS credentials' {
                 Paragraph "The following section provides a summary of the DHCP Servers Dynamic DNS registration credentials information on $($Domain.ToString().ToUpper())."
                 BlankLine
@@ -140,13 +143,15 @@ function Get-AbrADDHCPInfrastructure {
                         }
                     }
                     catch {
+
                         Write-PscriboMessage -IsWarning "$($_.Exception.Message) (Dynamic DNS credentials)"
 
-                        }
                     }
+                }
                 if ($HealthCheck.DHCP.BP) {
                     $OutObj | Where-Object { $_.'User Name' -eq "-"} | Set-Style -Style Warning -Property 'User Name','Domain Name'
                 }
+
                 $TableParams = @{
                     Name = "DHCP Servers Dynamic DNS Credentials Information - $($Domain.ToString().ToUpper())"
                     List = $false
diff --git a/Src/Private/Get-AbrADDHCPv4Scope.ps1 b/Src/Private/Get-AbrADDHCPv4Scope.ps1
@@ -57,7 +57,6 @@ function Get-AbrADDHCPv4Scope {
                 }
                 catch {
                     Write-PscriboMessage -IsWarning "$($_.Exception.Message) (IPv4 Scope Summary)"
-
                 }
             }
 
diff --git a/Src/Private/Get-AbrADDHCPv6Statistic.ps1 b/Src/Private/Get-AbrADDHCPv6Statistic.ps1
@@ -54,8 +54,8 @@ function Get-AbrADDHCPv6Statistic {
                 }
                 catch {
                     Write-PscriboMessage -IsWarning "$($_.Exception.Message) (IPv6 Service Statistics Summary)"
-                    }
                 }
+            }
 
             if ($HealthCheck.DHCP.Statistics) {
                 $OutObj | Where-Object { $_.'Percentage In Use' -gt 95} | Set-Style -Style Warning -Property 'Percentage Available','Percentage In Use'
diff --git a/Src/Private/Get-AbrADDNSInfrastructure.ps1 b/Src/Private/Get-AbrADDNSInfrastructure.ps1
@@ -68,6 +68,7 @@ function Get-AbrADDNSInfrastructure {
                     }
                     $OutObj | Table @TableParams
                 }
+
                 if ($InfoLevel.DNS -ge 2) {
                     Section -Style Heading6 "Domain Controller DNS IP Configuration" {
                         Paragraph "The following section provides information of the DNS IP Configuration."
@@ -162,6 +163,7 @@ function Get-AbrADDNSInfrastructure {
                         }
                     }
                 }
+                
                 if ($InfoLevel.DNS -ge 2) {
                     Section -Style Heading6 "Response Rate Limiting (RRL)" {
                         Paragraph "The following section provides a summary of the DNS Response Rate Limiting configuration."
@@ -254,6 +256,7 @@ function Get-AbrADDNSInfrastructure {
                         }
                     }
                 }
+
                 Section -Style Heading6 "Forwarder Options" {
                     Paragraph "The following section provides a summary of the DNS Forwarder configuration."
                     BlankLine
diff --git a/Src/Private/Get-AbrADDNSZone.ps1 b/Src/Private/Get-AbrADDNSZone.ps1
@@ -71,6 +71,7 @@ function Get-AbrADDNSZone {
                     }
                     $OutObj | Table @TableParams
                 }
+
                 if ($InfoLevel.DNS -ge 2) {
                     try {
                         $DCPssSession = New-PSSession $DC -Credential $Cred -Authentication Default
@@ -114,6 +115,7 @@ function Get-AbrADDNSZone {
                         Write-PscriboMessage -IsWarning "$($_.Exception.Message) (Zone Delegation)"
                     }
                 }
+
                 if ($InfoLevel.DNS -ge 2) {
                     try {
                         $DCPssSession = New-PSSession $DC -Credential $Cred -Authentication Default
@@ -153,6 +155,7 @@ function Get-AbrADDNSZone {
                             $OutObj | Table @TableParams
                             }
                         }
+                        Remove-PSSession -Session $DCPssSession
                     }
                     catch {
                         Write-PscriboMessage -IsWarning "$($_.Exception.Message) (Zone Transfers)"
@@ -197,6 +200,7 @@ function Get-AbrADDNSZone {
                         $OutObj | Table @TableParams
                     }
                 }
+
                 Section -Style Heading5 "$($DC.ToString().ToUpper().Split(".")[0]) Conditional Forwarder" {
                     Paragraph "The following section provides a summary of the DNS Conditional Forwarder information."
                     BlankLine
@@ -233,6 +237,7 @@ function Get-AbrADDNSZone {
                         }
                         $OutObj | Table @TableParams
                     }
+                    Remove-PSSession -Session $DCPssSession
                 }
                 if ($InfoLevel.DNS -ge 2) {
                     Section -Style Heading6 "$($DC.ToString().ToUpper().Split(".")[0]) Zone Scope Aging Properties" {
diff --git a/Src/Private/Get-AbrADDomainController.ps1 b/Src/Private/Get-AbrADDomainController.ps1
@@ -69,6 +69,7 @@ function Get-AbrADDomainController {
             }
             $OutObj | Table @TableParams
         }
+
         if ($InfoLevel.Domain -ge 2) {
             Write-PscriboMessage "Collecting AD Domain Controller Hardware information for domain $Domain"
             Section -Style Heading6 'Hardware Inventory' {
@@ -183,6 +184,7 @@ function Get-AbrADDomainController {
                 $OutObj | Table @TableParams
             }
         }
+
         Write-PscriboMessage "Collecting AD Domain Controller Time Source information."
         Section -Style Heading6 'Time Source Information' {
             Paragraph "The following section provides a summary of the Domain Controller Time Source configuration on $($Domain.ToString().ToUpper())."
diff --git a/Src/Private/SharedUtilsFunctions.ps1 b/Src/Private/SharedUtilsFunctions.ps1
@@ -21,7 +21,6 @@ function ConvertTo-TextYN {
             Position = 0,
             Mandatory)]
             [AllowEmptyString()]
-
             [string]
             $TEXT
         )
diff --git a/Src/Public/Invoke-AsBuiltReport.Microsoft.AD.ps1 b/Src/Public/Invoke-AsBuiltReport.Microsoft.AD.ps1
@@ -85,6 +85,7 @@ function Invoke-AsBuiltReport.Microsoft.AD {
             #---------------------------------------------------------------------------------------------#
             #                                 Domain Section                                              #
             #---------------------------------------------------------------------------------------------#
+
             if ($InfoLevel.Domain -ge 1) {
                 Section -Style Heading3 "Active Directory Domain Information" {
                     if ($Options.ShowDefinitionInfo) {
@@ -308,6 +309,7 @@ function Invoke-AsBuiltReport.Microsoft.AD {
             #---------------------------------------------------------------------------------------------#
             #                                 Certificate Authority Section                               #
             #---------------------------------------------------------------------------------------------#
+
             if ($InfoLevel.CA -ge 1) {
                 try {
                     Section -Style Heading3 "Certificate Authority Summary" {

Original file line number	Diff line number	Diff line change
`@@ -44,6 +44,7 @@`
`44`	`44`	`},`
`45`	`45`	`"CA": {`
`46`	`46`	`"Status": true`
	`47`	`+ "Statistics": true`
`47`	`48`	`}`
`48`	`49`	`}`
`49`	`50`	`}`
Original file line number	Diff line number	Diff line change
`@@ -73,6 +73,7 @@ function Get-AbrADDHCPInfrastructure {`
`73`	`73`	`$TableParams['Caption'] = "- $($TableParams.Name)"`
`74`	`74`	`}`
`75`	`75`	`$OutObj \| Table @TableParams`
	`76`	`+`
`76`	`77`	`Section -Style Heading6 'Service Database' {`
`77`	`78`	`Paragraph "The following section provides a summary of the DHCP servers service database information on $($Domain.ToString().ToUpper())."`
`78`	`79`	`BlankLine`
`@@ -104,10 +105,11 @@ function Get-AbrADDHCPInfrastructure {`
`104`	`105`	`}`
`105`	`106`	`}`
`106`	`107`	`catch {`
	`108`	`+`
`107`	`109`	`Write-PscriboMessage -IsWarning "$($_.Exception.Message) (Service Database)"`
`108`	`110`
`109`		`- }`
`110`	`111`	`}`
	`112`	`+ }`
`111`	`113`
`112`	`114`	`$TableParams = @{`
`113`	`115`	`Name = "DHCP Servers Database Information - $($Domain.ToString().ToUpper())"`
`@@ -119,6 +121,7 @@ function Get-AbrADDHCPInfrastructure {`
`119`	`121`	`}`
`120`	`122`	`$OutObj \| Table @TableParams`
`121`	`123`	`}`
	`124`	`+`
`122`	`125`	`Section -Style Heading6 'Dynamic DNS credentials' {`
`123`	`126`	`Paragraph "The following section provides a summary of the DHCP Servers Dynamic DNS registration credentials information on $($Domain.ToString().ToUpper())."`
`124`	`127`	`BlankLine`
`@@ -140,13 +143,15 @@ function Get-AbrADDHCPInfrastructure {`
`140`	`143`	`}`
`141`	`144`	`}`
`142`	`145`	`catch {`
	`146`	`+`
`143`	`147`	`Write-PscriboMessage -IsWarning "$($_.Exception.Message) (Dynamic DNS credentials)"`
`144`	`148`
`145`		`- }`
`146`	`149`	`}`
	`150`	`+ }`
`147`	`151`	`if ($HealthCheck.DHCP.BP) {`
`148`	`152`	`$OutObj \| Where-Object { $_.'User Name' -eq "-"} \| Set-Style -Style Warning -Property 'User Name','Domain Name'`
`149`	`153`	`}`
	`154`	`+`
`150`	`155`	`$TableParams = @{`
`151`	`156`	`Name = "DHCP Servers Dynamic DNS Credentials Information - $($Domain.ToString().ToUpper())"`
`152`	`157`	`List = $false`
Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,6 @@ function Get-AbrADDHCPv4Scope {`
`57`	`57`	`}`
`58`	`58`	`catch {`
`59`	`59`	`Write-PscriboMessage -IsWarning "$($_.Exception.Message) (IPv4 Scope Summary)"`
`60`		`-`
`61`	`60`	`}`
`62`	`61`	`}`
`63`	`62`
Original file line number	Diff line number	Diff line change
`@@ -54,8 +54,8 @@ function Get-AbrADDHCPv6Statistic {`
`54`	`54`	`}`
`55`	`55`	`catch {`
`56`	`56`	`Write-PscriboMessage -IsWarning "$($_.Exception.Message) (IPv6 Service Statistics Summary)"`
`57`		`- }`
`58`	`57`	`}`
	`58`	`+ }`
`59`	`59`
`60`	`60`	`if ($HealthCheck.DHCP.Statistics) {`
`61`	`61`	`$OutObj \| Where-Object { $_.'Percentage In Use' -gt 95} \| Set-Style -Style Warning -Property 'Percentage Available','Percentage In Use'`
Original file line number	Diff line number	Diff line change
`@@ -68,6 +68,7 @@ function Get-AbrADDNSInfrastructure {`
`68`	`68`	`}`
`69`	`69`	`$OutObj \| Table @TableParams`
`70`	`70`	`}`
	`71`	`+`
`71`	`72`	`if ($InfoLevel.DNS -ge 2) {`
`72`	`73`	`Section -Style Heading6 "Domain Controller DNS IP Configuration" {`
`73`	`74`	`Paragraph "The following section provides information of the DNS IP Configuration."`
`@@ -162,6 +163,7 @@ function Get-AbrADDNSInfrastructure {`
`162`	`163`	`}`
`163`	`164`	`}`
`164`	`165`	`}`
	`166`	`+`
`165`	`167`	`if ($InfoLevel.DNS -ge 2) {`
`166`	`168`	`Section -Style Heading6 "Response Rate Limiting (RRL)" {`
`167`	`169`	`Paragraph "The following section provides a summary of the DNS Response Rate Limiting configuration."`
`@@ -254,6 +256,7 @@ function Get-AbrADDNSInfrastructure {`
`254`	`256`	`}`
`255`	`257`	`}`
`256`	`258`	`}`
	`259`	`+`
`257`	`260`	`Section -Style Heading6 "Forwarder Options" {`
`258`	`261`	`Paragraph "The following section provides a summary of the DNS Forwarder configuration."`
`259`	`262`	`BlankLine`
Original file line number	Diff line number	Diff line change
`@@ -71,6 +71,7 @@ function Get-AbrADDNSZone {`
`71`	`71`	`}`
`72`	`72`	`$OutObj \| Table @TableParams`
`73`	`73`	`}`
	`74`	`+`
`74`	`75`	`if ($InfoLevel.DNS -ge 2) {`
`75`	`76`	`try {`
`76`	`77`	`$DCPssSession = New-PSSession $DC -Credential $Cred -Authentication Default`
`@@ -114,6 +115,7 @@ function Get-AbrADDNSZone {`
`114`	`115`	`Write-PscriboMessage -IsWarning "$($_.Exception.Message) (Zone Delegation)"`
`115`	`116`	`}`
`116`	`117`	`}`
	`118`	`+`
`117`	`119`	`if ($InfoLevel.DNS -ge 2) {`
`118`	`120`	`try {`
`119`	`121`	`$DCPssSession = New-PSSession $DC -Credential $Cred -Authentication Default`
`@@ -153,6 +155,7 @@ function Get-AbrADDNSZone {`
`153`	`155`	`$OutObj \| Table @TableParams`
`154`	`156`	`}`
`155`	`157`	`}`
	`158`	`+ Remove-PSSession -Session $DCPssSession`
`156`	`159`	`}`
`157`	`160`	`catch {`
`158`	`161`	`Write-PscriboMessage -IsWarning "$($_.Exception.Message) (Zone Transfers)"`
`@@ -197,6 +200,7 @@ function Get-AbrADDNSZone {`
`197`	`200`	`$OutObj \| Table @TableParams`
`198`	`201`	`}`
`199`	`202`	`}`
	`203`	`+`
`200`	`204`	`Section -Style Heading5 "$($DC.ToString().ToUpper().Split(".")[0]) Conditional Forwarder" {`
`201`	`205`	`Paragraph "The following section provides a summary of the DNS Conditional Forwarder information."`
`202`	`206`	`BlankLine`
`@@ -233,6 +237,7 @@ function Get-AbrADDNSZone {`
`233`	`237`	`}`
`234`	`238`	`$OutObj \| Table @TableParams`
`235`	`239`	`}`
	`240`	`+ Remove-PSSession -Session $DCPssSession`
`236`	`241`	`}`
`237`	`242`	`if ($InfoLevel.DNS -ge 2) {`
`238`	`243`	`Section -Style Heading6 "$($DC.ToString().ToUpper().Split(".")[0]) Zone Scope Aging Properties" {`
Original file line number	Diff line number	Diff line change
`@@ -69,6 +69,7 @@ function Get-AbrADDomainController {`
`69`	`69`	`}`
`70`	`70`	`$OutObj \| Table @TableParams`
`71`	`71`	`}`
	`72`	`+`
`72`	`73`	`if ($InfoLevel.Domain -ge 2) {`
`73`	`74`	`Write-PscriboMessage "Collecting AD Domain Controller Hardware information for domain $Domain"`
`74`	`75`	`Section -Style Heading6 'Hardware Inventory' {`
`@@ -183,6 +184,7 @@ function Get-AbrADDomainController {`
`183`	`184`	`$OutObj \| Table @TableParams`
`184`	`185`	`}`
`185`	`186`	`}`
	`187`	`+`
`186`	`188`	`Write-PscriboMessage "Collecting AD Domain Controller Time Source information."`
`187`	`189`	`Section -Style Heading6 'Time Source Information' {`
`188`	`190`	`Paragraph "The following section provides a summary of the Domain Controller Time Source configuration on $($Domain.ToString().ToUpper())."`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,6 @@ function ConvertTo-TextYN {`
`21`	`21`	`Position = 0,`
`22`	`22`	`Mandatory)]`
`23`	`23`	`[AllowEmptyString()]`
`24`		`-`
`25`	`24`	`[string]`
`26`	`25`	`$TEXT`
`27`	`26`	`)`