From 44db66d79c0a0afb16bf4d5f0d53a15c1bbd30ea Mon Sep 17 00:00:00 2001
From: Michael Friedrich <michael.friedrich@gmail.com>
Date: Fri, 12 Oct 2012 12:31:20 +0200
Subject: [PATCH] Config: only use one sample localhost

---
 icinga-app/config/icinga2.conf.dist  | 34 +++-------------------------
 icinga-app/config/icinga2.conf.win32 |  6 ++---
 2 files changed, 6 insertions(+), 34 deletions(-)

diff --git a/icinga-app/config/icinga2.conf.dist b/icinga-app/config/icinga2.conf.dist
index 42698f414..1dc470682 100644
--- a/icinga-app/config/icinga2.conf.dist
+++ b/icinga-app/config/icinga2.conf.dist
@@ -78,38 +78,9 @@ abstract object Service "icinga-service" {
 }
 
 /**
- * The service template for ping checks. In an Icinga 1.x environment
+ * The service templates for checks. In an Icinga 1.x environment
  * this would be defined as a check command.
  */
-abstract object Service "ping" inherits "icinga-service" {
-  check_command = "$plugindir$/check_ping -H $address$ -w $wrta$,$wpl$% -c $crta$,$cpl$%",
-
-  macros += {
-    wrta = 50,
-    wpl = 5,
-    crta = 100,
-    cpl = 10
-  }
-}
-
-/**
- * And finally we define some host that should be checked.
- */
-object Host "localhost" {
-  services = { "ping" },
-
-  macros = {
-    address = "127.0.0.1"
-  },
-
-  check_interval = 1m
-}
-
-
-
-/**
- * Below, an advanced example of checking a host and its services
- */
 
 /**
  * ping
@@ -196,8 +167,9 @@ abstract object Service "demo" inherits "icinga-service" {
 
 
 /**
- * one advanced icinga2 localhost
+ * And finally we define some host that should be checked.
  */
+
 object Host "localhost-i2" {
   services = {
     "ping", "ping6",
diff --git a/icinga-app/config/icinga2.conf.win32 b/icinga-app/config/icinga2.conf.win32
index ce13e9e0e..39a499b92 100644
--- a/icinga-app/config/icinga2.conf.win32
+++ b/icinga-app/config/icinga2.conf.win32
@@ -80,7 +80,7 @@ abstract object Service "icinga-service" {
  * The service template for ping checks. In an Icinga 1.x environment
  * this would be defined as a check command.
  */
-abstract object Service "ping" inherits "icinga-service" {
+abstract object Service "ping4" inherits "icinga-service" {
 
   /* using check_winping from https://www.itefix.no/i2/check_winping */
   check_command = "$plugindir$\check_ping.exe -H $address$ -w $wrta$,$wpl$% -c $crta$,$cpl$%",
@@ -96,8 +96,8 @@ abstract object Service "ping" inherits "icinga-service" {
 /**
  * And finally we define some host that should be checked.
  */
-object Host "localhost" {
-  services = { "ping" },
+object Host "localhost-i2" {
+  services = { "ping4" },
 
   macros = {
     address = "127.0.0.1"