Skip to content

Commit

Permalink
Merge pull request #50 from rebelinux/dev
Browse files Browse the repository at this point in the history 
v0.6.13
  • Loading branch information
@rebelinux
rebelinux authored Nov 13, 2024
2 parents f760f75 + 4a1bfdc commit b4a5a02
Show file tree
Hide file tree
Showing 29 changed files with 479 additions and 347 deletions.
14 changes: 14 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,20 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [0.6.13] - 2024-11-13

### Added

- Add support for displaying HyperVisor Information
- vCenter information
- vSphere Cluster Information
- Esxi Host table

### Changed

- Increase Diagrammer.Core minimum version requirement
- Improve logging

## [0.6.12] - 2024-10-30

### Added
Expand Down
6 changes: 3 additions & 3 deletions Src/Private/Get-DiagBackupServer.ps1
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ function Get-DiagBackupServer {
.DESCRIPTION
Build a diagram of the configuration of Veeam VBR in PDF/PNG/SVG formats using Psgraph.
.NOTES
Version: 0.6.9
Version: 0.6.13
Author: Jonathan Colon
Twitter: @jcolonfzenpr
Github: rebelinux
Expand Down Expand Up @@ -73,7 +73,7 @@ function Get-DiagBackupServer {
Edge -From $BackupServerInfo.Name -To $DatabaseServerInfo.Name @{arrowtail = "normal"; arrowhead = "normal"; minlen = 3; xlabel = $DatabaseServerInfo.DBPort }
}
} elseif (($EMServerInfo.Name -eq $BackupServerInfo.Name) -and ($DatabaseServerInfo.Name -eq $BackupServerInfo.Name)) {
Write-Verbose -Message "Database and Enterprise Maneger server colocated with Backup Server: Collecting Backup Server and Enterprise Manager Information."
Write-Verbose -Message "Database and Enterprise Manager server collocated with Backup Server: Collecting Backup Server and Enterprise Manager Information."
$BSHASHTABLE = @{}

$BackupServerInfo.psobject.properties | ForEach-Object { $BSHASHTABLE[$_.Name] = $_.Value }
Expand Down Expand Up @@ -135,7 +135,7 @@ function Get-DiagBackupServer {
}
}
} catch {
Write-Verbose $_.Exception.Message
Write-Verbose -Message $_.Exception.Message
}
}
end {}
Expand Down
2 changes: 1 addition & 1 deletion Src/Private/Get-DiagBackupToFileProxy.ps1
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ function Get-DiagBackupToFileProxy {
}
}
} catch {
Write-Verbose $_.Exception.Message
Write-Verbose -Message $_.Exception.Message
}
}
end {}
Expand Down
2 changes: 1 addition & 1 deletion Src/Private/Get-DiagBackupToHvProxy.ps1
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ function Get-DiagBackupToHvProxy {

}
} catch {
Write-Verbose $_.Exception.Message
Write-Verbose -Message $_.Exception.Message
}
}
end {}
Expand Down
4 changes: 2 additions & 2 deletions Src/Private/Get-DiagBackupToProtectedGroup.ps1
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ function Get-DiagBackupToProtectedGroup {
}
}
} catch {
Write-Verbose $_.Exception.Message
Write-Verbose -Message $_.Exception.Message
}

if ($ProtectedGroups.Container) {
Expand Down Expand Up @@ -343,7 +343,7 @@ function Get-DiagBackupToProtectedGroup {
}
}
} catch {
Write-Verbose $_.Exception.Message
Write-Verbose -Message $_.Exception.Message
}
}
end {}
Expand Down
2 changes: 1 addition & 1 deletion Src/Private/Get-DiagBackupToRepo.ps1
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ function Get-DiagBackupToRepo {
}
}
} catch {
Write-Verbose $_.Exception.Message
Write-Verbose -Message $_.Exception.Message
}
}
end {}
Expand Down
41 changes: 20 additions & 21 deletions Src/Private/Get-DiagBackupToSobr.ps1
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ function Get-DiagBackupToSobr {
.DESCRIPTION
Build a diagram of the configuration of Veeam VBR in PDF/PNG/SVG formats using Psgraph.
.NOTES
Version: 0.6.10
Version: 0.6.13
Author: Jonathan Colon
Twitter: @jcolonfzenpr
Github: rebelinux
Expand Down Expand Up @@ -43,12 +43,11 @@ function Get-DiagBackupToSobr {
}

if ($SOBROBJ.Performance) {

$Performance = try {
Get-DiaHTMLNodeTable -ImagesObj $Images -inputObject $SOBROBJ.Performance.Name -Align "Center" -iconType $SOBROBJ.Performance.IconType -columnSize 3 -IconDebug $IconDebug -MultiIcon -AditionalInfo $SOBROBJ.Performance.AditionalInfo -Subgraph -SubgraphLabel "Performance Extent" -SubgraphLabelPos "top" -SubgraphTableStyle "dashed,rounded" -fontColor $Fontcolor -TableBorderColor $Edgecolor -TableBorder "1"
try {
$Performance = Get-DiaHTMLNodeTable -ImagesObj $Images -inputObject $SOBROBJ.Performance.Name -Align "Center" -iconType $SOBROBJ.Performance.IconType -columnSize 3 -IconDebug $IconDebug -MultiIcon -AditionalInfo $SOBROBJ.Performance.AditionalInfo -Subgraph -SubgraphLabel "Performance Extent" -SubgraphLabelPos "top" -SubgraphTableStyle "dashed,rounded" -fontColor $Fontcolor -TableBorderColor $Edgecolor -TableBorder "1"
} catch {
Write-Verbose "Error: Unable to create SOBR Performance Objects. Disabling the section"
Write-Verbose "Error Message: $($_.Exception.Message)"
Write-Debug "Error Message: $($_.Exception.Message)"
}

if ($Performance) {
Expand All @@ -57,11 +56,11 @@ function Get-DiagBackupToSobr {
}
if ($SOBROBJ.Capacity) {

$Capacity = try {
Get-DiaHTMLNodeTable -ImagesObj $Images -inputObject $SOBROBJ.Capacity.Name -Align "Center" -iconType $SOBROBJ.Capacity.IconType -columnSize 3 -IconDebug $IconDebug -MultiIcon -AditionalInfo $SOBROBJ.Capacity.AditionalInfo -Subgraph -SubgraphLabel "Capacity Extent" -SubgraphLabelPos "top" -SubgraphTableStyle "dashed,rounded" -fontColor $Fontcolor -TableBorderColor $Edgecolor -TableBorder "1"
try {
$Capacity = Get-DiaHTMLNodeTable -ImagesObj $Images -inputObject $SOBROBJ.Capacity.Name -Align "Center" -iconType $SOBROBJ.Capacity.IconType -columnSize 3 -IconDebug $IconDebug -MultiIcon -AditionalInfo $SOBROBJ.Capacity.AditionalInfo -Subgraph -SubgraphLabel "Capacity Extent" -SubgraphLabelPos "top" -SubgraphTableStyle "dashed,rounded" -fontColor $Fontcolor -TableBorderColor $Edgecolor -TableBorder "1"
} catch {
Write-Verbose "Error: Unable to create SOBR Capacity Objects. Disabling the section"
Write-Verbose "Error Message: $($_.Exception.Message)"
Write-Debug "Error Message: $($_.Exception.Message)"
}

if ($Capacity) {
Expand All @@ -70,47 +69,47 @@ function Get-DiagBackupToSobr {
}
if ($SOBROBJ.Archive) {

$Archive = try {
Get-DiaHTMLNodeTable -ImagesObj $Images -inputObject $SOBROBJ.Archive.Name -Align "Center" -iconType $SOBROBJ.Archive.IconType -columnSize 3 -IconDebug $IconDebug -MultiIcon -AditionalInfo $SOBROBJ.Archive.AditionalInfo -Subgraph -SubgraphLabel "Archive Extent" -SubgraphLabelPos "top" -SubgraphTableStyle "dashed,rounded" -fontColor $Fontcolor -TableBorderColor $Edgecolor -TableBorder "1"
try {
$Archive = Get-DiaHTMLNodeTable -ImagesObj $Images -inputObject $SOBROBJ.Archive.Name -Align "Center" -iconType $SOBROBJ.Archive.IconType -columnSize 3 -IconDebug $IconDebug -MultiIcon -AditionalInfo $SOBROBJ.Archive.AditionalInfo -Subgraph -SubgraphLabel "Archive Extent" -SubgraphLabelPos "top" -SubgraphTableStyle "dashed,rounded" -fontColor $Fontcolor -TableBorderColor $Edgecolor -TableBorder "1"

} catch {
Write-Verbose "Error: Unable to create SOBR Archive Objects. Disabling the section"
Write-Verbose "Error Message: $($_.Exception.Message)"
Write-Debug "Error Message: $($_.Exception.Message)"
}

if ($Archive) {
$SOBRExtentNodesArray += $Archive
}
}

$SOBRExtentSubgraphNode = try {
Get-DiaHTMLSubGraph -ImagesObj $Images -TableArray $SOBRExtentNodesArray -Align 'Center' -IconDebug $IconDebug -Label 'Extents' -LabelPos "top" -fontColor $Fontcolor -TableStyle "dashed,rounded" -TableBorderColor $Edgecolor -TableBorder "1" -columnSize 3
try {
$SOBRExtentSubgraphNode = Get-DiaHTMLSubGraph -ImagesObj $Images -TableArray $SOBRExtentNodesArray -Align 'Center' -IconDebug $IconDebug -Label 'Extents' -LabelPos "top" -fontColor $Fontcolor -TableStyle "dashed,rounded" -TableBorderColor $Edgecolor -TableBorder "1" -columnSize 3
} catch {
Write-Verbose "Error: Unable to create SOBR Extents SubGraph Objects. Disabling the section"
Write-Verbose "Error Message: $($_.Exception.Message)"
Write-Debug "Error Message: $($_.Exception.Message)"
}

if ($SOBRExtentSubgraphNode) {
$SOBRNodesArray += $SOBRExtentSubgraphNode
}

$SOBRSubgraphNode = try {
Get-DiaHTMLSubGraph -ImagesObj $Images -TableArray $SOBRNodesArray -Align 'Center' -IconDebug $IconDebug -Label $SOBROBJ.Name -LabelPos "top" -fontColor $Fontcolor -TableStyle "dashed,rounded" -TableBorderColor $Edgecolor -TableBorder "1" -columnSize 1
try {
$SOBRSubgraphNode = Get-DiaHTMLSubGraph -ImagesObj $Images -TableArray $SOBRNodesArray -Align 'Center' -IconDebug $IconDebug -Label $SOBROBJ.Name -LabelPos "top" -fontColor $Fontcolor -TableStyle "dashed,rounded" -TableBorderColor $Edgecolor -TableBorder "1" -columnSize 1
} catch {
Write-Verbose "Error: Unable to create SOBR SubGraph Nodes Objects. Disabling the section"
Write-Verbose "Error Message: $($_.Exception.Message)"
Write-Debug "Error Message: $($_.Exception.Message)"
}

if ($SOBRSubgraphNode) {
$SOBRArray += $SOBRSubgraphNode
}
}

$SOBRSubgraph = try {
Node -Name SOBRRepo -Attributes @{Label = (Get-DiaHTMLSubGraph -ImagesObj $Images -TableArray $SOBRArray -Align 'Center' -IconDebug $IconDebug -Label 'SOBR Repositories' -LabelPos "top" -fontColor $Fontcolor -TableStyle "dashed,rounded" -TableBorderColor $Edgecolor -TableBorder "1" -columnSize 3); shape = 'plain'; fillColor = 'transparent'; fontsize = 14; fontname = "Segoe Ui" }
try {
$SOBRSubgraph = Node -Name SOBRRepo -Attributes @{Label = (Get-DiaHTMLSubGraph -ImagesObj $Images -TableArray $SOBRArray -Align 'Center' -IconDebug $IconDebug -Label 'SOBR Repositories' -LabelPos "top" -fontColor $Fontcolor -TableStyle "dashed,rounded" -TableBorderColor $Edgecolor -TableBorder "1" -columnSize 3); shape = 'plain'; fillColor = 'transparent'; fontsize = 14; fontname = "Segoe Ui" }
} catch {
Write-Verbose "Error: Unable to create SOBR SubGraph Objects. Disabling the section"
Write-Verbose "Error Message: $($_.Exception.Message)"
Write-Debug "Error Message: $($_.Exception.Message)"
}

if ($SOBRSubgraph) {
Expand All @@ -122,7 +121,7 @@ function Get-DiagBackupToSobr {
}
}
} catch {
Write-Verbose $_.Exception.Message
Write-Verbose -Message $_.Exception.Message
}
}
end {}
Expand Down
34 changes: 17 additions & 17 deletions Src/Private/Get-DiagBackupToTape.ps1
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ function Get-DiagBackupToTape {
.DESCRIPTION
Build a diagram of the configuration of Veeam VBR in PDF/PNG/SVG formats using Psgraph.
.NOTES
Version: 0.6.10
Version: 0.6.13
Author: Jonathan Colon
Twitter: @jcolonfzenpr
Github: rebelinux
Expand Down Expand Up @@ -55,24 +55,24 @@ function Get-DiagBackupToTape {

$TapeLibraryDrives = ($BackupTapeDrives | Where-Object { $_.LibraryId -eq $TSLibraryOBJ.Id } | Sort-Object -Property Name)

$TapeLibraryDrivesNode = try {
Get-DiaHTMLNodeTable -ImagesObj $Images -inputObject $TapeLibraryDrives.Name -Align "Center" -iconType "VBR_Tape_Drive" -columnSize $TapeLibraryDrives.Name.Count -IconDebug $IconDebug -MultiIcon -AditionalInfo $TapeLibraryDrives.AditionalInfo -Subgraph -SubgraphLabel "Tape Drives" -SubgraphLabelPos "top" -SubgraphTableStyle "dashed,rounded" -fontColor $Fontcolor -TableBorderColor $Edgecolor -TableBorder "1"
try {
$TapeLibraryDrivesNode = Get-DiaHTMLNodeTable -ImagesObj $Images -inputObject $TapeLibraryDrives.Name -Align "Center" -iconType "VBR_Tape_Drive" -columnSize $TapeLibraryDrives.Name.Count -IconDebug $IconDebug -MultiIcon -AditionalInfo $TapeLibraryDrives.AditionalInfo -Subgraph -SubgraphLabel "Tape Drives" -SubgraphLabelPos "top" -SubgraphTableStyle "dashed,rounded" -fontColor $Fontcolor -TableBorderColor $Edgecolor -TableBorder "1"

} catch {
Write-Verbose "Error: Unable to create Tape Library Drives Objects. Disabling the section"
Write-Verbose "Error Message: $($_.Exception.Message)"
Write-Debug "Error Message: $($_.Exception.Message)"
}

if ($TapeLibraryDrivesNode) {
$TapeLibraryNodesArray += $TapeLibraryDrivesNode
}
}

$TapeLibrarySubgraph = try {
Get-DiaHTMLSubGraph -ImagesObj $Images -TableArray $TapeLibraryNodesArray -Align 'Center' -IconDebug $IconDebug -Label "Tape Library" -LabelPos "top" -fontColor $Fontcolor -TableStyle "dashed,rounded" -TableBorderColor $Edgecolor -TableBorder "1" -columnSize 1
try {
$TapeLibrarySubgraph = Get-DiaHTMLSubGraph -ImagesObj $Images -TableArray $TapeLibraryNodesArray -Align 'Center' -IconDebug $IconDebug -Label "Tape Library" -LabelPos "top" -fontColor $Fontcolor -TableStyle "dashed,rounded" -TableBorderColor $Edgecolor -TableBorder "1" -columnSize 1
} catch {
Write-Verbose "Error: Unable to create Tape Library SubGraph Objects. Disabling the section"
Write-Verbose "Error Message: $($_.Exception.Message)"
Write-Debug "Error Message: $($_.Exception.Message)"
}

if ($TapeLibrarySubgraph) {
Expand All @@ -81,11 +81,11 @@ function Get-DiagBackupToTape {
}
}

$TapeLibrarySubgraphArray = try {
Get-DiaHTMLSubGraph -ImagesObj $Images -TableArray $TapeNodesArray -Align 'Center' -IconDebug $IconDebug -Label "Library" -LabelPos "top" -fontColor $Fontcolor -TableStyle "dashed,rounded" -TableBorderColor $Edgecolor -TableBorder "0" -columnSize 3
try {
$TapeLibrarySubgraphArray = Get-DiaHTMLSubGraph -ImagesObj $Images -TableArray $TapeNodesArray -Align 'Center' -IconDebug $IconDebug -Label " " -LabelPos "top" -fontColor $Fontcolor -TableStyle "dashed,rounded" -TableBorderColor $Edgecolor -TableBorder "0" -columnSize 3
} catch {
Write-Verbose "Error: Unable to create Tape Library SubGraph Array Objects. Disabling the section"
Write-Verbose "Error Message: $($_.Exception.Message)"
Write-Debug "Error Message: $($_.Exception.Message)"
}

if ($TapeServerNode) {
Expand All @@ -96,22 +96,22 @@ function Get-DiagBackupToTape {
$TapeLibrarySubArrayTable += $TapeLibrarySubgraphArray
}

$TapeServerSubgraph = try {
Get-DiaHTMLSubGraph -ImagesObj $Images -TableArray $TapeLibrarySubArrayTable -Align 'Center' -IconDebug $IconDebug -Label $TSOBJ.Name -LabelPos "top" -fontColor $Fontcolor -TableStyle "dashed,rounded" -TableBorderColor $Edgecolor -TableBorder "1" -columnSize 1
try {
$TapeServerSubgraph = Get-DiaHTMLSubGraph -ImagesObj $Images -TableArray $TapeLibrarySubArrayTable -Align 'Center' -IconDebug $IconDebug -Label $TSOBJ.Name -LabelPos "top" -fontColor $Fontcolor -TableStyle "dashed,rounded" -TableBorderColor $Edgecolor -TableBorder "1" -columnSize 1
} catch {
Write-Verbose "Error: Unable to create Tape Server SubGraph Objects. Disabling the section"
Write-Verbose "Error Message: $($_.Exception.Message)"
Write-Debug "Error Message: $($_.Exception.Message)"
}

if ($TapeServerSubgraph) {
$TapeArray += $TapeServerSubgraph
}
}
$TapeSubgraph = try {
Node -Name Tape -Attributes @{Label = (Get-DiaHTMLSubGraph -ImagesObj $Images -TableArray $TapeArray -Align 'Center' -IconDebug $IconDebug -Label 'Tape Servers' -LabelPos "top" -fontColor $Fontcolor -TableStyle "dashed,rounded" -TableBorderColor $Edgecolor -TableBorder "1" -columnSize 3); shape = 'plain'; fillColor = 'transparent'; fontsize = 14; fontname = "Segoe Ui" }
try {
$TapeSubgraph = Node -Name Tape -Attributes @{Label = (Get-DiaHTMLSubGraph -ImagesObj $Images -TableArray $TapeArray -Align 'Center' -IconDebug $IconDebug -Label 'Tape Servers' -LabelPos "top" -fontColor $Fontcolor -TableStyle "dashed,rounded" -TableBorderColor $Edgecolor -TableBorder "1" -columnSize 3); shape = 'plain'; fillColor = 'transparent'; fontsize = 14; fontname = "Segoe Ui" }
} catch {
Write-Verbose "Error: Unable to create Tape SubGraph Objects. Disabling the section"
Write-Verbose "Error Message: $($_.Exception.Message)"
Write-Debug "Error Message: $($_.Exception.Message)"
}
if ($TapeSubgraph) {
$TapeSubgraph
Expand All @@ -120,7 +120,7 @@ function Get-DiagBackupToTape {
}
}
} catch {
Write-Verbose $_.Exception.Message
Write-Verbose -Message $_.Exception.Message
}
}
end {}
Expand Down
Loading

0 comments on commit b4a5a02

Please sign in to comment.