tyler.durden
/
icinga2
mirror of https://github.com/Icinga/icinga2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix wrong argument for mssql plugin check command 

fixes #9372
This commit is contained in:
Michael Friedrich 2015-06-08 18:05:16 +02:00
parent aaf6ff4099
commit a9d6a695ab
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
doc/7-icinga-template-library.md
View File

@ -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.

12
itl/plugins-contrib.d/databases.conf
View File

@ -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