[checkmk-commits] Check_MK Git: check_mk: Remove 'Agent version (unknown)' for SNMP-only hosts

Module: check_mk Branch: master Commit: 793effada7d03f1c492b9dec3dda058bb1eb6635 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=793effada7d03f… Author: Mathias Kettner &lt;mk(a)mathias-kettner.de&gt; Date: Mon Aug 22 15:54:59 2011 +0200 Remove 'Agent version (unknown)' for SNMP-only hosts --- .bugs/181 | 14 ++++++++++---- ChangeLog | 1 + modules/check_mk_base.py | 18 ++++++++++-------- 3 files changed, 21 insertions(+), 12 deletions(-) diff --git a/.bugs/181 b/.bugs/181 index ace4d98..2de5fac 100644 --- a/.bugs/181 +++ b/.bugs/181 @@ -1,9 +1,15 @@ Title: Check_MK Dienst zeigt "Agent version (unknown)" bei nur SNMP hosts Component: core +State: done +Class: cleanup +Date: 2011-03-17 11:55:38 Benefit: 1 -State: open Cost: 2 -Date: 2011-03-17 11:55:38 -Class: cleanup +Fun: 0 + +Das ist letztlich nur ein Schönheitsfehler. Man sollte den String bei reinen SNMP Checks +einfach komplett rausnehmen. Oder vielleicht die SNMP Version dort anzeigen - das (unknown) +ist eher verwirrend. -Das ist letztlich nur ein Schönheitsfehler. Man sollte den String bei reinen SNMP Checks einfach komplett rausnehmen. Oder vielleicht die SNMP Version dort anzeigen - das (unknown) ist eher verwirrend. +2011-08-22 15:54:42: changed state open -> done +Der Text wird jetzt einfach weggelassen, wenn es ein SNMP host ist. diff --git a/ChangeLog b/ChangeLog index b41bbda..1734417 100644 --- a/ChangeLog +++ b/ChangeLog @@ -13,6 +13,7 @@ * Remove .f12 compile helper files from agents directory * Output missing sections in case of "WARNING - Only __ output of __..." * Remove obsolete code of snmp_info_single + * Remove 'Agent version (unknown)' for SNMP-only hosts Checks & Agents: * FIX: hr_mem: take into account cache and buffers diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index 8fd7fa7..44ce064 100755 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -679,25 +679,27 @@ def do_check(hostname, ipaddress): num_errors = len(error_sections) save_counters(hostname) if problems: - output = "CRIT - %s" % problems + output = "CRIT - %s, " % problems status = 2 elif num_errors > 0 and num_success > 0: - output = "WARN - Missing agent sections: %s" % ", ".join(error_sections) + output = "WARN - Missing agent sections: %s - " % ", ".join(error_sections) status = 1 elif num_errors > 0: - output = "CRIT - Got no information from host" + output = "CRIT - Got no information from host, " status = 2 elif agent_min_version and agent_version < agent_min_version: - output = "WARN - old plugin version %s (should be at least %s)" % (agent_version, agent_min_version) + output = "WARN - old plugin version %s (should be at least %s), " % (agent_version, agent_min_version) status = 1 else: - output = "OK - Agent version %s" % agent_version + output = "OK - " + if agent_version != None: + output += "Agent version %s, " % agent_version status = 0 except MKGeneralException, e: if opt_debug: raise - output = "UNKNOWN - %s" % e + output = "UNKNOWN - %s, " % e status = 3 if aggregate_check_mk: @@ -708,7 +710,7 @@ def do_check(hostname, ipaddress): raise run_time = time.time() - start_time - output += ", execution time %.1f sec|execution_time=%.3f\n" % (run_time, run_time) + output += "execution time %.1f sec|execution_time=%.3f\n" % (run_time, run_time) sys.stdout.write(output) sys.exit(status) @@ -809,7 +811,7 @@ def do_all_checks_on_host(hostname, ipaddress): version_info = get_host_info(hostname, ipaddress, 'check_mk') agent_version = version_info[0][1] else: - agent_version = "(unknown)" + agent_version = None except MKAgentError, e: g_broken_agent_hosts.add(hostname) agent_version = "(unknown)"