Skip to content

Commit

Permalink
Merge pull request #199 from rebelinux/dev
Browse files Browse the repository at this point in the history 
v0.8.14
  • Loading branch information
@rebelinux
rebelinux authored Jan 31, 2025
2 parents de4997c + 9f23a1b commit f067ff3
Show file tree
Hide file tree
Showing 28 changed files with 188 additions and 133 deletions.
4 changes: 2 additions & 2 deletions AsBuiltReport.Veeam.VBR.psd1
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
RootModule = 'AsBuiltReport.Veeam.VBR.psm1'

# Version number of this module.
ModuleVersion = '0.8.13'
ModuleVersion = '0.8.14'

# Supported PSEditions
# CompatiblePSEditions = @()
Expand Down Expand Up @@ -55,7 +55,7 @@
RequiredModules = @(
@{
ModuleName = 'AsBuiltReport.Core';
ModuleVersion = '1.4.1'
ModuleVersion = '1.4.2'
}
@{
ModuleName = 'PScriboCharts';
Expand Down
3 changes: 2 additions & 1 deletion AsBuiltreport.Veeam.VBR.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,8 @@
"EnableDiagramSignature": false,
"SignatureAuthorName": "",
"SignatureCompanyName": "",
"PSDefaultAuthentication": "Default"
"PSDefaultAuthentication": "Default",
"RoundUnits": 1
},
"InfoLevel": {
"_comment_": "Please refer to the AsBuiltReport project contributing guide for information about how to define InfoLevels.",
Expand Down
17 changes: 17 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,23 @@ 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.14] - 2025-01-30

### Added

- Add support for vMWare Cloud Director backup jobs
- Add option to set the RoundUnits of the storage usages

### Changed

- Storage units in the report are set to 1 round by default
- Increase AsBuiltReport.Core to v1.4.2

### Fixed

- Fix [#197](https://github.com/AsBuiltReport/AsBuiltReport.Veeam.VBR/issues/197)
- Fix [#198](https://github.com/AsBuiltReport/AsBuiltReport.Veeam.VBR/issues/198)

## [0.8.13] - 2024-12-11

### Added
Expand Down
31 changes: 16 additions & 15 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -155,21 +155,22 @@ The **Report** schema provides configuration of the Veeam VBR report information

The **Options** schema allows certain options within the report to be toggled on or off.

| Sub-Schema | Setting | Default | Description |
| ----------------------- | ------------------- | ------- | ------------------------------------------------------------------------------ |
| BackupServerPort | TCP Port | 9392 | Set the backup server service's custom port. |
| PSDefaultAuthentication | Negotiate/Kerberos | Default | Set the PSRemoting authentication method |
| EnableHardwareInventory | true / false | false | Toggle to enable/disable of Hardware information |
| 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) |
| EnableDiagramSignature | true/false | false | Toggle to enable/disable diagram signature (button right corner) |
| SignatureAuthorName | string | empty | Toggle to set signature author name. |
| SignatureCompanyName | string | empty | Toggle to set signature company name. |
| Sub-Schema | Setting | Default | Description |
| ----------------------- | -------------------------- | ------- | ------------------------------------------------------------------------------ |
| BackupServerPort | TCP Port | 9392 | Set the backup server service's custom port. |
| PSDefaultAuthentication | Default/Kerberos/Negotiate | Default | Set the PSRemoting authentication method |
| EnableHardwareInventory | true / false | false | Toggle to enable/disable of Hardware information |
| 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) |
| EnableDiagramSignature | true/false | false | Toggle to enable/disable diagram signature (button right corner) |
| SignatureAuthorName | string | empty | Toggle to set signature author name. |
| SignatureCompanyName | string | empty | Toggle to set signature company name. |
| RoundUnits | int | 1 | Set value to round the storage unit. |

### InfoLevel

Expand Down
8 changes: 4 additions & 4 deletions Src/Private/Get-AbrVbrBackupCopyjobConf.ps1
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ function Get-AbrVbrBackupCopyjobConf {
.DESCRIPTION
Documents the configuration of Veeam VBR in Word/HTML/Text formats using PScribo.
.NOTES
Version: 0.8.12
Version: 0.8.14
Author: Jonathan Colon
Twitter: @jcolonfzenpr
Github: rebelinux
Expand Down Expand Up @@ -98,7 +98,7 @@ function Get-AbrVbrBackupCopyjobConf {
$inObj = [ordered] @{
'Name' = $LinkedBkJob.Name
'Type' = $LinkedBkJob.TypeToString
'Size' = ConvertTo-FileSizeString -Size $LinkedBkJob.Info.IncludedSize
'Size' = ConvertTo-FileSizeString -RoundUnits $Options.RoundUnits -Size $LinkedBkJob.Info.IncludedSize
'Repository' = $LinkedBkJob.GetTargetRepository().Name
}
$OutObj += [pscustomobject](ConvertTo-HashToYN $inObj)
Expand Down Expand Up @@ -132,13 +132,13 @@ function Get-AbrVbrBackupCopyjobConf {
$inObj = [ordered] @{
'Name' = $LinkedRepository.Name
'Type' = "ScaleOut"
'Size' = ConvertTo-FileSizeString -Size $LinkedRepository.GetContainer().CachedTotalSpace.InBytesAsUInt64
'Size' = ConvertTo-FileSizeString -RoundUnits $Options.RoundUnits -Size $LinkedRepository.GetContainer().CachedTotalSpace.InBytesAsUInt64
}
} else {
$inObj = [ordered] @{
'Name' = $LinkedRepository.Name
'Type' = "Standard"
'Size' = ConvertTo-FileSizeString -Size $LinkedRepository.GetContainer().CachedTotalSpace.InBytesAsUInt64
'Size' = ConvertTo-FileSizeString -RoundUnits $Options.RoundUnits -Size $LinkedRepository.GetContainer().CachedTotalSpace.InBytesAsUInt64
}
}
$OutObj += [pscustomobject](ConvertTo-HashToYN $inObj)
Expand Down
4 changes: 2 additions & 2 deletions Src/Private/Get-AbrVbrBackupJobsRP.ps1
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ function Get-AbrVbrBackupJobsRP {
.DESCRIPTION
Documents the configuration of Veeam VBR in Word/HTML/Text formats using PScribo.
.NOTES
Version: 0.8.12
Version: 0.8.14
Author: Jonathan Colon
Twitter: @jcolonfzenpr
Github: rebelinux
Expand Down Expand Up @@ -43,7 +43,7 @@ function Get-AbrVbrBackupJobsRP {
$inObj = [ordered] @{
'VM Name' = $RestorePoint.VMName
'Backup Type' = $RestorePoint.Algorithm
'Backup Size' = (ConvertTo-FileSizeString -Size $RestorePoint.GetStorage().stats.BackupSize)
'Backup Size' = (ConvertTo-FileSizeString -RoundUnits $Options.RoundUnits -Size $RestorePoint.GetStorage().stats.BackupSize)
'Dedub Ratio' = [Math]::Round($DedupRatio, 2)
'Compress Ratio' = [Math]::Round($CompressRatio, 2)
'Reduction' = [Math]::Round(($DedupRatio * $CompressRatio), 2)
Expand Down
22 changes: 11 additions & 11 deletions Src/Private/Get-AbrVbrBackupProxy.ps1
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.12
Version: 0.8.14
Author: Jonathan Colon
Twitter: @jcolonfzenpr
Github: rebelinux
Expand Down Expand Up @@ -159,7 +159,7 @@ function Get-AbrVbrBackupProxy {
'Processor Model' = $HWCPU[0].Name
'Number of CPU Cores' = $HWCPU[0].NumberOfCores
'Number of Logical Cores' = $HWCPU[0].NumberOfLogicalProcessors
'Physical Memory (GB)' = ConvertTo-FileSizeString -Size $HW.CsTotalPhysicalMemory
'Physical Memory (GB)' = ConvertTo-FileSizeString -RoundUnits $Options.RoundUnits -Size $HW.CsTotalPhysicalMemory
}
$OutObj += [pscustomobject](ConvertTo-HashToYN $inObj)

Expand Down Expand Up @@ -193,7 +193,7 @@ function Get-AbrVbrBackupProxy {
'Model' = $Disk.Model
'Serial Number' = $Disk.SerialNumber
'Partition Style' = $Disk.PartitionStyle
'Disk Size' = ConvertTo-FileSizeString -Size $Disk.Size
'Disk Size' = ConvertTo-FileSizeString -RoundUnits $Options.RoundUnits -Size $Disk.Size
}
$LocalDiskReport += $TempLocalDiskReport
} catch {
Expand Down Expand Up @@ -229,7 +229,7 @@ function Get-AbrVbrBackupProxy {
'Model' = $Disk.Model
'Serial Number' = $Disk.SerialNumber
'Partition Style' = $Disk.PartitionStyle
'Disk Size' = ConvertTo-FileSizeString -Size $Disk.Size
'Disk Size' = ConvertTo-FileSizeString -RoundUnits $Options.RoundUnits -Size $Disk.Size
}
$SanDiskReport += $TempSanDiskReport
} catch {
Expand Down Expand Up @@ -262,8 +262,8 @@ function Get-AbrVbrBackupProxy {
'Drive Letter' = $HostVolume.DriveLetter
'File System Label' = $HostVolume.FileSystemLabel
'File System' = $HostVolume.FileSystem
'Size' = ConvertTo-FileSizeString -Size $HostVolume.Size
'Free Space' = ConvertTo-FileSizeString -Size $HostVolume.SizeRemaining
'Size' = ConvertTo-FileSizeString -RoundUnits $Options.RoundUnits -Size $HostVolume.Size
'Free Space' = ConvertTo-FileSizeString -RoundUnits $Options.RoundUnits -Size $HostVolume.SizeRemaining
'Health Status' = $HostVolume.HealthStatus
}
$HostVolumeReport += $TempHostVolumeReport
Expand Down Expand Up @@ -611,7 +611,7 @@ function Get-AbrVbrBackupProxy {
'Processor Model' = $HWCPU[0].Name
'Number of CPU Cores' = $HWCPU[0].NumberOfCores
'Number of Logical Cores' = $HWCPU[0].NumberOfLogicalProcessors
'Physical Memory (GB)' = ConvertTo-FileSizeString -Size $HW.CsTotalPhysicalMemory
'Physical Memory (GB)' = ConvertTo-FileSizeString -RoundUnits $Options.RoundUnits -Size $HW.CsTotalPhysicalMemory
}
$OutObj += [pscustomobject](ConvertTo-HashToYN $inObj)

Expand Down Expand Up @@ -645,7 +645,7 @@ function Get-AbrVbrBackupProxy {
'Model' = $Disk.Model
'Serial Number' = $Disk.SerialNumber
'Partition Style' = $Disk.PartitionStyle
'Disk Size' = ConvertTo-FileSizeString -Size $Disk.Size
'Disk Size' = ConvertTo-FileSizeString -RoundUnits $Options.RoundUnits -Size $Disk.Size
}
$LocalDiskReport += $TempLocalDiskReport
} catch {
Expand Down Expand Up @@ -681,7 +681,7 @@ function Get-AbrVbrBackupProxy {
'Model' = $Disk.Model
'Serial Number' = $Disk.SerialNumber
'Partition Style' = $Disk.PartitionStyle
'Disk Size' = ConvertTo-FileSizeString -Size $Disk.Size
'Disk Size' = ConvertTo-FileSizeString -RoundUnits $Options.RoundUnits -Size $Disk.Size
}
$SanDiskReport += $TempSanDiskReport
} catch {
Expand Down Expand Up @@ -717,8 +717,8 @@ function Get-AbrVbrBackupProxy {
'Drive Letter' = $HostVolume.DriveLetter
'File System Label' = $HostVolume.FileSystemLabel
'File System' = $HostVolume.FileSystem
'Size' = ConvertTo-FileSizeString -Size $HostVolume.Size
'Free Space' = ConvertTo-FileSizeString -Size $HostVolume.SizeRemaining
'Size' = ConvertTo-FileSizeString -RoundUnits $Options.RoundUnits -Size $HostVolume.Size
'Free Space' = ConvertTo-FileSizeString -RoundUnits $Options.RoundUnits -Size $HostVolume.SizeRemaining
'Health Status' = $HostVolume.HealthStatus
}
$HostVolumeReport += $TempHostVolumeReport
Expand Down
Loading

0 comments on commit f067ff3

Please sign in to comment.