tyler.durden/icinga2
1
0
Fork 0
mirror of https://github.com/Icinga/icinga2.git synced 2025-07-23 13:45:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6811 from Icinga/bugfix/win-check-memory-state-condition

Browse Source 
Fix state conditions in check_memory and check_swap
This commit is contained in:
Michael Friedrich 2018-12-03 15:06:30 +01:00 committed by GitHub
commit 7b39591c6b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 22 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
plugins/check_memory.cpp
View File

@ -164,7 +164,7 @@ static int printOutput(printInfoStruct& printInfo)
if (l_Debug) if (l_Debug)
std::wcout << L"Constructing output string" << '\n'; std::wcout << L"Constructing output string" << '\n';
state state; state state = OK;
std::wcout << L"MEMORY "; std::wcout << L"MEMORY ";
@ -175,16 +175,13 @@ static int printOutput(printInfoStruct& printInfo)
else else
currentValue = printInfo.tRam - printInfo.aRam; currentValue = printInfo.tRam - printInfo.aRam;
if (printInfo.warn.rend(currentValue, printInfo.tRam)) { if (printInfo.warn.rend(currentValue, printInfo.tRam))
state = WARNING; state = WARNING;
std::wcout << L"WARNING";
} else if (printInfo.crit.rend(currentValue, printInfo.tRam)) { if (printInfo.crit.rend(currentValue, printInfo.tRam))
state = CRITICAL; state = CRITICAL;
std::wcout << L"CRITICAL";
} else { std::wcout << stateToString(state);
state = OK;
std::wcout << L"OK";
}
if (!printInfo.showUsed) if (!printInfo.showUsed)
std::wcout << " - " << printInfo.percentFree << L"% free"; std::wcout << " - " << printInfo.percentFree << L"% free";

13
plugins/check_swap.cpp
View File

@ -194,16 +194,13 @@ static int printOutput(printInfoStruct& printInfo)
else else
currentValue = printInfo.tSwap - printInfo.aSwap; currentValue = printInfo.tSwap - printInfo.aSwap;
if (printInfo.warn.rend(currentValue, printInfo.tSwap)) { if (printInfo.warn.rend(currentValue, printInfo.tSwap))
state = WARNING; state = WARNING;
std::wcout << L"WARNING - ";
} else if (printInfo.crit.rend(currentValue, printInfo.tSwap)) { if (printInfo.crit.rend(currentValue, printInfo.tSwap))
state = CRITICAL; state = CRITICAL;
std::wcout << L"CRITICAL - ";
} else { std::wcout << stateToString(state) << " ";
state = OK;
std::wcout << L"OK - ";
}
if (!printInfo.showUsed) if (!printInfo.showUsed)
std::wcout << printInfo.percentFree << L"% free "; std::wcout << printInfo.percentFree << L"% free ";

9
plugins/thresholds.cpp
View File

@ -281,4 +281,13 @@ std::wstring formatErrorInfo(unsigned long err) {
} }
return out.str(); return out.str();
}
std::wstring stateToString(const state& state) {
switch (state) {
case OK: return L"OK";
case WARNING: return L"WARNING";
case CRITICAL: return L"CRITICAL";
default: return L"UNKNOWN";
}
} }

2
plugins/thresholds.hpp
View File

@ -76,4 +76,6 @@ std::wstring TunitStr(const Tunit&);
void printErrorInfo(unsigned long err = 0); void printErrorInfo(unsigned long err = 0);
std::wstring formatErrorInfo(unsigned long err); std::wstring formatErrorInfo(unsigned long err);
std::wstring stateToString(const state&);
#endif /* THRESHOLDS_H */ #endif /* THRESHOLDS_H */