From 06b7c0cdd536faa49a9c9811f9e4b9ebfae7ea72 Mon Sep 17 00:00:00 2001
From: Lord Hepipud <contact@lordhepipud.de>
Date: Tue, 5 Nov 2019 12:39:54 +0100
Subject: [PATCH] Fixes performance data output for single checks

---
 lib/icinga/plugin/New-IcingaCheckResult.psm1      | 2 +-
 lib/icinga/plugin/Write-IcingaPluginPerfData.psm1 | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/lib/icinga/plugin/New-IcingaCheckResult.psm1 b/lib/icinga/plugin/New-IcingaCheckResult.psm1
index 5e2a9f6..a64623a 100644
--- a/lib/icinga/plugin/New-IcingaCheckResult.psm1
+++ b/lib/icinga/plugin/New-IcingaCheckResult.psm1
@@ -24,7 +24,7 @@ function New-IcingaCheckresult()
         $this.check.Compile($TRUE) | Out-Null;
 
         if ([int]$this.check.exitcode -ne [int]$IcingaEnums.IcingaExitCode.Unknown -And -Not $this.noperfdata) {
-            Write-IcingaPluginPerfData -PerformanceData ($this.check.GetPerfData().perfdata) -CheckCommand $CheckCommand;
+            Write-IcingaPluginPerfData -PerformanceData ($this.check.GetPerfData()) -CheckCommand $CheckCommand;
         }
 
         return $this.check.exitcode;
diff --git a/lib/icinga/plugin/Write-IcingaPluginPerfData.psm1 b/lib/icinga/plugin/Write-IcingaPluginPerfData.psm1
index dc1221c..be86233 100644
--- a/lib/icinga/plugin/Write-IcingaPluginPerfData.psm1
+++ b/lib/icinga/plugin/Write-IcingaPluginPerfData.psm1
@@ -5,6 +5,14 @@ function Write-IcingaPluginPerfData()
         $CheckCommand
     );
 
+    if ($PerformanceData.package -eq $FALSE) {
+        $PerformanceData = @{
+            $PerformanceData.label = $PerformanceData;
+        }
+    } else {
+        $PerformanceData = $PerformanceData.perfdata;
+    }
+
     $CheckResultCache = Get-IcingaCacheData -Space 'sc_daemon' -CacheStore 'checkresult' -KeyName $CheckCommand;
 
     if ($global:IcingaDaemonData.FrameworkRunningAsDaemon -eq $FALSE) {