Checkmk git commits January 2015

checkmk-commits@lists.checkmk.com

8 participants
297 discussions

Check_MK Git: check_mk: temperature.include: Fixed inconsistent handling of None in best and worst case

by Konstantin Büttner

Module: check_mk Branch: master Commit: cb1a0aa4d4aa832dbb8ec91af42c9b9387ae1169 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cb1a0aa4d4aa83… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Tue Jan 20 10:08:02 2015 +0100 temperature.include: Fixed inconsistent handling of None in best and worst case --- checks/temperature.include | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/checks/temperature.include b/checks/temperature.include index b281112..276106d 100644 --- a/checks/temperature.include +++ b/checks/temperature.include @@ -85,6 +85,15 @@ def check_temperature(reading, params, dev_unit = "c", status = 0 return status + # min that deals correctly with None + def minn(a,b) + if a = None: + return b + elif b = None: + return a + else: + return min(a,b) + unitsym = { "c": "°C", "f": "°F", @@ -160,15 +169,15 @@ def check_temperature(reading, params, dev_unit = "c", # user levels exist (or no levels at all). # Use least critical of your and device's levels. If just one of both is defined, - # take than max deals correctly with None here. min does not work because None < int - # TODO FIXME HIRN + # take that. max deals correctly with None here. min does not work because None < int. + # minn is a min that deals with None in the way we want here. elif dlh == "best": warn, crit = max(usr_warn, dev_warn), max(usr_crit, dev_crit) - warn_lower, crit_lower = min(usr_warn_lower, dev_warn_lower), min(usr_crit_lower, dev_crit_lower) + warn_lower, crit_lower = minn(usr_warn_lower, dev_warn_lower), minn(usr_crit_lower, dev_crit_lower) # Use most critical of your and device's levels elif dlh == "worst": - warn, crit = min(usr_warn, dev_warn), min(usr_crit, dev_crit) + warn, crit = minn(usr_warn, dev_warn), minn(usr_crit, dev_crit) warn_lower, crit_lower = max(usr_warn_lower, dev_warn_lower), max(usr_crit_lower, dev_crit_lower) # Use user's levels if present, otherwise the device's

9 years, 9 months

Check_MK Git: check_mk: #1868 "Successfully created the host"

by Lars Michelsen

message is also shown on host diagnose page now Message-ID: <54be1a10.KMmec50AnwFyoYEu%lm(a)mathias-kettner.de> User-Agent: Heirloom mailx 12.5 6/20/10 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Module: check_mk Branch: master Commit: b8f8e2985a24f4df951db7af147db0adfb175d7b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b8f8e2985a24f4… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jan 20 08:37:59 2015 +0100 #1868 "Successfully created the host" message is also shown on host diagnose page now --- .werks/1868 | 9 +++++++++ ChangeLog | 1 + web/htdocs/wato.py | 14 +++++++------- 3 files changed, 17 insertions(+), 7 deletions(-) diff --git a/.werks/1868 b/.werks/1868 new file mode 100644 index 0000000..57d8a75 --- /dev/null +++ b/.werks/1868 @@ -0,0 +1,9 @@ +Title: "Successfully created the host" message is also shown on host diagnose page now +Level: 1 +Component: wato +Compatible: compat +Version: 1.2.7i1 +Date: 1421739446 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index de00fd3..9c673cd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -114,6 +114,7 @@ * 1760 Added search form to manual checks page * 1785 Upload SNMP MIBs via WATO... * 1461 msexch_dag.copyqueue: added a WATO rule for this check + * 1868 "Successfully created the host" message is also shown on host diagnose page now * 1761 FIX: Ruleset search is now consistent for host & serviceparameters and manual checks * 1765 FIX: Fixed bug when generating nagvis backends while having sites with livestatus proxy configured... * 1789 FIX: Fix preview of passive checks in WATO list of services diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 9aba1dd..e4848e4 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -2061,20 +2061,20 @@ def mode_edithost(phase, new, cluster): return elif new: if host.get('tag_agent') != 'ping': - create_result = 'folder', _('Successfully created the host. Now you should do a ' - '<a href="%s">service discovery</a> in order to auto-configure ' - 'all services to be checked on this host.') % \ - make_link([("mode", "inventory"), ("host", hostname)]) + create_msg = _('Successfully created the host. Now you should do a ' + '<a href="%s">service discovery</a> in order to auto-configure ' + 'all services to be checked on this host.') % \ + make_link([("mode", "inventory"), ("host", hostname)]) else: - create_result = 'folder' + create_msg = None if go_to_services: return "firstinventory" elif go_to_diag: html.set_var("_try", "1") - return "diag_host" + return "diag_host", create_msg else: - return create_result + return "folder", create_msg else: if go_to_services: return "inventory"

9 years, 9 months

Check_MK Git: check_mk: #1869 FIX Deleting outdated persisted agent sections now

by Lars Michelsen

Module: check_mk Branch: master Commit: 2e8c736e2687e3080e951f83271da0f467b3361b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2e8c736e2687e3… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jan 20 08:56:12 2015 +0100 #1869 FIX Deleting outdated persisted agent sections now --- .werks/1869 | 9 +++++++++ ChangeLog | 1 + modules/check_mk_base.py | 41 ++++++++++++++++++++--------------------- 3 files changed, 30 insertions(+), 21 deletions(-) diff --git a/.werks/1869 b/.werks/1869 new file mode 100644 index 0000000..3ad9b76 --- /dev/null +++ b/.werks/1869 @@ -0,0 +1,9 @@ +Title: Deleting outdated persisted agent sections now +Level: 1 +Component: core +Compatible: compat +Version: 1.2.7i1 +Date: 1421740547 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 9c673cd..60489fa 100644 --- a/ChangeLog +++ b/ChangeLog @@ -7,6 +7,7 @@ * 1832 FIX: Fix "global name 'splitted' is not defined" in bulk inventory... * 1808 FIX: Fixed broken nagios config when using RBN without a host defined... * 1842 FIX: Rewrote implementation of service discovery (formerly inventory)... + * 1869 FIX: Deleting outdated persisted agent sections now Checks & Agents: * 1665 agent_netapp: New special agent for NetApp monitoring via Web-API... diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index bf1dbe7..a530599 100644 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -503,27 +503,32 @@ def store_persisted_info(hostname, persisted): if not os.path.exists(dir): os.makedirs(dir) file(dir + hostname, "w").write("%r\n" % persisted) - if opt_verbose: - sys.stdout.write("Persisted sections %s.\n" % ", ".join(persisted.keys())) + verbose("Persisted sections %s.\n" % ", ".join(persisted.keys())) def add_persisted_info(hostname, info): + file_path = var_dir + "/persisted/" + hostname try: - path = var_dir + "/persisted/" + hostname - persisted = eval(file(path).read()) + persisted = eval(file(file_path).read()) except: return now = time.time() + modified = False for section, (persisted_until, persisted_section) in persisted.items(): if now < persisted_until or opt_force: if section not in info: info[section] = persisted_section - if opt_verbose: - sys.stdout.write("Added persisted section %s.\n" % section) + verbose("Added persisted section %s.\n" % section) else: - if opt_verbose: - sys.stdout.write("Persisted section %s is outdated by %d seconds.\n" % ( - section, persisted_until - now)) + verbose("Persisted section %s is outdated by %d seconds. Deleting it.\n" % ( + section, now - persisted_until)) + del persisted[section] + modified = True + + if not persisted: + os.remove(file_path) + elif modified: + store_persisted_info(hostname, persisted) def get_piggyback_info(hostname): @@ -538,15 +543,12 @@ def get_piggyback_info(hostname): file_path = dir + "/" + sourcehost if cachefile_age(file_path) > piggyback_max_cachefile_age: - if opt_debug: - sys.stderr.write("Piggyback file %s is outdated by %d seconds. Deleting it.\n" % - (file_path, cachefile_age(file_path) - piggyback_max_cachefile_age)) + verbose("Piggyback file %s is outdated by %d seconds. Deleting it.\n" % + (file_path, cachefile_age(file_path) - piggyback_max_cachefile_age)) os.remove(file_path) continue - if opt_debug: - sys.stderr.write("Using piggyback information from host %s.\n" % - sourcehost) + verbose("Using piggyback information from host %s.\n" % sourcehost) output += file(file_path).read() return output @@ -555,8 +557,7 @@ def get_piggyback_info(hostname): def store_piggyback_info(sourcehost, piggybacked): piggyback_path = tmp_dir + "/piggyback/" for backedhost, lines in piggybacked.items(): - if opt_debug: - sys.stderr.write("Storing piggyback data for %s.\n" % backedhost) + verbose("Storing piggyback data for %s.\n" % backedhost) dir = piggyback_path + backedhost if not os.path.exists(dir): os.makedirs(dir) @@ -580,8 +581,7 @@ def remove_piggyback_info_from(sourcehost, keep=[]): if backedhost not in ['.', '..'] and backedhost not in keep: path = piggyback_path + backedhost + "/" + sourcehost if os.path.exists(path): - if opt_debug: - sys.stderr.write("Removing stale piggyback file %s\n" % path) + verbose("Removing stale piggyback file %s\n" % path) os.remove(path) removed += 1 @@ -639,8 +639,7 @@ def read_cache_file(relpath, max_cache_age): result = f.read(10000000) f.close() if len(result) > 0: - if opt_debug: - sys.stderr.write("Using data from cachefile %s.\n" % cachefile) + verbose("Using data from cachefile %s.\n" % cachefile) return result elif opt_debug: sys.stderr.write("Skipping cache file %s: Too old "

9 years, 9 months

Check_MK Git: check_mk: #1870 FIX Joined columns were empty in CSV, JSON or PYTHON exports of view

by Lars Michelsen

Module: check_mk Branch: master Commit: f8fc67a9b12814d2a95d9dd592c873dbad35ef90 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f8fc67a9b12814… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jan 20 10:04:09 2015 +0100 #1870 FIX Joined columns were empty in CSV, JSON or PYTHON exports of view Joined view columns did not work correctly in CSV, JSON or PYTHON output formats. The columns were simply empty, while the regular columns on the web page were showing information. --- .werks/1870 | 12 ++++++++++++ ChangeLog | 1 + web/htdocs/views.py | 37 +++++++++++++++++++++---------------- web/plugins/views/webservice.py | 6 +++--- 4 files changed, 37 insertions(+), 19 deletions(-) diff --git a/.werks/1870 b/.werks/1870 new file mode 100644 index 0000000..0601321 --- /dev/null +++ b/.werks/1870 @@ -0,0 +1,12 @@ +Title: Joined columns were empty in CSV, JSON or PYTHON exports of view +Level: 1 +Component: multisite +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i1 +Date: 1421744582 + +Joined view columns did not work correctly in CSV, JSON or PYTHON output formats. +The columns were simply empty, while the regular columns on the web page were +showing information. diff --git a/ChangeLog b/ChangeLog index 60489fa..1cd78f9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -110,6 +110,7 @@ * 1803 FIX: Fixed exception in Check_MK prediction page... * 1804 FIX: Fixed prechecked checkboxes in view actions after first action submit... * 1843 FIX: Fixed crash in display of crash report for precompiled host checks + * 1870 FIX: Joined columns were empty in CSV, JSON or PYTHON exports of view... WATO: * 1760 Added search form to manual checks page diff --git a/web/htdocs/views.py b/web/htdocs/views.py index 628ba15..744f96e 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -2008,23 +2008,37 @@ def execute_hooks(hook): else: pass -def paint_painter(painter, row): +def paint(p, row, tdattrs=""): + tdclass, content = prepare_paint(p, row) + + if tdclass: + html.write("<td %s class=\"%s\">%s</td>\n" % (tdattrs, tdclass, content)) + else: + html.write("<td %s>%s</td>" % (tdattrs, content)) + return content != "" + +def paint_painter(painter, row, join_key=None): + if join_key != None: + row = row.get("JOIN", {}).get(join_key) + if not row: + return "", "" # no join information available for that column + if "args" in painter: return painter["paint"](row, *painter["args"]) else: return painter["paint"](row) +def get_join_key(p): + return len(p) >= 4 and p[3] or None + def prepare_paint(p, row): painter = p[0] linkview = p[1] tooltip = len(p) > 2 and p[2] or None - if len(p) >= 4: - join_key = p[3] - row = row.get("JOIN", {}).get(p[3]) - if not row: - return "", "" # no join information available for that column - tdclass, content = paint_painter(painter, row) + tdclass, content = paint_painter(painter, row, join_key=get_join_key(p)) + if tdclass == "" and content == "": + return tdclass, content content = html.utf8_to_entities(content) @@ -2082,15 +2096,6 @@ def row_id(view, row): key += '~%s' % row[col] return str(hash(key)) -def paint(p, row, tdattrs=""): - tdclass, content = prepare_paint(p, row) - - if tdclass: - html.write("<td %s class=\"%s\">%s</td>\n" % (tdattrs, tdclass, content)) - else: - html.write("<td %s>%s</td>" % (tdattrs, content)) - return content != "" - def paint_stalified(row, text): if is_stale(row): return "stale", text diff --git a/web/plugins/views/webservice.py b/web/plugins/views/webservice.py index 71c0bf8..f7e49a7 100644 --- a/web/plugins/views/webservice.py +++ b/web/plugins/views/webservice.py @@ -41,7 +41,7 @@ def render_python(rows, view, group_painters, painters, num_columns, show_checkb for row in rows: html.write("[") for p in painters: - tdclass, content = p[0]["paint"](row) + tdclass, content = paint_painter(p[0], row, join_key=get_join_key(p)) html.write(repr(html.strip_tags(content))) html.write(",") html.write("],") @@ -94,7 +94,7 @@ def render_json(rows, view, group_painters, painters, num_columns, show_checkbox first = False else: html.write(",") - tdclass, content = paint_painter(p[0], row) + tdclass, content = paint_painter(p[0], row, join_key=get_join_key(p)) if type(content) == unicode: content = content.encode("utf-8") else: @@ -161,7 +161,7 @@ def render_csv(rows, view, group_painters, painters, num_columns, show_checkboxe first = False else: html.write(csv_separator) - tdclass, content = paint_painter(p[0], row) + tdclass, content = paint_painter(p[0], row, join_key=get_join_key(p)) content = type(content) in [ int, float ] and str(content) or content stripped = html.strip_tags(content).replace('\n', '').replace('"', '""') html.write('"%s"' % stripped.encode("utf-8"))

9 years, 9 months

Check_MK Git: check_mk: EC: fix missing ipaddress when doing logwatch forwarding

by Mathias Kettner

Module: check_mk Branch: master Commit: 5e1a811503d9a20cbb08d44b7fd8133386d76118 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5e1a811503d9a2… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Jan 20 09:56:44 2015 +0100 EC: fix missing ipaddress when doing logwatch forwarding --- mkeventd/bin/mkeventd | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/mkeventd/bin/mkeventd b/mkeventd/bin/mkeventd index e33d83c..ea452d7 100755 --- a/mkeventd/bin/mkeventd +++ b/mkeventd/bin/mkeventd @@ -2117,7 +2117,9 @@ class EventServer: event["host"] = "" def parse_event(self, line, address): - event = {} + event = { + "ipaddress" : address or "", + } try: # Variant 1: plain syslog message without priority/facility: # May 26 13:45:01 Klapprechner CRON[8046]: message....

9 years, 9 months

Check_MK Git: check_mk: Reserved 20 Werk IDS

by Lars Michelsen

Module: check_mk Branch: master Commit: 00313e89c0eca4df97ca5733591d07c1e1ac9119 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=00313e89c0eca4… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jan 20 08:37:19 2015 +0100 Reserved 20 Werk IDS --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index e4cda12..6eaca3f 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -1868 +1888

9 years, 9 months

Check_MK Git: check_mk: Updated bug entries #2269

by Mathias Kettner

Module: check_mk Branch: master Commit: 29350a420fd62e1008adb6867fc8eb967425b5ef URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=29350a420fd62e… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Jan 19 18:19:00 2015 +0100 Updated bug entries #2269 --- .bugs/2269 | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/.bugs/2269 b/.bugs/2269 new file mode 100644 index 0000000..0db9843 --- /dev/null +++ b/.bugs/2269 @@ -0,0 +1,12 @@ +Title: cmk -v for a new host only creates the first RRD +Component: core +State: open +Date: 2015-01-19 18:15:29 +Targetversion: 1.2.5i1 +Class: bug + +When you do a cmk -v on the command line (using CMC) for a new host +without any RRD then only the first RRD is being created. Also the Perf-O-Meter +runs into a problem. Looks like only the first perfdata value is being +processed. Could be some spacing problem when sending check results from +the cmk command took via pipe into the core

9 years, 9 months

Check_MK Git: check_mk: mem.linux: fix PNP template for kernels without commit limit

by Mathias Kettner

Module: check_mk Branch: master Commit: 22cfdd60676598531f569a07c8f9304814a6dee4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=22cfdd60676598… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Jan 19 18:18:56 2015 +0100 mem.linux: fix PNP template for kernels without commit limit --- pnp-templates/check_mk-mem.linux.php | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pnp-templates/check_mk-mem.linux.php b/pnp-templates/check_mk-mem.linux.php index 9bae6f4..e6e51ee 100644 --- a/pnp-templates/check_mk-mem.linux.php +++ b/pnp-templates/check_mk-mem.linux.php @@ -118,12 +118,14 @@ $def[] = "" ; # 6. Committing -$opt[] = $defopt . "--title \"Memory committing\""; -$def[] = "" - . mem_area("total_total", "f0f0f0", "Total virtual memory", FALSE) - . mem_area("committed_as", "40a080", "Committed memory", FALSE) - . mem_area("commit_limit", "e0e0e0", "Commit limit", TRUE) - ; +if (isset($mem_defines["commit_limit"])) { + $opt[] = $defopt . "--title \"Memory committing\""; + $def[] = "" + . mem_area("total_total", "f0f0f0", "Total virtual memory", FALSE) + . mem_area("committed_as", "40a080", "Committed memory", FALSE) + . mem_area("commit_limit", "e0e0e0", "Commit limit", TRUE) + ; +} # 7. Shared memory if (isset($mem_defines["shmem"])) {

9 years, 9 months

Check_MK Git: check_mk: mem.linux: prevent crash for older kernels ( e.g. SLES9

by Mathias Kettner

Module: check_mk Branch: master Commit: a7dabcc20f6b2145d12ff9aacac00d9e7ecd0068 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a7dabcc20f6b21… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Jan 19 18:19:38 2015 +0100 mem.linux: prevent crash for older kernels (e.g. SLES9 ... where CommitLimit is missing --- checks/mem | 37 ++++++++++++++++++++++++++++++++---- web/plugins/perfometer/check_mk.py | 8 +++++++- 2 files changed, 40 insertions(+), 5 deletions(-) diff --git a/checks/mem b/checks/mem index cf888bd..eb6fb7c 100644 --- a/checks/mem +++ b/checks/mem @@ -118,6 +118,34 @@ # HugePages_Rsvd: 0 # Hugepagesize: 2048 kB +# Yet earlier kernel (SLES 9): +# <<<mem>>> +# MemTotal: 6224268 kB +# MemFree: 2913660 kB +# Buffers: 84712 kB +# Cached: 1779052 kB +# SwapCached: 0 kB +# Active: 1931528 kB +# Inactive: 1276156 kB +# HighTotal: 5373824 kB +# HighFree: 2233984 kB +# LowTotal: 850444 kB +# LowFree: 679676 kB +# SwapTotal: 1052280 kB +# SwapFree: 1052280 kB +# Dirty: 55680 kB +# Writeback: 0 kB +# Mapped: 1469268 kB +# Slab: 71724 kB +# Committed_AS: 2758332 kB +# PageTables: 7672 kB +# VmallocTotal: 112632 kB +# VmallocUsed: 9324 kB +# VmallocChunk: 103180 kB +# HugePages_Total: 0 +# HugePages_Free: 0 +# Hugepagesize: 2048 kB + factory_settings["mem_linux_default_levels"] = { "levels_virtual": ("perc_used", ( 80.0, 90.0)), @@ -292,10 +320,11 @@ def check_mem_linux(_no_item, params, info): yield r # only display if non-OK # Commit limit - r = check_mem_levels("Commit Limit", meminfo["TotalTotal"] - meminfo["CommitLimit"], - meminfo["TotalTotal"], params.get("levels_commitlimit"), of_what = "RAM + Swap") - if r[0]: - yield r # only display if non-OK + if "CommitLimit" in meminfo: + r = check_mem_levels("Commit Limit", meminfo["TotalTotal"] - meminfo["CommitLimit"], + meminfo["TotalTotal"], params.get("levels_commitlimit"), of_what = "RAM + Swap") + if r[0]: + yield r # only display if non-OK # VMalloc r = check_mem_levels("Largest Free VMalloc Chunk", meminfo["VmallocTotal"] - meminfo["VmallocChunk"], diff --git a/web/plugins/perfometer/check_mk.py b/web/plugins/perfometer/check_mk.py index 2040fab..38ffb11 100644 --- a/web/plugins/perfometer/check_mk.py +++ b/web/plugins/perfometer/check_mk.py @@ -180,7 +180,8 @@ perfometers["check_mk-ucd_cpu_util"] = perfometer_check_mk_kernel_util perfometers["check_mk-lparstat_aix.cpu_util"] = perfometer_check_mk_kernel_util def perfometer_check_mk_mem_used(row, check_command, perf_data): - h = '<table><tr>' + ram_used = None + for entry in perf_data: # Get total and used RAM if entry[0] == "ramused": @@ -200,11 +201,16 @@ def perfometer_check_mk_mem_used(row, check_command, perf_data): elif entry[0] == "swap_total": swap_total = float(entry[1]) # mem.linux + if not ram_used: + return + virt_total = ram_total + swap_total virt_used = ram_used + swap_used # paint used ram and swap ram_color, swap_color = "#80ff40", "#008030" + + h = '<table><tr>' h += perfometer_td(100 * ram_used / virt_total, ram_color) h += perfometer_td(100 * swap_used / virt_total, swap_color)

9 years, 9 months

Check_MK Git: check_mk: Discovery: never set node_info during inventory

by Mathias Kettner

Module: check_mk Branch: master Commit: 294ad4a315e39c963367ac6a4283182bf1d23412 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=294ad4a315e39c… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Jan 19 17:53:56 2015 +0100 Discovery: never set node_info during inventory When nodes of clusters are being service discovered do never set the node information. This is because we cannot know wether the service will actually be a clustered services before it is discovered. So the inventory function will never know wether the service will be part of a cluster or not. --- modules/discovery.py | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/modules/discovery.py b/modules/discovery.py index 26b6261..59ce57c 100644 --- a/modules/discovery.py +++ b/modules/discovery.py @@ -122,7 +122,7 @@ def do_discovery_for(hostname, check_types, only_new, use_caches): verbose(" nothing%s\n" % (only_new and " new" or "")) #. -# .--Check_MK Discovery--------------------------------------------------. +# .--Discovery Check-----------------------------------------------------. # | ____ _ _ _ | # | | _ \(_)___ ___ ___| |__ ___ ___| | __ | # | | | | | / __|/ __| / __| '_ \ / _ \/ __| |/ / | @@ -348,7 +348,7 @@ def discover_check_type(hostname, ipaddress, check_type, use_caches): section_name = check_type.split('.')[0] # make e.g. 'lsi' from 'lsi.arrays' try: - info = None + info = None # default in case of exception info = get_realhost_info(hostname, ipaddress, section_name, use_caches and inventory_max_cachefile_age or 0, ignore_check_interval=True) @@ -363,13 +363,12 @@ def discover_check_type(hostname, ipaddress, check_type, use_caches): if info == None: # No data for this check type return [] - # Add information about nodes if check wants this + # Add information about nodes if check wants this. Note: + # in the node info we always put None, not the name of a node. + # During inventory we behave like a non-cluster. We do not know + # yet if the service is going to be clustered! if check_info[check_type]["node_info"]: - if clusters_of(hostname): - add_host = hostname - else: - add_host = None - info = [ [add_host] + line for line in info ] + info = [ [None] + line for line in info ] # Now do the actual inventory try:

9 years, 9 months

← Newer
1
...
16
17
18
19
20
21
22
...
30
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits January 2015