upstream/icinga-powershell-framework
1
0
Fork 0
mirror of https://github.com/Icinga/icinga-powershell-framework.git synced 2025-12-20 23:00:35 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Added support for check output stored differently on daemon execution

Browse source
This commit is contained in:
Lord Hepipud 2019-10-05 22:01:15 +02:00
parent 3924c0a591
commit 7d6b9016e4
3 changed files with 16 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/icinga/exception/Exit-IcingaThrowException.psm1
View file

@ -70,6 +70,8 @@ function Exit-IcingaThrowException()
$ExceptionTypeString
);
Write-Host $OutputMessage;
exit $IcingaEnums.IcingaExitCode.Unknown;
if ($global:IcingaDaemonData.FrameworkRunningAsDaemon -eq $FALSE) {
Write-Host $OutputMessage;
exit $IcingaEnums.IcingaExitCode.Unknown;
}
}

4
lib/icinga/plugin/Write-IcingaPluginOutput.psm1
View file

@ -4,5 +4,9 @@ function Write-IcingaPluginOutput()
$Output
);
if ($global:IcingaDaemonData.FrameworkRunningAsDaemon -eq $FALSE) {
Write-Host $Output;
} else {
$IcingaThreadContent['Scheduler']['PluginCache'] += $Output;
}
}

8
lib/icinga/plugin/Write-IcingaPluginPerfData.psm1
View file

@ -6,8 +6,13 @@ function Write-IcingaPluginPerfData()
);
$CheckResultCache = Get-IcingaCacheData -Space 'sc_daemon' -CacheStore 'checkresult' -KeyName $CheckCommand;
if ($global:IcingaDaemonData.FrameworkRunningAsDaemon -eq $FALSE) {
[string]$PerfDataOutput = (Get-IcingaPluginPerfDataContent -PerfData $PerformanceData -CheckResultCache $CheckResultCache);
Write-Host ([string]::Format('| {0}', $PerfDataOutput));
} else {
[void](Get-IcingaPluginPerfDataContent -PerfData $PerformanceData -CheckResultCache $CheckResultCache -AsObject $TRUE);
}
}
function Get-IcingaPluginPerfDataContent()
@ -40,6 +45,9 @@ function Get-IcingaPluginPerfDataContent()
$compiledPerfData = (New-IcingaPerformanceDataEntry $data);
if ($AsObject) {
$global:IcingaThreadContent['Scheduler']['PluginPerfData'] += $compiledPerfData;
}
$PerfDataOutput += $compiledPerfData;
}
}