Spell ISATAP correctly and set noisatap in the ITL

refs #12155
This commit is contained in:
Jean Flach 2016-09-28 11:26:08 +02:00
parent 6c565d191d
commit eabb54eab6
3 changed files with 5 additions and 4 deletions

View File

@ -1456,7 +1456,7 @@ Name | Description
:-------------------|:------------ :-------------------|:------------
network\_win\_warn | **Optional**. The warning threshold. network\_win\_warn | **Optional**. The warning threshold.
network\_win\_crit | **Optional**. The critical threshold. network\_win\_crit | **Optional**. The critical threshold.
network\_no\_iastap | **Optional**. Do not print iastap interfaces. network\_no\_isatap | **Optional**. Do not print ISATAP interfaces.
### <a id="windows-plugins-perfmon-windows"></a> perfmon-windows ### <a id="windows-plugins-perfmon-windows"></a> perfmon-windows

View File

@ -97,10 +97,11 @@ object CheckCommand "network-windows" {
description = "Critical threshold" description = "Critical threshold"
} }
"-n" = { "-n" = {
set_if = "$network_no_iastap$" set_if = "$network_no_isatap$"
description = "Don't show isatap interfaces in output" description = "Don't show ISATAP interfaces in output"
} }
} }
vars.network_no_isatap = true
} }
object CheckCommand "perfmon-windows" { object CheckCommand "perfmon-windows" {

View File

@ -73,7 +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") ("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")
; ;