diff --git a/doc/6.13-external-commands-list,md b/doc/6.13-external-commands-list,md index abdafbaad..7b4348ce7 100644 --- a/doc/6.13-external-commands-list,md +++ b/doc/6.13-external-commands-list,md @@ -20,11 +20,11 @@ Additional details can be found in the [Icinga 1.x Documentation](http://docs.ic SCHEDULE_HOST_SVC_CHECKS | ;; (2) | ENABLE_HOST_SVC_CHECKS | ; (1) | DISABLE_HOST_SVC_CHECKS | ; (1) | - ACKNOWLEDGE_SVC_PROBLEM | ;;;;;;; (7) | - ACKNOWLEDGE_SVC_PROBLEM_EXPIRE | ;;;;;;;; (8) | + ACKNOWLEDGE_SVC_PROBLEM | ;;;;;;; (7) | Note: Icinga 2 treats all comments as persistent. + ACKNOWLEDGE_SVC_PROBLEM_EXPIRE | ;;;;;;;; (8) | Note: Icinga 2 treats all comments as persistent. REMOVE_SVC_ACKNOWLEDGEMENT | ;; (2) | - ACKNOWLEDGE_HOST_PROBLEM | ;;;;;; (6) | - ACKNOWLEDGE_HOST_PROBLEM_EXPIRE | ;;;;;;; (7) | + ACKNOWLEDGE_HOST_PROBLEM | ;;;;;; (6) | Note: Icinga 2 treats all comments as persistent. + ACKNOWLEDGE_HOST_PROBLEM_EXPIRE | ;;;;;;; (7) | Note: Icinga 2 treats all comments as persistent. REMOVE_HOST_ACKNOWLEDGEMENT | ; (1) | DISABLE_HOST_FLAP_DETECTION | ; (1) | ENABLE_HOST_FLAP_DETECTION | ; (1) | @@ -52,9 +52,9 @@ Additional details can be found in the [Icinga 1.x Documentation](http://docs.ic SCHEDULE_HOSTGROUP_SVC_DOWNTIME | ;;;;;;;; (8) | SCHEDULE_SERVICEGROUP_HOST_DOWNTIME | ;;;;;;;; (8) | SCHEDULE_SERVICEGROUP_SVC_DOWNTIME | ;;;;;;;; (8) | - ADD_HOST_COMMENT | ;;;; (4) | + ADD_HOST_COMMENT | ;;;; (4) | Note: Icinga 2 treats all comments as persistent. DEL_HOST_COMMENT | ; (1) | - ADD_SVC_COMMENT | ;;;;; (5) | + ADD_SVC_COMMENT | ;;;;; (5) | Note: Icinga 2 treats all comments as persistent. DEL_SVC_COMMENT | ; (1) | DEL_ALL_HOST_COMMENTS | ; (1) | DEL_ALL_SVC_COMMENTS | ;; (2) | diff --git a/doc/8-differences-between-icinga-1x-and-2.md b/doc/8-differences-between-icinga-1x-and-2.md index 82af46c78..9edab9d16 100644 --- a/doc/8-differences-between-icinga-1x-and-2.md +++ b/doc/8-differences-between-icinga-1x-and-2.md @@ -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. -## Comments +## 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. +## Comments + +Icinga 2 doesn't support non-persistent comments. + ## Commands Unlike in Icinga 1.x there are 3 different command types in Icinga 2: