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 80e9d728ded60f44b429dea03027966abf0bb375..70f43b2c9386fb5c7d3bf09d0e5fef8d6b4d8979 100644 (file)
--- a/doc/7-icinga-template-library.md
+++ b/doc/7-icinga-template-library.md
@@ -1319,7 +1319,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.
@@ -1364,6 +1364,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 7025e02a06495c6542e04419349b880f6cce25fb..50060bc01d6672b9bdeef8aeae0c7e4a359d72a8 100644 (file)
--- 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