From: Michael Friedrich <michael.friedrich@netways.de>
Date: Mon, 8 Jun 2015 16:05:16 +0000 (+0200)
Subject: Fix wrong argument for mssql plugin check command
X-Git-Tag: v2.4.0~625
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9bbfdbd0fb61e7244da20a0e05580452f6b98de2;p=icinga2

Fix wrong argument for mssql plugin check command

fixes #9372
---

diff --git a/doc/7-icinga-template-library.md b/doc/7-icinga-template-library.md
index 3824013a4..8b1bd6c86 100644
--- a/doc/7-icinga-template-library.md
+++ b/doc/7-icinga-template-library.md
@@ -1345,7 +1345,7 @@ mssql_health_critical            | **Optional.** The critical threshold dependin
 mssql_health_mode                | **Required.** The mode uses predefined keywords for the different checks. For example "connection-time", "database-free" or "sql".
 mssql_health_name                | **Optional.** Depending on the mode this could be the database name or a SQL statement.
 mssql_health_name2               | **Optional.** If "mssql_health_name" is a sql statement, "mssql_health_name2" can be used to appear in the output and the performance data.
-mssql_health_regexep             | **Optional.** If set to true, "mssql_health_name" will be interpreted as a regular expression. Defaults to false.
+mssql_health_regexp              | **Optional.** If set to true, "mssql_health_name" will be interpreted as a regular expression. Defaults to false.
 mssql_health_units               | **Optional.** This is used for a better output of mode=sql and for specifying thresholds for mode=tablespace-free. Possible values are "%", "KB", "MB" and "GB".
 mssql_health_offlineok           | **Optional.** Set this to true, if offline databases are perfectly ok for you. Defaults to false.
 mssql_health_commit              | **Optional.** Set this to true to turn on autocommit for the dbd::sybase module. Defaults to false.
@@ -1390,6 +1390,7 @@ oracle_health_critical           | **Optional.** The critical threshold dependin
 oracle_health_mode               | **Required.** The mode uses predefined keywords for the different checks. For example "connection-time", "flash-recovery-area-usage" or "sql".
 oracle_health_name               | **Optional.** The tablespace, datafile, wait event, latch, enqueue depending on the mode or SQL statement to be executed with "oracle_health_mode" sql.
 oracle_health_name2              | **Optional.** If "oracle_health_name" is a sql statement, "oracle_health_name2" can be used to appear in the output and the performance data.
+oracle_health_regexp             | **Optional.** If set to true, "oracle_health_name" will be interpreted as a regular expression. Defaults to false.
 oracle_health_units              | **Optional.** This is used for a better output of mode=sql and for specifying thresholds for mode=tablespace-free. Possible values are "%", "KB", "MB" and "GB".
 oracle_health_ident              | **Optional.** If set to true outputs instance and database names. Defaults to false.
 oracle_health_commit             | **Optional.** Set this to true to turn on autocommit for the dbd::oracle module. Defaults to false.
diff --git a/itl/plugins-contrib.d/databases.conf b/itl/plugins-contrib.d/databases.conf
index ebe1f1e0e..c98c27bf8 100644
--- a/itl/plugins-contrib.d/databases.conf
+++ b/itl/plugins-contrib.d/databases.conf
@@ -67,8 +67,8 @@ object CheckCommand "mssql_health" {
 			value = "$mssql_health_name2$"
 			description = "if name is a sql statement, name2 can be used to appear in the output and the performance data"
 		}
-		"--regexep" = {
-			set_if = "$mssql_health_regexep$"
+		"--regexp" = {
+			set_if = "$mssql_health_regexp$"
 			description = "name will be interpreted as a regular expression"
 		}
 		"--units" = {
@@ -85,7 +85,7 @@ object CheckCommand "mssql_health" {
 		}
 	}
 
-	vars.mssql_health_regexep = false
+	vars.mssql_health_regexp = false
 	vars.mssql_health_offlineok = false
 	vars.mssql_health_commit = false
 }
@@ -192,8 +192,8 @@ object CheckCommand "oracle_health" {
 			value = "$oracle_health_name2$"
 			description = "if name is a sql statement, name2 can be used to appear in the output and the performance data"
 		}
-		"--regexep" = {
-			set_if = "$oracle_health_regexep$"
+		"--regexp" = {
+			set_if = "$oracle_health_regexp$"
 			description = "name will be interpreted as a regular expression"
 		}
 		"--units" = {
@@ -219,7 +219,7 @@ object CheckCommand "oracle_health" {
 		"TNS_ADMIN" = "$oracle_tns_admin$"
 	}
 
-	vars.oracle_health_regexep = false
+	vars.oracle_health_regexp = false
 	vars.oracle_health_ident = false
 	vars.oracle_health_commit = false
 	vars.oracle_health_noperfdata = false