tyler.durden/icinga2
1
0
Fork 0
mirror of https://github.com/Icinga/icinga2.git synced 2025-07-21 12:44:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5733 from Icinga/feature/perfdataname

Browse Source 
Make --perf-syntax also change short message
This commit is contained in:
Michael Friedrich 2017-11-28 13:47:04 +01:00 committed by GitHub
commit 1f52e391d4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
plugins/check_perfmon.cpp
View File

@ -372,19 +372,19 @@ INT PrintOutput(CONST po::variables_map& vm, printInfoStruct& pi)
wssPerfData << pi.dValue << ';' << pi.tWarn.pString() << ';' << pi.tCrit.pString() << ";;";
if (pi.tCrit.rend(pi.dValue)) {
std::wcout << "PERFMON CRITICAL \"" << pi.wsFullPath << "\" = "
<< pi.dValue << " | " << wssPerfData.str() << '\n';
std::wcout << "PERFMON CRITICAL \"" << (vm.count("perf-syntax") ? vm["perf-syntax"].as<std::wstring>() : pi.wsFullPath)
<< "\" = " << pi.dValue << " | " << wssPerfData.str() << '\n';
return 2;
}
if (pi.tWarn.rend(pi.dValue)) {
std::wcout << "PERFMON WARNING \"" << pi.wsFullPath << "\" = "
<< pi.dValue << " | " << wssPerfData.str() << '\n';
std::wcout << "PERFMON WARNING \"" << (vm.count("perf-syntax") ? vm["perf-syntax"].as<std::wstring>() : pi.wsFullPath)
<< "\" = " << pi.dValue << " | " << wssPerfData.str() << '\n';
return 1;
}
std::wcout << "PERFMON OK \"" << pi.wsFullPath << "\" = "
<< pi.dValue << " | " << wssPerfData.str() << '\n';
std::wcout << "PERFMON OK \"" << (vm.count("perf-syntax") ? vm["perf-syntax"].as<std::wstring>() : pi.wsFullPath)
<< "\" = " << pi.dValue << " | " << wssPerfData.str() << '\n';
return 0;
}