ITL: Add report option to shorten output in oracle_health CheckCommand

fixes #4963
fixes #4661

Signed-off-by: Michael Friedrich <michael.friedrich@icinga.com>

diff --git a/doc/10-icinga-template-library.md b/doc/10-icinga-template-library.md
index eb192f6b9ee64527cf4d686dd7f6fc6482e3d26e..cc1fca2638d47dd901567a9f80817244f4ad5d8e 100644 (file)
--- a/doc/10-icinga-template-library.md
+++ b/doc/10-icinga-template-library.md
@@ -2075,6 +2075,7 @@ oracle_health_ident              | **Optional.** If set to true, outputs instanc
 oracle_health_commit             | **Optional.** Set this to true to turn on autocommit for the dbd::oracle module. Defaults to false.
 oracle_health_noperfdata         | **Optional.** Set this to true if you want to disable perfdata. Defaults to false.
 oracle_health_timeout            | **Optional.** Plugin timeout. Defaults to 60s.
+oracle_health_report             | **Optional.** Select the plugin output format. Can be short or long. Default to long.
 
 Environment Macros:
 

diff --git a/itl/plugins-contrib.d/databases.conf b/itl/plugins-contrib.d/databases.conf
index 1bd8dca89dfc856bdced0c2f566c15ece52c8818..ce72190e49daaf24e5785a7858ac392cb0948c05 100644 (file)
--- a/itl/plugins-contrib.d/databases.conf
+++ b/itl/plugins-contrib.d/databases.conf
@@ -400,6 +400,10 @@ object CheckCommand "oracle_health" {
                        value = "$oracle_health_timeout$"
                        description = "plugin timeout. Default is 60 seconds"
                }
+               "--report" = {
+                       value = "$oracle_health_report$"
+                       description = "select the plugin output format. Can be short, long or html. Default is long"
+               }
        }
 
        env = {
@@ -411,6 +415,7 @@ object CheckCommand "oracle_health" {
        vars.oracle_health_ident = false
        vars.oracle_health_commit = false
        vars.oracle_health_noperfdata = false
+       vars.oracle_health_report = "long"
 
        vars.oracle_home = "/usr/lib/oracle/11.2/client64/lib"
        vars.oracle_tns_admin = SysconfDir + "/icinga2/plugin-configs"