From 2f15476bc7808ecada80598a55cb9c660c72fee5 Mon Sep 17 00:00:00 2001 From: Alexander Stoll Date: Tue, 23 Jul 2019 10:50:58 +0200 Subject: [PATCH] Added FreeDiskSpace to Disk Provider, via Performance Counters --- icinga-module-windows.psm1 | 4 +++- lib/provider/disks/Icinga_ProviderDisks.psm1 | 3 +++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/icinga-module-windows.psm1 b/icinga-module-windows.psm1 index b04b78f..990a151 100644 --- a/icinga-module-windows.psm1 +++ b/icinga-module-windows.psm1 @@ -339,8 +339,10 @@ function Get-Icinga-Object() Import-IcingaLib '\'; # Initialise base configuration for our module +<# $Icinga2 = & (Join-Path -Path $PSScriptRoot -ChildPath '\core\init.ps1') ` -RootDirectory $PSScriptRoot ` -ModuleName $MyInvocation.MyCommand.Name; -Export-ModuleMember @Icinga2; \ No newline at end of file +Export-ModuleMember @Icinga2; +#> \ No newline at end of file diff --git a/lib/provider/disks/Icinga_ProviderDisks.psm1 b/lib/provider/disks/Icinga_ProviderDisks.psm1 index b03a8b6..c1fb3b1 100644 --- a/lib/provider/disks/Icinga_ProviderDisks.psm1 +++ b/lib/provider/disks/Icinga_ProviderDisks.psm1 @@ -51,6 +51,8 @@ function Get-IcingaDiskPartitions() continue; } } + + $DiskArray = New-IcingaPerformanceCounterStructure -CounterCategory 'LogicalDisk' -PerformanceCounterHash (New-IcingaPerformanceCounterArray @('\LogicalDisk(*)\% free space')); $diskPartitionSize = Get-Partition -DriveLetter $driveLetter; @@ -60,6 +62,7 @@ function Get-IcingaDiskPartitions() 'Disk' = $diskDisk; 'Partition' = $diskPartition; 'Size' = $diskPartitionSize.Size; + 'Free Space' = $DiskArray.Item([string]::Format('{0}:', $driveLetter))."% free space".value; } ); }