tyler.durden
/
icinga2
mirror of https://github.com/Icinga/icinga2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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 <michael.friedrich@gmail.com>
This commit is contained in:
Dolf Schimmel 2014-10-03 11:00:32 +02:00 committed by Michael Friedrich
parent e98aa15e83
commit 60a0ee8fec
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
AUTHORS
View File

@ -3,6 +3,7 @@ Alexander Wirt <formorer@debian.org>
Bernd Erk <bernd.erk@icinga.org>
Brian Dockter <specus@gmail.com>
Carlos Cesario <carloscesario@gmail.com>
Dolf Schimmel <dolf@transip.nl>
Gaël Beaudoin <gaboo@gaboo.org>
Gerd von Egidy <gerd@egidy.de>
Gunnar Beutner <gunnar.beutner@netways.de>

6
doc/6-configuring-icinga-2.md
View File

@ -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.