Converted example config files.

diff --git a/icinga-app/icinga-standalone.conf b/icinga-app/icinga-standalone.conf
index ccc2025a3e393247ac2fde080ed20dde79d4d945..f64c5cfc4ca55e0046682dee175c5af400cf7ea7 100644 (file)
--- a/icinga-app/icinga-standalone.conf
+++ b/icinga-app/icinga-standalone.conf
@@ -1,9 +1,7 @@
-{
-       "icinga": {
-               "icinga": {
-               }
-       },
-       "component": {
-               "demo": { }
-       }
-}
\ No newline at end of file
+local object application "icinga" {
+
+}
+
+local object component "demo" {
+
+}

diff --git a/icinga-app/icinga2.conf b/icinga-app/icinga2.conf
index b6e79c99aeb4f20fc567f215b0c3c46f3b709af6..813ee55b13bf757ef1aa3bcad01489a6defa095a 100644 (file)
--- a/icinga-app/icinga2.conf
+++ b/icinga-app/icinga2.conf
@@ -1,34 +1,29 @@
-{
-       "icinga": {
-               "icinga": {
-                       "replicate": "0",
-                       "privkey": "icinga-c2.key",
-                       "pubkey": "icinga-c2.crt",
-                       "cakey": "ca.crt",
-                       "node": "10.0.10.3",
-                       "service": "8888"
-               }
-       },
-       "component": {
-               "configrpc": { "replicate": "0" },
-               "demo": { "replicate": "0" },
-               "discovery": { "replicate": "0", "broker": "0" }
-       },
-       "endpoint": {
-               "icinga-c1": {
-                       "replicate": "0",
-                       "node": "10.0.10.14",
-                       "service": "7777",
-                       "roles": [ "broker", "demo" ]
-               }
-       },
-       "role": {
-               "broker": {
-                       "publications": [ "discovery::NewComponent" ]
-               },
-               "demo": {
-                       "publications": [ "demo::*" ],
-                       "subscriptions": [ "demo::*" ]
-               }
-       }
-}
\ No newline at end of file
+local object application "icinga" {
+       privkey = "icinga-c2.key",
+       pubkey = "icinga-c2.crt",
+
+       cakey = "ca.crt",
+       node = "10.0.10.3",
+       service = 8888
+}
+
+local object component "configrpc" {
+}
+
+local object component "demo" {
+}
+
+local object component "discovery" {
+       broker = 0
+}
+
+local object endpoint "icinga-c1" {
+       node = "10.0.10.14",
+       service = 7777,
+
+       roles = { "broker" }
+}
+
+local object role "broker" {
+       publications = { "discovery::NewComponent" }
+}

diff --git a/icinga-app/icinga3.conf b/icinga-app/icinga3.conf
index 879a39f22c12dfe524df0285f33692835d319e3d..5b65ff6c6d481a1f49ba74aec09c46cac7838664 100644 (file)
--- a/icinga-app/icinga3.conf
+++ b/icinga-app/icinga3.conf
@@ -1,34 +1,29 @@
-{
-       "icinga": {
-               "icinga": {
-                       "replicate": "0",
-                       "privkey": "icinga-c3.key",
-                       "pubkey": "icinga-c3.crt",
-                       "cakey": "ca.crt",
-                       "node": "10.0.10.14",
-                       "service": "9999"
-               }
-       },
-       "component": {
-               "configrpc": { "replicate": "0" },
-               "demo": { "replicate": "0" },
-               "discovery": { "replicate": "0", "broker": "0" }
-       },
-       "endpoint": {
-               "icinga-c1": {
-                       "replicate": "0",
-                       "node": "10.0.10.14",
-                       "service": "7777",
-                       "roles": [ "broker", "demo" ]
-               }
-       },
-       "role": {
-               "broker": {
-                       "publications": [ "discovery::NewComponent" ]
-               },
-               "demo": {
-                       "publications": [ "demo::*" ],
-                       "subscriptions": [ "demo::*" ]
-               }
-       }
-}
\ No newline at end of file
+local object application "icinga" {
+       privkey = "icinga-c3".key",
+       pubkey = "icinga-c3.crt",
+       cakey = "ca.crt",
+
+       node = "10.0.10.14",
+       service = 9999
+}
+
+local object component "configrpc" {
+}
+
+local object component "demo" {
+}
+
+local object component "discovery" {
+       broker = 0
+}
+
+local object endpoint "icinga-c1" {
+       node = "10.0.10.14",
+       service = 7777,
+
+       roles = { "broker" }
+}
+
+local object role "broker" {
+       publications = "discovery::NewComponent"
+}