tyler.durden/icinga2
1
0
Fork 0
mirror of https://github.com/Icinga/icinga2.git synced 2025-07-25 22:54:57 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update perfdata; Add skipping of isatap interfaces with parameter

Browse Source 
Also updates interface names to fix perfdata output

refs #12155
This commit is contained in:
Matthias Schales 2016-09-27 20:29:23 +02:00 committed by Jean Flach
parent 0df4b4edfb
commit 8c35c821c6
1 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
plugins/check_network.cpp
View File

@ -32,11 +32,12 @@
#include "check_network.h" #include "check_network.h"
#include "boost/algorithm/string/replace.hpp" #include "boost/algorithm/string/replace.hpp"
#define VERSION 1.1 #define VERSION 1.2
namespace po = boost::program_options; namespace po = boost::program_options;
static BOOL debug = FALSE; static BOOL debug = FALSE;
static BOOL noisatap = FALSE;
INT wmain(INT argc, WCHAR **argv) INT wmain(INT argc, WCHAR **argv)
{ {
@ -72,6 +73,7 @@ INT parseArguments(INT ac, WCHAR **av, po::variables_map& vm, printInfoStruct& p
("help,h", "print usage and exit") ("help,h", "print usage and exit")
("version,V", "print version and exit") ("version,V", "print version and exit")
("debug,d", "Verbose/Debug output") ("debug,d", "Verbose/Debug output")
("noisatap,n", "Don't show isatap interfaces in output")
("warning,w", po::wvalue<std::wstring>(), "warning value") ("warning,w", po::wvalue<std::wstring>(), "warning value")
("critical,c", po::wvalue<std::wstring>(), "critical value") ("critical,c", po::wvalue<std::wstring>(), "critical value")
; ;
@ -159,6 +161,9 @@ INT parseArguments(INT ac, WCHAR **av, po::variables_map& vm, printInfoStruct& p
if (vm.count("debug")) if (vm.count("debug"))
debug = TRUE; debug = TRUE;
if (vm.count("noisatap"))
noisatap = TRUE;
return -1; return -1;
} }
@ -189,8 +194,16 @@ INT printOutput(printInfoStruct& printInfo, CONST std::vector<nInterface>& vInte
std::wcout << "\tNo friendly name found, using adapter name\n"; std::wcout << "\tNo friendly name found, using adapter name\n";
wsFriendlyName = it->name; wsFriendlyName = it->name;
} }
boost::algorithm::replace_all(wsFriendlyName, "'", "''"); if(wsFriendlyName.find(L"isatap") != std::wstring::npos && noisatap) {
tss << L"netI='" << wsFriendlyName << L"';in=" << it->BytesInSec << "B;out=" << it->BytesOutSec << L"B "; if (debug)
std::wcout << "\tSkipping isatap interface " << wsFriendlyName << "\n";
continue;
}
else
{
boost::algorithm::replace_all(wsFriendlyName, "'", "''");
tss << L"\'" << wsFriendlyName << L"_in\'=" << it->BytesInSec << L"B \'" << wsFriendlyName << L"_out\'=" << it->BytesOutSec << L"B ";
}
} }
if (printInfo.warn.rend(tIn + tOut)) if (printInfo.warn.rend(tIn + tOut))