Bugfixes.

diff --git a/components/checker/checkercomponent.cpp b/components/checker/checkercomponent.cpp
index 036bed4abc521f6b669f7da78cca223865000d40..504280c626534032ad07e6bbd552586c4d79c420 100644 (file)
--- a/components/checker/checkercomponent.cpp
+++ b/components/checker/checkercomponent.cpp
@@ -69,7 +69,6 @@ int CheckerComponent::CheckTimerHandler(const TimerEventArgs& ea)
                return 0;
 
        for (;;) {
-
                Service service = m_Services.top();
 
                if (service.GetNextCheck() > now)

diff --git a/components/delegation/delegationcomponent.cpp b/components/delegation/delegationcomponent.cpp
index 4bab9472da6b9d5445ba73c6ffc50285dc9d90d8..f68a896d3fb58263d7f7d9b008041062b99a130f 100644 (file)
--- a/components/delegation/delegationcomponent.cpp
+++ b/components/delegation/delegationcomponent.cpp
@@ -86,7 +86,7 @@ int DelegationComponent::AssignServiceResponseHandler(const ConfigObject::Ptr& s
                Application::Log("Service delegation for service '" + service->GetName() + "' timed out.");
        } else {
                service->SetTag("checker", nrea.Sender->GetIdentity());
-               Application::Log("Service delegation for service '" + service->GetName() + "'was successful.");
+               Application::Log("Service delegation for service '" + service->GetName() + "' was successful.");
        }
 
        return 0;

diff --git a/icinga-app/Makefile.am b/icinga-app/Makefile.am
index 2987de93d0783e49ce896b0d6eb25649e404492a..78b5fd1127fbf008bd2be32b4b28a57119826e0d 100644 (file)
--- a/icinga-app/Makefile.am
+++ b/icinga-app/Makefile.am
@@ -24,6 +24,7 @@ icinga_LDADD = \
        -dlopen ${top_builddir}/components/checker/checker.la \
        -dlopen ${top_builddir}/components/configfile/configfile.la \
        -dlopen ${top_builddir}/components/configrpc/configrpc.la \
+       -dlopen ${top_builddir}/components/delegation/delegation.la \
        -dlopen ${top_builddir}/components/demo/demo.la \
        -dlopen ${top_builddir}/components/discovery/discovery.la
 

diff --git a/icinga-app/icinga2.conf b/icinga-app/icinga2.conf
index 979764daf7d5891754659c1718feecd60381064a..085f76297a3f50f04af21e489e97ddaa34da83fb 100644 (file)
--- a/icinga-app/icinga2.conf
+++ b/icinga-app/icinga2.conf
@@ -13,6 +13,9 @@ local object component "configrpc" {
 local object component "delegation" {
 }
 
+local object component "checker" {
+}
+
 local object component "discovery" {
        broker = 1
 }
@@ -44,9 +47,16 @@ abstract object service "nagios-service" {
 }
 
 abstract object service "ping" inherits "nagios-service" {
-       check_type = "nagios",
-       check_command = "$plugindir$/check_ping -H $address$",
-       check_interval = 30
+       check_command = "$plugindir$/check_ping -H $address$ -c $crta$,$cpl$% -w $wrta$,$wpl$%",
+       check_interval = 30,
+
+       macros += {
+               crta = 100,
+               wrta = 50,
+
+               cpl = 25,
+               wpl = 5
+       }
 }
 
 object service "localhost-ping" inherits "ping" {