Updated test configs.

diff --git a/icinga-app/icinga2.conf b/icinga-app/icinga2.conf
index 877c2c7437068e1ea30aa5555027a140d80cc92d..88871008dd01c2bdbdcdd25469b6f9c3d5820304 100644 (file)
--- a/icinga-app/icinga2.conf
+++ b/icinga-app/icinga2.conf
@@ -10,20 +10,49 @@ local object application "icinga" {
 local object component "configrpc" {
 }
 
-local object component "demo" {
+local object component "delegation" {
 }
 
 local object component "discovery" {
-       broker = 0
+       broker = 1
 }
 
-local object endpoint "icinga-c1" {
+local object endpoint "icinga-c3" {
        node = "192.168.5.46",
        service = 7777,
 
-       roles = { "broker" }
+       roles = { "all" }
 }
 
-local object role "broker" {
-       publications = { "discovery::NewComponent" }
+local object role "all" {
+       publications = { "*" },
+       subscriptions = { "*" }
+}
+
+# --------------------------------------------
+
+object host "localhost" {
+
+}
+
+abstract object service "nagios-service" {
+       check_type = "nagios",
+
+       macros = {
+               plugindir = "/usr/local/icinga/libexec"
+       }
+}
+
+abstract object service "ping" inherits "nagios-service" {
+       check_type = "nagios",
+       check_command = "$plugindir$/check_ping -H $address$",
+       check_interval = 30
+}
+
+object service "localhost-ping" inherits "ping" {
+       host_name = "localhost",
+
+       macros += {
+               address = "localhost"
+       }
 }

diff --git a/icinga-app/icinga3.conf b/icinga-app/icinga3.conf
index 5b65ff6c6d481a1f49ba74aec09c46cac7838664..0611a73afb487b5227cabdc047f0c2a44367fded 100644 (file)
--- a/icinga-app/icinga3.conf
+++ b/icinga-app/icinga3.conf
@@ -10,20 +10,21 @@ local object application "icinga" {
 local object component "configrpc" {
 }
 
-local object component "demo" {
+local object component "checker" {
 }
 
 local object component "discovery" {
        broker = 0
 }
 
-local object endpoint "icinga-c1" {
-       node = "10.0.10.14",
+local object endpoint "icinga-c2" {
+       node = "192.168.2.235",
        service = 7777,
 
-       roles = { "broker" }
+       roles = { "all" }
 }
 
-local object role "broker" {
-       publications = "discovery::NewComponent"
+local object role "all" {
+       publications = { "*" },
+       subscriptions = { "*" }
 }