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

git at icinga.org git at icinga.org
Wed Jun 4 11:30:38 CEST 2014


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

Author: Michael Friedrich <michael.friedrich at netways.de>
Date:   Wed Jun  4 10:23:39 2014 +0200

Revert "Fix configuration error on missing NodeName."

This reverts commit 72ef0d31fd19ed20b2d5b986990a7be15011da09.

Refs #6393

---

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

diff --git a/doc/2-getting-started.md b/doc/2-getting-started.md
index dd8bb9b..9a3e844 100644
--- a/doc/2-getting-started.md
+++ b/doc/2-getting-started.md
@@ -157,10 +157,7 @@ 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. Not required for a single
-     * instance setup.
-     */
+    /* Our local instance name. This should be the common name from the API certificate */
     const NodeName = "localhost"
 
     /* Our local zone name. */
diff --git a/etc/icinga2/constants.conf b/etc/icinga2/constants.conf
index abcaf93..f6fc323 100644
--- a/etc/icinga2/constants.conf
+++ b/etc/icinga2/constants.conf
@@ -6,11 +6,10 @@
 /* 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. Not required for a single
- * instance setup.
- */
-const NodeName = "localhost"
+/* 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 zone name. */
 const ZoneName = NodeName



More information about the icinga-checkins mailing list