From: Jean Flach <jean-marcel.flach@netways.de>
Date: Wed, 28 Sep 2016 09:26:08 +0000 (+0200)
Subject: Spell ISATAP correctly and set noisatap in the ITL
X-Git-Tag: v2.6.0~105
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=eabb54eab689edc2a9b2e49a2e82969aeee72c04;p=icinga2

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 ef5b1be1b..a25a30fe5 100644
--- 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 7b31fdc92..11d273485 100644
--- 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 26eb34ff6..3c97cf520 100644
--- 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")
 		;