[icinga-checkins] icinga.org: icinga2/next: Fix configuration error on missing NodeName.

git at icinga.org git at icinga.org
Tue Jun 3 15:35:02 CEST 2014


Module: icinga2
Branch: next
Commit: 72ef0d31fd19ed20b2d5b986990a7be15011da09
URL:    https://git.icinga.org/?p=icinga2.git;a=commit;h=72ef0d31fd19ed20b2d5b986990a7be15011da09

Author: Michael Friedrich <michael.friedrich at netways.de>
Date:   Tue Jun  3 14:54:21 2014 +0200

Fix configuration error on missing NodeName.

Fixes #6393

---

 doc/2-getting-started.md   |    5 ++++-
 etc/icinga2/constants.conf |    9 +++++----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/doc/2-getting-started.md b/doc/2-getting-started.md
index 9a3e844..dd8bb9b 100644
--- a/doc/2-getting-started.md
+++ b/doc/2-getting-started.md
@@ -157,7 +157,10 @@ The `constants.conf` configuration file can be used to define global constants:
     /* The directory which contains the plugins from the Monitoring Plugins project. */
     const PluginDir = "/usr/lib/nagios/plugins"
 
-    /* Our local instance name. This should be the common name from the API certificate */
+    /* Our local instance name. This should be the common name
+     * from the API certificate. Not required for a single
+     * instance setup.
+     */
     const NodeName = "localhost"
 
     /* Our local zone name. */
diff --git a/etc/icinga2/constants.conf b/etc/icinga2/constants.conf
index f6fc323..abcaf93 100644
--- a/etc/icinga2/constants.conf
+++ b/etc/icinga2/constants.conf
@@ -6,10 +6,11 @@
 /* The directory which contains the plugins from the Monitoring Plugins project. */
 const PluginDir = "/usr/lib/nagios/plugins"
 
-/* Our local instance name. By default this is the server's hostname as returned by `hostname --fqdn`.
- * This should be the common name from the API certificate.
-*/
-//const NodeName = "localhost"
+/* Our local instance name. This should be the common name
+ * from the API certificate. Not required for a single
+ * instance setup.
+ */
+const NodeName = "localhost"
 
 /* Our local zone name. */
 const ZoneName = NodeName



More information about the icinga-checkins mailing list