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

Merge pull request #6348 from Mikesch-mp/itl_db2_health 

Fix for catalogued locally databases. Fixes #6338
This commit is contained in:
Michael Friedrich 2018-06-28 14:40:53 +02:00 committed by GitHub
parent c7e61748d4 f499743ef2
commit c89f92e352
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2200,7 +2200,7 @@ Custom attributes passed as [command parameters](03-monitoring-basics.md#command
Name | Description Name | Description
---------------------------------|------------------------------------------------------------------------------------------------------------------------------ ---------------------------------|------------------------------------------------------------------------------------------------------------------------------
db2_health_database | **Required.** The name of the database. (If it was catalogued locally, this parameter is the only you need. Otherwise you must specify database, hostname and port) db2_health_database | **Required.** The name of the database. (If it was catalogued locally, this parameter and `db2_health_not_catalogued = false` are the only you need. Otherwise you must specify database, hostname and port)
db2_health_username | **Optional.** The username for the database connection. db2_health_username | **Optional.** The username for the database connection.
db2_health_password | **Optional.** The password for the database connection. db2_health_password | **Optional.** The password for the database connection.
db2_health_port | **Optional.** The port where DB2 is listening. db2_health_port | **Optional.** The port where DB2 is listening.
@ -2216,6 +2216,7 @@ db2_health_maxinactivity | **Optional.** Used for the maximum amount of tim
db2_health_mitigation | **Optional.** Classifies the severity of an offline tablespace. db2_health_mitigation | **Optional.** Classifies the severity of an offline tablespace.
db2_health_lookback | **Optional.** How many days in the past db2_health check should look back to calculate exitcode. db2_health_lookback | **Optional.** How many days in the past db2_health check should look back to calculate exitcode.
db2_health_report | **Optional.** Report can be used to output only the bad news. Possible values are "short", "long", "html". Defaults to `short`. db2_health_report | **Optional.** Report can be used to output only the bad news. Possible values are "short", "long", "html". Defaults to `short`.
db2_health_not_catalogued | **Optional.** Set this variable to false if you want to use a catalogued locally database. Defaults to `true`.
db2_health_env_db2_home | **Required.** Specifies the location of the db2 client libraries as environment variable `DB2_HOME`. Defaults to "/opt/ibm/db2/V10.5". db2_health_env_db2_home | **Required.** Specifies the location of the db2 client libraries as environment variable `DB2_HOME`. Defaults to "/opt/ibm/db2/V10.5".
db2_health_env_db2_version | **Optional.** Specifies the DB2 version as environment variable `DB2_VERSION`. db2_health_env_db2_version | **Optional.** Specifies the DB2 version as environment variable `DB2_VERSION`.

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

@ -344,6 +344,7 @@ object CheckCommand "db2_health" {
arguments = { arguments = {
"--hostname" = { "--hostname" = {
value = "$db2_health_hostname$" value = "$db2_health_hostname$"
set_if = "$db2_health_not_catalogued$"
description = "the host to connect" description = "the host to connect"
order = -2 order = -2
} }
@ -424,6 +425,7 @@ object CheckCommand "db2_health" {
} }
vars.db2_health_regexp = false vars.db2_health_regexp = false
vars.db2_health_not_catalogued = true
vars.db2_health_hostname = "$check_address$" vars.db2_health_hostname = "$check_address$"
vars.db2_health_report = "short" vars.db2_health_report = "short"