mirror of
https://github.com/Icinga/icinga2.git
synced 2025-07-27 07:34:15 +02:00
Add 'used' feature to check_swap
This implements the _used_ feature to check_swap to print the used swap instead of the default available swap.
This commit is contained in:
parent
f5e14e28eb
commit
9390d7e453
@ -36,6 +36,7 @@ struct printInfoStruct
|
|||||||
double aSwap;
|
double aSwap;
|
||||||
double percentFree;
|
double percentFree;
|
||||||
Bunit unit = BunitMB;
|
Bunit unit = BunitMB;
|
||||||
|
bool showUsed;
|
||||||
};
|
};
|
||||||
|
|
||||||
struct pageFileInfo
|
struct pageFileInfo
|
||||||
@ -73,6 +74,7 @@ static int parseArguments(int ac, WCHAR **av, po::variables_map& vm, printInfoSt
|
|||||||
("warning,w", po::wvalue<std::wstring>(), "Warning threshold")
|
("warning,w", po::wvalue<std::wstring>(), "Warning threshold")
|
||||||
("critical,c", po::wvalue<std::wstring>(), "Critical threshold")
|
("critical,c", po::wvalue<std::wstring>(), "Critical threshold")
|
||||||
("unit,u", po::wvalue<std::wstring>(), "The unit to use for display (default MB)")
|
("unit,u", po::wvalue<std::wstring>(), "The unit to use for display (default MB)")
|
||||||
|
("show-used,U", "Show used swap instead of the free swap")
|
||||||
;
|
;
|
||||||
|
|
||||||
po::wcommand_line_parser parser(ac, av);
|
po::wcommand_line_parser parser(ac, av);
|
||||||
@ -167,6 +169,12 @@ static int parseArguments(int ac, WCHAR **av, po::variables_map& vm, printInfoSt
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (vm.count("show-used")) {
|
||||||
|
printInfo.showUsed = true;
|
||||||
|
printInfo.warn.legal = true;
|
||||||
|
printInfo.crit.legal = true;
|
||||||
|
}
|
||||||
|
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -177,30 +185,35 @@ static int printOutput(printInfoStruct& printInfo)
|
|||||||
|
|
||||||
state state = OK;
|
state state = OK;
|
||||||
|
|
||||||
if (printInfo.warn.rend(printInfo.aSwap, printInfo.tSwap))
|
std::wcout << L"SWAP ";
|
||||||
|
|
||||||
|
double currentValue;
|
||||||
|
|
||||||
|
if (!printInfo.showUsed)
|
||||||
|
currentValue = printInfo.aSwap;
|
||||||
|
else
|
||||||
|
currentValue = printInfo.tSwap - printInfo.aSwap;
|
||||||
|
|
||||||
|
if (printInfo.warn.rend(currentValue, printInfo.tSwap)) {
|
||||||
state = WARNING;
|
state = WARNING;
|
||||||
|
std::wcout << L"WARNING - ";
|
||||||
if (printInfo.crit.rend(printInfo.aSwap, printInfo.tSwap))
|
} else if (printInfo.crit.rend(currentValue, printInfo.tSwap)) {
|
||||||
state = CRITICAL;
|
state = CRITICAL;
|
||||||
|
std::wcout << L"CRITICAL - ";
|
||||||
switch (state) {
|
} else {
|
||||||
case OK:
|
state = OK;
|
||||||
std::wcout << L"SWAP OK - " << printInfo.percentFree << L"% free | 'swap'=" << printInfo.aSwap << BunitStr(printInfo.unit) << L";"
|
std::wcout << L"OK - ";
|
||||||
<< printInfo.warn.pString(printInfo.tSwap) << L";" << printInfo.crit.pString(printInfo.tSwap)
|
|
||||||
<< L";0;" << printInfo.tSwap << '\n';
|
|
||||||
break;
|
|
||||||
case WARNING:
|
|
||||||
std::wcout << L"SWAP WARNING - " << printInfo.percentFree << L"% free | 'swap'=" << printInfo.aSwap << BunitStr(printInfo.unit) << L";"
|
|
||||||
<< printInfo.warn.pString(printInfo.tSwap) << L";" << printInfo.crit.pString(printInfo.tSwap)
|
|
||||||
<< L";0;" << printInfo.tSwap << '\n';
|
|
||||||
break;
|
|
||||||
case CRITICAL:
|
|
||||||
std::wcout << L"SWAP CRITICAL - " << printInfo.percentFree << L"% free | 'swap'=" << printInfo.aSwap << BunitStr(printInfo.unit) << L";"
|
|
||||||
<< printInfo.warn.pString(printInfo.tSwap) << L";" << printInfo.crit.pString(printInfo.tSwap)
|
|
||||||
<< L";0;" << printInfo.tSwap << '\n';
|
|
||||||
break;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (!printInfo.showUsed)
|
||||||
|
std::wcout << printInfo.percentFree << L"% free ";
|
||||||
|
else
|
||||||
|
std::wcout << 100 - printInfo.percentFree << L"% used ";
|
||||||
|
|
||||||
|
std::wcout << "| 'swap'=" << currentValue << BunitStr(printInfo.unit) << L";"
|
||||||
|
<< printInfo.warn.pString(printInfo.tSwap) << L";" << printInfo.crit.pString(printInfo.tSwap)
|
||||||
|
<< L";0;" << printInfo.tSwap << '\n';
|
||||||
|
|
||||||
return state;
|
return state;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user