Updated example configs.

diff --git a/doc/icinga2-config.odt b/doc/icinga2-config.odt
index 7df7b65ba8a7c36c84993e1bffa3dd05cff9e71b..d9d449c3fa16057341199b41f6032fe52e10ecb0 100644 (file)
Binary files a/doc/icinga2-config.odt and b/doc/icinga2-config.odt differ

diff --git a/icinga-app/icinga-checker1.conf b/icinga-app/icinga-checker1.conf
index c7c6f97a53c1670bd02ee7e10a293c0c732044d2..595e155bf9ee18bc9b5c0978cad873a1aa65ad46 100644 (file)
--- a/icinga-app/icinga-checker1.conf
+++ b/icinga-app/icinga-checker1.conf
@@ -1,4 +1,4 @@
-local object Application "icinga" {
+local object IcingaApplication "icinga" {
         cert = "icinga-c2.pem",
         ca = "ca.crt",
 

diff --git a/icinga-app/icinga-checker2.conf b/icinga-app/icinga-checker2.conf
index 70e8f9fc7e81f53415b040964a5ba9bd9dbe1336..aa262ab8d48bf6e018872ff48008e7bb6cfa95bf 100644 (file)
--- a/icinga-app/icinga-checker2.conf
+++ b/icinga-app/icinga-checker2.conf
@@ -1,17 +1,17 @@
-local object application "icinga" {
+local object IcingaApplication "icinga" {
        cert = "icinga-c3.pem",
        ca = "ca.crt"
 }
 
-local object component "checker" {
+local object Component "checker" {
 }
 
-local object component "discovery" {
+local object Component "discovery" {
        broker = 0
 }
 
-/* trusted upstream endpoint */
-local object endpoint "icinga-c1" {
+/* upstream endpoint */
+local object Endpoint "icinga-c1" {
        node = "192.168.5.46",
        service = 7777,
 }

diff --git a/icinga-app/icinga-standalone.conf b/icinga-app/icinga-standalone.conf
index a6acc464aa1c1f19cbedffc50fd8962d49493d5a..cfd3395f721235898bfaa5605e0e7081fa1199a9 100644 (file)
--- a/icinga-app/icinga-standalone.conf
+++ b/icinga-app/icinga-standalone.conf
@@ -1,4 +1,4 @@
-local object Application "icinga" {
+local object IcingaApplication "icinga" {
        cert = "icinga-c1.pem",
        ca = "ca.crt",
 

diff --git a/icinga-app/icinga1.conf b/icinga-app/icinga1.conf
index f24b3c11aba33ac1e1cda1514528f4a4566b989f..e110f1c5a720934a668c873873f086bc87754016 100644 (file)
--- a/icinga-app/icinga1.conf
+++ b/icinga-app/icinga1.conf
@@ -1,4 +1,4 @@
-local object Application "icinga" {
+local object IcingaApplication "icinga" {
        ca = "ca.crt",
        cert = "icinga-c1.pem",
 

diff --git a/icinga-app/icinga2.conf b/icinga-app/icinga2.conf
index 6dbee780c27523f9b4aa280a8ca3d23ec77ed9a3..859568e32592100dd310b5b4612c3b308c1873dc 100644 (file)
--- a/icinga-app/icinga2.conf
+++ b/icinga-app/icinga2.conf
@@ -1,4 +1,4 @@
-local object application "icinga" {
+local object Application "icinga" {
        ca = "ca.crt",
        cert = "icinga-c2.pem",
 
@@ -6,39 +6,41 @@ local object application "icinga" {
        service = 7777
 }
 
-local object component "configrpc" {
+local object Component "configrpc" {
 }
 
-local object component "delegation" {
+local object Component "delegation" {
 }
 
-local object component "checker" {
+local object Component "checker" {
 }
 
-local object component "discovery" {
+local object Component "discovery" {
        broker = 1
 }
 
-local object endpoint "icinga-c3" {
+local object Endpoint "icinga-c3" {
        node = "192.168.5.46",
        service = 9999,
 }
 
 # --------------------------------------------
 
-object host "localhost" {
+object Host "localhost" {
 
 }
 
-abstract object service "nagios-service" {
-       check_type = "nagios",
+abstract object Service "nagios-service" {
+       methods = {
+               check = "native::NagiosCheck"
+       },
 
        macros = {
                plugindir = "/usr/local/icinga/libexec"
        }
 }
 
-abstract object service "ping" inherits "nagios-service" {
+abstract object Service "ping" inherits "nagios-service" {
        check_command = "$plugindir$/check_ping -H $address$ -c $crta$,$cpl$% -w $wrta$,$wpl$%",
        check_interval = 30,
 
@@ -51,10 +53,11 @@ abstract object service "ping" inherits "nagios-service" {
        }
 }
 
-object service "localhost-ping" inherits "ping" {
+object Service "localhost-ping" inherits "ping" {
        host_name = "localhost",
 
        macros += {
                address = "localhost"
        }
 }
+