From 8568b4b7016b4efa8c23590f5fb1bd95ade5bc0c Mon Sep 17 00:00:00 2001 From: Gunnar Beutner Date: Tue, 24 Sep 2013 11:24:22 +0200 Subject: [PATCH] Make sample configuration more readable. Fixes #4724 --- etc/icinga2/icinga2.conf.dist | 41 ++++++++++++++++++++++++++-------- etc/icinga2/icinga2.conf.win32 | 4 +++- 2 files changed, 35 insertions(+), 10 deletions(-) diff --git a/etc/icinga2/icinga2.conf.dist b/etc/icinga2/icinga2.conf.dist index 757b9fad4..a95d1eb43 100644 --- a/etc/icinga2/icinga2.conf.dist +++ b/etc/icinga2/icinga2.conf.dist @@ -30,15 +30,38 @@ object CompatLog "compat-log" { } * And finally we define some host that should be checked. */ object Host "localhost" { - services["ping4"] = { templates = [ "ping4" ] }, - services["ping6"] = { templates = [ "ping6" ] }, - services["http"] = { templates = [ "http_ip" ] }, - services["ssh"] = { templates = [ "ssh" ] }, - services["load"] = { templates = [ "load" ] }, - services["processes"] = { templates = [ "processes" ] }, - services["users"] = { templates = [ "users" ] }, - services["disk"] = { templates = [ "disk" ] }, - + services["ping4"] = { + templates = [ "ping4" ] + }, + + services["ping6"] = { + templates = [ "ping6" ] + }, + + services["http"] = { + templates = [ "http_ip" ] + }, + + services["ssh"] = { + templates = [ "ssh" ] + }, + + services["load"] = { + templates = [ "load" ] + }, + + services["processes"] = { + templates = [ "processes" ] + }, + + services["users"] = { + templates = [ "users" ] + }, + + services["disk"] = { + templates = [ "disk" ] + }, + macros = { address = "127.0.0.1", address6 = "::1", diff --git a/etc/icinga2/icinga2.conf.win32 b/etc/icinga2/icinga2.conf.win32 index ecd9a3ba8..492d119b1 100644 --- a/etc/icinga2/icinga2.conf.win32 +++ b/etc/icinga2/icinga2.conf.win32 @@ -37,7 +37,9 @@ object Component "compat" { * And finally we define some host that should be checked. */ object Host "localhost" inherits "itl-host" { - services["ping4"] = { templates = [ "ping4" ] }, + services["ping4"] = { + templates = [ "ping4" ] + }, macros = { address = "127.0.0.1"