sensu-plugins-windows 2.1.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 377a2b75e1e7bd9d94ad88e3e5e84711df72a21d
-  data.tar.gz: c6a97eb3efa5a6e9251984e127861453aafbdd99
+  metadata.gz: 03475123ef7a2c451c0d301dbf37640cc7a08192
+  data.tar.gz: e15a8327c01b9e84d3da8b80267fd9782bf87bbd
 SHA512:
-  metadata.gz: db43777f468634d77a6fc2d408bf7e14f44ea5fa3aa95866a57bd6ec7179062d5bf8207a3e4c18f169600ae77098ca9e693f5d7f93cf287452496c30a52a3a68
-  data.tar.gz: e954695bf78a8d42dcf9c5c27ede9681d97d84c2824bec3ff772ee01ca3f592c2de6ce4a0dde0638570563d28cc5b2734b2c6adf650a8f1d6d32d3b31db27a6b
+  metadata.gz: 2b7ac45b11cca7841ff87a72fe8fd4e018dea0539e316a8c48fd404a88beb291f0a9d52b7f23bbac5d4f34d6b3eda88230c120498477060e4bfd02beef2c939c
+  data.tar.gz: cf71707f9fc12c924cff1ac5620cd30ae0d76572a6dd25ed53e6794ea4181686839d29414867330799834dc16cce6454e1f26556a1cfbb586cbe1bd041b81e90

data/CHANGELOG.md

@@ -4,6 +4,18 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 This CHANGELOG follows the format listed at [Keep A Changelog](http://keepachangelog.com/).
 
 ## [Unreleased]
+
+## [2.2.0] - 2017-09-08
+### Fixed
+- added multi language support to all the powershell scripts (@Seji64)
+- powershell/metric-windows-network.ps1: handle interfaces with spaces in their name (@Seji64)
+
+### Added
+- `powershell/perfhelper.ps1`: added standard sensu header (@Seji64)
+- added option to enable fdqn in metric path (@Seji64)
+- `powershell/metric-windows-disk.ps1` new metric script for disk IO stats (@Seji64)
+
+
 ### [2.1.0] - 2017-08-26
 ### Added
 - `powershell/check-windows-pagefile.ps1`: which basically allows checking how much pagefile (aka swap) is in use. (@hulkk)
@@ -103,7 +115,8 @@ This CHANGELOG follows the format listed at [Keep A Changelog](http://keepachang
 ### Added
 - Initial release
 
-[Unreleased]: https://github.com/sensu-plugins/sensu-plugins-Windows/compare/2.0.0...HEAD
+[Unreleased]: https://github.com/sensu-plugins/sensu-plugins-Windows/compare/2.2.0...HEAD
+[2.2.0]: https://github.com/sensu-plugins/sensu-plugins-Windows/compare/2.1.0...2.2.0
 [2.1.0]: https://github.com/sensu-plugins/sensu-plugins-Windows/compare/2.0.0...2.1.0
 [2.0.0]: https://github.com/sensu-plugins/sensu-plugins-Windows/compare/1.0.0...2.0.0
 [1.0.0]: https://github.com/sensu-plugins/sensu-plugins-Windows/compare/0.1.0...1.0.0

data/bin/powershell/check-windows-cpu-load.ps1

@@ -34,10 +34,18 @@ Param(
    [int]$CRITICAL
 )
 
+. (Join-Path $PSScriptRoot perfhelper.ps1)
+
 $ThisProcess = Get-Process -Id $pid
 $ThisProcess.PriorityClass = "BelowNormal"
 
-$Value = [System.Math]::Round((Get-Counter '\processor(_total)\% processor time' -SampleInterval 1 -MaxSamples 1).CounterSamples.CookedValue)
+$perfCategoryID = Get-PerformanceCounterByID -Name 'Processor Information'
+$perfCounterID = Get-PerformanceCounterByID -Name '% Processor Time'
+
+$localizedCategoryName = Get-PerformanceCounterLocalName -ID $perfCategoryID
+$localizedCounterName = Get-PerformanceCounterLocalName -ID $perfCounterID
+
+$Value = [System.Math]::Round((Get-Counter "\$localizedCategoryName(_total)\$localizedCounterName" -SampleInterval 1 -MaxSamples 1).CounterSamples.CookedValue)
 
 If ($Value -gt $CRITICAL) {
   Write-Host CheckWindowsCpuLoad CRITICAL: CPU at $Value%.
@@ -45,8 +53,10 @@ If ($Value -gt $CRITICAL) {
 
 If ($Value -gt $WARNING) {
   Write-Host CheckWindowsCpuLoad WARNING: CPU at $Value%.
-  Exit 1 }
+  Exit 1
+}
 
 Else {
   Write-Host CheckWindowsCpuLoad OK: CPU at $Value%.
-  Exit 0 }
+  Exit 0 
+}

data/bin/powershell/metric-windows-cpu-load.ps1

@@ -22,14 +22,43 @@
 #   Copyright 2016 sensu-plugins
 #   Released under the same terms as Sensu (the MIT license); see LICENSE for details.
 #
+
+param(
+    [switch]$UseFullyQualifiedHostname
+    )
+
 $ThisProcess = Get-Process -Id $pid
 $ThisProcess.PriorityClass = "BelowNormal"
 
-$Path = hostname
-$Path = $Path.ToLower()
+. (Join-Path $PSScriptRoot perfhelper.ps1)
+
+if ($UseFullyQualifiedHostname -eq $false) {
+    $Path = ($env:computername).ToLower()
+}else {
+    $Path = [System.Net.Dns]::GetHostEntry([string]"localhost").HostName.toLower()
+}
+
+$perfCategoryID = Get-PerformanceCounterByID -Name 'Processor Information'
+$localizedCategoryName = Get-PerformanceCounterLocalName -ID $perfCategoryID
+
+$counters =  New-Object System.Collections.ArrayList
+
+[void]$counters.Add('% Processor Time')
+[void]$counters.Add('% Idle Time')
+[void]$counters.Add('% User Time')
+[void]$counters.Add('% Interrupt Time')
+
+foreach ($counter in $counters) {
+
+$perfCounterID = Get-PerformanceCounterByID -Name $counter
+$localizedCounterName = Get-PerformanceCounterLocalName -ID $perfCounterID
+$value = [System.Math]::Round((Get-Counter "\$localizedCategoryName(_total)\$localizedCounterName" -SampleInterval 1 -MaxSamples 1).CounterSamples.CookedValue)
 
-$Value = (Get-WmiObject CIM_Processor).LoadPercentage
+$Time = DateTimeToUnixTimestamp -DateTime (Get-Date)
 
-$Time = [int][double]::Parse((Get-Date -UFormat %s))
+if ($counter -eq '% Processor Time') { Write-Host "$Path.cpu.percent.total $value $Time" }
+if ($counter -eq '% Idle Time') { Write-Host "$Path.cpu.percent.idle $value $Time" }
+if ($counter -eq '% User Time') { Write-Host "$Path.cpu.percent.user $value $Time" }
+if ($counter -eq '% Interrupt Time') { Write-Host "$Path.cpu.percent.user $value $Time" }
 
-Write-Host "$Path.system.processor_total.%_processor_time $Value $Time"
+}

data/bin/powershell/metric-windows-disk-usage.ps1

@@ -22,9 +22,22 @@
 #   Copyright 2016 sensu-plugins
 #   Released under the same terms as Sensu (the MIT license); see LICENSE for details.
 #
+
+param(
+    [switch]$UseFullyQualifiedHostname
+    )
+
 $ThisProcess = Get-Process -Id $pid
 $ThisProcess.PriorityClass = "BelowNormal"
 
+. (Join-Path $PSScriptRoot perfhelper.ps1)
+
+if ($UseFullyQualifiedHostname -eq $false) {
+    $Path = ($env:computername).ToLower()
+}else {
+    $Path = [System.Net.Dns]::GetHostEntry([string]"localhost").HostName.toLower()
+}
+
 $AllDisks = Get-WMIObject Win32_LogicalDisk -Filter "DriveType = 3" | ? { $_.DeviceID -notmatch "[ab]:"}
 
 foreach ($ObjDisk in $AllDisks) 
@@ -35,11 +48,9 @@ foreach ($ObjDisk in $AllDisks)
   $AvailableSpace = [System.Math]::Round(($ObjDisk.Freespace/1MB),2)
   $UsedPercentage = [System.Math]::Round(((($ObjDisk.Size-$ObjDisk.Freespace)/$ObjDisk.Size)*100),2)
 
-  $Path = (hostname).ToLower()
-
-  $Time = [int][double]::Parse((Get-Date -UFormat %s))
+  $Time = DateTimeToUnixTimestamp -DateTime (Get-Date)
 
-  Write-Host "$Path.system.Disk.$DeviceId.UsedMB $UsedSpace $Time"
-  Write-Host "$Path.system.Disk.$DeviceId.FreeMB $AvailableSpace $Time"
-  Write-Host "$Path.system.Disk.$DeviceId.UsedPercentage $UsedPercentage $Time"
+  Write-Host "$Path.disk.usage.$DeviceId.UsedMB $UsedSpace $Time"
+  Write-Host "$Path.disk.usage.$DeviceId.FreeMB $AvailableSpace $Time"
+  Write-Host "$Path.disk.usage.$DeviceId.UsedPercentage $UsedPercentage $Time"
 }

data/bin/powershell/metric-windows-disk.ps1

@@ -0,0 +1,91 @@
+#
+#   metric-windows-disk.ps1
+#
+# DESCRIPTION:
+#   This plugin collects and outputs all Disk/HDD Statistic in a Graphite acceptable format.
+#
+# OUTPUT:
+#   metric data
+#
+# PLATFORMS:
+#   Windows
+#
+# DEPENDENCIES:
+#   Powershell
+#
+# USAGE:
+#   Powershell.exe -NonInteractive -NoProfile -ExecutionPolicy Bypass -NoLogo -File C:\\etc\\sensu\\plugins\\metric-windows-disk.ps1
+#
+# NOTES:
+#
+# LICENSE:
+#   Copyright 2016 sensu-plugins
+#   Released under the same terms as Sensu (the MIT license); see LICENSE for details.
+#
+
+param(
+    [switch]$UseFullyQualifiedHostname
+    )
+
+$counters =  New-Object System.Collections.ArrayList
+$instances =  @{}
+
+$ThisProcess = Get-Process -Id $pid
+$ThisProcess.PriorityClass = "BelowNormal"
+
+. (Join-Path $PSScriptRoot perfhelper.ps1)
+
+if ($UseFullyQualifiedHostname -eq $false) {
+    $Path = ($env:computername).ToLower()
+}else {
+    $Path = [System.Net.Dns]::GetHostEntry([string]"localhost").HostName.toLower()
+}
+
+$perfCategoryID = Get-PerformanceCounterByID -Name 'PhysicalDisk'
+$localizedCategoryName = Get-PerformanceCounterLocalName -ID $perfCategoryID
+
+[void]$counters.Add('Avg. Disk Bytes/Read')
+[void]$counters.Add('Avg. Disk Bytes/Write')
+[void]$counters.Add('Avg. Disk sec/Read')
+[void]$counters.Add('Avg. Disk sec/Write')
+[void]$counters.Add('Current Disk Queue Length')
+
+foreach ($ObjDisk in (Get-Counter -Counter "\$localizedCategoryName(*)\*").CounterSamples) {
+
+   if ($instances.ContainsKey($ObjDisk.InstanceName) -eq $false) {
+        
+        if ($ObjDisk.InstanceName.ToLower() -ne '_total') {
+            $disk = $ObjDisk.InstanceName
+            $disk = $disk.Remove(0,1)
+            $disk = $disk.Replace(":","")
+            $disk = $disk.Trim()
+            $instances.Add($ObjDisk.InstanceName,$disk.toUpper())
+        }
+        
+   }
+    
+}
+
+foreach ($diskkey in $instances.Keys) {
+
+    $diskname = $instances.$diskkey
+
+    foreach ($counter in $counters) {
+
+        $perfCounterID = Get-PerformanceCounterByID -Name $counter
+        $localizedCounterName = Get-PerformanceCounterLocalName -ID $perfCounterID
+        $value = [System.Math]::Round((Get-Counter "\$localizedCategoryName($diskkey)\$localizedCounterName" -SampleInterval 1 -MaxSamples 1).CounterSamples.CookedValue)
+
+        $Time = DateTimeToUnixTimestamp -DateTime (Get-Date)
+
+        if ($counter -eq 'Avg. Disk Bytes/Read') { Write-Host "$Path.disk.iostat.$diskname.read_bytes $value $Time" }
+        if ($counter -eq 'Avg. Disk Bytes/Write') { Write-Host "$Path.disk.iostat.$diskname.write_bytes $value $Time" }
+        if ($counter -eq 'Avg. Disk sec/Read') { Write-Host "$Path.disk.iostat.$diskname.read_await $value $Time" }
+        if ($counter -eq 'Avg. Disk sec/Write') { Write-Host "$Path.disk.iostat.$diskname.write_await $value $Time" }
+        if ($counter -eq 'Current Disk Queue Length') { Write-Host "$Path.disk.iostat.$diskname.queue_lenght $value $Time" }
+
+    }
+
+}
+
+

data/bin/powershell/metric-windows-network.ps1

@@ -22,14 +22,54 @@
 #   Copyright 2016 sensu-plugins
 #   Released under the same terms as Sensu (the MIT license); see LICENSE for details.
 #
+
+param(
+    [string[]]$Interfaces,
+    [switch]$UseFullyQualifiedHostname
+    )
+
 $ThisProcess = Get-Process -Id $pid
 $ThisProcess.PriorityClass = "BelowNormal"
 
-foreach ($ObjNet in (Get-Counter -Counter "\Network Interface(*)\*").CounterSamples) 
-{ 
-  $Path = ($ObjNet.Path).Trim("\\") -replace "\\","." -replace " ","_" -replace "[(]","." -replace "[)]","" -replace "[\{\}]","" -replace "[\[\]]",""
-  $Value = [System.Math]::Round(($ObjNet.CookedValue),0)
-  $Time = [int][double]::Parse((Get-Date -UFormat %s))
+. (Join-Path $PSScriptRoot perfhelper.ps1)
+
+if ($UseFullyQualifiedHostname -eq $false) {
+    $Hostname = ($env:computername).ToLower()
+}else {
+    $Hostname = [System.Net.Dns]::GetHostEntry([string]"localhost").HostName.toLower()
+}
+
+$perfCategoryID = Get-PerformanceCounterByID -Name 'Network Interface'
+$localizedCategoryName = Get-PerformanceCounterLocalName -ID $perfCategoryID
 
-  Write-Host "$Path $Value $Time"
+for($i = 0; $i -lt $Interfaces.Count; $i+=1) {
+    $tmp = $Interfaces[$i]
+    $Interfaces[$i] = $tmp.Replace("_"," ")
 }
+
+foreach ($ObjNet in (Get-Counter -Counter "\$localizedCategoryName(*)\*").CounterSamples) 
+{ 
+
+  if ($Interfaces.Contains($ObjNet.InstanceName)) {
+
+     $Measurement = ($ObjNet.Path).Trim("\\") -replace "\\","." -replace " ","_" -replace "[(]","." -replace "[)]","" -replace "[\{\}]","" -replace "[\[\]]",""
+
+	 $Measurement = $Measurement.Remove(0,$Measurement.IndexOf("."))   
+	 $Path = $Hostname+$Measurement
+
+     $Path = $Path.Replace("/s","_per_second")
+     $Path = $Path.Replace(":","")
+     $Path = $Path.Replace(",","")
+     $Path = $Path.Replace("�","ae")
+     $Path = $Path.Replace("�","oe")
+     $Path = $Path.Replace("�","ue")
+	 $Path = $Path.Replace("�","ss")
+
+     $Value = [System.Math]::Round(($ObjNet.CookedValue),0)
+     $Time = DateTimeToUnixTimestamp -DateTime (Get-Date)
+
+     Write-Host "$Path $Value $Time"
+
+   }
+
+}

data/bin/powershell/metric-windows-processor-queue-length.ps1

@@ -22,14 +22,22 @@
 #   Copyright 2016 sensu-plugins
 #   Released under the same terms as Sensu (the MIT license); see LICENSE for details.
 #
+param(
+    [switch]$UseFullyQualifiedHostname
+    )
+
 $ThisProcess = Get-Process -Id $pid
 $ThisProcess.PriorityClass = "BelowNormal"
 
-$Path = hostname
-$Path = $Path.ToLower()
+. (Join-Path $PSScriptRoot perfhelper.ps1)
 
-$Value = (Get-WmiObject Win32_PerfFormattedData_PerfOS_System).ProcessorQueueLength
+if ($UseFullyQualifiedHostname -eq $false) {
+    $Path = ($env:computername).ToLower()
+}else {
+    $Path = [System.Net.Dns]::GetHostEntry([string]"localhost").HostName.toLower()
+}
 
-$Time = [int][double]::Parse((Get-Date -UFormat %s))
+$Value = (Get-WmiObject Win32_PerfFormattedData_PerfOS_System).ProcessorQueueLength
+$Time = DateTimeToUnixTimestamp -DateTime (Get-Date)
 
-Write-Host "$Path.system.processor_queue_length $Value $Time"
+Write-Host "$Path.cpu.queue_length $Value $Time"

data/bin/powershell/metric-windows-ram-usage.ps1

@@ -22,14 +22,29 @@
 #   Copyright 2016 sensu-plugins
 #   Released under the same terms as Sensu (the MIT license); see LICENSE for details.
 #
+param(
+    [switch]$UseFullyQualifiedHostname
+    )
+
 $ThisProcess = Get-Process -Id $pid
 $ThisProcess.PriorityClass = "BelowNormal"
 
+. (Join-Path $PSScriptRoot perfhelper.ps1)
+
+if ($UseFullyQualifiedHostname -eq $false) {
+    $Path = ($env:computername).ToLower()
+}else {
+    $Path = [System.Net.Dns]::GetHostEntry([string]"localhost").HostName.toLower()
+}
+
 $FreeMemory = (Get-WmiObject -Query "SELECT TotalVisibleMemorySize, FreePhysicalMemory FROM Win32_OperatingSystem").FreePhysicalMemory
 $TotalMemory = (Get-WmiObject -Query "SELECT TotalVisibleMemorySize, FreePhysicalMemory FROM Win32_OperatingSystem").TotalVisibleMemorySize
+$UsedMemory = $TotalMemory-$FreeMemory
 
-$Path = (hostname).ToLower()
 $Value = [System.Math]::Round(((($TotalMemory-$FreeMemory)/$TotalMemory)*100),2)
-$Time = [int][double]::Parse((Get-Date -UFormat %s))
+$Time = DateTimeToUnixTimestamp -DateTime (Get-Date)
 
-Write-host "$Path.system.ram.RamUsagePercent $Value $Time"
+Write-host "$Path.memory.free $FreeMemory $Time"
+Write-host "$Path.memory.total $TotalMemory $Time"
+Write-host "$Path.memory.used $UsedMemory $Time"
+Write-host "$Path.memory.percent.used $Value $Time"

data/bin/powershell/metric-windows-system.ps1

@@ -0,0 +1,56 @@
+#
+#   metric-windows-system.ps1
+#
+# DESCRIPTION:
+#   This plugin collects and outputs some System Perfomance Counters in a Graphite acceptable format.
+#
+# OUTPUT:
+#   metric data
+#
+# PLATFORMS:
+#   Windows
+#
+# DEPENDENCIES:
+#   Powershell
+#
+# USAGE:
+#   Powershell.exe -NonInteractive -NoProfile -ExecutionPolicy Bypass -NoLogo -File C:\\etc\\sensu\\plugins\\metric-windows-sytem.ps1
+#
+# NOTES:
+#
+# LICENSE:
+#   Copyright 2016 sensu-plugins
+#   Released under the same terms as Sensu (the MIT license); see LICENSE for details.
+#
+
+param(
+    [switch]$UseFullyQualifiedHostname
+    )
+
+$ThisProcess = Get-Process -Id $pid
+$ThisProcess.PriorityClass = "BelowNormal"
+
+. (Join-Path $PSScriptRoot perfhelper.ps1)
+
+if ($UseFullyQualifiedHostname -eq $false) {
+    $Path = ($env:computername).ToLower()
+}else {
+    $Path = [System.Net.Dns]::GetHostEntry([string]"localhost").HostName.toLower()
+}
+
+$perfCategoryID = Get-PerformanceCounterByID -Name 'Processor Information'
+$localizedCategoryName = Get-PerformanceCounterLocalName -ID $perfCategoryID
+$perfCounterID = Get-PerformanceCounterByID -Name 'Interrupts/sec'
+$localizedCounterName = Get-PerformanceCounterLocalName -ID $perfCounterID
+$count_interrupt = [System.Math]::Round((Get-Counter "\$localizedCategoryName(_total)\$localizedCounterName" -SampleInterval 1 -MaxSamples 1).CounterSamples.CookedValue)
+
+$perfCategoryID = Get-PerformanceCounterByID -Name 'System'
+$localizedCategoryName = Get-PerformanceCounterLocalName -ID $perfCategoryID
+$perfCounterID = Get-PerformanceCounterByID -Name 'Context Switches/sec'
+$localizedCounterName = Get-PerformanceCounterLocalName -ID $perfCounterID
+$count_context = [System.Math]::Round((Get-Counter "\$localizedCategoryName\$localizedCounterName" -SampleInterval 1 -MaxSamples 1).CounterSamples.CookedValue)
+
+$Time = DateTimeToUnixTimestamp -DateTime (Get-Date)
+
+Write-Host "$Path.system.irq_per_second $count_interrupt $Time"
+Write-Host "$Path.system.context_switches_per_second $count_context $Time"

data/bin/powershell/metric-windows-uptime.ps1

@@ -25,10 +25,18 @@
 $ThisProcess = Get-Process -Id $pid
 $ThisProcess.PriorityClass = "BelowNormal"
 
-$Counter = ((Get-Counter "\System\System Up Time").CounterSamples)
+. (Join-Path $PSScriptRoot perfhelper.ps1)
+
+$perfCategoryID = Get-PerformanceCounterByID -Name 'System'
+$localizedCategoryName = Get-PerformanceCounterLocalName -ID $perfCategoryID
+
+$perfCounterID = Get-PerformanceCounterByID -Name 'System Up Time'
+$localizedCounterName = Get-PerformanceCounterLocalName -ID $perfCounterID
+
+$Counter = ((Get-Counter "\$localizedCategoryName\$localizedCounterName").CounterSamples)
 
 $Path = ($Counter.Path).Trim("\\") -replace " ","_" -replace "\\","." -replace "[\{\}]","" -replace "[\[\]]",""
 $Value = [System.Math]::Truncate($Counter.CookedValue)
-$Time = [int][double]::Parse((Get-Date -UFormat %s))
+$Time = DateTimeToUnixTimestamp -DateTime (Get-Date)
 
 Write-Host "$Path $Value $Time"

data/bin/powershell/perfhelper.ps1

@@ -0,0 +1,106 @@
+#
+#   perfhelper.ps1
+#
+# DESCRIPTION:
+#   This is file provides useful functions for powershell based metric checks
+#
+# OUTPUT:
+#   metric data
+#
+# PLATFORMS:
+#   Windows
+#
+# DEPENDENCIES:
+#   Powershell
+#
+# USAGE:
+#   To use these functions dot source this file. 
+#	Example: . (Join-Path $PSScriptRoot perfhelper.ps1)
+#
+# NOTES:
+#
+# LICENSE:
+#   Copyright 2016 sensu-plugins
+#   Released under the same terms as Sensu (the MIT license); see LICENSE for details.
+#
+#
+# Taken from: http://www.powershellmagazine.com/2013/07/19/querying-performance-counters-from-powershell/
+# THX!
+#
+
+
+function Get-PerformanceCounterByID
+{
+    param
+    (
+        [Parameter(Mandatory=$true)]
+        $Name
+    )
+
+    $hashfile = (Join-Path $PSScriptRoot perfhash.hsh)
+
+    if ([System.IO.File]::Exists($hashfile)) {
+        
+        $perfHash = Import-Clixml -Path $hashfile
+    }
+ 
+    if ($perfHash -eq $null)
+    {
+ 
+        $key = 'Registry::HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Perflib\009'
+        $counters = (Get-ItemProperty -Path $key -Name Counter).Counter
+        $perfHash = @{}
+        $all = $counters.Count
+ 
+        for($i = 0; $i -lt $all; $i+=2)
+        {
+           $perfHash.$($counters[$i+1]) = $counters[$i]
+        }
+
+        Export-Clixml -InputObject $perfHash -Path $hashfile
+
+    }
+ 
+   $perfHash.$Name
+}
+
+$signature = @'
+[DllImport("pdh.dll", SetLastError = true, CharSet = CharSet.Unicode)]
+static extern UInt32 PdhLookupPerfNameByIndex(string szMachineName, uint dwNameIndex, StringBuilder szNameBuffer, ref uint pcchNameBufferSize);
+'@;
+
+Function Get-PerformanceCounterLocalName
+{
+  param
+  (
+    [UInt32]
+    $ID,
+ 
+    $ComputerName = $env:COMPUTERNAME
+  )
+ 
+  $code = '[DllImport("pdh.dll", SetLastError=true, CharSet=CharSet.Unicode)] public static extern UInt32 PdhLookupPerfNameByIndex(string szMachineName, uint dwNameIndex, System.Text.StringBuilder szNameBuffer, ref uint pcchNameBufferSize);'
+ 
+  $Buffer = New-Object System.Text.StringBuilder(1024)
+  [UInt32]$BufferSize = $Buffer.Capacity
+ 
+  $t = Add-Type -MemberDefinition $code -PassThru -Name PerfCounter -Namespace Utility
+  $rv = $t::PdhLookupPerfNameByIndex($ComputerName, $id, $Buffer, [Ref]$BufferSize)
+ 
+  if ($rv -eq 0)
+  {
+    $Buffer.ToString().Substring(0, $BufferSize-1)
+  }
+  else
+  {
+    Throw 'Get-PerformanceCounterLocalName : Unable to retrieve localized name. Check computer name and performance counter ID.'
+  }
+}
+
+Function DateTimeToUnixTimestamp([datetime]$DateTime)
+{
+    $utcDate = $DateTime.ToUniversalTime()
+    # Convert to a Unix time without any rounding
+    [uint64]$UnixTime = [double]::Parse((Get-Date -Date $utcDate -UFormat %s))
+    return [uint64]$UnixTime
+}

data/lib/sensu-plugins-windows/version.rb

@@ -1,7 +1,7 @@
 module SensuPluginsWindows
   module Version
     MAJOR = 2
-    MINOR = 1
+    MINOR = 2
     PATCH = 0
 
     VER_STRING = [MAJOR, MINOR, PATCH].compact.join('.')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sensu-plugins-windows
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.2.0
 platform: ruby
 authors:
 - Sensu-Plugins and contributors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-26 00:00:00.000000000 Z
+date: 2017-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sensu-plugin
@@ -153,8 +153,8 @@ dependencies:
 description: Sensu plugins for Windows
 email: "<sensu-users@googlegroups.com>"
 executables:
-- check-windows-cpu-load.rb
 - check-windows-disk.rb
+- check-windows-cpu-load.rb
 - check-windows-process.rb
 - check-windows-processor-queue-length.rb
 - check-windows-ram.rb
@@ -194,10 +194,13 @@ files:
 - bin/powershell/check-windows-service.ps1
 - bin/powershell/metric-windows-cpu-load.ps1
 - bin/powershell/metric-windows-disk-usage.ps1
+- bin/powershell/metric-windows-disk.ps1
 - bin/powershell/metric-windows-network.ps1
 - bin/powershell/metric-windows-processor-queue-length.ps1
 - bin/powershell/metric-windows-ram-usage.ps1
+- bin/powershell/metric-windows-system.ps1
 - bin/powershell/metric-windows-uptime.ps1
+- bin/powershell/perfhelper.ps1
 - lib/sensu-plugins-windows.rb
 - lib/sensu-plugins-windows/version.rb
 homepage: https://github.com/sensu-plugins/sensu-plugins-windows
@@ -226,7 +229,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Sensu plugins for Windows