Fix for catalogued locally databases. Fixes #6338

diff --git a/doc/10-icinga-template-library.md b/doc/10-icinga-template-library.md
index 0da925058e137bd916c04f5991aa51dab9f7d3f4..d57d42352989fe36892ed3ee5f68b0a9d51e7a57 100644 (file)
--- a/doc/10-icinga-template-library.md
+++ b/doc/10-icinga-template-library.md
@@ -2181,7 +2181,7 @@ Custom attributes passed as [command parameters](03-monitoring-basics.md#command
 
 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_cataloged = 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_password           | **Optional.** The password for the database connection.
 db2_health_port               | **Optional.** The port where DB2 is listening.
@@ -2197,6 +2197,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_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_not_cataloged      | **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_version    | **Optional.** Specifies the DB2 version as environment variable `DB2_VERSION`.
 

diff --git a/itl/plugins-contrib.d/databases.conf b/itl/plugins-contrib.d/databases.conf
index 8b4c2ffd268f9db9fd4814f0d5b4b33841e32e9c..7e5a30e11dea0fde7a833f9090f5a3a02a2aa9ae 100644 (file)
--- a/itl/plugins-contrib.d/databases.conf
+++ b/itl/plugins-contrib.d/databases.conf
@@ -344,6 +344,7 @@ object CheckCommand "db2_health" {
         arguments = {
                 "--hostname" = {
                         value = "$db2_health_hostname$"
+                        set_if = "$db2_health_not_cataloged$"
                         description = "the host to connect"
                         order = -2
                 }
@@ -424,6 +425,7 @@ object CheckCommand "db2_health" {
         }
 
         vars.db2_health_regexp = false
+        vars.db2_health_not_cataloged = true
         vars.db2_health_hostname = "$check_address$"
         vars.db2_health_report = "short"