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

Add path exclusion to check_disk.exe 

Also do some refactoring and make -m do something

fixes #9201
This commit is contained in:
Jean Flach 2015-06-23 13:15:55 +02:00
parent 88f004a356
commit 21e072332c
2 changed files with 68 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

90
plugins/check_disk.cpp
View File

@ -20,6 +20,8 @@
#include <Shlwapi.h> #include <Shlwapi.h>
#include <iostream> #include <iostream>
#include <math.h> #include <math.h>
#include <boost/foreach.hpp>
#include <boost/bind.hpp>
#include "check_disk.h" #include "check_disk.h"
@ -45,7 +47,7 @@ INT wmain(INT argc, WCHAR **argv)
printInfo.crit.legal = !printInfo.crit.legal; printInfo.crit.legal = !printInfo.crit.legal;
if (printInfo.drives.empty()) if (printInfo.drives.empty())
ret = check_drives(vDrives); ret = check_drives(vDrives, printInfo.exclude_drives);
else else
ret = check_drives(vDrives, printInfo); ret = check_drives(vDrives, printInfo);
@ -62,7 +64,7 @@ INT wmain(INT argc, WCHAR **argv)
return printOutput(printInfo, vDrives); return printOutput(printInfo, vDrives);
} }
INT parseArguments(INT ac, WCHAR **av, po::variables_map& vm, printInfoStruct& printInfo) static INT parseArguments(INT ac, WCHAR **av, po::variables_map& vm, printInfoStruct& printInfo)
{ {
WCHAR namePath[MAX_PATH]; WCHAR namePath[MAX_PATH];
GetModuleFileName(NULL, namePath, MAX_PATH); GetModuleFileName(NULL, namePath, MAX_PATH);
@ -77,23 +79,18 @@ INT parseArguments(INT ac, WCHAR **av, po::variables_map& vm, printInfoStruct& p
("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")
("path,p", po::wvalue<std::vector<std::wstring>>()->multitoken(), "Declare explicitly which drives to check (default checks all)") ("path,p", po::wvalue<std::vector<std::wstring>>()->multitoken(), "Declare explicitly which drives to check (default checks all)")
("unit,u", po::wvalue<std::wstring>(), "Assign unit possible are: B, kB, MB, GB, TB") ("exclude_device,x", po::wvalue<std::vector<std::wstring>>()->multitoken(), "Exclude these drives from check")
("exclude-type,X", po::wvalue<std::vector<std::wstring>>()->multitoken(), "Exclude partition types (ignored)")
("unit,u", po::wvalue<std::wstring>(), "Assign unit possible are: B, kB, MB, GB, TB")\
("megabytes,m", "use megabytes, overridden by -unit")
; ;
po::basic_command_line_parser<WCHAR> parser(ac, av); po::basic_command_line_parser<WCHAR> parser(ac, av);
try { try {
po::options_description allDesc;
allDesc.add(desc);
allDesc.add_options()
("exclude-type,X", po::wvalue<std::vector<std::wstring>>()->multitoken(), "exclude partition types (ignored)")
("megabytes,m", "use megabytes")
;
po::store( po::store(
parser parser
.options(allDesc) .options(desc)
.style( .style(
po::command_line_style::unix_style | po::command_line_style::unix_style |
po::command_line_style::allow_long_disguise) po::command_line_style::allow_long_disguise)
@ -124,7 +121,7 @@ INT parseArguments(INT ac, WCHAR **av, po::variables_map& vm, printInfoStruct& p
L" 0\tOK,\n\tNo Thresholds were broken or the programs check part was not executed\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" 1\tWARNING,\n\tThe warning, but not the critical threshold was broken\n"
L" 2\tCRITICAL,\n\tThe 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" 3\tUNKNOWN, \n\tThe program experienced an internal or input error\n\n"
L"Threshold syntax:\n\n" L"Threshold syntax:\n\n"
L"-w THRESHOLD\n" L"-w THRESHOLD\n"
L"warn if threshold is broken, which means VALUE < THRESHOLD\n\n" L"warn if threshold is broken, which means VALUE < THRESHOLD\n\n"
@ -168,6 +165,9 @@ INT parseArguments(INT ac, WCHAR **av, po::variables_map& vm, printInfoStruct& p
if (vm.count("path")) if (vm.count("path"))
printInfo.drives = vm["path"].as<std::vector<std::wstring>>(); printInfo.drives = vm["path"].as<std::vector<std::wstring>>();
if (vm.count("exclude_device"))
printInfo.exclude_drives = vm["exclude_device"].as<std::vector<std::wstring>>();
if (vm.count("unit")) { if (vm.count("unit")) {
try { try {
printInfo.unit = parseBUnit(vm["unit"].as<std::wstring>()); printInfo.unit = parseBUnit(vm["unit"].as<std::wstring>());
@ -175,8 +175,12 @@ INT parseArguments(INT ac, WCHAR **av, po::variables_map& vm, printInfoStruct& p
std::wcout << "Unknown unit Type " << vm["unit"].as<std::wstring>() << '\n'; std::wcout << "Unknown unit Type " << vm["unit"].as<std::wstring>() << '\n';
return 3; return 3;
} }
} else } else {
printInfo.unit = BunitB; if (vm.count("megabytes"))
printInfo.unit = BunitMB;
else
printInfo.unit = BunitB;
}
if (vm.count("debug")) if (vm.count("debug"))
debug = TRUE; debug = TRUE;
@ -184,7 +188,7 @@ INT parseArguments(INT ac, WCHAR **av, po::variables_map& vm, printInfoStruct& p
return -1; return -1;
} }
INT printOutput(printInfoStruct& printInfo, std::vector<drive>& vDrives) static INT printOutput(printInfoStruct& printInfo, std::vector<drive>& vDrives)
{ {
if (debug) if (debug)
std::wcout << "Constructing output string\n"; std::wcout << "Constructing output string\n";
@ -231,7 +235,7 @@ INT printOutput(printInfoStruct& printInfo, std::vector<drive>& vDrives)
return state; return state;
} }
INT check_drives(std::vector<drive>& vDrives) static INT check_drives(std::vector<drive>& vDrives, std::vector<std::wstring>& vExclude_Drives)
{ {
DWORD dwResult, dwSize = 0, dwVolumePathNamesLen = MAX_PATH + 1; DWORD dwResult, dwSize = 0, dwVolumePathNamesLen = MAX_PATH + 1;
WCHAR szLogicalDrives[1024], szVolumeName[MAX_PATH], *szVolumePathNames = NULL; WCHAR szLogicalDrives[1024], szVolumeName[MAX_PATH], *szVolumePathNames = NULL;
@ -248,7 +252,7 @@ INT check_drives(std::vector<drive>& vDrives)
if (dwResult > MAX_PATH) if (dwResult > MAX_PATH)
goto die; goto die;
if (debug) if (debug)
std::wcout << "Splitting string INTo single drive names\n"; std::wcout << "Splitting string intoo single drive names\n";
LPTSTR szSingleDrive = szLogicalDrives; LPTSTR szSingleDrive = szLogicalDrives;
while (*szSingleDrive) { while (*szSingleDrive) {
@ -259,9 +263,9 @@ INT check_drives(std::vector<drive>& vDrives)
std::wcout << "Got: " << drname << '\n'; std::wcout << "Got: " << drname << '\n';
} }
if (debug) if (debug)
std::wcout << "Getting volume mountpoINTs (includes NTFS folders)\n" std::wcout << "Getting volume mountpoints (includes NTFS folders)\n"
<< "Getting first volume\n"; << "Getting first volume\n";
hVolume = FindFirstVolume(szVolumeName, MAX_PATH); hVolume = FindFirstVolume(szVolumeName, MAX_PATH);
if (hVolume == INVALID_HANDLE_VALUE) if (hVolume == INVALID_HANDLE_VALUE)
@ -276,7 +280,8 @@ INT check_drives(std::vector<drive>& vDrives)
volumeNameEnd = wcslen(szVolumeName) - 1; volumeNameEnd = wcslen(szVolumeName) - 1;
szVolumePathNames = reinterpret_cast<WCHAR*>(new WCHAR[dwVolumePathNamesLen]); szVolumePathNames = reinterpret_cast<WCHAR*>(new WCHAR[dwVolumePathNamesLen]);
while (!GetVolumePathNamesForVolumeName(szVolumeName, szVolumePathNames, dwVolumePathNamesLen, &dwVolumePathNamesLen)) { while (!GetVolumePathNamesForVolumeName(szVolumeName, szVolumePathNames, dwVolumePathNamesLen,
&dwVolumePathNamesLen)) {
if (GetLastError() != ERROR_MORE_DATA) if (GetLastError() != ERROR_MORE_DATA)
break; break;
delete[] reinterpret_cast<WCHAR*>(szVolumePathNames); delete[] reinterpret_cast<WCHAR*>(szVolumePathNames);
@ -303,8 +308,19 @@ INT check_drives(std::vector<drive>& vDrives)
FindVolumeClose(hVolume); FindVolumeClose(hVolume);
if (szVolumePathNames) if (szVolumePathNames)
delete[] reinterpret_cast<WCHAR*>(szVolumePathNames); delete[] reinterpret_cast<WCHAR*>(szVolumePathNames);
if (!vExclude_Drives.empty()) {
if (debug)
std::wcout << "Removing excluded drives\n";
BOOST_FOREACH(const std::wstring wsDriveName, vExclude_Drives)
{
vDrives.erase(std::remove_if(vDrives.begin(), vDrives.end(),
boost::bind(checkName, _1, wsDriveName + L'\\')), vDrives.end());
}
}
return -1; return -1;
die: die:
if (hVolume) if (hVolume)
FindVolumeClose(hVolume); FindVolumeClose(hVolume);
@ -312,17 +328,27 @@ die:
return 3; return 3;
} }
INT check_drives(std::vector<drive>& vDrives, printInfoStruct& printInfo)
static INT check_drives(std::vector<drive>& vDrives, printInfoStruct& printInfo)
{ {
WCHAR *slash = L"\\"; if (!printInfo.exclude_drives.empty()) {
if (debug)
std::wcout << "Removing excluded drives from user input drives\n";
BOOST_FOREACH(std::wstring wsDrive, printInfo.exclude_drives)
{
printInfo.drives.erase(std::remove(printInfo.drives.begin(), printInfo.drives.end(), wsDrive),
printInfo.drives.end());
}
}
if (debug) if (debug)
std::wcout << "Parsing user input drive names\n"; std::wcout << "Parsing user input drive names\n";
for (std::vector<std::wstring>::iterator it = printInfo.drives.begin(); for (std::vector<std::wstring>::iterator it = printInfo.drives.begin();
it != printInfo.drives.end(); ++it) { it != printInfo.drives.end(); ++it) {
if (it->at(it->length() - 1) != *slash) if (it->at(it->length() - 1) != *L"\\")
it->append(slash); it->append(L"\\");
if (std::wstring::npos == it->find(L":\\")) { if (std::wstring::npos == it->find(L":\\")) {
std::wcout << "A \":\" is required after the drive name of " << *it << '\n'; std::wcout << "A \":\" is required after the drive name of " << *it << '\n';
return 3; return 3;
@ -334,7 +360,7 @@ INT check_drives(std::vector<drive>& vDrives, printInfoStruct& printInfo)
return -1; return -1;
} }
BOOL getFreeAndCap(drive& drive, const Bunit& unit) static BOOL getFreeAndCap(drive& drive, const Bunit& unit)
{ {
if (debug) if (debug)
std::wcout << "Getting free disk space for drive " << drive.name << '\n'; std::wcout << "Getting free disk space for drive " << drive.name << '\n';
@ -347,10 +373,16 @@ BOOL getFreeAndCap(drive& drive, const Bunit& unit)
drive.cap = round((tempTotal.QuadPart / pow(1024.0, unit))); drive.cap = round((tempTotal.QuadPart / pow(1024.0, unit)));
if (debug) if (debug)
std::wcout << "\tAfter conversion: " << drive.cap << '\n' std::wcout << "\tAfter conversion: " << drive.cap << '\n'
<< "\tfree: " << tempFree.QuadPart << '\n'; << "\tfree: " << tempFree.QuadPart << '\n';
drive.free = round((tempFree.QuadPart / pow(1024.0, unit))); drive.free = round((tempFree.QuadPart / pow(1024.0, unit)));
if (debug) if (debug)
std::wcout << "\tAfter conversion: " << drive.free << '\n' << '\n'; std::wcout << "\tAfter conversion: " << drive.free << '\n' << '\n';
return TRUE; return TRUE;
} }
static bool checkName(const drive& d, const std::wstring& s)
{
return (s == d.name);
}

13
plugins/check_disk.h
View File

@ -39,13 +39,14 @@ struct drive
struct printInfoStruct struct printInfoStruct
{ {
threshold warn, crit; threshold warn, crit;
std::vector<std::wstring> drives; std::vector<std::wstring> drives, exclude_drives;
Bunit unit; Bunit unit;
}; };
INT parseArguments(int, wchar_t **, boost::program_options::variables_map&, printInfoStruct&); static INT parseArguments(int, wchar_t **, boost::program_options::variables_map&, printInfoStruct&);
INT printOutput(printInfoStruct&, std::vector<drive>&); static INT printOutput(printInfoStruct&, std::vector<drive>&);
INT check_drives(std::vector<drive>&); static INT check_drives(std::vector<drive>&, std::vector<std::wstring>&);
INT check_drives(std::vector<drive>&, printInfoStruct&); static INT check_drives(std::vector<drive>&, printInfoStruct&);
BOOL getFreeAndCap(drive&, const Bunit&); static BOOL getFreeAndCap(drive&, const Bunit&);
static bool checkName(const drive& d, const std::wstring& s);
#endif /*CHECK_DISK_H*/ #endif /*CHECK_DISK_H*/