Update example config files.

diff --git a/etc/icinga2/icinga2.conf.dist b/etc/icinga2/icinga2.conf.dist
index a95d1eb43acb0ef705addf647ac027a026cc11ae..28244afa8e55db41e569a7705971cac511fb7282 100644 (file)
--- a/etc/icinga2/icinga2.conf.dist
+++ b/etc/icinga2/icinga2.conf.dist
@@ -18,12 +18,13 @@ set IcingaMacros = {
 }
 
 /**
- * The compat component periodically updates the status.dat and objects.cache
+ * The compat library periodically updates the status.dat and objects.cache
  * files. These are used by the Icinga 1.x CGIs to display the state of
  * hosts and services. CompatLog writeis the Icinga 1.x icinga.log and archives.
  */
 library "compat"
-object CompatComponent "compat" { }
+object StatusDataWriter "status" { }
+object ExternalCommandListener "command" { }
 object CompatLog "compat-log" { }
 
 /**
@@ -67,7 +68,5 @@ object Host "localhost" {
     address6 = "::1",
   },
   
-  hostcheck = "ping4",
-
-  check_interval = 1m
+  check = "ping4",
 }

diff --git a/etc/icinga2/icinga2.conf.win32 b/etc/icinga2/icinga2.conf.win32
index 492d119b155109788a98c60f382238ac3775f997..59bf17697b3a94d50a2d5dfb4eeaf30b4ae511fd 100644 (file)
--- a/etc/icinga2/icinga2.conf.win32
+++ b/etc/icinga2/icinga2.conf.win32
@@ -10,16 +10,11 @@
 #include <itl/itl.conf>
 #include <itl/standalone.conf>
 
-/**
- * Global configuration settings
- */
-object IcingaApplication "icinga" {
-  pid_path = "icinga2.pid",
-  state_path = "icinga2.state",
+set IcingaPidPath = "icinga2.pid"
+set IcingaStatePath = "icinga2.state"
 
-  macros = {
-    plugindir = "C:\\Plugins"
-  }
+set IcingaMacros = {
+  plugindir = "C:\\Plugins"
 }
 
 /**
@@ -28,7 +23,7 @@ object IcingaApplication "icinga" {
  * hosts and services.
  */
 library "compat"
-object Component "compat" {
+object StatusDataWriter "status" {
   status_path = "status.dat",
   objects_path = "objects.cache",
 }
@@ -45,6 +40,6 @@ object Host "localhost" inherits "itl-host" {
     address = "127.0.0.1"
   },
 
-  check_interval = 1m
+  check = "ping4"
 }