Implement the IcingaCheckTask check type.

Fixes #2822

diff --git a/etc/icinga2/conf.d/localhost.conf b/etc/icinga2/conf.d/localhost.conf
index 3d363f082c55c9b19d95cd2673b7802f8b837080..a031059571f6b7c8ff3cd1cd500bcf8c9f5db548 100644 (file)
--- a/etc/icinga2/conf.d/localhost.conf
+++ b/etc/icinga2/conf.d/localhost.conf
@@ -6,6 +6,12 @@
 object Host "localhost" inherits "linux-server" {
   display_name = "localhost",
 
+  services["icinga"] = {
+    templates = [ "generic-service" ],
+
+    check_command = "icinga"
+  },
+
   services["ping4"] = {
     templates = [ "generic-service" ],
 

diff --git a/itl/command-common.conf b/itl/command-common.conf
index b4c1c5ab46a8bc8d4d7c85e1cc968416c922289a..1492485a3309a21e51bab6c546e66b861d72af21 100644 (file)
--- a/itl/command-common.conf
+++ b/itl/command-common.conf
@@ -229,3 +229,5 @@ object CheckCommand "snmp-uptime" inherits "snmp" {
        }
 }
 
+object CheckCommand "icinga" inherits "icinga-check-command" {
+}

diff --git a/itl/command.conf b/itl/command.conf
index 12e87641390f27e9f2026a77e0fcdcf27262efdc..3bb472f8a8fc1dbe815988df4453a9cb5c7dcd03 100644 (file)
--- a/itl/command.conf
+++ b/itl/command.conf
@@ -19,6 +19,12 @@
 
 library "methods"
 
+template CheckCommand "icinga-check-command" {
+       methods = {
+               execute = "IcingaCheck"
+       }
+}
+
 template CheckCommand "plugin-check-command" {
        methods = {
                execute = "PluginCheck"

diff --git a/lib/methods/CMakeLists.txt b/lib/methods/CMakeLists.txt
index b5fe6b2425acbde9d7bee731a97a19a65a200051..64dde6cbe1141405c540636b43ddd280f2d83aea 100644 (file)
--- a/lib/methods/CMakeLists.txt
+++ b/lib/methods/CMakeLists.txt
@@ -16,9 +16,9 @@
 # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 
 add_library(methods SHARED
-  legacytimeperiod.cpp nullchecktask.cpp nulleventtask.cpp pluginchecktask.cpp
-  plugineventtask.cpp pluginnotificationtask.cpp randomchecktask.cpp
-  timeperiodtask.cpp
+  icingachecktask.cpp legacytimeperiod.cpp nullchecktask.cpp
+  nulleventtask.cpp pluginchecktask.cpp plugineventtask.cpp
+  pluginnotificationtask.cpp randomchecktask.cpp timeperiodtask.cpp
 )
 
 target_link_libraries(methods ${Boost_LIBRARIES} base config icinga)

diff --git a/lib/methods/icingachecktask.cpp b/lib/methods/icingachecktask.cpp
new file mode 100644 (file)
index 0000000..0744ddd
--- /dev/null
+++ b/lib/methods/icingachecktask.cpp
@@ -0,0 +1,48 @@
+/******************************************************************************
+ * Icinga 2                                                                   *
+ * Copyright (C) 2012-2013 Icinga Development Team (http://www.icinga.org/)   *
+ *                                                                            *
+ * This program is free software; you can redistribute it and/or              *
+ * modify it under the terms of the GNU General Public License                *
+ * as published by the Free Software Foundation; either version 2             *
+ * of the License, or (at your option) any later version.                     *
+ *                                                                            *
+ * This program is distributed in the hope that it will be useful,            *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the              *
+ * GNU General Public License for more details.                               *
+ *                                                                            *
+ * You should have received a copy of the GNU General Public License          *
+ * along with this program; if not, write to the Free Software Foundation     *
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
+ ******************************************************************************/
+
+#include "methods/icingachecktask.h"
+#include "icinga/cib.h"
+#include "base/application.h"
+#include "base/utility.h"
+#include "base/scriptfunction.h"
+
+using namespace icinga;
+
+REGISTER_SCRIPTFUNCTION(IcingaCheck, &IcingaCheckTask::ScriptFunc);
+
+CheckResult::Ptr IcingaCheckTask::ScriptFunc(const Service::Ptr&)
+{
+       double interval = Utility::GetTime() - Application::GetStartTime();
+
+       if (interval > 60)
+               interval = 60;
+
+       Dictionary::Ptr perfdata = make_shared<Dictionary>();
+       perfdata->Set("active_checks", CIB::GetActiveChecksStatistics(interval) / interval);
+       perfdata->Set("passive_checks", CIB::GetPassiveChecksStatistics(interval) / interval);
+
+       CheckResult::Ptr cr = make_shared<CheckResult>();
+       cr->SetOutput("Icinga 2 is running.");
+       cr->SetPerformanceData(perfdata);
+       cr->SetState(StateOK);
+
+       return cr;
+}
+

diff --git a/lib/methods/icingachecktask.h b/lib/methods/icingachecktask.h
new file mode 100644 (file)
index 0000000..bf5d0bb
--- /dev/null
+++ b/lib/methods/icingachecktask.h
@@ -0,0 +1,45 @@
+/******************************************************************************
+ * Icinga 2                                                                   *
+ * Copyright (C) 2012-2013 Icinga Development Team (http://www.icinga.org/)   *
+ *                                                                            *
+ * This program is free software; you can redistribute it and/or              *
+ * modify it under the terms of the GNU General Public License                *
+ * as published by the Free Software Foundation; either version 2             *
+ * of the License, or (at your option) any later version.                     *
+ *                                                                            *
+ * This program is distributed in the hope that it will be useful,            *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the              *
+ * GNU General Public License for more details.                               *
+ *                                                                            *
+ * You should have received a copy of the GNU General Public License          *
+ * along with this program; if not, write to the Free Software Foundation     *
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
+ ******************************************************************************/
+
+#ifndef ICINGACHECKTASK_H
+#define ICINGACHECKTASK_H
+
+#include "methods/i2-methods.h"
+#include "icinga/service.h"
+
+namespace icinga
+{
+
+/**
+ * Icinga check type.
+ *
+ * @ingroup methods
+ */
+class I2_METHODS_API IcingaCheckTask
+{
+public:
+       static CheckResult::Ptr ScriptFunc(const Service::Ptr& service);
+
+private:
+       IcingaCheckTask(void);
+};
+
+}
+
+#endif /* ICINGACHECKTASK_H */