From 60a0ee8fec88116c7b36223e3db5d30484098f98 Mon Sep 17 00:00:00 2001 From: Dolf Schimmel Date: Fri, 3 Oct 2014 11:00:32 +0200 Subject: [PATCH] Documentation: Fix default command timeout is 60 seconds, not 5 minutes. As defined by lib/icinga/command.ti fixes #7338 Signed-off-by: Michael Friedrich --- AUTHORS | 1 + doc/6-configuring-icinga-2.md | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/AUTHORS b/AUTHORS index 017ff35d2..170e9e1ed 100644 --- a/AUTHORS +++ b/AUTHORS @@ -3,6 +3,7 @@ Alexander Wirt Bernd Erk Brian Dockter Carlos Cesario +Dolf Schimmel Gaël Beaudoin Gerd von Egidy Gunnar Beutner diff --git a/doc/6-configuring-icinga-2.md b/doc/6-configuring-icinga-2.md index ecddd99c1..4a9bab41a 100644 --- a/doc/6-configuring-icinga-2.md +++ b/doc/6-configuring-icinga-2.md @@ -881,7 +881,7 @@ Attributes: command |**Required.** The command. This can either be an array of individual command arguments. Alternatively a string can be specified in which case the shell interpreter (usually /bin/sh) takes care of parsing the command. When using the "arguments" attribute this must be an array. env |**Optional.** A dictionary of macros which should be exported as environment variables prior to executing the command. vars |**Optional.** A dictionary containing custom attributes that are specific to this command. - timeout |**Optional.** The command timeout in seconds. Defaults to 5 minutes. + timeout |**Optional.** The command timeout in seconds. Defaults to 60 seconds. arguments |**Optional.** A dictionary of command arguments. @@ -966,7 +966,7 @@ Attributes: command |**Required.** The command. This can either be an array of individual command arguments. Alternatively a string can be specified in which case the shell interpreter (usually /bin/sh) takes care of parsing the command. env |**Optional.** A dictionary of macros which should be exported as environment variables prior to executing the command. vars |**Optional.** A dictionary containing custom attributes that are specific to this command. - timeout |**Optional.** The command timeout in seconds. Defaults to 5 minutes. + timeout |**Optional.** The command timeout in seconds. Defaults to 60 seconds. arguments |**Optional.** A dictionary of command arguments. Command arguments can be used the same way as for `CheckCommand` objects. @@ -993,7 +993,7 @@ Attributes: command |**Required.** The command. This can either be an array of individual command arguments. Alternatively a string can be specified in which case the shell interpreter (usually /bin/sh) takes care of parsing the command. env |**Optional.** A dictionary of macros which should be exported as environment variables prior to executing the command. vars |**Optional.** A dictionary containing custom attributes that are specific to this command. - timeout |**Optional.** The command timeout in seconds. Defaults to 5 minutes. + timeout |**Optional.** The command timeout in seconds. Defaults to 60 seconds. arguments |**Optional.** A dictionary of command arguments. Command arguments can be used the same way as for `CheckCommand` objects.