Module: check_mk
Branch: master
Commit: be803bce57ed4f99ee7899ef815335df94870398
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=be803bce57ed4f…
Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de>
Date: Mon Sep 2 12:51:31 2013 +0200
Updated bug entries #1043
---
.bugs/1043 | 15 +++++++++++++++
1 file changed, 15 insertions(+)
diff --git a/.bugs/1043 b/.bugs/1043
new file mode 100644
index 0000000..613075f
--- /dev/null
+++ b/.bugs/1043
@@ -0,0 +1,15 @@
+Title: active check check_dns by default asks the wrong DNS server
+Component: checks
+State: open
+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
+but at the moment it does NOT: instead the resolver of the nagios machine is used
+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$
Module: check_mk
Branch: master
Commit: cace9e0ab8daaf3773c1f7e872b6e836806e8793
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cace9e0ab8daaf…
Author: Andreas Boesl <ab(a)mathias-kettner.de>
Date: Mon Sep 2 12:35:33 2013 +0200
Updated bug entries #1039
---
.bugs/1039 | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/.bugs/1039 b/.bugs/1039
index 4c1fa6d..899d7c1 100644
--- a/.bugs/1039
+++ b/.bugs/1039
@@ -1,9 +1,9 @@
Title: livestatus bug in OutputFormat: json
Component: livestatus
-State: open
+Class: bug
+State: done
Date: 2013-08-27 16:02:02
Targetversion: 1.2.3i2
-Class: bug
Hi,
@@ -84,3 +84,6 @@ interne Frage:
Der Bug ist in der 1.2.2p2 vorhanden, in der 1.2.3i1 aber bereits gefixt.
Was muessen wir auf den Stable-Branch mergen, damit das Problem auch in der
naechsten Stable-Version gefixt ist?
+
+2013-09-02 12:35:30: changed state open -> done
+Fix vom master nach 1.2.2 nachgezogen
Module: check_mk
Branch: master
Commit: 979e5815a7cd29ba4200ec49c6927507dc6ee638
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=979e5815a7cd29…
Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de>
Date: Mon Sep 2 12:35:26 2013 +0200
Updated bug entries #0973
---
.bugs/973 | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/.bugs/973 b/.bugs/973
index a9c2e24..20f3983 100644
--- a/.bugs/973
+++ b/.bugs/973
@@ -1,9 +1,9 @@
Title: problem in check options for check_dns
Component: checks
-State: open
+Class: bug
+State: done
Date: 2013-08-09 16:39:44
Targetversion: 1.2.3i2
-Class: bug
bin gerade in WATO auf einen Punkt gestoßen, den ich für einen Fehler
halte, und zwar beim Konfigurieren eines aktiven DNS-Checks unter
@@ -26,3 +26,7 @@ Ich hab mir in WATO erstmal durch Eingabe von '' (also leerem String)
geholfen. Ich bin noch nicht so vertraut mit Check_MK, daher wollte ich
lieber erstmal hier nachfragen - als Alternative zu einem Bug-Report.
+
+2013-09-02 12:35:21: changed state open -> done
+FIX: check_dns: parameter -A does not get an additional string
+it is handled as a boolean now
Module: check_mk
Branch: master
Commit: 03e86b6dcdf951d6578af231ae1bf2f98d74e2ec
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=03e86b6dcdf951…
Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de>
Date: Mon Sep 2 12:34:22 2013 +0200
FIX: check_dns: parameter -A does not get an additional string
---
ChangeLog | 1 +
checks/check_dns | 4 ++--
web/plugins/wato/active_checks.py | 18 ++++++------------
3 files changed, 9 insertions(+), 14 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index a63d4c1..74b134c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -74,6 +74,7 @@
* win_printers: Monitoring of printer queue on a windows printserver
* FIX: hr_mem: handle virtual memory correct on some devices
* FIX: apache_status agent plugin: now also works, if prog name contains slashes
+ * FIX: check_dns: parameter -A does not get an additional string
Notifications:
* notify.py: Matching service level: Use the hosts service level if a
diff --git a/checks/check_dns b/checks/check_dns
index 0a29dfe..1cf1c07 100644
--- a/checks/check_dns
+++ b/checks/check_dns
@@ -34,8 +34,8 @@ def check_dns_arguments(params):
if "expected_address" in settings:
args += ' -a %s' % quote_shell_string(settings["expected_address"])
- if "expected_authority" in settings:
- args += ' -A %s' % quote_shell_string(settings["expected_authority"])
+ if settings.get("expected_authority"):
+ args += ' -A'
if "response_time" in settings:
args += ' -w %d' % int(settings["response_time"][0])
diff --git a/web/plugins/wato/active_checks.py b/web/plugins/wato/active_checks.py
index 20bfb12..ef0b11a 100644
--- a/web/plugins/wato/active_checks.py
+++ b/web/plugins/wato/active_checks.py
@@ -54,19 +54,13 @@ register_rule(group,
"must end with a dot (.) " )),
),
( "expected_authority",
- TextAscii(
- title = _("Expected Authority"),
- allow_empty = False,
- help = _("Optional expect the DNS server to be authoriative"
- "for the lookup ")),
+ FixedValue(
+ value = True,
+ title = _("Expect Authoritative DNS Server"),
+ totext = _("Expect Authoritative"),
+ help = _("Optional expect the DNS server to be authoriative"
+ "for the lookup ")),
),
- #( "expected_authority",
- # FixedValue(
- # value = True,
- # title = _("Expect Authoritative DNS Server"),
- # totext = _("DNS Server must be authoritative for the lookup"),
- # )
-
( "response_time",
Tuple(
title = _("Expected response time"),
Module: check_mk
Branch: master
Commit: c48ed5d124bc0d068173cec2a116803948489069
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c48ed5d124bc0d…
Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de>
Date: Mon Sep 2 11:44:10 2013 +0200
fixing bug #0971: agent plugin apache_status now also works, if prog name contains slashes
---
ChangeLog | 1 +
agents/plugins/apache_status | 6 ++++--
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 40bb853..a63d4c1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -73,6 +73,7 @@
* df: Negative integer levels for MB left on a device
* win_printers: Monitoring of printer queue on a windows printserver
* FIX: hr_mem: handle virtual memory correct on some devices
+ * FIX: apache_status agent plugin: now also works, if prog name contains slashes
Notifications:
* notify.py: Matching service level: Use the hosts service level if a
diff --git a/agents/plugins/apache_status b/agents/plugins/apache_status
index df2ee7f..79d9de3 100755
--- a/agents/plugins/apache_status
+++ b/agents/plugins/apache_status
@@ -18,7 +18,7 @@
# It is also possible to override or extend the ssl_ports variable to make the
# check contact other ports than 443 with HTTPS requests.
-import os, sys, urllib2
+import os, sys, urllib2, re
config_dir = os.getenv("MK_CONFDIR", "/etc/check_mk")
config_file = config_dir + "/apache_status.conf"
@@ -43,7 +43,9 @@ def try_detect_servers():
if len(parts) < 7 or '/' not in parts[6]:
continue
- pid, proc = parts[6].split('/')
+ pid, proc = parts[6].split('/', 1)
+ to_replace = re.compile('^.*/')
+ proc = to_replace.sub('', proc)
procs = [ 'apache2', 'httpd', 'httpd2-prefork', 'httpd2-worker', 'httpd.worker' ]
# the pid/proc field length is limited to 19 chars. Thus in case of
Module: check_mk
Branch: master
Commit: def49b5f52b89bc31972cdfc75453fef9f76620e
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=def49b5f52b89b…
Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de>
Date: Mon Sep 2 11:45:11 2013 +0200
Updated bug entries #0971
---
.bugs/971 | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/.bugs/971 b/.bugs/971
index e1a7fa3..f05e062 100644
--- a/.bugs/971
+++ b/.bugs/971
@@ -1,9 +1,9 @@
Title: apache_status agent plugin: Problem at split if more than one slash in output
Component: checks
-State: open
+Class: bug
+State: done
Date: 2013-08-09 14:57:53
Targetversion: 1.2.3i2
-Class: bug
I just installed the agents plugin apache_status (the version from release 1.2.2p2) on several of my machines.
On one of the machines it bugs however:
@@ -31,3 +31,6 @@ tcp6 0 0 :::443 :::* LISTEN
----
Note the ./ts3server_li entries.
Since there is more than 1 slash in the line, the split will return more than the expected 2 results.
+
+2013-09-02 11:45:03: changed state open -> done
+agent plugin apache_status now also works, if prog name contains slashes
Module: check_mk
Branch: master
Commit: 5ff6544284c3918610dad1350da42632c14f1ff9
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5ff6544284c391…
Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de>
Date: Mon Sep 2 10:53:17 2013 +0200
Updated bug entries #1039
---
.bugs/1039 | 23 +++++++++++++++++++++++
1 file changed, 23 insertions(+)
diff --git a/.bugs/1039 b/.bugs/1039
index b8da79a..4c1fa6d 100644
--- a/.bugs/1039
+++ b/.bugs/1039
@@ -61,3 +61,26 @@ soweit nachvollziehen kann.
In der 1.1.10p3 war dieser Bug definitiv nicht drin.
Getestet habe ich mit den Nagios Versionen 3.2.1 und 3.5.0, bei beiden tritt diese falsche JSON Kodierung auf.
+
+
+2013-09-02 bs:
+das letzte Komma ist definitiv falsch
+Der Bug ist in der 1.2.2p2 vorhanden, in der 1.2.3i1 aber bereits gefixt,
+da ist das Komma nicht drin:
+
+OMD[bs2nd]:~/testdata$ (echo 'GET services'; echo 'Columns: host_name comments_with_info'; echo 'Filter: host_name = localhost'; echo 'OutputFormat: json') | unixcat ~/tmp/run/live
+[["localhost",[]],
+["localhost",[]],
+["localhost",[]],
+["localhost",[]],
+["localhost",[]],
+["localhost",[]],
+["localhost",[]],
+["localhost",[[1,"omdadmin","test for comment bug"],[2,"omdadmin","Testing"]]]]
+
+
+2013-09-02 bs:
+interne Frage:
+Der Bug ist in der 1.2.2p2 vorhanden, in der 1.2.3i1 aber bereits gefixt.
+Was muessen wir auf den Stable-Branch mergen, damit das Problem auch in der
+naechsten Stable-Version gefixt ist?