Update example config.

Refs #5925

diff --git a/etc/icinga2/conf.d/downtimes.conf b/etc/icinga2/conf.d/downtimes.conf
index 2274d57a1c1259c0384487b5c5704bfb94e3f5e8..0c50b7827e2ba8c4eb7a3a66dd8aa89bd223cf59 100644 (file)
--- a/etc/icinga2/conf.d/downtimes.conf
+++ b/etc/icinga2/conf.d/downtimes.conf
@@ -16,4 +16,3 @@ template ScheduledDowntime "backup-downtime" {
     sunday = "02:00-03:00"
   }
 }
-

diff --git a/etc/icinga2/conf.d/localhost.conf b/etc/icinga2/conf.d/localhost.conf
index 9a9507f98388354f523b44de5bc4cb1072c21b17..7c80e6929e7face51434bf6098e10cf1b78b4fb2 100644 (file)
--- a/etc/icinga2/conf.d/localhost.conf
+++ b/etc/icinga2/conf.d/localhost.conf
@@ -10,65 +10,59 @@ object Host "localhost" {
   vars.address6 = "::1"
 }
 
-apply Service "icinga" {
+object Service "icinga" {
   import "generic-service"
 
+  host_name = "localhost"
   check_command = "icinga"
-
-  assign where host.name == "localhost"
 }
 
-apply Service "http" {
+object Service "http" {
   import "generic-service"
 
+  host_name = "localhost"
   check_command = "http_ip"
-
-  assign where host.name == "localhost"
 }
 
-apply Service "ssh" {
+object Service "ssh" {
   import "generic-service"
 
+  host_name = "localhost"
   check_command = "ssh"
-
-  assign where host.name == "localhost"
 }
 
-apply Service "load" {
+object Service "load" {
   import "generic-service"
 
+  host_name = "localhost"
   check_command = "load"
-
-  assign where host.name == "localhost"
 }
 
-apply ScheduledDowntime "backup-downtime" to Service {
+object ScheduledDowntime "backup-downtime" {
   import "backup-downtime"
 
-  assign where host.name == "localhost" && service.name == "load"
+  host_name = "localhost"
+  service_name = "load"
 }
 
-apply Service "processes" {
+object Service "processes" {
   import "generic-service"
 
+  host_name = "localhost"
   check_command = "processes"
-
-  assign where host.name == "localhost"
 }
 
-apply Service "users" {
+object Service "users" {
   import "generic-service"
 
+  host_name = "localhost"
   check_command = "users"
-
-  assign where host.name == "localhost"
 }
 
-apply Service "disk" {
+object Service "disk" {
   import "generic-service"
 
+  host_name = "localhost"
   check_command = "disk"
-
-  assign where host.name == "localhost"
 }
 

diff --git a/etc/icinga2/conf.d/users.conf b/etc/icinga2/conf.d/users.conf
index 762184f568da8e0d1438cc797651318f3c890203..0762b3ab548c88c5aca5042158b212bac3c59656 100644 (file)
--- a/etc/icinga2/conf.d/users.conf
+++ b/etc/icinga2/conf.d/users.conf
@@ -16,7 +16,6 @@ object User "icingaadmin" {
   vars.notes = "This is the Icinga 2 Admin account."
 }
 
-
 object UserGroup "icingaadmins" {
   display_name = "Icinga 2 Admin Group"
 }