v0.8.11

rebelinux · Sep 23, 2024 · 5ec992a · 5ec992a
1 parent fc76a29
commit 5ec992a
Show file tree

Hide file tree

Showing 7 changed files with 40 additions and 15 deletions.
diff --git a/AsBuiltReport.Veeam.VBR.psd1 b/AsBuiltReport.Veeam.VBR.psd1
@@ -63,11 +63,11 @@
         }
         @{
             ModuleName = 'Diagrammer.Core';
-            ModuleVersion = '0.2.7'
+            ModuleVersion = '0.2.8'
         }
         @{
             ModuleName = 'Veeam.Diagrammer';
-            ModuleVersion = '0.6.6'
+            ModuleVersion = '0.6.8'
         }
     )
 

diff --git a/AsBuiltreport.Veeam.VBR.json b/AsBuiltreport.Veeam.VBR.json
@@ -14,6 +14,7 @@
         "EnableHardwareInventory": false,
         "EnableDiagrams": false,
         "EnableDiagramDebug": false,
+        "DiagramTheme": "White",
         "DiagramWaterMark": "",
         "ExportDiagrams": true,
         "ExportDiagramsFormat": ["png"],

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,21 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ##### This project is community maintained and has no sponsorship from Veeam, its employees or any of its affiliates.
 
+## [0.8.11] - Unreleased
+
+### Added
+
+- Add diagram theming option (Black/White/Neon)
+
+### Changed
+
+- Increase Diagrammer.Core minimum requirement to v0.2.8
+- Increase Veeam.Diagrammer minimum requirement to v0.6.8
+
+### Fixed
+
+- Fix SOBR capacity extent members table
+
 ## [0.8.10] - 2024-09-12
 
 ### Changed

diff --git a/README.md b/README.md
@@ -157,6 +157,7 @@ The **Options** schema allows certain options within the report to be toggled on
 | ReportStyle             | Veeam/AsBuiltReport | Veeam   | Allow to set report style template.                                            |
 | EnableDiagrams          | true / false        | false   | Toggle to enable/disable of Infrastructure Diagrams                            |
 | EnableDiagramsDebug     | true/false          | false   | Toggle to enable/disable diagram debug option.                                 |
+| DiagramTheme            | string              | White   | Used to set the diagram theme. (Black/White/Neon)                              |
 | DiagramWaterMark        | string              | empty   | Used to set the diagram waterMark.                                             |
 | ExportDiagrams          | true/false          | true    | Toggle to enable/disable diagram export option.                                |
 | ExportDiagramsFormat    | string array        | png     | Set the format used to export the infrastructure diagram. (dot, png, pdf, svg) |

diff --git a/Src/Private/Get-AbrVbrBackupProxy.ps1 b/Src/Private/Get-AbrVbrBackupProxy.ps1
@@ -6,7 +6,7 @@ function Get-AbrVbrBackupProxy {
     .DESCRIPTION
         Documents the configuration of Veeam VBR in Word/HTML/Text formats using PScribo.
     .NOTES
-        Version:        0.8.8
+        Version:        0.8.11
         Author:         Jonathan Colon
         Twitter:        @jcolonfzenpr
         Github:         rebelinux
@@ -448,7 +448,7 @@ function Get-AbrVbrBackupProxy {
                             if ($Options.EnableDiagrams) {
                                 Try {
                                     Try {
-                                        $Graph = New-VeeamDiagram -Target $System -Credential $Credential -Format base64 -Direction top-to-bottom -DiagramType "Backup-to-vSphere-Proxy"
+                                        $Graph = New-VeeamDiagram -Target $System -Credential $Credential -Format base64 -Direction top-to-bottom -DiagramType "Backup-to-vSphere-Proxy" -DiagramTheme $DiagramTheme
                                     } Catch {
                                         Write-PScriboMessage -IsWarning "VMware Backup Proxy Diagram: $($_.Exception.Message)"
                                     }
@@ -894,7 +894,7 @@ function Get-AbrVbrBackupProxy {
                                 if ($Options.EnableDiagrams) {
                                     Try {
                                         Try {
-                                            $Graph = New-VeeamDiagram -Target $System -Credential $Credential -Format base64 -Direction top-to-bottom -DiagramType "Backup-to-HyperV-Proxy"
+                                            $Graph = New-VeeamDiagram -Target $System -Credential $Credential -Format base64 -Direction top-to-bottom -DiagramType "Backup-to-HyperV-Proxy" -DiagramTheme $DiagramTheme
                                         } Catch {
                                             Write-PScriboMessage -IsWarning "HyperV Backup Proxy Diagram: $($_.Exception.Message)"
                                         }

diff --git a/Src/Private/Get-AbrVbrScaleOutRepository.ps1 b/Src/Private/Get-AbrVbrScaleOutRepository.ps1
@@ -6,7 +6,7 @@ function Get-AbrVbrScaleOutRepository {
     .DESCRIPTION
         Documents the configuration of Veeam VBR in Word/HTML/Text formats using PScribo.
     .NOTES
-        Version:        0.8.7
+        Version:        0.8.11
         Author:         Jonathan Colon
         Twitter:        @jcolonfzenpr
         Github:         rebelinux
@@ -37,9 +37,9 @@ function Get-AbrVbrScaleOutRepository {
                             $inObj = [ordered] @{
                                 'Name' = $BackupRepo.Name
                                 'Performance Tier' = $BackupRepo.Extent.Name
-                                'Capacity Tier' = Switch ($BackupRepo.CapacityExtent.Repository.Name) {
+                                'Capacity Tier' = Switch ($BackupRepo.CapacityExtents.Repository.Name) {
                                     $null { 'Not configured' }
-                                    default { $BackupRepo.CapacityExtent.Repository.Name }
+                                    default { $BackupRepo.CapacityExtents.Repository.Name }
                                 }
                                 'Archive Tier' = Switch ($BackupRepo.ArchiveExtent.Repository.Name) {
                                     $null { 'Not configured' }
@@ -170,7 +170,7 @@ function Get-AbrVbrScaleOutRepository {
                                         #---------------------------------------------------------------------------------------------#
                                         #                               Capacity Tier Section                                         #
                                         #---------------------------------------------------------------------------------------------#
-                                        foreach ($CapacityExtent in $BackupRepo.CapacityExtent) {
+                                        foreach ($CapacityExtent in $BackupRepo.CapacityExtents) {
                                             try {
                                                 Section -Style NOTOCHeading6 -ExcludeFromTOC "Capacity Tier" {
                                                     $OutObj = @()

diff --git a/Src/Public/Invoke-AsBuiltReport.Veeam.VBR.ps1 b/Src/Public/Invoke-AsBuiltReport.Veeam.VBR.ps1
@@ -5,7 +5,7 @@ function Invoke-AsBuiltReport.Veeam.VBR {
     .DESCRIPTION
         Documents the configuration of Veeam VBR in Word/HTML/Text formats using PScribo.
     .NOTES
-        Version:        0.8.10
+        Version:        0.8.11
         Author:         Jonathan Colon
         Twitter:        @jcolonfzenpr
         Github:         rebelinux
@@ -66,6 +66,13 @@ function Invoke-AsBuiltReport.Veeam.VBR {
         }
     }
 
+    # Set default theme styles
+    if (-Not $Options.DiagramTheme) {
+        $DiagramTheme = 'White'
+    } else {
+        $DiagramTheme = $Options.DiagramTheme
+    }
+
     # Used to set values to TitleCase where required
     $script:TextInfo = (Get-Culture).TextInfo
 
@@ -135,7 +142,7 @@ function Invoke-AsBuiltReport.Veeam.VBR {
                         if ($Options.EnableDiagrams -and ((Get-VBRWANAccelerator).count -gt 0)) {
                             Try {
                                 Try {
-                                    $Graph = New-VeeamDiagram -Target $System -Credential $Credential -Format base64 -Direction top-to-bottom -DiagramType "Backup-to-WanAccelerator"
+                                    $Graph = New-VeeamDiagram -Target $System -Credential $Credential -Format base64 -Direction top-to-bottom -DiagramType "Backup-to-WanAccelerator" -DiagramTheme $DiagramTheme
                                 } Catch {
                                     Write-PScriboMessage -IsWarning "Wan Accelerator Diagram: $($_.Exception.Message)"
                                 }
@@ -163,7 +170,7 @@ function Invoke-AsBuiltReport.Veeam.VBR {
                         if ($Options.EnableDiagrams) {
                             Try {
                                 Try {
-                                    $Graph = New-VeeamDiagram -Target $System -Credential $Credential -Format base64 -Direction top-to-bottom -DiagramType "Backup-to-Repository"
+                                    $Graph = New-VeeamDiagram -Target $System -Credential $Credential -Format base64 -Direction top-to-bottom -DiagramType "Backup-to-Repository" -DiagramTheme $DiagramTheme
                                 } Catch {
                                     Write-PScriboMessage -IsWarning "Backup Repository Diagram: $($_.Exception.Message)"
                                 }
@@ -186,7 +193,7 @@ function Invoke-AsBuiltReport.Veeam.VBR {
                         if ($Options.EnableDiagrams -and (Get-VBRBackupRepository -ScaleOut)) {
                             Try {
                                 Try {
-                                    $Graph = New-VeeamDiagram -Target $System -Credential $Credential -Format base64 -Direction top-to-bottom -DiagramType "Backup-to-Sobr"
+                                    $Graph = New-VeeamDiagram -Target $System -Credential $Credential -Format base64 -Direction top-to-bottom -DiagramType "Backup-to-Sobr" -DiagramTheme $DiagramTheme
                                 } Catch {
                                     Write-PScriboMessage -IsWarning "ScaleOut Backup Repository Diagram: $($_.Exception.Message)"
                                 }
@@ -242,7 +249,7 @@ function Invoke-AsBuiltReport.Veeam.VBR {
                         if ($Options.EnableDiagrams -and ((Get-VBRTapeServer).count -gt 0) -and ((Get-VBRTapeLibrary).count -gt 0)) {
                             Try {
                                 Try {
-                                    $Graph = New-VeeamDiagram -Target $System -Credential $Credential -Format base64 -Direction top-to-bottom -DiagramType "Backup-to-Tape"
+                                    $Graph = New-VeeamDiagram -Target $System -Credential $Credential -Format base64 -Direction top-to-bottom -DiagramType "Backup-to-Tape" -DiagramTheme $DiagramTheme
                                 } Catch {
                                     Write-PScriboMessage -IsWarning "Tape Infrastructure Diagram: $($_.Exception.Message)"
                                 }
@@ -287,7 +294,7 @@ function Invoke-AsBuiltReport.Veeam.VBR {
                             if ($Options.EnableDiagrams -and $InventObjs) {
                                 Try {
                                     Try {
-                                        $Graph = New-VeeamDiagram -Target $System -Credential $Credential -Format base64 -Direction top-to-bottom -DiagramType "Backup-to-ProtectedGroup"
+                                        $Graph = New-VeeamDiagram -Target $System -Credential $Credential -Format base64 -Direction top-to-bottom -DiagramType "Backup-to-ProtectedGroup" -DiagramTheme $DiagramTheme
                                     } Catch {
                                         Write-PScriboMessage -IsWarning "Physical Infrastructure Diagram: $($_.Exception.Message)"
                                     }
@@ -480,6 +487,7 @@ function Invoke-AsBuiltReport.Veeam.VBR {
                 'DiagramType' = 'Backup-Infrastructure'
                 'WaterMarkText' = $Options.DiagramWaterMark
                 'WaterMarkColor' = 'DarkGreen'
+                'DiagramTheme' = $DiagramTheme
             }
 
             if ($Options.EnableDiagramDebug) {