Spell ISATAP correctly and set noisatap in the ITL

refs #12155

diff --git a/doc/10-icinga-template-library.md b/doc/10-icinga-template-library.md
index ef5b1be1bd3fa1ff8941c48763b1dd26482a2eb2..a25a30fe580be4ad3416293fceb952672e428ee9 100644 (file)
--- a/doc/10-icinga-template-library.md
+++ b/doc/10-icinga-template-library.md
@@ -1456,7 +1456,7 @@ Name                | Description
 :-------------------|:------------
 network\_win\_warn  | **Optional**. The warning 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

diff --git a/itl/command-plugins-windows.conf b/itl/command-plugins-windows.conf
index 7b31fdc923a9cd8d3f59d2854553c6b9e8362f62..11d27348524821c5a961f78b188872acfb088cd9 100644 (file)
--- a/itl/command-plugins-windows.conf
+++ b/itl/command-plugins-windows.conf
@@ -97,10 +97,11 @@ object CheckCommand "network-windows" {
                        description = "Critical threshold"
                }
                "-n" = {
-                       set_if = "$network_no_iastap$"
-                       description = "Don't show isatap interfaces in output"
+                       set_if = "$network_no_isatap$"
+                       description = "Don't show ISATAP interfaces in output"
                }
        }
+       vars.network_no_isatap = true
 }
 
 object CheckCommand "perfmon-windows" {

diff --git a/plugins/check_network.cpp b/plugins/check_network.cpp
index 26eb34ff67a32b9c0e7ceee08be1da1d9a47f839..3c97cf520469a6626be936d8722a4ee54bd6f9c2 100644 (file)
--- a/plugins/check_network.cpp
+++ b/plugins/check_network.cpp
@@ -73,7 +73,7 @@ INT parseArguments(INT ac, WCHAR **av, po::variables_map& vm, printInfoStruct& p
                ("help,h", "print usage and exit")
                ("version,V", "print version and exit")
                ("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")
                ("critical,c", po::wvalue<std::wstring>(), "critical value")
                ;