Skip to content

Commit 2b3e792

Browse files
rebelinuxrebelinux
authored
Merge pull request #211 from AsBuiltReport/dev
v0.8.18
2 parents 6d7d8b6 + 1cfb257 commit 2b3e792

File tree

7 files changed

+110
-54
lines changed

7 files changed

+110
-54
lines changed

‎.github/workflows/Release.yml‎

Lines changed: 27 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -37,29 +37,30 @@ jobs:
3737
shell: pwsh
3838
run: |
3939
Publish-Module -Path ./ -NuGetApiKey ${{ secrets.PSGALLERY_API_KEY }} -Verbose
40-
tweet:
41-
needs: publish-to-gallery
42-
runs-on: ubuntu-latest
43-
steps:
44-
- uses: Eomm/why-don-t-you-tweet@v2
45-
# We don't want to tweet if the repository is not a public one
46-
if: ${{ !github.event.repository.private }}
47-
with:
48-
# GitHub event payload
49-
# https://docs.github.com/en/developers/webhooks-and-events/webhooks/webhook-events-and-payloads#release
50-
tweet-message: "[New Release] ${{ github.event.repository.name }} ${{ github.event.release.tag_name }}! Check out what's new! ${{ github.event.release.html_url }} #Veeam #AsBuiltReport #PowerShell #VeeamVanguard #VeeamLegend"
51-
env:
52-
TWITTER_CONSUMER_API_KEY: ${{ secrets.TWITTER_CONSUMER_API_KEY }}
53-
TWITTER_CONSUMER_API_SECRET: ${{ secrets.TWITTER_CONSUMER_API_SECRET }}
54-
TWITTER_ACCESS_TOKEN: ${{ secrets.TWITTER_ACCESS_TOKEN }}
55-
TWITTER_ACCESS_TOKEN_SECRET: ${{ secrets.TWITTER_ACCESS_TOKEN_SECRET }}
56-
bsky-post:
57-
needs: publish-to-gallery
58-
runs-on: ubuntu-latest
59-
steps:
60-
- uses: zentered/[email protected]
61-
with:
62-
post: "[New Release] ${{ github.event.repository.name }} ${{ github.event.release.tag_name }}! Check out what's new! ${{ github.event.release.html_url }} #Veeam #AsBuiltReport #PowerShell #VeeamVanguard #VeeamLegend"
63-
env:
64-
BSKY_IDENTIFIER: ${{ secrets.BSKY_IDENTIFIER }}
65-
BSKY_PASSWORD: ${{ secrets.BSKY_PASSWORD }}
40+
41+
# tweet:
42+
# needs: publish-to-gallery
43+
# runs-on: ubuntu-latest
44+
# steps:
45+
# - uses: Eomm/why-don-t-you-tweet@v2
46+
# # We don't want to tweet if the repository is not a public one
47+
# if: ${{ !github.event.repository.private }}
48+
# with:
49+
# # GitHub event payload
50+
# # https://docs.github.com/en/developers/webhooks-and-events/webhooks/webhook-events-and-payloads#release
51+
# tweet-message: "[New Release] ${{ github.event.repository.name }} ${{ github.event.release.tag_name }}! Check out what's new! ${{ github.event.release.html_url }} #Veeam #AsBuiltReport #PowerShell #VeeamVanguard #VeeamLegend"
52+
# env:
53+
# TWITTER_CONSUMER_API_KEY: ${{ secrets.TWITTER_CONSUMER_API_KEY }}
54+
# TWITTER_CONSUMER_API_SECRET: ${{ secrets.TWITTER_CONSUMER_API_SECRET }}
55+
# TWITTER_ACCESS_TOKEN: ${{ secrets.TWITTER_ACCESS_TOKEN }}
56+
# TWITTER_ACCESS_TOKEN_SECRET: ${{ secrets.TWITTER_ACCESS_TOKEN_SECRET }}
57+
# bsky-post:
58+
# needs: publish-to-gallery
59+
# runs-on: ubuntu-latest
60+
# steps:
61+
# - uses: zentered/[email protected]
62+
# with:
63+
# post: "[New Release] ${{ github.event.repository.name }} ${{ github.event.release.tag_name }}! Check out what's new! ${{ github.event.release.html_url }} #Veeam #AsBuiltReport #PowerShell #VeeamVanguard #VeeamLegend"
64+
# env:
65+
# BSKY_IDENTIFIER: ${{ secrets.BSKY_IDENTIFIER }}
66+
# BSKY_PASSWORD: ${{ secrets.BSKY_PASSWORD }}

‎.github/workflows/Stale.yml‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
name: 'Close stale issues and PRs'
2+
on:
3+
schedule:
4+
- cron: '30 1 * * *'
5+
6+
jobs:
7+
stale:
8+
runs-on: ubuntu-latest
9+
steps:
10+
- uses: actions/stale@v9
11+
with:
12+
stale-issue-message: 'This issue has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. Thank you for your contributions.'
13+
days-before-stale: 30
14+
days-before-close: 7
15+
exempt-pr-labels: 'help wanted,enhancement,security,pinned'
16+
stale-pr-label: 'wontfix'
17+
stale-issue-label: 'wontfix'
18+
exempt-issue-labels: 'help wanted,enhancement,security,pinned'

‎AsBuiltReport.Veeam.VBR.psd1‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
RootModule = 'AsBuiltReport.Veeam.VBR.psm1'
1313

1414
# Version number of this module.
15-
ModuleVersion = '0.8.17'
15+
ModuleVersion = '0.8.18'
1616

1717
# Supported PSEditions
1818
# CompatiblePSEditions = @()
@@ -137,4 +137,4 @@
137137
# Default prefix for commands exported from this module. Override the default prefix using Import-Module -Prefix.
138138
# DefaultCommandPrefix = ''
139139

140-
}
140+
}

‎AsBuiltreport.Veeam.VBR.json‎

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -17,17 +17,17 @@
1717
"DiagramTheme": "White",
1818
"DiagramWaterMark": "",
1919
"DiagramType": {
20-
"Backup-Infrastructure": true,
21-
"Backup-to-File-Proxy": false,
22-
"Backup-to-HyperV-Proxy": false,
23-
"Backup-to-Repository": false,
24-
"Backup-to-Sobr": false,
25-
"Backup-to-Tape": false,
26-
"Backup-to-ProtectedGroup": false,
27-
"Backup-to-vSphere-Proxy": false,
28-
"Backup-to-WanAccelerator": false
20+
"Infrastructure": true,
21+
"FileProxy": true,
22+
"HyperVProxy": true,
23+
"Repository": true,
24+
"Sobr": true,
25+
"Tape": true,
26+
"ProtectedGroup": true,
27+
"vSphereProxy": true,
28+
"WanAccelerator": true
2929
},
30-
"ExportDiagrams": true,
30+
"ExportDiagrams": false,
3131
"ExportDiagramsFormat": [
3232
"png"
3333
],
@@ -59,10 +59,11 @@
5959
"Vault": 1
6060
},
6161
"Inventory": {
62+
"EntraID": 1,
6263
"FileShare": 1,
64+
"Nutanix": 0,
6365
"PHY": 1,
64-
"VI": 1,
65-
"EntraID": 1
66+
"VI": 1
6667
},
6768
"Storage": {
6869
"ISILON": 1,

‎CHANGELOG.md‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,23 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
77

88
##### This project is community maintained and has no sponsorship from Veeam, its employees or any of its affiliates.
99

10+
## [0.8.18] - 2025-04-27
11+
12+
### Added
13+
14+
- Add code to allow the exporting of the Veeam diagram
15+
- Infrastructure
16+
- FileProxy
17+
- HyperVProxy
18+
- Repository
19+
- Sobr
20+
- Tape
21+
- ProtectedGroup
22+
- vSphereProxy
23+
- WanAccelerator
24+
- Enhance Veeam report configuration and diagram functionality by adding EntraID and Nutanix options
25+
- Refining diagram theme handling in the diagrammer function.
26+
1027
## [0.8.17] - 2025-04-18
1128

1229
### Added

‎Src/Private/Get-AbrVbrDiagrammer.ps1‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,12 @@ function Get-AbrVbrDiagrammer {
3434

3535
process {
3636
try {
37+
# Set default theme styles
38+
if (-Not $Options.DiagramTheme) {
39+
$DiagramTheme = 'White'
40+
} else {
41+
$DiagramTheme = $Options.DiagramTheme
42+
}
3743
$DiagramTypeArray = @()
3844
$DiagramTypeHash = @{
3945
'Backup-Infrastructure' = 'Infrastructure'

‎Src/Public/Invoke-AsBuiltReport.Veeam.VBR.ps1‎

Lines changed: 27 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ function Invoke-AsBuiltReport.Veeam.VBR {
55
.DESCRIPTION
66
Documents the configuration of Veeam VBR in Word/HTML/Text formats using PScribo.
77
.NOTES
8-
Version: 0.8.17
8+
Version: 0.8.18
99
Author: Jonathan Colon
1010
Twitter: @jcolonfzenpr
1111
Github: rebelinux
@@ -82,13 +82,6 @@ function Invoke-AsBuiltReport.Veeam.VBR {
8282
}
8383
}
8484

85-
# Set default theme styles
86-
if (-Not $Options.DiagramTheme) {
87-
$DiagramTheme = 'White'
88-
} else {
89-
$DiagramTheme = $Options.DiagramTheme
90-
}
91-
9285
# Used to set values to TitleCase where required
9386
$script:TextInfo = (Get-Culture).TextInfo
9487

@@ -107,12 +100,12 @@ function Invoke-AsBuiltReport.Veeam.VBR {
107100
if ($Options.EnableDiagrams) {
108101
Try {
109102
Try {
110-
$Graph = Get-AbrVbrDiagrammer -DiagramType Backup-Infrastructure -DiagramOutput base64
103+
$Graph = Get-AbrVbrDiagrammer -DiagramType 'Backup-Infrastructure' -DiagramOutput base64
111104
} Catch {
112105
Write-PScriboMessage -IsWarning "Backup Infrastructure Diagram: $($_.Exception.Message)"
113106
}
114107
if ($Graph) {
115-
If ((Get-DiaImagePercent -GraphObj $Graph).Width -gt 1500) { $ImagePrty = 10 } else { $ImagePrty = 40 }
108+
If ((Get-DiaImagePercent -GraphObj $Graph).Width -gt 1500) { $ImagePrty = 10 } else { $ImagePrty = 30 }
116109
Section -Style Heading1 "Backup Infrastructure Diagram." -Orientation Landscape {
117110
Image -Base64 $Graph -Text "Backup Infrastructure Diagram" -Percent $ImagePrty -Align Center
118111
Paragraph "Image preview: Opens the image in a new tab to view it at full resolution." -Tabs 2
@@ -195,7 +188,7 @@ function Invoke-AsBuiltReport.Veeam.VBR {
195188
if ($Graph) {
196189
If ((Get-DiaImagePercent -GraphObj $Graph).Width -gt 1500) { $ImagePrty = 10 } else { $ImagePrty = 50 }
197190
Section -Style Heading3 "Wan Accelerator Diagram." {
198-
Image -Base64 $Graph -Text "Wan Accelerator Diagram" -Align Center -Width 600 -Height 400
191+
Image -Base64 $Graph -Text "Wan Accelerator Diagram" -Percent $ImagePrty -Align Center
199192
Paragraph "Image preview: Opens the image in a new tab to view it at full resolution." -Tabs 2
200193
}
201194
BlankLine
@@ -526,11 +519,31 @@ function Invoke-AsBuiltReport.Veeam.VBR {
526519
}
527520

528521
#---------------------------------------------------------------------------------------------#
529-
# Backup Infrastructure Diagram Section #
522+
# Export Diagram Section #
530523
#---------------------------------------------------------------------------------------------#
531524

532-
Get-AbrVbrDiagrammer -DiagramType 'Backup-Infrastructure'
533-
525+
if ($Options.ExportDiagrams) {
526+
$DiagramTypeHash = @{
527+
'Infrastructure' = 'Backup-Infrastructure'
528+
'FileProxy' = 'Backup-to-File-Proxy'
529+
'HyperVProxy' = 'Backup-to-HyperV-Proxy'
530+
'ProtectedGroup' = 'Backup-to-ProtectedGroup'
531+
'Repository' = 'Backup-to-Repository'
532+
'Sobr' = 'Backup-to-Sobr'
533+
'Tape' = 'Backup-to-Tape'
534+
'vSphereProxy' = 'Backup-to-vSphere-Proxy'
535+
'WanAccelerator' = 'Backup-to-WanAccelerator'
536+
}
537+
$Options.DiagramType.PSobject.Properties | ForEach-Object {
538+
try {
539+
if ($_.Value) {
540+
Get-AbrVbrDiagrammer -DiagramType $DiagramTypeHash[$_.Name]
541+
}
542+
} catch {
543+
Write-PScriboMessage -IsWarning "Export Diagram $($_.Name) Error: $($_.Exception.Message)"
544+
}
545+
}
546+
}
534547
}
535548

536549
if ((Get-VBRServerSession).Server) {

0 commit comments

Comments
 (0)