Fix example configuration.

diff --git a/doc/2.1-setting-up-icinga-2.md b/doc/2.1-setting-up-icinga-2.md
index 70dd9093e7453664a338d8e62bc2b698bc7ff249..c1438c4e5c58a8e23f5ca8b766980ea2ad41a647 100644 (file)
--- a/doc/2.1-setting-up-icinga-2.md
+++ b/doc/2.1-setting-up-icinga-2.md
@@ -63,7 +63,6 @@ Here's a brief description of the example config:
 Icinga 2 supports [C/C++-style comments](#comments).
 
     include <itl/itl.conf>
-    include <itl/standalone.conf>
 
 The *include* directive can be used to include other files. The *itl/itl.conf*
 file is distributed as part of Icinga 2 and provides a number of useful templates
@@ -116,35 +115,35 @@ The *conf.d/localhost.conf* file contains our first host definition:
      */
     object Host "localhost" {
       services["ping4"] = {
-        templates = [ "ping4" ]
+        check_command = "ping4"
       },
 
       services["ping6"] = {
-        templates = [ "ping6" ]
+        check_command = "ping6"
       },
 
       services["http"] = {
-        templates = [ "http_ip" ]
+        check_command = "http_ip"
       },
 
       services["ssh"] = {
-        templates = [ "ssh" ]
+        check_command = "ssh"
       },
 
       services["load"] = {
-        templates = [ "load" ]
+        check_command = "load"
       },
 
       services["processes"] = {
-        templates = [ "processes" ]
+        check_command = "processes"
       },
 
       services["users"] = {
-        templates = [ "users" ]
+        check_command = "users"
       },
 
       services["disk"] = {
-        templates = [ "disk" ]
+        check_command = "disk"
       },
 
       macros = {
@@ -155,6 +154,7 @@ The *conf.d/localhost.conf* file contains our first host definition:
       check = "ping4",
     }
 
+
 This defines a host named "localhost" which has a couple of services. Services
 may inherit from one or more service templates.
 

diff --git a/etc/icinga2/conf.d/localhost.conf b/etc/icinga2/conf.d/localhost.conf
index 795cfb9af36d5930bc823c8d0493b27a180a965e..778f1113d518ecfecd3bb866cf96d95232f2e7c9 100644 (file)
--- a/etc/icinga2/conf.d/localhost.conf
+++ b/etc/icinga2/conf.d/localhost.conf
@@ -13,7 +13,7 @@ object Host "localhost" {
   },
 
   services["http"] = {
-    check_command = "http"
+    check_command = "http_ip"
   },
 
   services["ssh"] = {