Move kernel check to the Debian package directory.

Refs #6012

diff --git a/debian/config/kernel.conf b/debian/config/kernel.conf
new file mode 100644 (file)
index 0000000..0f89073
--- /dev/null
+++ b/debian/config/kernel.conf
@@ -0,0 +1,13 @@
+/*
+ * This check requires the "sudo" and "binutils" packages to be installed.
+ * You will also need to add the following line to your /etc/sudoers file:
+ * nagios ALL=(ALL:ALL) NOPASSWD: /etc/icinga2/scripts/check_kernel
+ */
+
+object Service "kernel" {
+  import "generic-service"
+
+  host_name = "localhost"
+  check_command = "kernel"
+}
+

diff --git a/debian/icinga2-common.install b/debian/icinga2-common.install
index d6b0451a5fbf3c40028e4d489bd11e2ba9edec62..e3ade60ded1dfc75cc3e50b0fee5993140ab2f22 100644 (file)
--- a/debian/icinga2-common.install
+++ b/debian/icinga2-common.install
@@ -1,5 +1,6 @@
 debian/tmp/etc/icinga2
 debian/config/apt.conf        etc/icinga2/conf.d/hosts/localhost
+debian/config/kernel.conf     etc/icinga2/conf.d/hosts/localhost
 usr/bin/icinga2-build*
 usr/bin/icinga2-sign-key
 usr/sbin/icinga2-*-feature

diff --git a/etc/CMakeLists.txt b/etc/CMakeLists.txt
index e2d869bc76f593632f568963d5b742c9bb1130fa..154fab4ae1537b0fe1c5ebffa1a0b6a0bf7cbfde 100644 (file)
--- a/etc/CMakeLists.txt
+++ b/etc/CMakeLists.txt
@@ -31,7 +31,6 @@ install_if_not_exists(icinga2/conf.d/hosts/localhost.conf ${CMAKE_INSTALL_SYSCON
 install_if_not_exists(icinga2/conf.d/hosts/localhost/disk.conf ${CMAKE_INSTALL_SYSCONFDIR}/icinga2/conf.d/hosts/localhost)
 install_if_not_exists(icinga2/conf.d/hosts/localhost/http.conf ${CMAKE_INSTALL_SYSCONFDIR}/icinga2/conf.d/hosts/localhost)
 install_if_not_exists(icinga2/conf.d/hosts/localhost/icinga.conf ${CMAKE_INSTALL_SYSCONFDIR}/icinga2/conf.d/hosts/localhost)
-install_if_not_exists(icinga2/conf.d/hosts/localhost/kernel.conf ${CMAKE_INSTALL_SYSCONFDIR}/icinga2/conf.d/hosts/localhost)
 install_if_not_exists(icinga2/conf.d/hosts/localhost/load.conf ${CMAKE_INSTALL_SYSCONFDIR}/icinga2/conf.d/hosts/localhost)
 install_if_not_exists(icinga2/conf.d/hosts/localhost/procs.conf ${CMAKE_INSTALL_SYSCONFDIR}/icinga2/conf.d/hosts/localhost)
 install_if_not_exists(icinga2/conf.d/hosts/localhost/ssh.conf ${CMAKE_INSTALL_SYSCONFDIR}/icinga2/conf.d/hosts/localhost)

diff --git a/etc/icinga2/conf.d/hosts/localhost/kernel.conf b/etc/icinga2/conf.d/hosts/localhost/kernel.conf
deleted file mode 100644 (file)
index 1a8f55d..0000000
--- a/etc/icinga2/conf.d/hosts/localhost/kernel.conf
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * Kernel check requires sudo and binutils properly installed.
- * Might not work on all systems.
- */
-
-/*
-object Service "kernel" {
-  import "generic-service"
-
-  host_name = "localhost"
-  check_command = "kernel"
-}
-*/