[checkmk-commits] Check_MK Git: check_mk: clusters: removed version for Check_MK service output

Module: check_mk Branch: master Commit: 817df4e15db8190299c53511d94a85fe79ceb31c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=817df4e15db819… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jun 17 08:53:41 2013 +0200 clusters: removed version for Check_MK service output --- ChangeLog | 2 ++ modules/.f12 | 2 +- modules/check_mk_base.py | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3daa9f6..9b4f8e1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -19,6 +19,8 @@ * windows agent: no longer tries to execute directories * FIX: esx_vsphere_datastores: Fix incomplete performance data and Perf-O-Meter * fileinfo: no longer inventorize missing files(reported by windows agent) + * cluster hosts: removed agent version output from Check_MK service (this + was misleading for different agent versions on multiple nodes) Multisite: * User accounts can now be locked after a specified amount of auth diff --git a/modules/.f12 b/modules/.f12 index b1a4d0b..ab5e57d 100644 --- a/modules/.f12 +++ b/modules/.f12 @@ -1,3 +1,3 @@ -SITE=${SITE:-cmc} +SITE=${SITE:-$(omd sites --bare | head -n 1)} sudo cp -v *.py /omd/sites/$SITE/share/check_mk/modules/ sudo su - $SITE -c "cmk --debug -U" diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index d89c202..f79969f 100755 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -902,7 +902,7 @@ def do_check(hostname, ipaddress, only_check_types = None): status = exit_spec.get("wrong_version", 1) else: output = "" - if agent_version != None: + if not is_cluster(hostname) and agent_version != None: output += "Agent version %s, " % agent_version status = 0