Checkmk git commits May 2015

checkmk-commits@lists.checkmk.com

7 participants
200 discussions

Check_MK Git: check_mk: Fixed headers for icons

by Lars Michelsen

Module: check_mk Branch: master Commit: 6a9e9203b768ae4026beb89b8c593187358d038f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6a9e9203b768ae… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed May 6 11:17:14 2015 +0200 Fixed headers for icons --- web/plugins/icons/builtin.py | 103 ++++++++++++++++++++++++++++++++---------- 1 file changed, 79 insertions(+), 24 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=6a9e9203b7…

9 years, 1 month

Check_MK Git: check_mk: Fixed SNMPv3 contextes in case of selecting " all SNMP checks"

by Lars Michelsen

Module: check_mk Branch: master Commit: f723b814202fa8a65e3b68b6a341cbb935cb5391 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f723b814202fa8… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed May 6 10:40:57 2015 +0200 Fixed SNMPv3 contextes in case of selecting "all SNMP checks" --- modules/snmp.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/snmp.py b/modules/snmp.py index 4ff2cbb..78fd211 100644 --- a/modules/snmp.py +++ b/modules/snmp.py @@ -92,7 +92,7 @@ def cmp_oids(o1, o2): def snmpv3_contexts_of(hostname, check_type): for ty, rules in host_extra_conf(hostname, snmpv3_contexts): - if ty == check_type: + if ty == None or ty == check_type: return rules return [None]

9 years, 1 month

Check_MK Git: check_mk: Minor code cleanup

by Konstantin Büttner

Module: check_mk Branch: master Commit: c8ecb4de4162e72cc4b9338af38a36ce5ed220ba URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c8ecb4de4162e7… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Wed May 6 10:37:16 2015 +0200 Minor code cleanup --- checks/hwg_temp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/checks/hwg_temp b/checks/hwg_temp index d84931f..2d0a07d 100644 --- a/checks/hwg_temp +++ b/checks/hwg_temp @@ -85,9 +85,9 @@ check_info['hwg_temp'] = { "1.4", # sensor unit integer 0=unknown, 1=°C, 2=°F, 3=°K, 4=% "1.7", - ]), - "snmp_scan_function" : lambda oid: "hwg" in oid(".1.3.6.1.2.1.1.1.0").lower(), - "group" : "temperature", - "includes" : [ "temperature.include" ], + ]), + "snmp_scan_function" : lambda oid: "hwg" in oid(".1.3.6.1.2.1.1.1.0").lower(), + "group" : "temperature", + "includes" : [ "temperature.include" ], }

9 years, 1 month

Check_MK Git: check_mk: Internal restructuration of availability - step 2

by Mathias Kettner

Module: check_mk Branch: master Commit: 279dc0d7f48d31af4cf7b3c91dfc7ac56f95dd59 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=279dc0d7f48d31… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue May 5 15:06:18 2015 +0200 Internal restructuration of availability - step 2 --- web/plugins/views/availability.py | 69 +++++++++++++++++++++++++------------ 1 file changed, 47 insertions(+), 22 deletions(-) diff --git a/web/plugins/views/availability.py b/web/plugins/views/availability.py index 0cd4e6a..ce26e4c 100644 --- a/web/plugins/views/availability.py +++ b/web/plugins/views/availability.py @@ -29,6 +29,8 @@ import availability # Variable name conventions # spans_by_host: a two tier dict: (site, host) -> service -> list(spans) # In case of BI (site, host) is (None, aggr_group), service is aggr_name +# availability: a list of dicts. Each dicts describes the availability +# information of one object (seconds being OK, CRIT, etc.) #. @@ -805,11 +807,26 @@ def do_render_availability(spans_by_host, what, avoptions, timeline, timewarpcod else: statistics[s] = [ 1, duration, duration ] # count, min, max - if not show_timeline: - timeline_rows = None + availability_entry = { + "site" : site_host[0], + "host" : site_host[1], + "service" : service, + "display_name" : display_name, + "states" : states, + "considered_duration" : considered_duration, + "total_duration" : total_duration, + "statistics" : statistics, + "groups" : group_ids, + } - availability.append([site_host[0], site_host[1], service, display_name, states, - considered_duration, total_duration, statistics, timeline_rows, group_ids]) + if show_timeline: + availability_entry["timeline"] = timeline_rows + + availability.append(availability_entry) + + + # [site_host[0], site_host[1], service, display_name, states, + # considered_duration, total_duration, statistics, timeline_rows, group_ids]) # Prepare number format function range, range_title = avoptions["range"] @@ -819,7 +836,11 @@ def do_render_availability(spans_by_host, what, avoptions, timeline, timewarpcod fetch_data = {} + del timeline_rows + # TODO: timeline_rows direct aus availability holen if timeline: + # TODO: Here we assume that we show exactly one object + timeline_rows = availability[0]["timeline"] if not fetch: # Timeline does not support fetch render_timeline(timeline_rows, from_time, until_time, total_duration, timeline, range_title, render_number, what, timewarpcode, avoptions, False, style="standalone") @@ -1245,9 +1266,9 @@ def render_timeline_legend(what): def get_av_groups(availability, grouping): all_group_ids = set([]) - for site, host, service, display_name, states, considered_duration, total_duration, statistics, timeline_rows, group_ids in availability: - all_group_ids.update(group_ids) - if len(group_ids) == 0: + for entry in availability: + all_group_ids.update(entry["groups"]) + if len(entry["groups"]) == 0: all_group_ids.add(()) # null-tuple denotes ungrouped objects return all_group_ids @@ -1259,9 +1280,9 @@ def render_availability_group(group_title, range_title, group_id, availability, # Filter out groups that we want to show this time group_availability = [] for entry in availability: - group_ids = entry[-1] + group_ids = entry["groups"] if group_id == () and group_ids: - continue # This is not an angrouped object + continue # This is not an ungrouped object elif group_id and group_id not in group_ids: continue # Not this group group_availability.append(entry) @@ -1302,10 +1323,10 @@ def render_availability_group(group_title, range_title, group_id, availability, # Sort according to host and service. First after site, then # host (natural sort), then service def cmp_av_entry(a, b): - return cmp(a[0], b[0]) or \ - cmp(num_split(a[1]) + (a[1],), num_split(b[1]) + (b[1],)) or \ - cmp(cmp_service_name_equiv(a[2]), cmp_service_name_equiv(b[2])) or \ - cmp(a[2], b[2]) + return cmp(a["site"], b["site"]) or \ + cmp(num_split(a["host"]) + (a["host"],), num_split(b["host"]) + (b["host"],)) or \ + cmp(cmp_service_name_equiv(a["service"]), cmp_service_name_equiv(b["service"])) or \ + cmp(a["service"], b["service"]) group_availability.sort(cmp = cmp_av_entry) show_summary = avoptions.get("summary") @@ -1315,7 +1336,11 @@ def render_availability_group(group_title, range_title, group_id, availability, searchable = False, limit = None, output_format = do_csv and "csv" or (fetch and "fetch" or "html"), omit_headers = "omit_headers" in avoptions["labelling"]) - for site, host, service, display_name, states, considered_duration, total_duration, statistics, timeline_rows, group_ids in group_availability: + for entry in group_availability: + site = entry["site"] + host = entry["host"] + service = entry["service"] + table.row() if what != "bi": @@ -1384,24 +1409,24 @@ def render_availability_group(group_title, range_title, group_id, availability, if avoptions["av_mode"]: sname = _("Avail.") - number = states.get(sid, 0) + number = entry["states"].get(sid, 0) if not number: css = "unused" elif show_summary: summary.setdefault(sid, 0.0) if avoptions["timeformat"].startswith("percentage"): - if considered_duration > 0: - summary[sid] += float(number) / considered_duration + if entry["considered_duration"] > 0: + summary[sid] += float(number) / entry["considered_duration"] else: summary[sid] += number # Apply visual availability levels (render OK in yellow/red, if too low) if number and av_levels and sid in [ "ok", "up" ]: css = "state%d" % check_av_levels(number, av_levels, considered_duration) - table.cell(sname, render_number(number, considered_duration), css="narrow number " + css, help=help) + table.cell(sname, render_number(number, entry["considered_duration"]), css="narrow number " + css, help=help) # Statistics? - x_cnt, x_min, x_max = statistics.get(sid, (None, None, None)) + x_cnt, x_min, x_max = entry["statistics"].get(sid, (None, None, None)) os_aggrs, os_states = avoptions.get("outage_statistics", ([],[])) if sid in os_states: for aggr in os_aggrs: @@ -1442,13 +1467,13 @@ def render_availability_group(group_title, range_title, group_id, availability, if show_summary == "average" or avoptions["timeformat"].startswith("percentage"): number /= len(group_availability) if avoptions["timeformat"].startswith("percentage"): - number *= considered_duration + number *= entry["considered_duration"] if not number: css = "unused" if number and av_levels and sid in [ "ok", "up" ]: - css = "state%d" % check_av_levels(number, av_levels, considered_duration) - table.cell(sname, render_number(number, considered_duration), css="heading number " + css, help=help) + css = "state%d" % check_av_levels(number, av_levels, entry["considered_duration"]) + table.cell(sname, render_number(number, entry["considered_duration"]), css="heading number " + css, help=help) os_aggrs, os_states = avoptions.get("outage_statistics", ([],[])) if sid in os_states: for aggr in os_aggrs:

9 years, 1 month

Check_MK Git: check_mk: Internal restructuration of availability - step 1

by Mathias Kettner

Module: check_mk Branch: master Commit: 86f350a942d00b5752f5efdebb3701ff57ad5e1b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=86f350a942d00b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue May 5 14:49:17 2015 +0200 Internal restructuration of availability - step 1 --- web/htdocs/availability.py | 99 +++++++++++++++++++++++++++ web/plugins/views/availability.py | 137 ++++++++++++++++--------------------- 2 files changed, 159 insertions(+), 77 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=86f350a942…

9 years, 1 month

Check_MK Git: check_mk: Comment cleanup

by Mathias Kettner

Module: check_mk Branch: master Commit: d182115ce850b6249f974444d11ecf941bf56a86 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d182115ce850b6… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue May 5 11:48:52 2015 +0200 Comment cleanup --- inventory/solaris_mem | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/inventory/solaris_mem b/inventory/solaris_mem index 88b5b26..3f42b5f 100644 --- a/inventory/solaris_mem +++ b/inventory/solaris_mem @@ -25,14 +25,14 @@ # Boston, MA 02110-1301 USA. -#<<<statgrab_mem>>> -#mem.cache 0 -#mem.free 166014599168 -#mem.total 274877906944 -#mem.used 108863307776 -#swap.free 87748075520 -#swap.total 203939356672 -#swap.used 116191281152 +# <<<statgrab_mem>>> +# mem.cache 0 +# mem.free 166014599168 +# mem.total 274877906944 +# mem.used 108863307776 +# swap.free 87748075520 +# swap.total 203939356672 +# swap.used 116191281152 def inv_solaris_mem(info): node = inv_tree("hardware.memory.")

9 years, 1 month

Check_MK Git: check_mk: #2226 FIX prtconf: Fix computation of CPU clock speed: 1MHz is 1000^2 Hz, not 1024^2

by Mathias Kettner

Module: check_mk Branch: master Commit: 4b15d4dd2c486306e9032f096e5218c4438681e3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4b15d4dd2c4863… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue May 5 11:50:10 2015 +0200 #2226 FIX prtconf: Fix computation of CPU clock speed: 1MHz is 1000^2 Hz, not 1024^2 --- .werks/2226 | 10 ++++++++++ ChangeLog | 1 + inventory/prtconf | 2 +- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/2226 b/.werks/2226 new file mode 100644 index 0000000..641408e --- /dev/null +++ b/.werks/2226 @@ -0,0 +1,10 @@ +Title: prtconf: Fix computation of CPU clock speed: 1MHz is 1000^2 Hz, not 1024^2 +Level: 1 +Component: inv +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i1 +Date: 1430819374 + + diff --git a/ChangeLog b/ChangeLog index d367edf..edde7a7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -547,6 +547,7 @@ * 2197 FIX: win_reg_uninstall: Fix exception in case of invalid output line... * 2224 FIX: Fixed sorting in inventory based views... * 2246 FIX: Linux CPU Inventory: Fixed wrong number of CPUs when first CPU is not in first slot + * 2226 FIX: prtconf: Fix computation of CPU clock speed: 1MHz is 1000^2 Hz, not 1024^2 1.2.6b1: diff --git a/inventory/prtconf b/inventory/prtconf index 2147c85..c9326ea 100644 --- a/inventory/prtconf +++ b/inventory/prtconf @@ -77,7 +77,7 @@ def inv_prtconf(info): inv_tree("hardware.cpu.")["model"] = value elif varname == "Processor Clock Speed": - inv_tree("hardware.cpu.")["max_speed"] = float(value.split()[0]) * 1024 * 1024 + inv_tree("hardware.cpu.")["max_speed"] = float(value.split()[0]) * 1000 * 1000 elif varname == "Number Of Processors": inv_tree("hardware.cpu.")["cpus"] = int(value)

9 years, 1 month

Check_MK Git: check_mk: Upon install, the MSI installer did not unpack any plugins provided

by Andreas Boesl

Module: check_mk Branch: master Commit: d07316ae78ca0c923e589254012f688ab6a49ca9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d07316ae78ca0c… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon May 4 12:33:38 2015 +0200 Upon install, the MSI installer did not unpack any plugins provided by the plugins.cap file. You had to manually unpack these plugins with the command "check_mk_agent.exe unpack plugins.cap". This has been fixed. --- .werks/2077 | 15 +++++++++++++++ ChangeLog | 1 + doc/treasures/windows_msi/check_mk_agent_baked.wxs | 8 ++++++++ 3 files changed, 24 insertions(+) diff --git a/.werks/2077 b/.werks/2077 new file mode 100644 index 0000000..64b324a --- /dev/null +++ b/.werks/2077 @@ -0,0 +1,15 @@ +Title: Windows MSI Installer: fixed automatical install of agent plugins +Level: 2 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i1 +Date: 1430735433 + +Upon install, the MSI installer did not unpack any plugins provided +by the plugins.cap file. You had to manually unpack these plugins +with the command "check_mk_agent.exe unpack plugins.cap". + +This has been fixed. + diff --git a/ChangeLog b/ChangeLog index bc69311..c16bbc3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -351,6 +351,7 @@ * 2071 FIX: windows agent: fileinfo check now correctly reports empty directories... * 2072 FIX: agent_netapp, netapp_api_volumes, netapp_api_disks: Improved check output... * 2075 FIX: check_mk_agent: fixed formatting error for windows eventlog entries > 2048 characters... + * 2077 FIX: Windows MSI Installer: fixed automatical install of agent plugins... Multisite: * 1758 Improved exception hander: Shows details without additional debug request, added mailto link for error report... diff --git a/doc/treasures/windows_msi/check_mk_agent_baked.wxs b/doc/treasures/windows_msi/check_mk_agent_baked.wxs index c903fa7..5b7c47c 100644 --- a/doc/treasures/windows_msi/check_mk_agent_baked.wxs +++ b/doc/treasures/windows_msi/check_mk_agent_baked.wxs @@ -74,6 +74,13 @@ Impersonate="no" Return ="ignore"/> + <CustomAction Id="unpack_plugins" + Directory ="INSTALLDIR" + ExeCommand ='[INSTALLDIR]check_mk_agent.exe unpack plugins.cap' + Execute ="deferred" + Impersonate="no" + Return ="ignore"/> + <CustomAction Id="uninstall_plugins" Directory ="INSTALLDIR" ExeCommand ='[INSTALLDIR]uninstall_plugins.bat' @@ -96,6 +103,7 @@ Return ="ignore"/> <InstallExecuteSequence> + <Custom Action="unpack_plugins" Before="InstallFinalize">NOT REMOVE="ALL"</Custom> <Custom Action="install_service" Before="InstallFinalize">NOT REMOVE="ALL" AND INSTALLSERVICE</Custom> <Custom Action="start_service" Before="InstallFinalize">NOT REMOVE="ALL" AND INSTALLSERVICE</Custom> </InstallExecuteSequence>

9 years, 1 month

Check_MK Git: check_mk: Smaller logging cleanups and fixed in notification module

by Mathias Kettner

Module: check_mk Branch: master Commit: b8fc09f26791e2996eb43e762b825907631d99b3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b8fc09f26791e2… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue May 5 10:20:39 2015 +0200 Smaller logging cleanups and fixed in notification module --- modules/notify.py | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/modules/notify.py b/modules/notify.py index dc18841..26bb7b7 100644 --- a/modules/notify.py +++ b/modules/notify.py @@ -285,7 +285,7 @@ def locally_deliver_raw_context(raw_context, analyse=False): # have precedence in this situation! if not contactname or contactname == "check-mk-notify": # 1. RULE BASE NOTIFICATIONS - notify_log("Preparing rule based notifications") + notify_log_debug("Preparing rule based notifications") return notify_rulebased(raw_context, analyse=analyse) if analyse: @@ -361,6 +361,8 @@ def notify_keepalive(): else: notify_log("We are back after a restart.") + notify_log_debug("Verbose logging is activated.") + while True: try: # Invalidate timeperiod cache @@ -593,7 +595,7 @@ def user_notification_rules(): # is handled by WATO. Contact specific rules are a # WATO-only feature anyway... user_rules.append(rule) - notify_log("Found %d user specific rules" % len(user_rules)) + notify_log_debug("Found %d user specific rules" % len(user_rules)) return user_rules @@ -1296,8 +1298,7 @@ def notify_via_email(plugin_context): if "utf8" in l or "utf-8" in l or "utf.8" in l: encoding = encoding.strip() os.putenv("LANG", encoding) - if notification_logging >= 2: - notify_log("Setting locale for mail to %s." % encoding) + notify_log_debug("Setting locale for mail to %s." % encoding) break else: notify_log("No UTF-8 encoding found in your locale -a! Please provide C.UTF-8 encoding.") @@ -1305,8 +1306,7 @@ def notify_via_email(plugin_context): # Important: we must not output anything on stdout or stderr. Data of stdout # goes back into the socket to the CMC in keepalive mode and garbles the # handshake signal. - if notification_logging >= 2: - notify_log("Executing command: %s" % command) + notify_log_debug("Executing command: %s" % command) p = subprocess.Popen(command_utf8, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE, stdin=subprocess.PIPE) stdout_txt, stderr_txt = p.communicate(body.encode("utf-8")) @@ -1470,13 +1470,15 @@ def create_spoolfile(data): # 3. Notifications to *got* forwarded. Contain neither of both. # Spool files of type 1 are not handled here! def handle_spoolfile(spoolfile): + notif_uuid = spoolfile.rsplit("/", 1)[-1] notify_log("----------------------------------------------------------------------") try: data = eval(file(spoolfile).read()) if "plugin" in data: plugin_context = data["context"] plugin = data["plugin"] - notify_log("Got spool file (%s) for local delivery via %s" % ( + notify_log("Got spool file %s (%s) for local delivery via %s" % ( + notif_uuid[:8], find_host_service(plugin_context), (plugin or "plain mail"))) return call_notification_script(plugin, plugin_context) @@ -1484,9 +1486,9 @@ def handle_spoolfile(spoolfile): # We received a forwarded raw notification. We need to process # this with our local notification rules in order to call one, # several or no actual plugins. - notify_log("Got spool file (%s) from remote host for local delivery." % - find_host_service(plugin_context)) raw_context = data["context"] + notify_log("Got spool file %s (%s) from remote host for local delivery." % ( + notif_uuid[:8], find_host_service(raw_context))) locally_deliver_raw_context(data["context"]) return 0 # No error handling for async delivery @@ -2000,6 +2002,11 @@ def notify_log(message): formatted = u"%s %s\n" % (time.strftime("%F %T", time.localtime()), message) file(notification_log, "a").write(formatted.encode("utf-8")) +def notify_log_debug(message): + if notification_logging >= 2: + notify_log(message) + + def get_readable_rel_date(timestamp): try: change = int(timestamp)

9 years, 1 month

Check_MK Git: check_mk: Small cleanup in treasures

by Mathias Kettner

Module: check_mk Branch: master Commit: a1fd6517f9004b7f51280132589983fb1abe5f14 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a1fd6517f9004b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue May 5 09:49:12 2015 +0200 Small cleanup in treasures --- doc/treasures/{ => deprecated}/mk_oracle.old | 0 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/doc/treasures/mk_oracle.old b/doc/treasures/deprecated/mk_oracle.old similarity index 100% rename from doc/treasures/mk_oracle.old rename to doc/treasures/deprecated/mk_oracle.old

9 years, 1 month

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits May 2015