From 773e398799900765b13f15f452281cd33488b9e4 Mon Sep 17 00:00:00 2001 From: Jo Goossens Date: Thu, 5 Nov 2015 17:50:47 +0100 Subject: [PATCH] Add missing parameters for jmx4perl check command fixes #10503 --- doc/7-icinga-template-library.md | 4 +++- itl/plugins-contrib.d/web.conf | 14 ++++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/doc/7-icinga-template-library.md b/doc/7-icinga-template-library.md index cddc31bb4..5a89bb1d1 100644 --- a/doc/7-icinga-template-library.md +++ b/doc/7-icinga-template-library.md @@ -1995,7 +1995,9 @@ jmx4perl_label | **Optional.** Label to be used for printing out t jmx4perl_perfdata | **Optional.** Whether performance data should be omitted, which are included by default. Defaults to "on" for numeric values, to "off" for strings. jmx4perl_unknown_is_critical | **Optional.** Map UNKNOWN errors to errors with a CRITICAL status. Defaults to false. jmx4perl_timeout | **Optional.** Seconds before plugin times out. Defaults to "15". - +jmx4perl_config | **Optional.** Path to configuration file. +jmx4perl_server | **Optional.** Symbolic name of server url to use, which needs to be configured in the configuration file. +jmx4perl_check | **Optional.** Name of a check configuration as defined in the configuration file, use array if you need arguments. #### squid diff --git a/itl/plugins-contrib.d/web.conf b/itl/plugins-contrib.d/web.conf index 6deb930dc..84a735599 100644 --- a/itl/plugins-contrib.d/web.conf +++ b/itl/plugins-contrib.d/web.conf @@ -192,6 +192,20 @@ object CheckCommand "jmx4perl" { value = "$jmx4perl_timeout$" description = "Seconds before plugin times out (default: 15)" } + "--config" = { + value = "$jmx4perl_config$" + description = "Path to configuration file." + } + "--server" = { + value = "$jmx4perl_server$" + description = "Symbolic name of server url to use, which needs to be configured in the configuration file." + } + "--check" = { + value = "$jmx4perl_check$" + description = "Name of a check configuration as defined in the configuration file, use array if you need arguments." + order = 1 + repeat_key = false + } } vars.jmx4perl_url = "http://$address$:8080/jolokia"