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

Documentation: Add a note on unsupported non-persistent comments. 

Refs #5295
This commit is contained in:
Michael Friedrich 2014-04-17 17:51:13 +02:00
parent 0da670d11c
commit 4a3ca90a51
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
doc/6.13-external-commands-list,md
View File

@ -20,11 +20,11 @@ Additional details can be found in the [Icinga 1.x Documentation](http://docs.ic
SCHEDULE_HOST_SVC_CHECKS | ;<host_name>;<check_time> (2) |
ENABLE_HOST_SVC_CHECKS | ;<host_name> (1) |
DISABLE_HOST_SVC_CHECKS | ;<host_name> (1) |
ACKNOWLEDGE_SVC_PROBLEM | ;<host_name>;<service_name>;<sticky>;<notify>;<persistent>;<author>;<comment> (7) |
ACKNOWLEDGE_SVC_PROBLEM_EXPIRE | ;<host_name>;<service_name>;<sticky>;<notify>;<persistent>;<timestamp>;<author>;<comment> (8) |
ACKNOWLEDGE_SVC_PROBLEM | ;<host_name>;<service_name>;<sticky>;<notify>;<persistent>;<author>;<comment> (7) | Note: Icinga 2 treats all comments as persistent.
ACKNOWLEDGE_SVC_PROBLEM_EXPIRE | ;<host_name>;<service_name>;<sticky>;<notify>;<persistent>;<timestamp>;<author>;<comment> (8) | Note: Icinga 2 treats all comments as persistent.
REMOVE_SVC_ACKNOWLEDGEMENT | ;<host_name>;<service_name> (2) |
ACKNOWLEDGE_HOST_PROBLEM | ;<host_name>;<sticky>;<notify>;<persistent>;<author>;<comment> (6) |
ACKNOWLEDGE_HOST_PROBLEM_EXPIRE | ;<host_name>;<sticky>;<notify>;<persistent>;<timestamp>;<author>;<comment> (7) |
ACKNOWLEDGE_HOST_PROBLEM | ;<host_name>;<sticky>;<notify>;<persistent>;<author>;<comment> (6) | Note: Icinga 2 treats all comments as persistent.
ACKNOWLEDGE_HOST_PROBLEM_EXPIRE | ;<host_name>;<sticky>;<notify>;<persistent>;<timestamp>;<author>;<comment> (7) | Note: Icinga 2 treats all comments as persistent.
REMOVE_HOST_ACKNOWLEDGEMENT | ;<host_name> (1) |
DISABLE_HOST_FLAP_DETECTION | ;<host_name> (1) |
ENABLE_HOST_FLAP_DETECTION | ;<host_name> (1) |
@ -52,9 +52,9 @@ Additional details can be found in the [Icinga 1.x Documentation](http://docs.ic
SCHEDULE_HOSTGROUP_SVC_DOWNTIME | ;<hostgroup_name>;<start_time>;<end_time>;<fixed>;<trigger_id>;<duration>;<author>;<comment> (8) |
SCHEDULE_SERVICEGROUP_HOST_DOWNTIME | ;<servicegroup_name>;<start_time>;<end_time>;<fixed>;<trigger_id>;<duration>;<author>;<comment> (8) |
SCHEDULE_SERVICEGROUP_SVC_DOWNTIME | ;<servicegroup_name>;<start_time>;<end_time>;<fixed>;<trigger_id>;<duration>;<author>;<comment> (8) |
ADD_HOST_COMMENT | ;<host_name>;<persistent>;<author>;<comment> (4) |
ADD_HOST_COMMENT | ;<host_name>;<persistent>;<author>;<comment> (4) | Note: Icinga 2 treats all comments as persistent.
DEL_HOST_COMMENT | ;<comment_id> (1) |
ADD_SVC_COMMENT | ;<host_name>;<service_name>;<persistent>;<author>;<comment> (5) |
ADD_SVC_COMMENT | ;<host_name>;<service_name>;<persistent>;<author>;<comment> (5) | Note: Icinga 2 treats all comments as persistent.
DEL_SVC_COMMENT | ;<comment_id> (1) |
DEL_ALL_HOST_COMMENTS | ;<host_name> (1) |
DEL_ALL_SVC_COMMENTS | ;<host_name>;<service_name> (2) |

6
doc/8-differences-between-icinga-1x-and-2.md
View File

@ -86,7 +86,7 @@ set in the `constants.conf` configuration file:
[Global macros](#global-constants) can only be defined once. Trying to modify a
global constant will result in an error.
## <a id="differences-1x-2-comments"></a> Comments
## <a id="differences-1x-2-configuration-comments"></a> Configuration Comments
In Icinga 1.x comments are made using a leading hash (`#`) or a semi-colon (`;`)
for inline comments.
@ -397,6 +397,10 @@ where the initial state checks must have happened. Icinga 2 will use the
`retry_interval` setting instead and `check_interval` divided by 5 if
`retry_interval` is not defined.
## <a id="differences-1x-2-comments"></a> Comments
Icinga 2 doesn't support non-persistent comments.
## <a id="differences-1x-2-commands"></a> Commands
Unlike in Icinga 1.x there are 3 different command types in Icinga 2: