From a4111d2964aab0afac322559f8305a39bfd70b05 Mon Sep 17 00:00:00 2001 From: Michael Friedrich Date: Wed, 9 Oct 2013 18:54:57 +0200 Subject: [PATCH] Conversion: Update readme and test config. --- tools/configconvert/README | 15 +++++++++------ tools/configconvert/icinga2-conv.conf | 15 +++++++++------ 2 files changed, 18 insertions(+), 12 deletions(-) diff --git a/tools/configconvert/README b/tools/configconvert/README index f85638b4a..111bfb2ba 100644 --- a/tools/configconvert/README +++ b/tools/configconvert/README @@ -16,8 +16,8 @@ will be converted into Icinga2's logic with new notification objects, allowing to define notifications directly on the service definition then. Commands will be split by type (Check, Event, Notification) and relinked where -possible. The host's check_command is dropped, and a possible service hostcheck -looked up, if possible. +possible. The host's check_command is dropped, and a possible host check service +looked up, if possible. Otherwise a new service object will be added and linked. Notifications will be built based on the service->contact relations, and escalations will also be merged into notifications, having times begin/end as @@ -36,18 +36,21 @@ dictionary (freely definable macros in Icinga 2.x). All required templates will be inherited from Icinga2's Template Library (ITL). +Regular expressions are not supported, also for the reason that this is optional in Icinga 1.x + RUN -# ./icinga2_convert_v1_v2.pl -v -o conf/ +# ./icinga2_convert_v1_v2.pl -c /etc/icinga/icinga.cfg -o conf/ HELP # ./icinga2_convert_v1_v2.pl -h +VERBOSE +# ./icinga2_convert_v1_v2.pl -v -c /etc/icinga/icinga.cfg -o conf/ + TEST There's a small icinga2 conversion test config available, including conf/ folder. -# ~/i2/sbin/icinga2 -c icinga2-conv.conf - -(or if icinga2 binary is located in $HOME/i2/sbin/icinga2, simply use run_icinga2) +# /usr/bin/icinga2 -c icinga2-conv.conf REQUIREMENTS diff --git a/tools/configconvert/icinga2-conv.conf b/tools/configconvert/icinga2-conv.conf index 87b18b2c6..6b49be68f 100644 --- a/tools/configconvert/icinga2-conv.conf +++ b/tools/configconvert/icinga2-conv.conf @@ -1,11 +1,14 @@ include -include -include "conf/resource.conf" +//basic +include "../../etc/icinga2/features-available/checker.conf" +include "../../etc/icinga2/features-available/notification.conf" + +//classic ui +include "../../etc/icinga2/features-available/statusdat.conf" +include "../../etc/icinga2/features-available/compat-log.conf" +include "../../etc/icinga2/features-available/command.conf" -library "compat" -object StatusDataWriter "status" { } -object ExternalCommandListener "command" { } -object CompatLogger "compat-log" { } +include "conf/resource.conf" include "conf/*.conf" -- 2.40.0