From ff3de818f6387b846eae22b393a9a4d198c7bbec Mon Sep 17 00:00:00 2001 From: Gunnar Beutner Date: Tue, 13 May 2014 06:59:00 +0200 Subject: [PATCH] Move kernel check to the Debian package directory. Refs #6012 --- debian/config/kernel.conf | 13 +++++++++++++ debian/icinga2-common.install | 1 + etc/CMakeLists.txt | 1 - etc/icinga2/conf.d/hosts/localhost/kernel.conf | 13 ------------- 4 files changed, 14 insertions(+), 14 deletions(-) create mode 100644 debian/config/kernel.conf delete mode 100644 etc/icinga2/conf.d/hosts/localhost/kernel.conf diff --git a/debian/config/kernel.conf b/debian/config/kernel.conf new file mode 100644 index 000000000..0f8907379 --- /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 d6b0451a5..e3ade60de 100644 --- 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 e2d869bc7..154fab4ae 100644 --- 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 index 1a8f55d96..000000000 --- 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" -} -*/ -- 2.40.0