From 91b0b25b36492f0fb9d52dd8c4bbaffe8a8250f6 Mon Sep 17 00:00:00 2001 From: Michael Friedrich Date: Fri, 24 Aug 2018 11:54:20 +0200 Subject: [PATCH] Update upgrading docs for v2.10 and namespaces --- doc/06-distributed-monitoring.md | 2 +- doc/16-upgrading-icinga-2.md | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/doc/06-distributed-monitoring.md b/doc/06-distributed-monitoring.md index 8795335ed..8964fcffd 100644 --- a/doc/06-distributed-monitoring.md +++ b/doc/06-distributed-monitoring.md @@ -2807,7 +2807,7 @@ or the `bind_host` and `bind_port` attributes of the [ApiListener](09-object-types.md#objecttype-apilistener) object. The environment must be set with the global constant `Environment` or as object attribute -of the [IcingaApplication](#objecttype-icingaapplication) object. +of the [IcingaApplication](09-object-types.md#objecttype-icingaapplication) object. In any case the constant is default value for the attribute and the direct configuration in the objects have more precedence. The constants have been added to allow the values being set from the CLI on startup. diff --git a/doc/16-upgrading-icinga-2.md b/doc/16-upgrading-icinga-2.md index 4e4db7c7f..1a4d54875 100644 --- a/doc/16-upgrading-icinga-2.md +++ b/doc/16-upgrading-icinga-2.md @@ -44,6 +44,11 @@ New [Icinga constants](17-language-reference.md#icinga-constants) have been adde * `Environment` for specifying the Icinga environment. Defaults to not set. * `ApiBindHost` and `ApiBindPort` to allow overriding the default ApiListener values. This will be used for an Icinga addon only. +### Configuration: Namespaces + +The keywords `namespace` and `using` are now [reserved](17-language-reference.md#reserved-keywords) for the namespace functionality provided +with v2.10. Read more about how it works [here](17-language-reference.md#namespaces). + ## Upgrading to v2.9 ### Deprecation and Removal Notes -- 2.40.0