Module: check_mk
Branch: master
Commit: 2e5d57d3d75fbabc58cdd6b6b9ba82f86a085207
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2e5d57d3d75fba…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Fri Oct 18 13:22:35 2013 -0500
FIX: check_dns: default to querying the host itself
---
.bugs/1042 | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++----
.bugs/1043 | 6 ++++--
ChangeLog | 1 +
checks/check_dns | 2 ++
4 files changed, 60 insertions(+), 6 deletions(-)
diff --git a/.bugs/1042 b/.bugs/1042
index 33a0e20..a0cc70d 100644
--- a/.bugs/1042
+++ b/.bugs/1042
@@ -5,7 +5,56 @@ Date: 2013-08-30 15:48:55
Targetversion: 1.2.3
Class: bug
-Problems in Multisite GUI if apache is running with mpm
-prefork works
-so the package should depend on apache2-mpm
-but at least the deb for ubuntu 13.04 64bit does not, maybe others too
+Problems in Multisite GUI if apache is running with mpm prefork works so the
+package should depend on apache2-mpm but at least the deb for ubuntu 13.04
+64bit does not, maybe others too
+
+Here is the fix. Important for the future: when supporting a new distribution
+we must not copy the file from
omdistro.org, but create one ourselves, since
+we have several changes in that file.
+
+
+diff --git a/distros/Makefile.UBUNTU_12.10 b/distros/Makefile.UBUNTU_12.10
+index af1cd7f..dc075b9 100644
+--- a/distros/Makefile.UBUNTU_12.10
++++ b/distros/Makefile.UBUNTU_12.10
+@@ -33,8 +33,8 @@ BUILD_PACKAGES += apache2-threaded-dev # compiling mod_python
+ BUILD_PACKAGES += apache2 # compiling mod_python
+ BUILD_PACKAGES += libncurses5-dev # compiling mod-gearman
+ BUILD_PACKAGES += dietlibc-dev # is not really needed, but useful for cmk components
+-BUILD_PACKAGES += libpcap-dev # needed for CMC
+-BUILD_PACKAGES += gettext # needed for german l10n
++BUILD_PACKAGES += libpcap-dev # needed for CMC
++BUILD_PACKAGES += gettext # needed for german l10n
+ OS_PACKAGES =
+ OS_PACKAGES += time # needed for mk-job
+ OS_PACKAGES += traceroute # needed for Check_MK parent scan
+diff --git a/distros/Makefile.UBUNTU_13.04 b/distros/Makefile.UBUNTU_13.04
+index 5895796..8cbe9b1 100644
+--- a/distros/Makefile.UBUNTU_13.04
++++ b/distros/Makefile.UBUNTU_13.04
+@@ -1,5 +1,6 @@
+ DISTRO_CODE = raring
+ BUILD_PACKAGES =
++BUILD_PACKAGES += smbclient
+ BUILD_PACKAGES += build-essential
+ BUILD_PACKAGES += dpatch
+ BUILD_PACKAGES += dnsutils
+@@ -31,6 +32,9 @@ BUILD_PACKAGES += snmp
+ BUILD_PACKAGES += apache2-threaded-dev # compiling mod_python
+ BUILD_PACKAGES += apache2 # compiling mod_python
+ BUILD_PACKAGES += libncurses5-dev # compiling mod-gearman
++BUILD_PACKAGES += dietlibc-dev # is not really needed, but useful for cmk components
++BUILD_PACKAGES += libpcap-dev # needed for CMC
++BUILD_PACKAGES += gettext # needed for german l10n
+ OS_PACKAGES =
+ OS_PACKAGES += time # needed for mk-job
+ OS_PACKAGES += traceroute # needed for Check_MK parent scan
+@@ -42,6 +46,7 @@ OS_PACKAGES += fping
+ OS_PACKAGES += graphviz
+ OS_PACKAGES += libapache2-mod-fcgid
+ OS_PACKAGES += libapache2-mod-proxy-html
++OS_PACKAGES += apache2-mpm-prefork # Multisite/mod_python crashes with mpm-worker!
+ OS_PACKAGES += libboost-program-options1.49.0
+ OS_PACKAGES += libdbi1
+ OS_PACKAGES += libevent-1.4-2
diff --git a/.bugs/1043 b/.bugs/1043
index 613075f..39992ea 100644
--- a/.bugs/1043
+++ b/.bugs/1043
@@ -1,9 +1,9 @@
Title: active check check_dns by default asks the wrong DNS server
Component: checks
-State: open
+Class: bug
+State: done
Date: 2013-09-02 12:46:49
Targetversion: 1.2.3i2
-Class: bug
if I add a check_dns active check to a server by a wato rule without any additional
parameters, I expect it to check the DNS server on *this* machine
@@ -13,3 +13,5 @@ to determine which DNS server to send the name query to
the change would be the following:
as long as -s is not entered separately in the rule, the -s parameter should be
set to $HOSTADDRESS$
+
+2013-10-18 13:22:41: changed state open -> done
diff --git a/ChangeLog b/ChangeLog
index c4159ec..afc198b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -55,6 +55,7 @@
* FIX: local: tolerate invalid output lines
* FIX: hp_proliant: Correct handling of missing snmp data
* FIX: logwatch.ec: No longer forwards "I" lines to event console
+ * FIX: check_dns: default to querying the host itself
WATO:
* You can now have site-specific global settings when using
diff --git a/checks/check_dns b/checks/check_dns
index 1cf1c07..f655577 100644
--- a/checks/check_dns
+++ b/checks/check_dns
@@ -30,6 +30,8 @@ def check_dns_arguments(params):
if "server" in settings:
args += ' -s %s' % quote_shell_string(settings["server"])
+ else:
+ args += " -s '$HOSTADDRESS$'"
if "expected_address" in settings:
args += ' -a %s' %
quote_shell_string(settings["expected_address"])