[icinga-checkins] icinga.org: icinga2/master: Clean up the win32 config example.

git at icinga.org git at icinga.org
Sat Feb 16 09:28:26 CET 2013


Module: icinga2
Branch: master
Commit: f0093689fdfb9897db66a87335545457c4e66a2c
URL:    https://git.icinga.org/?p=icinga2.git;a=commit;h=f0093689fdfb9897db66a87335545457c4e66a2c

Author: Gunnar Beutner <gunnar.beutner at netways.de>
Date:   Sat Feb 16 09:20:45 2013 +0100

Clean up the win32 config example.

Fixes #3705

---

 etc/icinga2/icinga2.conf.win32 |   68 ++-------------------------------------
 1 files changed, 4 insertions(+), 64 deletions(-)

diff --git a/etc/icinga2/icinga2.conf.win32 b/etc/icinga2/icinga2.conf.win32
index be79b1f..52ecf10 100644
--- a/etc/icinga2/icinga2.conf.win32
+++ b/etc/icinga2/icinga2.conf.win32
@@ -7,6 +7,9 @@
  * description of what configuration options are available.
  */
 
+#include <itl/itl.conf>
+#include <itl/standalone.conf>
+
 /**
  * Global configuration settings
  */
@@ -20,29 +23,6 @@ local object IcingaApplication "icinga" {
 }
 
 /**
- * Advanced logging settings
- */
-local object Logger "my-debug-log" {
-  type = "console",
-  severity = "debug"
-}
-
-/**
- * The checker component takes care of executing service checks.
- */
-local object Component "checker" {
-
-}
-
-/**
- * The delegation component assigns services to checkers. You need to load
- * this component even if your Icinga setup only consists of a single instance.
- */
-local object Component "delegation" {
-
-}
-
-/**
  * The compat component periodically updates the status.dat and objects.cache
  * files. These are used by the Icinga 1.x CGIs to display the state of
  * hosts and services.
@@ -53,49 +33,9 @@ local object Component "compat" {
 }
 
 /**
- * The compatido component works as idomod connector to a running ido2db
- * daemon, connected via tcp socket only. It will dump config and status
- * information periodically for now. By default, this remains disabled.
- */
-/*
-local object Component "compatido" {
-  socket_address = "127.0.0.1",
-  socket_port = "5668",
-  instance_name = "i2-default",
-}
-*/
-
-/**
- * This template defines some basic parameters for services that use
- * external plugins for their checks.
- */
-abstract object Service "icinga-service" {
-  methods = {
-    check = "PluginCheck"
-  }
-}
-
-/**
- * The service template for ping checks. In an Icinga 1.x environment
- * this would be defined as a check command.
- */
-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$%",
-
-  macros += {
-    wrta = 100,
-    wpl = 80,
-    crta = 250,
-    cpl = 100
-  }
-}
-
-/**
  * And finally we define some host that should be checked.
  */
-object Host "localhost-i2" {
+object Host "localhost" inherits "itl-host" {
   services = { "ping4" },
 
   macros = {





More information about the icinga-checkins mailing list