Checkmk git commits September 2016

checkmk-commits@lists.checkmk.com

9 participants
301 discussions

by Andreas Boesl

Module: check_mk Branch: master Commit: 55aba30130732cd3791a3e612f18517e4fc4a0a5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=55aba30130732c… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Sep 20 14:07:29 2016 +0200 fixed typo --- agents/special/agent_vsphere | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/agents/special/agent_vsphere b/agents/special/agent_vsphere index 0999fee..a75fa2a 100755 --- a/agents/special/agent_vsphere +++ b/agents/special/agent_vsphere @@ -1137,7 +1137,7 @@ def connect_to_server(): raise global error error = "Cannot connect to vSphere Server. Please check the IP and SSL certificate (if applicable) "\ - "\and try again. This error is not related to the login credentials. Error message: %r" % e + "and try again. This error is not related to the login credentials. Error message: %r" % e def retrieve_systeminfo(): global systeminfo

8 years

Fixed wrong help text

by Lars Michelsen

Module: check_mk Branch: master Commit: 1fcc3d2ec20061a32eba2ea825c2924c816daa93 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1fcc3d2ec20061… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Sep 20 13:54:05 2016 +0200 Fixed wrong help text --- modules/packaging.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/packaging.py b/modules/packaging.py index 81153ff..34b1750 100644 --- a/modules/packaging.py +++ b/modules/packaging.py @@ -418,7 +418,7 @@ def validate_package_files_part(packages, pacname, part, dir, rel_paths): def package_install(args): if len(args) != 1: - raise PackageException("Usage: check_mk -P remove NAME") + raise PackageException("Usage: check_mk -P install NAME") path = args[0] if not os.path.exists(path): raise PackageException("No such file %s." % path)

8 years

Write notification spoolfiles into temporary file ( before allowing mknotifyd to process it)

by Lars Michelsen

Module: check_mk Branch: master Commit: f6471bb41930aef3cc19bcde9f41b8b6cd769ae0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f6471bb41930ae… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Sep 20 13:35:25 2016 +0200 Write notification spoolfiles into temporary file (before allowing mknotifyd to process it) --- modules/notify.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/modules/notify.py b/modules/notify.py index 43bab3f..34df6b3 100644 --- a/modules/notify.py +++ b/modules/notify.py @@ -1212,7 +1212,10 @@ def create_spoolfile(data): os.makedirs(notification_spooldir) file_path = "%s/%s" % (notification_spooldir, fresh_uuid()) notify_log("Creating spoolfile: %s" % file_path) - file(file_path,"w").write(pprint.pformat(data)) + + # First write into tempfile that is not handled by mknotifyd + file(file_path + ".new", "w").write(pprint.pformat(data)) + os.rename(file_path + ".new", file_path) # There are three types of spool files:

8 years

3876 new option "negation" for filter "several service groups"

by Simon Betz

Module: check_mk Branch: master Commit: b7ecad977ee4c5e70cb5a3258e846539c3743128 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b7ecad977ee4c5… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue Sep 20 13:27:10 2016 +0200 3876 new option "negation" for filter "several service groups" --- .werks/3876 | 9 +++++++++ ChangeLog | 1 + web/plugins/visuals/filters.py | 31 +++++++++++++++++++++++-------- 3 files changed, 33 insertions(+), 8 deletions(-) diff --git a/.werks/3876 b/.werks/3876 new file mode 100644 index 0000000..136eaae --- /dev/null +++ b/.werks/3876 @@ -0,0 +1,9 @@ +Title: new option "negation" for filter "several service groups" +Level: 1 +Component: multisite +Compatible: compat +Version: 1.4.0i1 +Date: 1474370770 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index a7cbf6e..1cee385 100644 --- a/ChangeLog +++ b/ChangeLog @@ -425,6 +425,7 @@ * 3864 tactical overview now shows the number of stale hosts and services * 3847 Painter options can now be reset to defaults... * 3856 Improved handling of Check_MK GUI request timeouts... + * 3876 new option "negation" for filter "several service groups" * 3059 FIX: Fixed highlighting of availability timeline time slices * 3175 FIX: Fix timeranges of graphs that are embedded in a dashboard... * 3076 FIX: fixed broken views in check_mk raw edition diff --git a/web/plugins/visuals/filters.py b/web/plugins/visuals/filters.py index fccf0c3..a5b3d39 100644 --- a/web/plugins/visuals/filters.py +++ b/web/plugins/visuals/filters.py @@ -258,21 +258,24 @@ def all_groups(what): return [ (name, groups[name] or name) for name in groups.keys() ] class FilterMultigroup(Filter): - def __init__(self, what, title): - htmlvars = [ what + "groups" ] - Filter.__init__(self, htmlvars[0], # name + def __init__(self, what, title, negateable=False): + self.htmlvar = what + "groups" + htmlvars = [ self.htmlvar ] + self.negateable = negateable + if self.negateable: + htmlvars.append("neg_" + self.htmlvar) + Filter.__init__(self, self.htmlvar, # name title, what, # info, e.g. "service" htmlvars, []) # no link info needed self.what = what - self.htmlvar = htmlvars[0] def double_height(self): return True def valuespec(self): - return DualListChoice(choices = all_groups(self.what), rows=4, autoheight=False, enlarge_active=True) + return DualListChoice(choices = all_groups(self.what), rows=2, autoheight=False, enlarge_active=True) def selection(self): current = html.var(self.htmlvar, "").strip().split("|") @@ -284,16 +287,28 @@ class FilterMultigroup(Filter): def display(self): html.write('<div class=multigroup>') self.valuespec().render_input(self.htmlvar, self.selection()) + if self.negateable: + html.write(" <nobr>") + html.checkbox(self.htmlvars[1], label=_("negate")) + html.write("</nobr>") html.write('</div>') def filter(self, infoname): current = self.selection() if len(current) == 0: return "" # No group selected = all groups selected, filter unused + # not (A or B) => (not A) and (not B) + if self.negateable and html.get_checkbox(self.htmlvars[1]): + negate = "!" + op = "And" + else: + negate = "" + op = "Or" filters = "" for group in current: - filters += "Filter: %s_groups >= %s\n" % (self.what, lqencode(group)) - filters += "Or: %d\n" % len(current) + filters += "Filter: %s_groups %s>= %s\n" % (self.what, negate, lqencode(group)) + if len(current) > 1: + filters += "%s: %d\n" % (op, len(current)) return filters @@ -376,7 +391,7 @@ declare_filter(104, FilterGroupCombo("host", _("Host is in Group"), declare_filter(105, FilterMultigroup("host", _("Several Host Groups")), _("Selection of multiple host groups")) declare_filter(204, FilterGroupCombo("service", _("Service is in Group"), False), _("Optional selection of service group")) declare_filter(205, FilterGroupCombo("service", _("Servicegroup (enforced)"), True), _("Dropdown list, selection of service group is <b>enforced</b>")) -declare_filter(205, FilterMultigroup("service", _("Several Service Groups")), _("Selection of multiple service groups")) +declare_filter(205, FilterMultigroup("service", _("Several Service Groups"), True), _("Selection of multiple service groups")) declare_filter(106, FilterGroupCombo("host_contact", _("Host Contact Group"), False), _("Optional selection of host contact group")) declare_filter(206, FilterGroupCombo("service_contact", _("Service Contact Group"), False), _("Optional selection of service contact group"))

8 years

3808 FIX df.include: fixed incorrect levels calculations on very small filesystems

by Andreas Boesl

Module: check_mk Branch: master Commit: b9d64568fc919a82aa3397f583987a00ce7ca496 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b9d64568fc919a… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Sep 20 11:50:45 2016 +0200 3808 FIX df.include: fixed incorrect levels calculations on very small filesystems Filesystems with <tt>Free space left</tt> levels less than 1MB were incorrectly calculated. The check always reported CRIT in this scenario. --- .werks/3808 | 11 +++++++++++ ChangeLog | 1 + checks/df.include | 2 +- 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/.werks/3808 b/.werks/3808 new file mode 100644 index 0000000..428ba30 --- /dev/null +++ b/.werks/3808 @@ -0,0 +1,11 @@ +Title: df.include: fixed incorrect levels calculations on very small filesystems +Level: 1 +Component: checks +Compatible: compat +Version: 1.4.0i1 +Date: 1474364904 +Class: fix + +Filesystems with <tt>Free space left</tt> levels less than 1MB were incorrectly calculated. +The check always reported CRIT in this scenario. + diff --git a/ChangeLog b/ChangeLog index 0b3f494..a7cbf6e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -398,6 +398,7 @@ * 3746 FIX: tinkerforge: Keep check from crashing in case of unconfigured params * 3862 FIX: mknotifyd mknotifyd.connection: New service description (when enabled)... * 3807 FIX: mssql_counters: fixed crash when the check is unable to parse a timestamp provided by the plugin + * 3808 FIX: df.include: fixed incorrect levels calculations on very small filesystems... Multisite: * 3187 notification view: new filter for log command via regex diff --git a/checks/df.include b/checks/df.include index 8e0f5de..c9bfdee 100644 --- a/checks/df.include +++ b/checks/df.include @@ -321,7 +321,7 @@ def df_check_filesystem_single(hostname, mountpoint, size_mb, avail_mb, reserved get_percent_human_readable(used_perc), used_hr, size_hr) status = 0 - if warn_mb <= -1: + if warn_mb < 0: # Negative levels, so calculate MB left rest_mb = size_mb - used_mb crit_mb = crit_mb * -1

8 years

3807 FIX mssql_counters: fixed crash when the check is unable to parse a timestamp provided by the plugin

by Andreas Boesl

Module: check_mk Branch: master Commit: 5367c24d59f44d8db6e7196e53b9e53040b3b2d1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5367c24d59f44d… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Sep 20 10:44:40 2016 +0200 3807 FIX mssql_counters: fixed crash when the check is unable to parse a timestamp provided by the plugin --- .werks/3807 | 9 +++++++++ ChangeLog | 1 + checks/mssql_counters | 9 ++++++--- 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/.werks/3807 b/.werks/3807 new file mode 100644 index 0000000..6650be8 --- /dev/null +++ b/.werks/3807 @@ -0,0 +1,9 @@ +Title: mssql_counters: fixed crash when the check is unable to parse a timestamp provided by the plugin +Level: 1 +Component: checks +Compatible: compat +Version: 1.4.0i1 +Date: 1474361050 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index acdae50..0b3f494 100644 --- a/ChangeLog +++ b/ChangeLog @@ -397,6 +397,7 @@ * 3701 FIX: FIX ps.perf graph title for Memory and CPU Usage... * 3746 FIX: tinkerforge: Keep check from crashing in case of unconfigured params * 3862 FIX: mknotifyd mknotifyd.connection: New service description (when enabled)... + * 3807 FIX: mssql_counters: fixed crash when the check is unable to parse a timestamp provided by the plugin Multisite: * 3187 notification view: new filter for log command via regex diff --git a/checks/mssql_counters b/checks/mssql_counters index 71ab47d..2f82ba3 100644 --- a/checks/mssql_counters +++ b/checks/mssql_counters @@ -145,9 +145,12 @@ def mssql_time_from_counter(info): return utc_mktime(time.strptime(" ".join(line[3:]).split(".")[0], "%Y-%m-%d %H:%M:%S")) except ValueError: - # ... german - return utc_mktime(time.strptime(" ".join(line[3:]), - "%d.%m.%Y %H:%M:%S")) + try: + # ... german + return utc_mktime(time.strptime(" ".join(line[3:]), + "%d.%m.%Y %H:%M:%S")) + except: + pass return None def check_mssql_counters_transactions(item, params, info):

8 years

further update for WK3796

by Andreas Boesl

Module: check_mk Branch: master Commit: db6e85626701ca9631de7d7bfa0c141d29cc9e0f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=db6e85626701ca… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Sep 20 10:20:37 2016 +0200 further update for WK3796 --- agents/special/agent_vsphere | 42 ++++++++++++++++++++++++++++-------------- 1 file changed, 28 insertions(+), 14 deletions(-) diff --git a/agents/special/agent_vsphere b/agents/special/agent_vsphere index 0552951..0999fee 100755 --- a/agents/special/agent_vsphere +++ b/agents/special/agent_vsphere @@ -854,7 +854,7 @@ opt_vm_piggyname = "alias" opt_spaces = "underscore" opt_no_cert = False -win_agent_output = None +win_agent_output = "" error = None error_exit = 1 @@ -940,6 +940,18 @@ vsphere_output = [] def output(line): vsphere_output.append(line) +# This function is used to modify the vsphere output, just before it is written to stdout +def check_winperf_processor(line): + if "<<<winperf_processor>>>" in win_agent_output: + try: + vsphere_output.remove(line) + except ValueError: + pass +# A list of tuples: (line, function_pointer) +# A certain line can register a function pointer +# The function pointer is called later on with the line as argument +postprocess_functions = [] + socket.setdefaulttimeout(opt_timeout) def get_agent_info_tcp(hostname): response = "" @@ -976,10 +988,6 @@ def get_agent_info_tcp(hostname): return response -if opt_agent: - win_agent_output = get_agent_info_tcp(host_address) - error_exit = 0 - # Globals of ESX System. These settings are available after the first "systeminfo" query systemfields = [ ("apiVersion", float), @@ -1475,14 +1483,13 @@ if not error: output("<<<<%s>>>>" % convert_hostname(properties["name"][0])) output("<<<esx_vsphere_hostsystem>>>") - # Special handling. If the windows agent reports winperf_processor skip - # summary.quickStats.overallCpuUsage in output. This would lead to a - # duplicate "CPU utlization" service - skip_cpu_util = opt_agent and "<<<winperf_processor>>>" in win_agent_output - for key in sorted(properties.keys()): - if skip_cpu_util and key == "summary.quickStats.overallCpuUsage": - continue + # Special handling. If the windows may report winperf_processor in the following call + # remove summary.quickStats.overallCpuUsage from the output. This would lead to a + # duplicate "CPU utlization" service + if opt_agent and key == "summary.quickStats.overallCpuUsage": + postprocess_functions.append(("%s %s" % (key, " ".join(properties[key])), check_winperf_processor)) + output("%s %s" % (key, " ".join(properties[key]))) output("<<<esx_vsphere_sensors:sep(59)>>>") @@ -1695,11 +1702,18 @@ def make_utf8(line): else: return line -print "\n".join(map(make_utf8, vsphere_output)) - if opt_agent: + win_agent_output = get_agent_info_tcp(host_address) sys.stdout.write(win_agent_output) sys.stdout.flush() + error_exit = 0 + +# May filter some data from the vsphere_output variable +# Currently only used by winperf_processor special handling +for line, function in postprocess_functions: + function(line) + +print "\n".join(map(make_utf8, vsphere_output)) if tracefile: tracefile.close()

8 years

werks: small refactoring (write ack file with tempfile now)

by Lars Michelsen

Module: check_mk Branch: master Commit: 28a1c0adccfbb4978dfa4003dfa0065e3e9506a5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=28a1c0adccfbb4… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Sep 20 09:24:49 2016 +0200 werks: small refactoring (write ack file with tempfile now) --- web/htdocs/werks.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/web/htdocs/werks.py b/web/htdocs/werks.py index 8d58e75..a4829f7 100644 --- a/web/htdocs/werks.py +++ b/web/htdocs/werks.py @@ -31,6 +31,7 @@ import defaults, config, os, table import re from lib import * from valuespec import * +import cmk.store as store acknowledgement_path = defaults.var_dir + "/acknowledged_werks.mk" @@ -203,7 +204,7 @@ def acknowledge_werks(werks): def save_acknowledgements(acknowledged_werks): - file(acknowledgement_path, "w").write("%r\n" % acknowledged_werks) + store.save_file(acknowledgement_path, "%r\n" % acknowledged_werks) def acknowledge_all_werks():

8 years

3885 FIX Fixed sorting of version in werk list ( 1.2.8p10 and 1.2.8p11 were not listed on top)

by Lars Michelsen

Module: check_mk Branch: master Commit: ad112795b3711851c524a9514baefe24c5788591 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ad112795b37118… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Sep 20 09:15:52 2016 +0200 3885 FIX Fixed sorting of version in werk list (1.2.8p10 and 1.2.8p11 were not listed on top) --- .werks/3885 | 10 ++++++++++ ChangeLog | 1 + modules/check_mk_base.py | 1 + web/htdocs/werks.py | 49 +++++++++++++++++++++++++++++++++++++++++++++++- 4 files changed, 60 insertions(+), 1 deletion(-) diff --git a/.werks/3885 b/.werks/3885 new file mode 100644 index 0000000..7f11a33 --- /dev/null +++ b/.werks/3885 @@ -0,0 +1,10 @@ +Title: Fixed sorting of version in werk list (1.2.8p10 and 1.2.8p11 were not listed on top) +Level: 1 +Component: multisite +Class: fix +Compatible: compat +State: unknown +Version: 1.4.0i1 +Date: 1474355728 + + diff --git a/ChangeLog b/ChangeLog index 8745e77..acdae50 100644 --- a/ChangeLog +++ b/ChangeLog @@ -505,6 +505,7 @@ * 3850 FIX: Fixed JS error when quicksearch snapin not in sidebar * 3871 FIX: stale services view: excluded services in downtime per default * 3874 FIX: fixed graphs displaying wrong labels + * 3885 FIX: Fixed sorting of version in werk list (1.2.8p10 and 1.2.8p11 were not listed on top) WATO: * 3244 WATO BI Module: swap order of aggregation function and child node selection... diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index 1faaf69..192e97c 100644 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -1362,6 +1362,7 @@ def branch_of_daily_build(v): # 1.2.4b1 -> 01020420100 # 1.2.3i1p1 -> 01020310101 # 1.2.3i1 -> 01020310100 +# TODO: Copied to werks.py - find location for common code. def parse_check_mk_version(v): def extract_number(s): number = '' diff --git a/web/htdocs/werks.py b/web/htdocs/werks.py index 31ff1f0..8d58e75 100644 --- a/web/htdocs/werks.py +++ b/web/htdocs/werks.py @@ -606,6 +606,53 @@ def werks_sorted_by_version(werks): if lhs["version"] == rhs["version"]: return cmp(lhs["date"], rhs["date"]) else: - return cmp(lhs["version"], rhs["version"]) + return cmp(parse_check_mk_version(lhs["version"]), + parse_check_mk_version(rhs["version"])) return sorted(werks, cmp=by_version, reverse=True) + + +# Parses versions of Check_MK and converts them into comparable integers. +# This does not handle daily build numbers, only official release numbers. +# 1.2.4p1 -> 01020450001 +# 1.2.4 -> 01020450000 +# 1.2.4b1 -> 01020420100 +# 1.2.3i1p1 -> 01020310101 +# 1.2.3i1 -> 01020310100 +# TODO: Copied from check_mk_base.py - find location for common code. +def parse_check_mk_version(v): + def extract_number(s): + number = '' + for i, c in enumerate(s): + try: + int(c) + number += c + except ValueError: + s = s[i:] + return number and int(number) or 0, s + return number and int(number) or 0, '' + + parts = v.split('.') + while len(parts) < 3: + parts.append("0") + + major, minor, rest = parts + sub, rest = extract_number(rest) + + if not rest: + val = 50000 + elif rest[0] == 'p': + num, rest = extract_number(rest[1:]) + val = 50000 + num + elif rest[0] == 'i': + num, rest = extract_number(rest[1:]) + val = 10000 + num*100 + + if rest and rest[0] == 'p': + num, rest = extract_number(rest[1:]) + val += num + elif rest[0] == 'b': + num, rest = extract_number(rest[1:]) + val = 20000 + num*100 + + return int('%02d%02d%02d%05d' % (int(major), int(minor), sub, val))

8 years

Improved error message when creating backup target in CMA

by Lars Michelsen

Module: check_mk Branch: master Commit: cab34c5cdcd7cc21ae9381d93ce1b6021509f0c0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cab34c5cdcd7cc… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Sep 20 09:02:54 2016 +0200 Improved error message when creating backup target in CMA --- web/htdocs/backup.py | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/web/htdocs/backup.py b/web/htdocs/backup.py index bac42a5..3132e32 100644 --- a/web/htdocs/backup.py +++ b/web/htdocs/backup.py @@ -1357,10 +1357,15 @@ class BackupTargetLocal(BackupTargetType): file(test_file_path, "w") os.unlink(test_file_path) except IOError, e: - raise MKUserError(varprefix, - _("Failed to write to the configured directory. The site user needs to be able to " - "write the target directory. The recommended way is to make it writable by the " - "group \"omd\".")) + if is_cma(): + raise MKUserError(varprefix, + _("Failed to write to the configured directory. The target directory needs " + "to be writable.")) + else: + raise MKUserError(varprefix, + _("Failed to write to the configured directory. The site user needs to be able to " + "write the target directory. The recommended way is to make it writable by the " + "group \"omd\".")) # TODO: Duplicate code with mkbackup

8 years

← Newer
1
...
11
12
13
14
15
16
17
...
31
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits September 2016