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

Add check_memory, update check_swap, thresholds 

Adds check_memory which works like check_swap which has been updated to work like check_memory
Both sport a -u(nit) option with MB as default, like their linux versions.
A possible bug with all plugins having the -u(nit) option when using -u kB has been fixed. Don't use icinga to monitor you commodore though.

refs #8287 #8060
This commit is contained in:
Jean Flach 2015-02-03 10:22:09 +01:00
parent 25f2636a77
commit acff66875d
4 changed files with 260 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
plugins/CMakeLists.txt
View File

@ -27,8 +27,8 @@ if ( WIN32 )
)
list( APPEND check_SOURCES
check_disk.cpp check_load.cpp check_network.cpp check_ping.cpp check_procs.cpp check_service.cpp
check_swap.cpp check_update.cpp check_uptime.cpp check_users.cpp )
check_disk.cpp check_load.cpp check_memory.cpp check_network.cpp check_ping.cpp check_procs.cpp
check_service.cpp check_swap.cpp check_update.cpp check_uptime.cpp check_users.cpp )
foreach ( source ${check_SOURCES} )
string ( REGEX REPLACE ".cpp\$" "" check_OUT "${source}" )
@ -51,7 +51,8 @@ if ( WIN32 )
target_link_libraries( check_users wtsapi32.lib )
install (
TARGETS check_disk check_load check_network check_procs check_ping check_service check_swap check_update check_uptime check_users
TARGETS check_disk check_load check_memory check_network check_procs check_ping
check_service check_swap check_update check_uptime check_users
RUNTIME DESTINATION ${CMAKE_INSTALL_SBINDIR} )
endif()

230
plugins/check_memory.cpp Normal file
View File

@ -0,0 +1,230 @@
/******************************************************************************
* Icinga 2 *
* Copyright (C) 2012-2015 Icinga Development Team (http://www.icinga.org) *
* *
* This program is free software; you can redistribute it and/or *
* modify it under the terms of the GNU General Public License *
* as published by the Free Software Foundation; either version 2 *
* of the License, or (at your option) any later version. *
* *
* This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* GNU General Public License for more details. *
* *
* You should have received a copy of the GNU General Public License *
* along with this program; if not, write to the Free Software Foundation *
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. *
******************************************************************************/
#include <Shlwapi.h>
#include <iostream>
#include <WinBase.h>
#include "thresholds.h"
#include "boost/program_options.hpp"
#define VERSION 1.0
namespace po = boost::program_options;
using std::endl; using std::wcout; using std::wstring;
using std::cout;
static BOOL debug = FALSE;
struct printInfoStruct
{
threshold warn, crit;
DWORD tRam, aRam;
Bunit unit = BunitMB;
};
static int parseArguments(int, wchar_t **, po::variables_map&, printInfoStruct&);
static int printOutput(printInfoStruct&);
static int check_memory(printInfoStruct&);
int wmain(int argc, wchar_t **argv)
{
printInfoStruct printInfo = {};
po::variables_map vm;
int ret = parseArguments(argc, argv, vm, printInfo);
if (ret != -1)
return ret;
ret = check_memory(printInfo);
if (ret != -1)
return ret;
return printOutput(printInfo);
}
int parseArguments(int ac, wchar_t ** av, po::variables_map& vm, printInfoStruct& printInfo)
{
wchar_t namePath[MAX_PATH];
GetModuleFileName(NULL, namePath, MAX_PATH);
wchar_t *progName = PathFindFileName(namePath);
po::options_description desc;
desc.add_options()
("help,h", "print help message and exit")
("version,V", "print version and exit")
("debug,d", "Verbose/Debug output")
("warning,w", po::wvalue<wstring>(), "warning threshold")
("critical,c", po::wvalue<wstring>(), "critical threshold")
("unit,u", po::wvalue<wstring>(), "the unit to use for display (default MB)")
;
po::basic_command_line_parser<wchar_t> parser(ac, av);
try {
po::store(
parser
.options(desc)
.style(
po::command_line_style::unix_style |
po::command_line_style::allow_long_disguise)
.run(),
vm);
vm.notify();
} catch (std::exception& e) {
cout << e.what() << endl << desc << endl;
return 3;
}
if (vm.count("help")) {
wcout << progName << " Help\n\tVersion: " << VERSION << endl;
wprintf(
L"%s is a simple program to check a machines physical memory.\n"
L"You can use the following options to define its behaviour:\n\n", progName);
cout << desc;
wprintf(
L"\nIt will then output a string looking something like this:\n\n"
L"\tMEMORY WARNING - 50%% free | memory=2024MB;3000;500;0;4096\n\n"
L"\"MEMORY\" being the type of the check, \"WARNING\" the returned status\n"
L"and \"50%%\" is the returned value.\n"
L"The performance data is found behind the \"|\", in order:\n"
L"returned value, warning threshold, critical threshold, minimal value and,\n"
L"if applicable, the maximal value. Performance data will only be displayed when\n"
L"you set at least one threshold\n\n"
L"%s' exit codes denote the following:\n"
L" 0\tOK,\n\tNo Thresholds were broken or the programs check part was not executed\n"
L" 1\tWARNING,\n\tThe warning, but not the critical threshold was broken\n"
L" 2\tCRITICAL,\n\tThe critical threshold was broken\n"
L" 3\tUNKNOWN, \n\tThe program experienced an internal or input error\n\n"
L"Threshold syntax:\n\n"
L"-w THRESHOLD\n"
L"warn if threshold is broken, which means VALUE > THRESHOLD\n"
L"(unless stated differently)\n\n"
L"-w !THRESHOLD\n"
L"inverts threshold check, VALUE < THRESHOLD (analogous to above)\n\n"
L"-w [THR1-THR2]\n"
L"warn is VALUE is inside the range spanned by THR1 and THR2\n\n"
L"-w ![THR1-THR2]\n"
L"warn if VALUE is outside the range spanned by THR1 and THR2\n\n"
L"-w THRESHOLD%%\n"
L"if the plugin accepts percentage based thresholds those will be used.\n"
L"Does nothing if the plugin does not accept percentages, or only uses\n"
L"percentage thresholds. Ranges can be used with \"%%\", but both range values need\n"
L"to end with a percentage sign.\n\n"
L"All of these options work with the critical threshold \"-c\" too.\n"
, progName);
cout << endl;
return 0;
}
if (vm.count("version"))
wcout << L"Version: " << VERSION << endl;
if (vm.count("warning")) {
try {
printInfo.warn = threshold(vm["warning"].as<wstring>());
} catch (std::invalid_argument& e) {
cout << e.what() << endl;
return 3;
}
printInfo.warn.legal = !printInfo.warn.legal;
}
if (vm.count("critical")) {
try {
printInfo.crit = threshold(vm["critical"].as<wstring>());
} catch (std::invalid_argument& e) {
cout << e.what() << endl;
return 3;
}
printInfo.crit.legal = !printInfo.crit.legal;
}
if (vm.count("debug"))
debug = TRUE;
if (vm.count("unit")) {
try {
printInfo.unit = parseBUnit(vm["unit"].as<wstring>());
} catch (std::invalid_argument& e) {
cout << e.what() << endl;
return 3;
}
}
return -1;
}
int printOutput(printInfoStruct& printInfo)
{
if (debug)
wcout << L"Constructing output string" << endl;
state state = OK;
double fswap = ((double)printInfo.aRam / (double)printInfo.tRam) * 100.0;
if (printInfo.warn.rend(printInfo.aRam, printInfo.tRam))
state = WARNING;
if (printInfo.crit.rend(printInfo.aRam, printInfo.tRam))
state = CRITICAL;
switch (state) {
case OK:
wcout << L"MEMORY OK - " << fswap << L"% free | memory=" << printInfo.aRam << BunitStr(printInfo.unit) << L";"
<< printInfo.warn.pString(printInfo.tRam) << L";" << printInfo.crit.pString(printInfo.tRam)
<< L";0;" << printInfo.tRam << endl;
break;
case WARNING:
wcout << L"MEMORY WARNING - " << fswap << L"% free | memory=" << printInfo.aRam << BunitStr(printInfo.unit) << L";"
<< printInfo.warn.pString(printInfo.tRam) << L";" << printInfo.crit.pString(printInfo.tRam)
<< L";0;" << printInfo.tRam << endl;
break;
case CRITICAL:
wcout << L"MEMORY CRITICAL - " << fswap << L"% free | memory=" << printInfo.aRam << BunitStr(printInfo.unit) << L";"
<< printInfo.warn.pString(printInfo.tRam) << L";" << printInfo.crit.pString(printInfo.tRam)
<< L";0;" << printInfo.tRam << endl;
break;
}
return state;
}
int check_memory(printInfoStruct& printInfo)
{
if (debug)
wcout << L"Accessing memory statistics via MemoryStatus" << endl;
_MEMORYSTATUS *pMemBuf = new _MEMORYSTATUS;
GlobalMemoryStatus(pMemBuf);
printInfo.tRam = round(pMemBuf->dwTotalPhys / pow(1024.0, printInfo.unit));
printInfo.aRam = round(pMemBuf->dwAvailPhys / pow(1024.0, printInfo.unit));
if (debug)
wcout << L"Found pMemBuf->dwTotalPhys: " << pMemBuf->dwTotalPhys << endl
<< L"Found pMemBuf->dwAvailPhys: " << pMemBuf->dwAvailPhys << endl;
delete pMemBuf;
return -1;
}

25
plugins/check_swap.cpp
View File

@ -37,6 +37,7 @@ struct printInfoStruct
{
threshold warn, crit;
DWORD tSwap, aSwap;
Bunit unit = BunitMB;
};
static int parseArguments(int, wchar_t **, po::variables_map&, printInfoStruct&);
@ -73,6 +74,7 @@ int parseArguments(int ac, wchar_t **av, po::variables_map& vm, printInfoStruct&
("debug,d", "Verbose/Debug output")
("warning,w", po::wvalue<wstring>(), "warning threshold")
("critical,c", po::wvalue<wstring>(), "critical threshold")
("unit,u", po::wvalue<wstring>(), "the unit to use for display (default MB)")
;
po::basic_command_line_parser<wchar_t> parser(ac, av);
@ -102,7 +104,7 @@ int parseArguments(int ac, wchar_t **av, po::variables_map& vm, printInfoStruct&
L"\nIt will then output a string looking something like this:\n\n"
L"\tSWAP WARNING - 20%% free | swap=2000B;3000;500;0;10000\n\n"
L"\"SWAP\" being the type of the check, \"WARNING\" the returned status\n"
L"and \"23.8304%%\" is the returned value.\n"
L"and \"20%%\" is the returned value.\n"
L"The performance data is found behind the \"|\", in order:\n"
L"returned value, warning threshold, critical threshold, minimal value and,\n"
L"if applicable, the maximal value. Performance data will only be displayed when\n"
@ -159,6 +161,15 @@ int parseArguments(int ac, wchar_t **av, po::variables_map& vm, printInfoStruct&
if (vm.count("debug"))
debug = TRUE;
if (vm.count("unit")) {
try {
printInfo.unit = parseBUnit(vm["unit"].as<wstring>());
} catch (std::invalid_argument& e) {
cout << e.what() << endl;
return 3;
}
}
return -1;
}
@ -168,7 +179,7 @@ int printOutput(printInfoStruct& printInfo)
wcout << L"Constructing output string" << endl;
state state = OK;
double fswap = (printInfo.aSwap / printInfo.tSwap) * 100.0;
double fswap = ((double)printInfo.aSwap / (double)printInfo.tSwap) * 100.0;
if (printInfo.warn.rend(printInfo.aSwap, printInfo.tSwap))
state = WARNING;
@ -178,17 +189,17 @@ int printOutput(printInfoStruct& printInfo)
switch (state) {
case OK:
wcout << L"SWAP OK - " << fswap << L"% free | swap=" << printInfo.aSwap << L"B;"
wcout << L"SWAP OK - " << fswap << L"% free | swap=" << printInfo.aSwap << BunitStr(printInfo.unit) << L";"
<< printInfo.warn.pString(printInfo.tSwap) << L";" << printInfo.crit.pString(printInfo.tSwap)
<< L";0;" << printInfo.tSwap << endl;
break;
case WARNING:
wcout << L"SWAP WARNING - " << fswap << L"% free | swap=" << printInfo.aSwap << L"B;"
wcout << L"SWAP WARNING - " << fswap << L"% free | swap=" << printInfo.aSwap << BunitStr(printInfo.unit) << L";"
<< printInfo.warn.pString(printInfo.tSwap) << L";" << printInfo.crit.pString(printInfo.tSwap)
<< L";0;" << printInfo.tSwap << endl;
break;
case CRITICAL:
wcout << L"SWAP CRITICAL - " << fswap << L"% free | swap=" << printInfo.aSwap << L"B;"
wcout << L"SWAP CRITICAL - " << fswap << L"% free | swap=" << printInfo.aSwap << BunitStr(printInfo.unit) << L";"
<< printInfo.warn.pString(printInfo.tSwap) << L";" << printInfo.crit.pString(printInfo.tSwap)
<< L";0;" << printInfo.tSwap << endl;
break;
@ -203,8 +214,8 @@ int check_swap(printInfoStruct& printInfo)
GlobalMemoryStatus(pMemBuf);
printInfo.tSwap = pMemBuf->dwTotalPageFile;
printInfo.aSwap = pMemBuf->dwAvailPageFile;
printInfo.tSwap = round(pMemBuf->dwTotalPageFile / pow(1024.0, printInfo.unit));
printInfo.aSwap = round(pMemBuf->dwAvailPageFile / pow(1024.0, printInfo.unit));
delete pMemBuf;

14
plugins/thresholds.cpp
View File

@ -110,19 +110,21 @@ std::wstring threshold::pString(const double max)
if (!set)
return L"";
//transform percentages to abolute values
double lowerAbs = lower/100 * max;
double upperAbs = upper/100 * max;
double lowerAbs = lower;
double upperAbs = upper;
if (perc) {
lowerAbs = lower / 100 * max;
upperAbs = upper / 100 * max;
}
std::wstring s, lowerStr = removeZero(lowerAbs),
upperStr = removeZero(upperAbs);
if (!legal)
s.append(L"!");
if (lower != upper) {
s.append(L"[").append(lowerStr).append(L"-")
.append(upperStr).append(L"]");
} else
s = lowerStr;
s.append(lowerStr);
return s;
}
@ -158,7 +160,7 @@ Bunit parseBUnit(const wstring& str)
if (wstr == L"B")
return BunitB;
if (wstr == L"kB")
if (wstr == L"KB")
return BunitkB;
if (wstr == L"MB")
return BunitMB;