Module: check_mk
Branch: master
Commit: b649d8d74b5c1b6b32e40d65d4d76e1e89c1f32e
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b649d8d74b5c1b…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Thu Mar 29 16:05:40 2012 +0200
FIX: Cluster host checks were UNKNOWN all the time
---
ChangeLog | 3 +++
modules/check_mk.py | 4 ++--
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index f5511bc..52b357d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,7 @@
1.2.0b2:
+ Core:
+ * FIX: Cluster host checks were UNKNOWN all the time
+
WATO:
* Added new permission "move hosts" to allow/deny moving of hosts in WATO
* Also write out contact definitions for users without contactgroups to
diff --git a/modules/check_mk.py b/modules/check_mk.py
index b022c49..535674d 100755
--- a/modules/check_mk.py
+++ b/modules/check_mk.py
@@ -1457,7 +1457,7 @@ def create_nagios_hostdefs(outfile, hostname):
try:
ip = lookup_ipaddress(hostname)
except:
- if not is_cluster(hostname):
+ if not is_clust:
raise MKGeneralException("Cannot determine ip address of %s. Please add to ipaddresses." % hostname)
ip = None
@@ -1479,7 +1479,7 @@ def create_nagios_hostdefs(outfile, hostname):
if is_clust and ip: # Do check cluster IP address if one is there
outfile.write(" check_command\t\t\tcheck-mk-ping!%s\n" % ping_args)
elif ping_args and is_clust: # use check_icmp in cluster mode
- outfile.write(" check_command\t\t\tcheck-mk-ping-cluster!%s\n" % args)
+ outfile.write(" check_command\t\t\tcheck-mk-ping-cluster!%s\n" % ping_args)
elif ping_args: # use special arguments
outfile.write(" check_command\t\t\tcheck-mk-ping!%s\n" % ping_args)
Module: check_mk
Branch: master
Commit: de1774d9f86ffcbe1674867b4531573bf1b886da
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=de1774d9f86ffc…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Thu Mar 29 14:36:14 2012 +0200
FIX: Group filters can handle groups without aliases now
---
ChangeLog | 1 +
web/plugins/views/filters.py | 3 ++-
2 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 51d510c..f5511bc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -21,6 +21,7 @@
* FIX: Oracle checks try to handle ORA-* errors reported by the agent
All oracle checks will return UNKNOWN when finding an ORA-* message
* FIX: filesystem levels set via WATO didn't work, but do now
+ * FIX: Group filters can handle groups without aliases now
1.2.0b1:
Core, Setup, etc.:
diff --git a/web/plugins/views/filters.py b/web/plugins/views/filters.py
index bc5f8ad..728a8da 100644
--- a/web/plugins/views/filters.py
+++ b/web/plugins/views/filters.py
@@ -80,7 +80,8 @@ def all_groups(what):
groups = dict(html.live.query("GET %sgroups\nColumns: name alias\n" % what))
names = groups.keys()
names.sort()
- return [ (name, groups[name]) for name in names ]
+ # use alias by default but fallback to name if no alias defined
+ return [ (name, groups[name] or name) for name in names ]
class FilterGroupCombo(Filter):
def __init__(self, what, title, enforce):