From: Gunnar Beutner <gunnar.beutner@netways.de>
Date: Tue, 14 Aug 2012 12:09:08 +0000 (+0200)
Subject: Updated example configs.
X-Git-Tag: v0.0.1~138
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=06674919428823e04f38c9adf6175a498f5f8e68;p=icinga2

Updated example configs.
---

diff --git a/doc/icinga2-config.odt b/doc/icinga2-config.odt
index 7df7b65ba..d9d449c3f 100644
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 c7c6f97a5..595e155bf 100644
--- 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 70e8f9fc7..aa262ab8d 100644
--- 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 a6acc464a..cfd3395f7 100644
--- 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 f24b3c11a..e110f1c5a 100644
--- 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 6dbee780c..859568e32 100644
--- 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"
 	}
 }
+