From: Michael Friedrich Date: Tue, 26 Jun 2018 07:54:43 +0000 (+0200) Subject: Merge pull request #6412 from Icinga/fix/plugin-output X-Git-Tag: v2.9.0~13 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=73f69e89d9bf30c16c71a5d47e83cf366fc7bce5;p=icinga2 Merge pull request #6412 from Icinga/fix/plugin-output Fix output formatting in windows plugins --- 73f69e89d9bf30c16c71a5d47e83cf366fc7bce5 diff --cc plugins/check_memory.cpp index 8c274c1fe,bbdbd741f..e69e02700 --- a/plugins/check_memory.cpp +++ b/plugins/check_memory.cpp @@@ -187,9 -187,9 +187,9 @@@ static int printOutput(printInfoStruct else std::wcout << " - " << 100 - printInfo.percentFree << L"% used"; - std::wcout << "| memory=" << currentValue << BunitStr(printInfo.unit) << L";" + std::wcout << "| 'memory'=" << currentValue << BunitStr(printInfo.unit) << L";" << printInfo.warn.pString(printInfo.tRam) << L";" << printInfo.crit.pString(printInfo.tRam) - << L";0;" << printInfo.tRam; + << L";0;" << printInfo.tRam << '\n'; return state; }