Config Conversion: Update sample icinga2 config.

refs #4701

diff --git a/tools/configconvert/icinga2-conv.conf b/tools/configconvert/icinga2-conv.conf
index c9f86de7ac056c153dad9f6ad6fca5123db607e7..841d414764311c1115b7315831a3d2a4d9eb907e 100644 (file)
--- a/tools/configconvert/icinga2-conv.conf
+++ b/tools/configconvert/icinga2-conv.conf
@@ -1,37 +1,10 @@
-/**
- * Icinga 2 configuration file
- * - this is where you define settings for the Icinga application including
- * which hosts/services to check.
- *
- * The docs/icinga2-config.txt file in the source tarball has a detailed
- * description of what configuration options are available.
- */
-
 include <itl/itl.conf>
 include <itl/standalone.conf>
 
-/**
- * Global configuration settings
- */
-local object IcingaApplication "icinga" {
- macros = {
-    plugindir = "/usr/local/icinga/libexec"
-  }
-}
+include "conf/resource.conf"
 
-/**
- * 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.
- */
 library "compat"
-local object CompatComponent "compat" { }
-local object CompatLog "compat-log" { }
-
-/*
-local object ConsoleLogger "my-debug-log" {
-    severity = "debug"
-}
-*/
+object CompatComponent "compat" { }
+object CompatLog "compat-log" { }
 
 include "conf/*.conf"