From: Gunnar Beutner Date: Sat, 5 Apr 2014 20:20:57 +0000 (+0200) Subject: Update example config. X-Git-Tag: v0.0.10~198 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=323f3ec6c5efe819c3707cc3bc4c41a21ba517eb;p=icinga2 Update example config. Refs #5925 --- diff --git a/etc/icinga2/conf.d/downtimes.conf b/etc/icinga2/conf.d/downtimes.conf index 2274d57a1..0c50b7827 100644 --- 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 9a9507f98..7c80e6929 100644 --- 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 762184f56..0762b3ab5 100644 --- 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" }