Checkmk git commits August 2011

checkmk-commits@lists.checkmk.com

3 participants
272 discussions

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

by git＠mathias-kettner.de

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 <mk(a)mathias-kettner.de> 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)"

12 years, 10 months

Check_MK Git: check_mk: Removed obsolete code of snmp_info_single

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 56b3f060ece92f678837536d6c6ab44deba7da01 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=56b3f060ece92f… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Aug 22 15:46:03 2011 +0200 Removed obsolete code of snmp_info_single --- .bugs/110 | 13 ++++++++++--- ChangeLog | 1 + doc/helpers/validate_checks | 2 +- modules/check_mk.py | 6 +----- modules/check_mk_base.py | 14 -------------- modules/snmp.py | 42 ------------------------------------------ 6 files changed, 13 insertions(+), 65 deletions(-) diff --git a/.bugs/110 b/.bugs/110 index 5583786..4614bea 100644 --- a/.bugs/110 +++ b/.bugs/110 @@ -1,10 +1,17 @@ Title: Remove obsolete code of snmp_info_single Component: core +State: done +Class: cleanup +Date: 2011-01-27 09:39:10 Benefit: 1 -State: open Cost: 1 -Date: 2011-01-27 09:39:10 -Class: cleanup +Fun: 0 Obsolete code formerly used by snmp_info_single should be removed from the code. + +Seems that no (shipped) check uses this anymore, so we can go +forward. The documentation does not mention this anyway. + +2011-08-22 15:44:37: changed state open -> done +Removed the code. diff --git a/ChangeLog b/ChangeLog index 6f0c22e..b41bbda 100644 --- a/ChangeLog +++ b/ChangeLog @@ -12,6 +12,7 @@ * Show datasource program on cmk -D * 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 Checks & Agents: * FIX: hr_mem: take into account cache and buffers diff --git a/doc/helpers/validate_checks b/doc/helpers/validate_checks index 65b97d4..49fcc41 100755 --- a/doc/helpers/validate_checks +++ b/doc/helpers/validate_checks @@ -82,7 +82,7 @@ def get_all_checks(): return k def is_snmp_check(check): - return check in snmp_info or check in snmp_info_single + return check in snmp_info def all_nonfunction_vars(): return set([ name for name,value in globals().items() if name[0] != '_' and type(value) != type(lambda:0) ]) diff --git a/modules/check_mk.py b/modules/check_mk.py index 2d8d9f9..328a2d2 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -317,7 +317,6 @@ check_default_levels = {} # dictionary-configured checks declare t factory_settings = {} # factory settings for dictionary-configured checks check_config_variables = [] # variables (names) in checks/* needed for check itself snmp_info = {} # whichs OIDs to fetch for which check (for tabular information) -snmp_info_single = {} # similar, but for single SNMP variables (MIB-Name BASE-OID List-of-Suffixes) snmp_scan_functions = {} # SNMP autodetection @@ -612,7 +611,7 @@ def get_snmp_character_encoding(hostname): def check_uses_snmp(check_type): check_name = check_type.split(".")[0] - return snmp_info.has_key(check_name) or snmp_info_single.has_key(check_name) + return snmp_info.has_key(check_name) def is_snmp_host(hostname): return in_binary_hostlist(hostname, snmp_hosts) @@ -2266,7 +2265,6 @@ no_inventory_possible = None "check_config_variables = []\n" + "check_default_levels = {}\n" + "snmp_info = {}\n" + - "snmp_info_single = {}\n" + "snmp_scan_functions = {}\n") for filename in filenames: @@ -2650,8 +2648,6 @@ def show_check_manual(checkname): agent = agent.strip() ags.append({ "vms" : "VMS", "linux":"Linux", "aix": "AIX", "solaris":"Solaris", "windows":"Windows", "snmp":"SNMP"}.get(agent, agent.upper())) print_splitline(header_color_left, "Supported Agents: ", header_color_right, ", ".join(ags)) - if checkname in snmp_info_single: - print_splitline(header_color_left, "Required MIB: ", header_color_right, snmp_info_single[checkname][0]) empty_line() print_textbody(header['description']) diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index 23f7dbe..8fd7fa7 100755 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -329,20 +329,6 @@ def get_realhost_info(hostname, ipaddress, checkname, max_cache_age): write_cache_file(cache_relpath, repr(table) + "\n") return table - # now try SNMP explicity values - try: - mib, baseoid, suffixes = snmp_info_single[checkname] - except: - baseoid = None - if baseoid: - content = read_cache_file(cache_relpath, max_cache_age) - if content: - return eval(content) - table = get_snmp_explicit(hostname, ipaddress, mib, baseoid, suffixes) - store_cached_checkinfo(hostname, checkname, table) - write_cache_file(cache_relpath, repr(table) + "\n") - return table - # No SNMP check. Then we must contact the check_mk_agent. Have we already # to get data from the agent? If yes we must not do that again! Even if # no cache file is present diff --git a/modules/snmp.py b/modules/snmp.py index 4d5450e..211a164 100644 --- a/modules/snmp.py +++ b/modules/snmp.py @@ -70,48 +70,6 @@ def convert_from_hex(value): def oid_to_bin(oid): return u"".join([ unichr(int(p)) for p in oid.strip(".").split(".") ]) -# Fetch single values via SNMP. This function is only used by snmp_info_single, -# which is only rarely used. Most checks use snmp_info, which is handled by -# get_snmp_table. -def get_snmp_explicit(hostname, ipaddress, mib, baseoid, suffixes): - if opt_debug: - sys.stderr.write('Fetching misc values from OID %s%s%s%s from IP %s\n' % \ - (tty_bold, tty_green, baseoid, tty_normal, ipaddress)) - - info = [] - cmd = snmp_walk_command(hostname) - for suffix in suffixes: - if mib: - mibinfo = " -m %s" % mib - else: - mibinfo = "" - portspec = snmp_port_spec(hostname) - command = cmd + "%s -OQ -OU -Oe %s%s %s.%s 2>/dev/null" % \ - (mibinfo, ipaddress, portspec, baseoid, suffix) - if opt_debug: - sys.stderr.write(' Running %s\n' % (command,)) - num_found = 0 - snmp_process = os.popen(command, "r") - for line in snmp_process.readlines(): - if not '=' in line: # TODO: join onto previous line - continue - item, value = line.split("=") - value_text = strip_snmp_value(value) - # try to remove text, only keep number - value_num = value_text.split(" ")[0] - value_num = value_num.lstrip("+") - value_num = value_num.rstrip("%") - item = strip_snmp_value(item.split(":")[-1]) - if item.endswith(".0"): - item = item[:-2] - info.append( [ item, value_num, value_text ] ) - num_found += 1 - exitstatus = snmp_process.close() - if exitstatus: - if opt_verbose: - sys.stderr.write(tty_red + tty_bold + "ERROR: " + tty_normal + "SNMP error\n") - raise MKSNMPError("SNMP Error on %s" % ipaddress) - return info def snmpwalk_on_suboid(hostname, ip, oid): portspec = snmp_port_spec(hostname)

12 years, 10 months

Check_MK Git: check_mk: Updated bug entries

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 70744a4db6f3db9be853ce871f31ee806a58f0fe URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=70744a4db6f3db… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Aug 22 15:45:51 2011 +0200 Updated bug entries --- .bugs/102 | 10 +++++++--- .bugs/135 | 8 +++++++- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/.bugs/102 b/.bugs/102 index dce6241..b3831c2 100644 --- a/.bugs/102 +++ b/.bugs/102 @@ -1,12 +1,16 @@ Title: SNMP scan gets OID twice Component: core +State: done +Class: nastiness +Date: 2011-01-24 15:07:41 Benefit: 1 -State: open Cost: 1 -Date: 2011-01-24 15:07:41 -Class: nastiness +Fun: 0 In some scan functions 1.3.6.1.2.1.1.1.0 is used, in other ones .1.3.6.1.2.1.1.1.0. Therefore the OID is fetched twice. Either fix all checks or automatically normalize OIDs to always or never begin with a dot. + +2011-08-22 15:14:01: changed state open -> done +All checks are now normalized to using .1.3.6.1 (with dot) diff --git a/.bugs/135 b/.bugs/135 index be65c0a..7138ada 100644 --- a/.bugs/135 +++ b/.bugs/135 @@ -7,4 +7,10 @@ Date: 2011-02-15 10:02:09 Class: cleanup When calling check_mk --help the config check should -be skipped. +be skipped. Same holds for --version (and maybe others +like --packager). + +We also could restrict the config check positively +to -C, -U, -R, -O (all code that actually influences +the productive Nagios daemon). +

12 years, 10 months

Check_MK Git: check_mk: Perf-O-Meter: strip arguments from command (after ! )

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: c92a80bef4f7acb894fca554dc651a3a36d1882c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c92a80bef4f7ac… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Aug 22 15:08:50 2011 +0200 Perf-O-Meter: strip arguments from command (after !) --- .bugs/263 | 10 +++++++--- ChangeLog | 2 ++ web/plugins/views/perfometer.py | 3 +++ 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/.bugs/263 b/.bugs/263 index a5c76f2..626605b 100644 --- a/.bugs/263 +++ b/.bugs/263 @@ -1,13 +1,17 @@ Title: Perf-O-Meter should not honor command arguments Component: multisite +State: done +Class: cleanup +Date: 2011-05-04 12:41:53 Benefit: 1 -State: open Cost: 1 -Date: 2011-05-04 12:41:53 -Class: cleanup +Fun: 0 When creating perfometers for custom commands (such as legacy checks) it would be better, if the Perf-O-Meter would not honor the complete check command but drop everything after the first !. check_http!www.hirni.de!123 should display the Perf-O-Meter of check_http, without the !... + +2011-08-22 15:08:11: changed state open -> done +Done. We strip everything after ! diff --git a/ChangeLog b/ChangeLog index e2db174..6f0c22e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -40,6 +40,8 @@ * Man-Pages of Check_MK checks shown in Multisite honor OMD's local hierarchy * nicer output of substates, translate (!) and (!!) into HTML code * new command for clearing modified attributes (red cross, green checkmark) + * Perf-O-Meters: strip away arguments from check_command (e.g. + "check-foo!17!31" -> "check-foo"). WATO: * Show error message in case of empty inventory due to agent error diff --git a/web/plugins/views/perfometer.py b/web/plugins/views/perfometer.py index 9506e77..126512b 100644 --- a/web/plugins/views/perfometer.py +++ b/web/plugins/views/perfometer.py @@ -115,6 +115,9 @@ def paint_perfometer(row): else: check_command = row["service_check_command"] + # Strip away arguments like in "check_http!-H mathias-kettner.de" + check_command = check_command.split("!")[0] + # Find matching perf-o-meter function perf_painter = perfometers.get(check_command) if not perf_painter:

12 years, 10 months

Check_MK Git: check_mk: text_area: show error, add default value, content quoting

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 316532c7870d19ecf4434555242b3e743abbff05 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=316532c7870d19… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Aug 22 14:57:09 2011 +0200 text_area: show error, add default value, content quoting --- .bugs/15 | 17 ++++++++++++++--- .bugs/261 | 8 ++++++++ .bugs/313 | 10 +++++++--- .bugs/46 | 13 +++++++++++++ .bugs/97 | 11 ++++++++++- web/htdocs/check_mk.css | 2 +- web/htdocs/htmllib.py | 20 +++++++++++++++----- web/htdocs/views.py | 8 +++++--- 8 files changed, 73 insertions(+), 16 deletions(-) diff --git a/.bugs/15 b/.bugs/15 index 9117096..30e9aa5 100644 --- a/.bugs/15 +++ b/.bugs/15 @@ -1,13 +1,24 @@ Title: Counter-Wrap: bei service aggregation fehlen Checks Component: core +State: wontfix +Class: nastiness +Date: 2010-12-21 12:14:07 Benefit: 1 -State: open Cost: 3 -Date: 2010-12-21 12:14:07 -Class: nastiness +Fun: 0 Wenn ein Counter Wrap passiert und der check selbst die Exception nicht abfängt, dann wird das Ergebnis nicht an Nagios weitergeleitet. Der Service wird auch nicht in die aggregierten Services eines Summary Hosts aufgenommen. Das kann dazu führen, dass die Anzahl der Services in einem Summary-Host variabel ist. + +Das Problem ist, dass das Problem nur schwer zu lösen ist. Man müsste ja +den aktuellen Status der fehlenden Checks per Livestatus ermitteln, was +natürlich ein viel zu großer Häck wäre, der nicht in Frage kommt. + +Daher: wir lassen das Problem bestehen. Die Service Aggregation ist +ohnehin ein Auslaufmodell, dass mit zunehmend stabilem BI überflüssig +ist und früher oder später rausfliegt. + +2011-08-22 14:20:05: changed state open -> wontfix diff --git a/.bugs/261 b/.bugs/261 index 21fb7e5..9482830 100644 --- a/.bugs/261 +++ b/.bugs/261 @@ -11,3 +11,11 @@ uses a different scheme for the service description. Make all checks use "Temperature %s". Also use a common PNP-template that handles a missing WARN/CRIT. Maybe use a common code base, if this makes sense. + +We also need a tool for renaming service descriptions later on +without loosing history data. That way we have a migration +path - at least for OMD. This includes: + +- Events in Nagios log files +- RRDs +- ??? diff --git a/.bugs/313 b/.bugs/313 index 55b9918..b60d155 100644 --- a/.bugs/313 +++ b/.bugs/313 @@ -1,12 +1,16 @@ Title: htmllib: text_area does not have default value Component: multisite +State: done +Class: nastiness +Date: 2011-07-22 10:48:50 Benefit: 1 -State: open Cost: 1 -Date: 2011-07-22 10:48:50 -Class: nastiness +Fun: 0 The function htmllib.text_area should accept a default value, just as all other input elements. Furthermore the quoting for > and < is missing. And yet furthermore the complain about a bad user input is not visualized. + +2011-08-22 14:56:49: changed state open -> done +All three topics fixed. diff --git a/.bugs/46 b/.bugs/46 index 49cd147..838b7f2 100644 --- a/.bugs/46 +++ b/.bugs/46 @@ -19,3 +19,16 @@ Visualisierung machen. Kernel (Context switches) und diskstat ist bereits umgestellt. Unklar, was noch fehlt. Aktuell fällt mir z.B. die Linux-NICS ein. Winperf auch? + +winperf --> Macht nix: wird durch winperf_* ersetzt +diskstat.include --> Macht nix: nur noch für den legacy modus +fc_brocade_port --> Macht nix: wird durch brocade_fcport ersetzt +fc_brocade_port_detailed --> Macht nix: wird durch brocade_fcport ersetzt +netctr --> Macht nix: wird durch lnx_if abgelöst +vms_netif --> Macht nix: verwendet eh kaum jemand + +Bleiben drei Checks: + +aironet_errors +statgrab_disk +statgrab_net diff --git a/.bugs/97 b/.bugs/97 index f2cedac..572e8a1 100644 --- a/.bugs/97 +++ b/.bugs/97 @@ -2,10 +2,19 @@ Title: Restart nagios on OMD - use OMD method Component: core Benefit: 1 State: open -Cost: 1 +Cost: 2 Date: 2011-01-22 13:53:40 Class: cleanup When doing a restart of Nagios or a config check while running under OMD, then better not call the start scripts directly, but use omd to do this 'omd restart nagios'. + +Solution: if we detect OMD then do not use the value from defaults, +but directly call 'omd re{start,load} core'. + +Problem is: I've just fixed a problem in OMD (2011-08-22), that +makes 'omd restart core' work in the first place. + +--> better wait a time until all Check_MK users surely use + OMD versions that have that fix. diff --git a/web/htdocs/check_mk.css b/web/htdocs/check_mk.css index 372faae..7ba718b 100644 --- a/web/htdocs/check_mk.css +++ b/web/htdocs/check_mk.css @@ -970,7 +970,7 @@ table.boxlayout td.boxcolumn { } -.inputerror input { +.inputerror input, .inputerror textarea { background-color: #f84; } diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index 2b12878..4183ae6 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -63,8 +63,8 @@ class uriinfo: if i[0] not in omit ]) -# Encode HTML attributes: replace " with " This code -# is slow. +# Encode HTML attributes: replace " with ", also replace +# < and >. This code is slow. def attrencode(value): if type(value) == int: return str(value) @@ -72,6 +72,10 @@ def attrencode(value): for c in value: if c == '"': new += """ + elif c == '<': + new += "<" + elif c == '>': + new += ">" else: new += c return new @@ -337,9 +341,15 @@ class html: self.write(html) self.form_vars.append(varname) - def text_area(self, varname, rows): - value = self.req.vars.get(varname, "") - self.write("<textarea name=\"%s\">%s</textarea>\n" % (varname, value)) + def text_area(self, varname, deflt="", rows=8): + value = self.req.vars.get(varname, deflt) + error = self.user_errors.get(varname) + if error: + self.write("<x class=inputerror>") + self.write("<textarea name=\"%s\">%s</textarea>\n" % (varname, attrencode(value))) + if error: + self.write("</x>") + self.set_focus(varname) self.form_vars.append(varname) def sorted_select(self, varname, options, deflt="", onchange=None): diff --git a/web/htdocs/views.py b/web/htdocs/views.py index 4f11b50..74be45a 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -384,7 +384,9 @@ def page_edit_views(msg=None): view = html.multisite_views[(owner, viewname)] if owner == html.req.user or (view["public"] and (owner == "" or config.user_may(owner, "publish_views"))): if first: - html.write("<tr><th>Name</th><th>Title / Description</th><th>Owner</th><th>Public</th><th>linked</th><th>Datasource</th><th></th></tr>\n") + html.write("<tr><th>Name</th><th>Title / Description</th>" + "<th>Owner</th><th>Public</th><th>linked</th>" + "<th>Datasource</th><th></th></tr>\n") first = False html.write("<tr><td class=legend>%s</td>" % viewname) html.write("<td class=content>") @@ -394,7 +396,7 @@ def page_edit_views(msg=None): html.write(view["title"]) description = view.get("description") if description: - html.write("<br><div class=viewdescription>%s</div>" % description) + html.write("<br><div class=viewdescription>%s</div>" % htmllib.attrencode(description)) html.write("</td>") if owner == "": ownertxt = "<i>builtin</i>" @@ -534,7 +536,7 @@ def page_edit_view(): html.write("</td></tr>\n") html.write("<tr><td class=legend>" + _("Description") + "</td><td class=content>") - html.text_area("view_description", 4) + html.text_area("view_description", "", 4) html.write("</td></tr>\n") # Larger sections are foldable and closed by default

12 years, 10 months

Check_MK Git: check_mk: Output missing sections in case of " WARNING - Only __ output of"

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 2640aa0f1b0d5183fcfb468d41e5b5a80dc9c730 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2640aa0f1b0d51… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Aug 22 13:45:42 2011 +0200 Output missing sections in case of "WARNING - Only __ output of" --- .bugs/314 | 10 +++++++--- ChangeLog | 1 + modules/check_mk_base.py | 20 ++++++++++++-------- 3 files changed, 20 insertions(+), 11 deletions(-) diff --git a/.bugs/314 b/.bugs/314 index 970a8c6..de48a6c 100644 --- a/.bugs/314 +++ b/.bugs/314 @@ -1,10 +1,14 @@ Title: WARNING - Got only 15 out of 18 infos: which? Component: core +State: done +Class: nastiness +Date: 2011-07-22 10:49:16 Benefit: 1 -State: open Cost: 2 -Date: 2011-07-22 10:49:16 -Class: nastiness +Fun: 0 When this error occurs, we should output the list of missing agent sections (i.e. *which* information is missing). + +2011-08-22 13:45:06: changed state open -> done +Missing section names are now output. diff --git a/ChangeLog b/ChangeLog index c6dd74a..e2db174 100644 --- a/ChangeLog +++ b/ChangeLog @@ -11,6 +11,7 @@ style FUNC(checkname, info) is still supported but deprecated. * Show datasource program on cmk -D * Remove .f12 compile helper files from agents directory + * Output missing sections in case of "WARNING - Only __ output of __..." 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 a6b2009..23f7dbe 100755 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -689,19 +689,20 @@ def do_check(hostname, ipaddress): try: load_counters(hostname) - agent_version, num_success, num_errors, problems = do_all_checks_on_host(hostname, ipaddress) + agent_version, num_success, error_sections, problems = do_all_checks_on_host(hostname, ipaddress) + num_errors = len(error_sections) save_counters(hostname) if problems: output = "CRIT - %s" % problems status = 2 elif num_errors > 0 and num_success > 0: - output = "WARNING - Got only %d out of %d infos" % (num_success, num_success + num_errors) + output = "WARN - Missing agent sections: %s" % ", ".join(error_sections) status = 1 elif num_errors > 0: output = "CRIT - Got no information from host" status = 2 elif agent_min_version and agent_version < agent_min_version: - output = "WARNING - 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 @@ -736,7 +737,7 @@ def do_all_checks_on_host(hostname, ipaddress): global g_hostname g_hostname = hostname num_success = 0 - num_errors = 0 + error_sections = set([]) check_table = get_sorted_check_table(hostname) problems = [] @@ -754,14 +755,14 @@ def do_all_checks_on_host(hostname, ipaddress): except MKSNMPError, e: if str(e): problems.append(str(e)) - num_errors += 1 + error_sections.add(infotype) g_broken_snmp_hosts.add(hostname) continue except MKAgentError, e: if str(e): problems.append(str(e)) - num_errors += 1 + error_sections.add(infotype) g_broken_agent_hosts.add(hostname) continue @@ -811,7 +812,7 @@ def do_all_checks_on_host(hostname, ipaddress): if not dont_submit: submit_check_result(hostname, description, result, aggrname) else: - num_errors += 1 + error_sections.add(infotype) submit_aggregated_results(hostname) if checkresult_file_fd != None: @@ -828,7 +829,10 @@ def do_all_checks_on_host(hostname, ipaddress): agent_version = "(unknown)" except: agent_version = "(unknown)" - return agent_version, num_success, num_errors, ", ".join(problems) + error_sections = list(error_sections) + error_sections.sort() + return agent_version, num_success, error_sections, ", ".join(problems) + def open_checkresult_file():

12 years, 10 months

Check_MK Git: check_mk: Fix compile bug in Livestatus

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 0557549e15f2f77114ff876482d5a74a269bec53 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0557549e15f2f7… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Aug 22 13:31:37 2011 +0200 Fix compile bug in Livestatus --- livestatus/src/opids.cc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/livestatus/src/opids.cc b/livestatus/src/opids.cc index 50e6b39..a9e36b3 100644 --- a/livestatus/src/opids.cc +++ b/livestatus/src/opids.cc @@ -24,7 +24,7 @@ #include "opids.h" -const char *op_names_plus_8[] { +const char *op_names_plus_8[] = { "", "", ">=", "<=", "!~~", "!=~", "!~", "!=", "(invalid)", "=", "~", "=~", "~~", ">", "<" };

12 years, 10 months

Check_MK Git: check_mk: Remove . f12 compile helper files from agents directory

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: d674f1a216d8b32b5fdc70fdb03ef5bd92879f56 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d674f1a216d8b3… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Aug 22 13:14:34 2011 +0200 Remove .f12 compile helper files from agents directory --- .bugs/153 | 10 +++++++--- .bugs/311 | 2 +- ChangeLog | 1 + Makefile | 2 +- 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/.bugs/153 b/.bugs/153 index bf29d84..a1c305f 100644 --- a/.bugs/153 +++ b/.bugs/153 @@ -1,9 +1,13 @@ Title: .f12 files is shipped with agents Component: core +State: done +Class: cleanup +Date: 2011-02-18 11:03:18 Benefit: 1 -State: open Cost: 1 -Date: 2011-02-18 11:03:18 -Class: cleanup +Fun: 0 The setup seems to install the .f12 files into the agents directory. + +2011-08-22 13:13:59: changed state open -> done +Fixed in Makefile. diff --git a/.bugs/311 b/.bugs/311 index c18822b..76d1cb1 100644 --- a/.bugs/311 +++ b/.bugs/311 @@ -1,6 +1,6 @@ Title: IPMI cache initialization race condition Component: checks -Benefit: 6 +Benefit: 1 State: open Cost: 4 Date: 2011-07-18 15:42:34 diff --git a/ChangeLog b/ChangeLog index a70bc09..c6dd74a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -10,6 +10,7 @@ * Inventory functions now only take the single argument 'info'. The old style FUNC(checkname, info) is still supported but deprecated. * Show datasource program on cmk -D + * Remove .f12 compile helper files from agents directory Checks & Agents: * FIX: hr_mem: take into account cache and buffers diff --git a/Makefile b/Makefile index 7004337..cba6a17 100644 --- a/Makefile +++ b/Makefile @@ -75,7 +75,7 @@ dist: mk-livestatus cp multisite.mk multisite.mk-$(VERSION) tar czf $(DISTNAME)/conf.tar.gz $(TAROPTS) main.mk-$(VERSION) multisite.mk-$(VERSION) rm -f main.mk-$(VERSION) multisite.mk-$(VERSION) - tar czf $(DISTNAME)/agents.tar.gz $(TAROPTS) -C agents --exclude "*~" $$(cd agents ; ls) + tar czf $(DISTNAME)/agents.tar.gz $(TAROPTS) -C agents --exclude "*~" --exclude .f12 $$(cd agents ; ls) cd $(DISTNAME) ; ../make_package_info $(VERSION) > package_info install -m 755 scripts/*.{sh,py} $(DISTNAME) install -m 644 COPYING AUTHORS ChangeLog $(DISTNAME)

12 years, 10 months

Check_MK Git: check_mk: gb: catch invalid bug id in command line

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 9bd4d0cedd8acf7d5f52743d5f77a446aba79d8d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9bd4d0cedd8acf… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Aug 21 14:50:25 2011 +0200 gb: catch invalid bug id in command line --- gb | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/gb b/gb index ed2339c..89c07ec 100755 --- a/gb +++ b/gb @@ -86,8 +86,10 @@ def load_bugs(): continue def save_last_bugid(id): - file(".last", "w").write("%d\n" % int(id)) - + try: + file(".last", "w").write("%d\n" % int(id)) + except: + pass def check_modified(): global g_modified @@ -296,7 +298,10 @@ def main_show(args): for id in ids: if id != ids[0]: sys.stdout.write("-------------------------------------------------------------------------------\n") - show_bug(g_bugs[int(id)]) + try: + show_bug(g_bugs[int(id)]) + except: + sys.stderr.write("Skipping invalid bug id '%s'\n" % id) save_last_bugid(ids[-1]) def get_input(what, default = ""):

12 years, 10 months

Check_MK Git: check_mk: WATO: Show error message in case of inventory error

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 4c35c9d1e3ea4a17632c23475f8cb8d43614d370 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4c35c9d1e3ea4a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Aug 21 14:51:31 2011 +0200 WATO: Show error message in case of inventory error --- .bugs/11 | 10 +++++++--- ChangeLog | 3 +++ modules/check_mk.py | 3 +++ modules/check_mk_base.py | 5 +++++ web/htdocs/wato.py | 7 ++++++- 5 files changed, 24 insertions(+), 4 deletions(-) diff --git a/.bugs/11 b/.bugs/11 index 7a8c61d..d91ed07 100644 --- a/.bugs/11 +++ b/.bugs/11 @@ -1,10 +1,11 @@ Title: Keine Fehlermeldung bei Connection closed Component: wato +State: done +Class: nastiness +Date: 2010-12-21 12:09:13 Benefit: 2 -State: open Cost: 3 -Date: 2010-12-21 12:09:13 -Class: nastiness +Fun: 0 Wenn der Check_MK Agent einen nicht reinlässt (only_from gesetzt), dann bekommen man nicht Connection refused, sondern eine @@ -13,3 +14,6 @@ Fehler. WATO zeigt bei der Inventur einfach keine Dienste an. Der try-inventory sollte das aber als Fehler behandeln und irgendwie anzeigen. Schließlich ist über die Tags ja festgelegt, dass vom Agenten Daten kommen sollen. + +2011-08-21 14:51:12: changed state open -> done +Jetzt kommt eine sinnvolle Fehlermeldung. diff --git a/ChangeLog b/ChangeLog index 77d883e..e2685fb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -37,6 +37,9 @@ * Man-Pages of Check_MK checks shown in Multisite honor OMD's local hierarchy * nicer output of substates, translate (!) and (!!) into HTML code + WATO: + * Show error message in case of empty inventory due to agent error + 1.1.11i2: Core, Setup, etc.: * FIX: sort output of cmk --list-hosts alphabetically diff --git a/modules/check_mk.py b/modules/check_mk.py index f7d6d3d..2d8d9f9 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -1870,6 +1870,8 @@ def make_inventory(checkname, hostnamelist, check_only=False, include_state=Fals raise elif not include_state and str(e): sys.stderr.write("Host '%s': %s\n" % (hostname, str(e))) + elif include_state and str(e): # WATO automation. Abort + raise continue except MKSNMPError, e: # This special handling is needed for the inventory check. It needs special @@ -1966,6 +1968,7 @@ def make_inventory(checkname, hostnamelist, check_only=False, include_state=Fals except KeyboardInterrupt: sys.stderr.write('<Interrupted>\n') + if not check_only: if newchecks != []: filename = autochecksdir + "/" + checkname + "-" + time.strftime("%Y-%m-%d_%H.%M.%S") diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index c9e1059..a6b2009 100755 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -475,7 +475,12 @@ def get_agent_info_tcp(hostname, ipaddress): else: break s.close() + if len(output) == 0: # may be caused by xinetd not allowing our address + raise MKAgentError("Empty output from agent at TCP port %d" % + agent_port_of(hostname)) return output + except MKAgentError, e: + raise except Exception, e: raise MKAgentError("Cannot get data from TCP port %s:%d: %s" % (ipaddress, agent_port_of(hostname), e)) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 32002f0..fd58fd9 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -2050,7 +2050,12 @@ def changelog_button(): def show_service_table(hostname, firsttime): # Read current check configuration cache_options = not html.var("_scan") and [ '--cache' ] or [] - table = check_mk_automation("try-inventory", cache_options + [hostname]) + try: + table = check_mk_automation("try-inventory", cache_options + [hostname]) + except Exception, e: + html.show_error("Inventory failed for this host: %s" % e) + return + table.sort() html.begin_form("checks", None, "POST")

12 years, 10 months

← Newer
1
...
8
9
10
11
12
13
14
...
28
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits August 2011