Checkmk git commits December 2016

checkmk-commits@lists.checkmk.com

10 participants
391 discussions

Worked around recently introduced encoding issues in the GUI

by Lars Michelsen

Module: check_mk Branch: master Commit: 78ef0da5165baf08454d49aab2273f2fc3ebc661 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=78ef0da5165baf… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Dec 14 08:53:21 2016 +0100 Worked around recently introduced encoding issues in the GUI Change-Id: I33dcaa7235aaf196cc326f0aa4f6e6ddbeaf8ba5 --- web/htdocs/htmllib.py | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index ff50d36..7d34b24 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -189,7 +189,23 @@ class HTML(object): def __str__(self): - return self.__bytebatzen__() + # Against the sense of the __str__() method, we need to return the value + # as unicode here. Why? There are many cases where something like + # "%s" % HTML(...) is done in the GUI code. This calls the __str__ function + # because the origin is a str() object. The call will then return a UTF-8 + # encoded str() object. This brings a lot of compatbility issues to the code + # which can not be solved easily. + # To deal with this situation we need the implicit conversion from str to + # unicode that happens when we return a unicode value here. In all relevant + # cases this does exactly what we need. It would only fail if the origin + # string contained characters that can not be decoded with the ascii codec + # which is not relevant for us here. + # + # This is problematic: + # html.write("%s" % HTML("ä")) + # + # Bottom line: We should relly cleanup internal unicode/str handling. + return self.value def __repr__(self):

7 years, 9 months

Fixed issue in recent cleanup

by Lars Michelsen

Module: check_mk Branch: master Commit: 4dc87cedbd680b75a750796d9bb426d1e51a8432 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4dc87cedbd680b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Dec 13 17:57:51 2016 +0100 Fixed issue in recent cleanup Change-Id: I0bfa16c134fac24a3d6b79902e84e27f9308d926 --- web/htdocs/wato.py | 35 ++++++++++++++--------------------- 1 file changed, 14 insertions(+), 21 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 47ea763..f8efdb5 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -12085,31 +12085,24 @@ def mode_rulesets(phase, group=None): if help: html.help(help) - if not only_host: - all_rulesets = {} - rs = load_rulesets(Folder.current()) - for varname, rules in rs.items(): - all_rulesets.setdefault(varname, []) - all_rulesets[varname] += [ (Folder.current(), rule) for rule in rules ] - else: - all_rulesets = load_all_rulesets() - if only_used: - all_rulesets = dict([ r for r in all_rulesets.items() if len(r[1]) > 0 ]) + all_rulesets = load_all_rulesets() + if only_used: + all_rulesets = dict([ r for r in all_rulesets.items() if len(r[1]) > 0 ]) - if only_ineffective: - all_hosts = Host.all() + if only_ineffective: + all_hosts = Host.all() - has_ineffective_rules = False - rulesets_with_ineffective_rules = {} - for varname, rules in all_rulesets.items(): - rulespec = g_rulespecs[varname] + has_ineffective_rules = False + rulesets_with_ineffective_rules = {} + for varname, rules in all_rulesets.items(): + rulespec = g_rulespecs[varname] - for folder, rule in rules: - if rule_is_ineffective(rule, folder, rulespec, all_hosts): - rule_list = rulesets_with_ineffective_rules.setdefault(varname, []) - rule_list.append((folder, rule)) + for folder, rule in rules: + if rule_is_ineffective(rule, folder, rulespec, all_hosts): + rule_list = rulesets_with_ineffective_rules.setdefault(varname, []) + rule_list.append((folder, rule)) - all_rulesets = rulesets_with_ineffective_rules + all_rulesets = rulesets_with_ineffective_rules # Select matching rule groups while keeping their configured order

7 years, 9 months

Fetched livestatus from downstream.

by Sven Panne

Module: check_mk Branch: master Commit: 1c0b02d8c67df77809288733af1a340eb41b0f49 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1c0b02d8c67df7… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Dec 13 17:39:58 2016 +0100 Fetched livestatus from downstream. Change-Id: I9d601035b1ae93a6447f9bf0275e99f03be71f32 --- livestatus/src/OutputBuffer.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/livestatus/src/OutputBuffer.cc b/livestatus/src/OutputBuffer.cc index e3b5b26..f4d7b34 100644 --- a/livestatus/src/OutputBuffer.cc +++ b/livestatus/src/OutputBuffer.cc @@ -110,7 +110,7 @@ void OutputBuffer::flush(int fd, int *termination_flag) { ostringstream os; os << setw(3) << setfill('0') << static_cast<unsigned>(_response_code) - << " " << setw(11) << setfill(' ') << s; + << " " << setw(11) << setfill(' ') << s << "\n"; string header = os.str(); writeData(fd, termination_flag, header.c_str(), header.size()); writeData(fd, termination_flag, buffer, s);

7 years, 9 months

Fetched livestatus from downstream.

by Sven Panne

Module: check_mk Branch: master Commit: d809f234b2fe0d11309f22dfeac56b55934627c3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d809f234b2fe0d… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Dec 13 16:39:55 2016 +0100 Fetched livestatus from downstream. Change-Id: Ic980d4bb0eac54186f675dabdb66c47a8b0184ef --- livestatus/src/DoubleColumn.cc | 6 ++---- livestatus/src/LogCache.cc | 11 +++++----- livestatus/src/LogCache.h | 3 ++- livestatus/src/OutputBuffer.cc | 14 +++++++----- livestatus/src/PerfdataAggregator.cc | 6 ++---- livestatus/src/TableContacts.cc | 9 ++++---- livestatus/src/mk_logwatch.cc | 4 ++-- livestatus/src/unixcat.cc | 42 ++++++++++++++++++++---------------- 8 files changed, 49 insertions(+), 46 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=d809f234b2…

7 years, 9 months

Notification rules: Use standard store functions for persistance

by Lars Michelsen

Module: check_mk Branch: master Commit: aa9cab51223a2a7ddc0dc099a4afc6cd29fbc970 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=aa9cab51223a2a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Dec 12 16:56:53 2016 +0100 Notification rules: Use standard store functions for persistance Change-Id: I1f5f49f12f0477f7b395f8bbc6a2e3fd3cdbaf8d --- web/htdocs/wato.py | 34 ++++++++++++++-------------------- 1 file changed, 14 insertions(+), 20 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index f2dccaa..47ea763 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -6840,30 +6840,24 @@ class CheckTypeGroupSelection(ElementSelection): def load_notification_rules(): filename = wato_root_dir + "notifications.mk" - if not os.path.exists(filename): - return [] + notification_rules = store.load_from_mk_file(filename, + "notification_rules", []) + + # Convert to new plugin configuration format + for rule in notification_rules: + if "notify_method" in rule: + method = rule["notify_method"] + plugin = rule["notify_plugin"] + del rule["notify_method"] + rule["notify_plugin"] = ( plugin, method ) + + return notification_rules - try: - vars = { "notification_rules" : [] } - execfile(filename, vars, vars) - notification_rules = vars["notification_rules"] - # Convert to new plugin configuration format - for rule in notification_rules: - if "notify_method" in rule: - method = rule["notify_method"] - plugin = rule["notify_plugin"] - del rule["notify_method"] - rule["notify_plugin"] = ( plugin, method ) - return notification_rules - except Exception, e: - if config.debug: - raise MKGeneralException(_("Cannot read configuration file %s: %s") % - (filename, e)) - return [] def save_notification_rules(rules): make_nagios_directory(wato_root_dir) - file(wato_root_dir + "notifications.mk", "w").write("notification_rules += %s\n" % pprint.pformat(rules)) + store.save_to_mk_file(wato_root_dir + "notifications.mk", + "notification_rules", rules) def FolderChoice(**kwargs):

7 years, 9 months

4140 FIX Views: Download agent output action was not displayed correctly on SNMP+Agent hosts

by Lars Michelsen

Module: check_mk Branch: master Commit: 7a2f81987bb02219d60f9c84c04c565d18f092af URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7a2f81987bb022… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Dec 13 10:57:51 2016 +0100 4140 FIX Views: Download agent output action was not displayed correctly on SNMP+Agent hosts Change-Id: I4e6b8907f37481c6274c197d385e2ecddef55339 --- .werks/4140 | 9 +++++++++ ChangeLog | 1 + web/plugins/icons/wato.py | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.werks/4140 b/.werks/4140 new file mode 100644 index 0000000..87f97e9 --- /dev/null +++ b/.werks/4140 @@ -0,0 +1,9 @@ +Title: Views: Download agent output action was not displayed correctly on SNMP+Agent hosts +Level: 1 +Component: multisite +Compatible: compat +Version: 1.4.0i3 +Date: 1481623042 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index a816edb..4152334 100644 --- a/ChangeLog +++ b/ChangeLog @@ -93,6 +93,7 @@ * 4128 FIX: Fixed exception in "Virtual host tree" snapin in case a user tries to access a not existing tree * 4129 FIX: Fixed possible exception when a view is linking to a not permitted other view * 4137 FIX: List of strings: New fields are now added when last field is not empty... + * 4140 FIX: Views: Download agent output action was not displayed correctly on SNMP+Agent hosts WATO: * 3984 Permissions can now be filtered by providing a search term on the "edit role" page... diff --git a/web/plugins/icons/wato.py b/web/plugins/icons/wato.py index a560636..d8720c8 100644 --- a/web/plugins/icons/wato.py +++ b/web/plugins/icons/wato.py @@ -99,7 +99,7 @@ def paint_download_host_info(what, row, tags, host_custom_vars, ty): # be piggyback data available which should be downloadable. if ty == "walk" and "snmp" not in tags: return - elif ty == "agent" and "snmp" in tags and "agent" not in tags: + elif ty == "agent" and "snmp" in tags and "tcp" not in tags: return params = [("host", row["host_name"]),

7 years, 9 months

Added comment

by Mathias Kettner

Module: check_mk Branch: master Commit: 41b173c77461c41796cc12719a3e716c460f5abb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=41b173c77461c4… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Dec 13 09:11:38 2016 +0100 Added comment Change-Id: I901ea05508c8d36a7b200bc105f537cf1727561e --- web/plugins/sidebar/mkeventd.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/web/plugins/sidebar/mkeventd.py b/web/plugins/sidebar/mkeventd.py index 11df8e4..4f8fad4 100644 --- a/web/plugins/sidebar/mkeventd.py +++ b/web/plugins/sidebar/mkeventd.py @@ -40,6 +40,9 @@ def render_mkeventd_performance(): html.write("<table class=\"content_center mkeventd_performance\">\n") + # TODO: Reorder these values and create a useful order. + # e.g. Client connects and Time per client request after + # each other. columns = [ (_("Received messages"), "message", "%.2f/s"), (_("Rule hits"), "rule_hit", "%.2f/s"),

7 years, 9 months

Reserved 10 Werk IDS

by Marcel Arentz

Module: check_mk Branch: master Commit: fc028cba05986b5c1a5721347aaba44e6e00321c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fc028cba05986b… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Mon Dec 12 21:43:52 2016 +0100 Reserved 10 Werk IDS Change-Id: I5ef7e85a943d1f571da40245cce767ab964666a1 --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index ccbd775..26de2ed 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -4187 +4197

7 years, 9 months

still problems with werk ids

by Marcel Arentz

Module: check_mk Branch: master Commit: 0c290b17f2addfca6aee70b148cbec1b2293884f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0c290b17f2addf… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Mon Dec 12 21:51:04 2016 +0100 still problems with werk ids Change-Id: I27768eb23a9530cead65519caa8f2a909f18bce7 --- .werks/4162 | 7 +++---- .werks/4180 | 10 ++++++++++ ChangeLog | 3 ++- 3 files changed, 15 insertions(+), 5 deletions(-) diff --git a/.werks/4162 b/.werks/4162 index fb30afd..c539a79 100644 --- a/.werks/4162 +++ b/.werks/4162 @@ -1,10 +1,9 @@ -Title: fileinfo: Made paths for file grouping compatible for windows +Title: esx_vsphere_vm.heartbeat: fixed KeyError Level: 1 Component: checks +Class: fix Compatible: compat Version: 1.4.0i3 -Date: 1481575441 -Class: fix +Date: 1481551341 -The check is now able to handle windows pathnames. diff --git a/.werks/4180 b/.werks/4180 new file mode 100644 index 0000000..fb30afd --- /dev/null +++ b/.werks/4180 @@ -0,0 +1,10 @@ +Title: fileinfo: Made paths for file grouping compatible for windows +Level: 1 +Component: checks +Compatible: compat +Version: 1.4.0i3 +Date: 1481575441 +Class: fix + +The check is now able to handle windows pathnames. + diff --git a/ChangeLog b/ChangeLog index b5b6be1..a816edb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -62,13 +62,14 @@ * 4102 FIX: logwatch: Fixed crash due to non-existant logfile... * 4160 FIX: emcvnx_info: fixed data handling, now detects errors * 4161 FIX: emcvnx_sp_util: fixed empty data handling + * 4162 FIX: esx_vsphere_vm.heartbeat: fixed KeyError * 4163 FIX: kernel: fixed empty data handling * 4164 FIX: livestatus_status: fixed ValueError for values in scientific notation * 4103 FIX: kaspersky_av_client: No longer crash when date of last full scan is unknown... * 4177 FIX: smart: added compatibility for Intel SSDs... * 4178 FIX: apt: Fixed crash on unexpected output... * 4179 FIX: oracle_dataguard_stats, oracle_longactivesessions, oracle_rman: fixed crashes... - * 4162 FIX: fileinfo: Made paths for file grouping compatible for windows... + * 4180 FIX: fileinfo: Made paths for file grouping compatible for windows... Multisite: * 4070 Added a painter for the service check period

7 years, 9 months

4162 FIX fileinfo: Made paths for file grouping compatible for windows

by Marcel Arentz

Module: check_mk Branch: master Commit: e5c9df8e3cfc55923f1b37ff26970ac12fd6f875 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e5c9df8e3cfc55… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Mon Dec 12 21:45:30 2016 +0100 4162 FIX fileinfo: Made paths for file grouping compatible for windows The check is now able to handle windows pathnames. Change-Id: I072c7d4642dc282cebb1227f3397198a0c13cb53 --- .werks/4162 | 8 ++++---- ChangeLog | 4 ++-- checks/fileinfo | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.werks/4162 b/.werks/4162 index 0854c6e..fb30afd 100644 --- a/.werks/4162 +++ b/.werks/4162 @@ -1,10 +1,10 @@ -Title: esx_vsphere_vm.heartbeat: fixed KeyError +Title: fileinfo: Made paths for file grouping compatible for windows Level: 1 Component: checks -Class: fix Compatible: compat -State: unknown Version: 1.4.0i3 -Date: 1481551341 +Date: 1481575441 +Class: fix +The check is now able to handle windows pathnames. diff --git a/ChangeLog b/ChangeLog index aefb968..b5b6be1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -20,7 +20,6 @@ * 4109 websphere_mq_instance, websphere_mq_instance.manager: new checks for Websphere MQ * 4110 netscaler_vserver: now lower levels for health are configurable * 4098 ups_cps_battery, ups_cps_battery.temp, ups_cps_inphase, ups_cps_outphase: Several checks to monitor CPS UPS devices - * 4159 FIX: mem.win: fixed KeyError * 3987 FIX: Check_MK Agent Access: Windows agent reported incorrect only from value * 3952 FIX: diskstat: fixed bug if multipath devices having an alias... * 3939 FIX: f5_bigip_conns: readded performance data and graphs... @@ -59,16 +58,17 @@ * 4138 FIX: statgrab: Fixed issue in FreeBSD agent when statgrab is not installed * 4158 FIX: fileinfo: fixed file handling containing spaces * 4101 FIX: citrix_sessions: Output error message in case of missing session information.... + * 4159 FIX: mem.win: Fixed KeyError * 4102 FIX: logwatch: Fixed crash due to non-existant logfile... * 4160 FIX: emcvnx_info: fixed data handling, now detects errors * 4161 FIX: emcvnx_sp_util: fixed empty data handling - * 4162 FIX: esx_vsphere_vm.heartbeat: fixed KeyError * 4163 FIX: kernel: fixed empty data handling * 4164 FIX: livestatus_status: fixed ValueError for values in scientific notation * 4103 FIX: kaspersky_av_client: No longer crash when date of last full scan is unknown... * 4177 FIX: smart: added compatibility for Intel SSDs... * 4178 FIX: apt: Fixed crash on unexpected output... * 4179 FIX: oracle_dataguard_stats, oracle_longactivesessions, oracle_rman: fixed crashes... + * 4162 FIX: fileinfo: Made paths for file grouping compatible for windows... Multisite: * 4070 Added a painter for the service check period diff --git a/checks/fileinfo b/checks/fileinfo index 4dbe305..bbe0940 100644 --- a/checks/fileinfo +++ b/checks/fileinfo @@ -62,7 +62,7 @@ def inventory_fileinfo(info, case): def fileinfo_process_date(pattern, reftime): for what, the_time in [ ("DATE", reftime), ("YESTERDAY", reftime - 86400) ]: - the_regex = '(/.*)\$%s:((?:%%\w.?){1,})\$(.*)' % what + the_regex = '((?:/|[A-Za-z]).*)\$%s:((?:%%\w.?){1,})\$(.*)' % what disect = re.match(the_regex, pattern) if disect: prefix = disect.group(1)

7 years, 9 months

← Newer
1
...
22
23
24
25
26
27
28
...
40
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits December 2016