Fix nrpe command definition.

Refs ##6225

diff --git a/doc/5-configuring-icinga-2.md b/doc/5-configuring-icinga-2.md
index 25691b0984c8e5bd6405cabce63937387ed12866..1791755c05ac1aa23462be2a67af8090fcd37a91 100644 (file)
--- a/doc/5-configuring-icinga-2.md
+++ b/doc/5-configuring-icinga-2.md
@@ -1981,10 +1981,9 @@ Name            | Description
 nrpe_address    | **Optional.** The host's address. Defaults to "$address$".
 nrpe_port       | **Optional.** The NRPE port. Defaults to 5668.
 nrpe_command    | **Optional.** The command that should be executed.
-nrpe_no_ssl     | **Optional.** Whether to disable SSL or not.
-nrpe_timeout_unknown | **Optional.** Whether to set timeouts to unknown instead of critical state.
+nrpe_no_ssl     | **Optional.** Whether to disable SSL or not. Defaults to `false`.
+nrpe_timeout_unknown | **Optional.** Whether to set timeouts to unknown instead of critical state. Defaults to `false`.
 nrpe_timeout    | **Optional.** The timeout in seconds.
-nrpe_arguments  | **Optional.** Optional nrpe arguments (must be enabled on the NRPE client).
 
 #### <a id="plugin-check-command-apt"></a> apt
 

diff --git a/itl/command-plugins.conf b/itl/command-plugins.conf
index e6d16d79ab0324a17876c257fc36c2c7c412a948..b570480927cdd53d1f9119b49cb369c9a70933f3 100644 (file)
--- a/itl/command-plugins.conf
+++ b/itl/command-plugins.conf
@@ -353,30 +353,27 @@ object CheckCommand "by_ssh" {
 }
 
 object CheckCommand "nrpe" {
-        import "plugin-check-command"
+       import "plugin-check-command"
 
-        command = PluginDir + "/check_nrpe"
+       command = PluginDir + "/check_nrpe"
 
-        arguments = {
-                "-H" = "$nrpe_address$"
-                "-p" = "$nrpe_port$"
-                "-c" = "$nrpe_command$"
-                "-n" = {
-                        set_if = "$nrpe_no_ssl$"
+       arguments = {
+               "-H" = "$nrpe_address$"
+               "-p" = "$nrpe_port$"
+               "-c" = "$nrpe_command$"
+               "-n" = {
+                       set_if = "$nrpe_no_ssl$"
                        description = "Do not use SSL."
-                }
-                "-u" = {
-                        set_if = "$nrpe_timeout_unknown$"
+               }
+               "-u" = {
+                       set_if = "$nrpe_timeout_unknown$"
                        description = "Make socket timeouts return an UNKNOWN state instead of CRITICAL"
-                }
-                "-t" = "$nrpe_timeout$"
-                "-a" = {
-                       value = "$nrpe_arguments$"
-                       description = "Optional arguments that should be passed to the nrpe command."
-                       order = -1
                }
-        }
+               "-t" = "$nrpe_timeout$"
+       }
 
-        vars.nrpe_address = "$address$"
+       vars.nrpe_address = "$address$"
+       vars.nrpe_no_ssl = false
+       vars.nrpe_timeout_unknown = false
 }