tyler.durden
/
icinga2
mirror of https://github.com/Icinga/icinga2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix performance output of check_perfmon 

fixes #10489
refs #12679
This commit is contained in:
Jean Flach 2016-09-08 16:50:10 +02:00
parent 3e7b943e36
commit adad7180e0
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
plugins/check_perfmon.cpp
View File

@ -337,10 +337,10 @@ BOOL QueryPerfData(printInfoStruct& pI)
switch (pI.dwRequestedType) switch (pI.dwRequestedType)
{ {
case (PDH_FMT_LONG) : case (PDH_FMT_LONG):
pI.dValue = pDisplayValues[0].FmtValue.longValue; pI.dValue = pDisplayValues[0].FmtValue.longValue;
break; break;
case (PDH_FMT_LARGE) : case (PDH_FMT_LARGE):
pI.dValue = pDisplayValues[0].FmtValue.largeValue; pI.dValue = pDisplayValues[0].FmtValue.largeValue;
break; break;
default: default:
@ -361,9 +361,8 @@ die:
INT PrintOutput(CONST po::variables_map& vm, printInfoStruct& pi) INT PrintOutput(CONST po::variables_map& vm, printInfoStruct& pi)
{ {
std::wstringstream wssPerfData; std::wstringstream wssPerfData;
wssPerfData << "perfmon=" << pi.dValue << ';' wssPerfData << "\"" << pi.wsFullPath << "\"=" << pi.dValue << ';'
<< pi.tWarn.pString() << ';' << pi.tCrit.pString() << ";; " << pi.tWarn.pString() << ';' << pi.tCrit.pString() << ";;";
<< '"' << pi.wsFullPath << "\"=" << pi.dValue;
if (pi.tCrit.rend(pi.dValue)) { if (pi.tCrit.rend(pi.dValue)) {
std::wcout << "PERFMON CRITICAL \"" << pi.wsFullPath << "\" = " std::wcout << "PERFMON CRITICAL \"" << pi.wsFullPath << "\" = "