Checkmk git commits July 2017

checkmk-commits@lists.checkmk.com

11 participants
286 discussions

4912 FIX rds_licenses: Fixed exception if agent bakery is used to deploy this plugin

by Marcel Arentz

Module: check_mk Branch: master Commit: cd5276074483256326c318cd7b90d2df9a544fd2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cd527607448325… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Tue Jul 4 09:07:53 2017 +0200 4912 FIX rds_licenses: Fixed exception if agent bakery is used to deploy this plugin The Agent Bakery threw an exception if someone tried to configure the deployment by the ruleset. The reason for this has been a wrong path to the plugin. Thanks to Stephan Glotzbach for reporting this issue! Change-Id: Ied842fc1217f2f00e65813700efcb51397cc894c --- .werks/4912 | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/.werks/4912 b/.werks/4912 new file mode 100644 index 0000000..f51ddf5 --- /dev/null +++ b/.werks/4912 @@ -0,0 +1,14 @@ +Title: rds_licenses: Fixed exception if agent bakery is used to deploy this plugin +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1499151446 +Class: fix + +The Agent Bakery threw an exception if someone tried to configure the +deployment by the ruleset. The reason for this has been a wrong path to +the plugin. + +Thanks to Stephan Glotzbach for reporting this issue!

6 years, 12 months

big refactoring of cups_queues

by Marcel Arentz

Module: check_mk Branch: master Commit: 682a5797544c720aad8c3eb5af64e27991e5955d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=682a5797544c72… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Wed Apr 5 16:18:02 2017 +0200 big refactoring of cups_queues Change-Id: I3cea934731e82f74b1d53e8f373af3939e8be4b1 --- checks/cups_queues | 120 +++++++++++++++++++++++++++++------------------------ 1 file changed, 66 insertions(+), 54 deletions(-) diff --git a/checks/cups_queues b/checks/cups_queues index 351f27a..972abcb 100644 --- a/checks/cups_queues +++ b/checks/cups_queues @@ -55,72 +55,84 @@ factory_settings['cups_queues_default_levels'] = { } -def inventory_cups_queues(info): - return [ ('%s' % line[1], {}) for line in info if line[0] == 'printer' ] +def parse_cups_queues(info): + parsed = {} - -def check_cups_queues(item, params, info): + for num, line in enumerate(info): + if line[0] == "printer": + parsed[line[1]] = { + 'status_readable' : ' '.join(line[2:4]).replace(' ', '_').strip('.'), + 'output' : ' '.join(line[2:]), + 'jobs' : [], + } + if len(info) > num+1 and \ + not info[num+1][0] in [ 'printer', '---' ]: + parsed[line[1]]['output'] += " (%s)" % \ + " ".join(info[num+1]) + elif line[0] == "---": + break + + queue_section = False + for line in info: + if line[0] == '---': + queue_section = True + continue + + item = line[0].split("-", 1)[0] + if item in parsed and queue_section: + # Handle different time formats... + try: # Tue Jun 29 09:05:54 2010 + job_time = time.mktime(time.strptime(' '.join(line[-5:]), \ + '%a %b %d %H:%M:%S %Y')) + except: # Thu 29 Aug 2013 12:41:42 AM CEST + job_time = time.mktime(time.strptime(' '.join(line[-7:]), \ + '%a %d %b %Y %H:%M:%S %p %Z')) + parsed[item]['jobs'].append(job_time) + + return parsed + +def inventory_cups_queues(parsed): + for item in parsed: + yield item, {} + +def check_cups_queues(item, params, parsed): + data = parsed[item] if type(params) == tuple and len(params) == 4: params = {"job_count" : (params[0], params[1]), "job_age" : (params[2], params[3]), } - warn_num, crit_num = params["job_count"] - warn_age, crit_age = params["job_age"] - state = 3 - output = "Queue not found" - jobs = 0 - now = time.time() - oldest = now - for num, line in enumerate(info): - # Parse printer status - if line[0] == 'printer' and line[1] == item: - statusoutput = ' '.join(line[2:]) - status = ' '.join(line[2:4]) - - # If the next line does not start with "printer" append it as additional output - if len(info) > num+1 and not info[num+1][0] in [ 'printer', '---' ]: - statusoutput += " (%s)" % " ".join(info[num+1]) - - if status in [ "is idle.", "now printing", "disabled since" ]: - state = params[status.replace(" ", "_").replace(".", "")] - output = "%s" % statusoutput - else: - state = 3 - output = "Undefined status output in \"lpr -p\"" - - # Parse job - elif line[0].startswith(item+'-'): - # This is a queue item count the number of items and check the max age - jobs += 1 - - # Try to parse different time formats. TODO: Couldn't we run the lpr command - # with some environment var to fixate the date format? - try: - # Tue Jun 29 09:05:54 2010 - timestring = ' '.join(line[-5:]) - parsed = time.strptime(timestring, '%a %b %d %H:%M:%S %Y') - except: - # Thu 29 Aug 2013 12:41:42 AM CEST - timestring = ' '.join(line[-7:]) - parsed = time.strptime(timestring, '%a %d %b %Y %H:%M:%S %p %Z') - - dt = time.mktime(parsed) - if dt < oldest: - oldest = dt - - jobOutput = 'Jobs: %d' % jobs - if jobs > 0: - if oldest < now - crit_age or jobs > crit_num: + if data["status_readable"] in params: + state = params[data["status_readable"]] + yield state, data["output"] + else: + yield 3, "Undefinded status output in \"lpr -p\"" + + now = time.time() + jobs_count = len(data["jobs"]) + if jobs_count > 0: + warn_num, crit_num = params["job_count"] + yield 0, "Jobs: %d" % jobs_count, \ + [ ("jobs", jobs_count, warn_num, crit_num, 0) ] + + warn_age, crit_age = params["job_age"] + now = time.time() + oldest = min(data["jobs"]) + oldest_readable = time.strftime("%c", time.localtime(oldest)) + + if oldest < now - crit_age or jobs_count > crit_num: state = 2 - elif oldest < now - warn_age or jobs > warn_num: + elif oldest < now - warn_age or jobs_count > warn_num: state = 1 - jobOutput += ', Oldest job is from %s' % time.strftime("%c", time.localtime(oldest)) + else: + state = 0 - return (state, output + " - " + jobOutput, [ ("jobs", jobs, warn_num, crit_num, 0) ]) + if state: + yield state, "Oldest job is from %s" % oldest_readable check_info["cups_queues"] = { + 'parse_function' : parse_cups_queues, 'inventory_function' : inventory_cups_queues, 'check_function' : check_cups_queues, 'service_description' : 'CUPS Queue %s',

6 years, 12 months

4554 FIX cups_queues: Moved agent section into own plugin script

by Marcel Arentz

Module: check_mk Branch: master Commit: 63ce31a7a94e23549796f4a2d82e05d97d60ca28 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=63ce31a7a94e23… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Wed Apr 5 16:17:40 2017 +0200 4554 FIX cups_queues: Moved agent section into own plugin script Due performance issues we decided to remove this section from the linux agent and put into a plugin. Now you are able to define individual caching ages instead of being forced having a caching of five minutes to satisfy large environments even if you do not have one. Change-Id: I068f563794f44f2302f18a242b072a6f20b84d01 --- .werks/4554 | 13 +++++++++++ agents/check_mk_agent.linux | 39 ------------------------------- agents/plugins/mk_cups_queues | 54 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 67 insertions(+), 39 deletions(-) diff --git a/.werks/4554 b/.werks/4554 new file mode 100644 index 0000000..50f6236 --- /dev/null +++ b/.werks/4554 @@ -0,0 +1,13 @@ +Title: cups_queues: Moved agent section into own plugin script +Level: 1 +Component: checks +Compatible: incomp +Edition: cre +Version: 1.5.0i1 +Date: 1491400977 +Class: fix + +Due performance issues we decided to remove this section from the linux agent +and put into a plugin. Now you are able to define individual caching ages +instead of being forced having a caching of five minutes to satisfy large +environments even if you do not have one. diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index 8af57f4..caeed2a 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -577,45 +577,6 @@ if [ -e /proc/drbd ]; then cat /proc/drbd fi -# Status of CUPS printer queues -if type lpstat > /dev/null 2>&1; then - # Systemd starts cupsd on demand: Instead of checking that the cupsd is - # running we check that the cups service exists and is enabled. - if pgrep -f "\bcupsd" > /dev/null 2>&1 \ - || (type systemctl >/dev/null 2>&1 && systemctl is-enabled cups.service); then - # first define a function to check cups - function cups_queues () { - CPRINTCONF=/etc/cups/printers.conf - if [ -r "$CPRINTCONF" ] ; then - LOCAL_PRINTERS=$(grep -E "<(Default)?Printer .*>" $CPRINTCONF | awk '{print $2}' | sed -e 's/>//') - lpstat -p | while read LINE - do - PRINTER=$(echo $LINE | awk '{print $2}') - if echo "$LOCAL_PRINTERS" | grep -q "$PRINTER"; then - echo $LINE - fi - done - echo '---' - lpstat -o | while read LINE - do - PRINTER=${LINE%%-*} - if echo $LOCAL_PRINTERS | grep -q $PRINTER; then - echo $LINE - fi - done - else - lpstat -p - echo '---' - lpstat -o | sort - fi - } - # Make cups_queues available for subshell - export -f cups_queues - # Use cups_queues function with run_cached and cache time of 5 mins - run_cached -s cups_queues 300 "cups_queues" - fi -fi - # Heartbeat monitoring # Different handling for heartbeat clusters with and without CRM # for the resource state diff --git a/agents/plugins/mk_cups_queues b/agents/plugins/mk_cups_queues new file mode 100755 index 0000000..986a7ef --- /dev/null +++ b/agents/plugins/mk_cups_queues @@ -0,0 +1,54 @@ +#!/bin/bash +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2017 mk(a)mathias-kettner.de | +# +------------------------------------------------------------------+ +# +# This file is part of Check_MK. +# The official homepage is at http://mathias-kettner.de/check_mk. +# +# check_mk is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation in version 2. check_mk is distributed +# in the hope that it will be useful, but WITHOUT ANY WARRANTY; with- +# out even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. See the GNU General Public License for more de- +# tails. You should have received a copy of the GNU General Public +# License along with GNU Make; see the file COPYING. If not, write +# to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, +# Boston, MA 02110-1301 USA. + +if type lpstat > /dev/null 2>&1 ; then + export LC_TIME="en_US.UTF-8" + echo "<<<cups_queues>>>" + CPRINTCONF=/etc/cups/printers.conf + if [ -r "$CPRINTCONF" ] ; then + LOCAL_PRINTERS=$(grep -E "<(Default)?Printer .*>" $CPRINTCONF | awk '{print $2}' | sed -e 's/>//') + lpstat -p | while read LINE + do + PRINTER=$(echo $LINE | awk '{print $2}') + if echo "$LOCAL_PRINTERS" | grep -q "$PRINTER"; then + echo $LINE + fi + done + echo '---' + lpstat -o | while read LINE + do + PRINTER=${LINE%%-*} + if echo $LOCAL_PRINTERS | grep -q $PRINTER; then + echo $LINE + fi + done + else + PRINTER=$(lpstat -p) + echo $PRINTER + echo '---' + QUEUE=$(lpstat -o | sort) + echo $QUEUE + fi +fi

6 years, 12 months

Fix an issue with if check family after check file separation

by Lars Michelsen

Module: check_mk Branch: master Commit: fb0d9ff62c70549b851cd6e98a217351f7786a98 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fb0d9ff62c7054… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jul 4 07:50:03 2017 +0200 Fix an issue with if check family after check file separation Change-Id: I88b3f511cd6b28994e26fb0975371346c86475c2 --- cmk_base/checks.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/cmk_base/checks.py b/cmk_base/checks.py index 5ed07d4..ba0e41b 100644 --- a/cmk_base/checks.py +++ b/cmk_base/checks.py @@ -156,6 +156,13 @@ def load_checks(filelist): else: context_ident_list += new_checks + # Hack to make dependencies between multiple includes work. In case we + # need more here we need to find another solution. + # TODO(lm): This needs to be cleaned up. Try to move the includes to + # python modules that are separated from each other and can refer to + # each other. + _include_contexts["if64.include"].update(_include_contexts["if.include"]) + config.add_check_variables(check_variable_defaults) # Now convert check_info to new format.

6 years, 12 months

Fixed recently introduced problem during config compilation when using NEGATE in rules

by Lars Michelsen

Module: check_mk Branch: master Commit: 1736a8f497f56e6eb3cbbbc09b931e2267390968 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1736a8f497f56e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jul 3 15:58:26 2017 +0200 Fixed recently introduced problem during config compilation when using NEGATE in rules Change-Id: Ib8997b7e6ac315857013121c8dd1b17ddbefc92f --- cmk_base/config.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/cmk_base/config.py b/cmk_base/config.py index f130977..05298b5 100644 --- a/cmk_base/config.py +++ b/cmk_base/config.py @@ -126,10 +126,13 @@ def _initialize_default_levels_variables(): def _load_config(with_conf_d, exclude_parents_mk): import cmk_base.checks helper_vars = { - "FILE_PATH" : None, - "FOLDER_PATH" : None, - "ALL_HOSTS" : rulesets.ALL_HOSTS, - "ALL_SERVICES" : rulesets.ALL_SERVICES, + "FILE_PATH" : None, + "FOLDER_PATH" : None, + "PHYSICAL_HOSTS" : rulesets.PHYSICAL_HOSTS, + "CLUSTER_HOSTS" : rulesets.CLUSTER_HOSTS, + "ALL_HOSTS" : rulesets.ALL_HOSTS, + "ALL_SERVICES" : rulesets.ALL_SERVICES, + "NEGATE" : rulesets.NEGATE, } global_dict = globals()

6 years, 12 months

Fixed WATO ruleset navigation

by Lars Michelsen

Module: check_mk Branch: master Commit: f730364456bc497c3db4199c339cde51b6ace22f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f730364456bc49… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jul 3 15:45:35 2017 +0200 Fixed WATO ruleset navigation Change-Id: I5480809db4677961ff1ccb1083816f1af0dbe2af --- web/htdocs/valuespec.py | 11 ++++++----- web/htdocs/wato.py | 14 +++++--------- 2 files changed, 11 insertions(+), 14 deletions(-) diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index 490ed5e..e4386ad 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -1624,10 +1624,10 @@ class DropdownChoice(ValueSpec): html.write(self._empty_text) elif len(options[0]) == 3: html.icon_dropdown(varprefix, self._options_for_html(options), - deflt=self._option_id(defval)) + deflt=self.option_id(defval)) else: html.dropdown(varprefix, self._options_for_html(options), - deflt=self._option_id(defval),onchange=self._on_change, sorted=self._sorted) + deflt=self.option_id(defval),onchange=self._on_change, sorted=self._sorted) def _get_invalid_choice_title(self, value): @@ -1664,17 +1664,18 @@ class DropdownChoice(ValueSpec): def _is_selected_option_from_html(self, varprefix, val): selected_value = html.var(varprefix) - return selected_value == self._option_id(val) + return selected_value == self.option_id(val) def _options_for_html(self, orig_options): options = [] for val, title in orig_options: - options.append((self._option_id(val), title)) + options.append((self.option_id(val), title)) return options - def _option_id(self, val): + @classmethod + def option_id(cls, val): return "%s" % hash(val) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 621169a..d4dce5c 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -12212,19 +12212,19 @@ class ModeRuleEditor(WatoMode): html.context_button(_("Used Rulesets"), folder_preserving_link([ ("mode", "rulesets"), - ("search_p_ruleset_used", "0"), + ("search_p_ruleset_used", DropdownChoice.option_id(True)), ("search_p_ruleset_used_USE", "on"), ]), "usedrulesets") html.context_button(_("Ineffective rules"), folder_preserving_link([ ("mode", "rulesets"), - ("search_p_rule_ineffective", "0"), + ("search_p_rule_ineffective", DropdownChoice.option_id(True)), ("search_p_rule_ineffective_USE", "on")] ), "rulesets_ineffective") html.context_button(_("Deprecated Rulesets"), folder_preserving_link([ ("mode", "rulesets"), - ("search_p_ruleset_deprecated", "0"), + ("search_p_ruleset_deprecated", DropdownChoice.option_id(True)), ("search_p_ruleset_deprecated_USE", "on") ]), "rulesets_deprecated") @@ -12299,12 +12299,8 @@ class ModeRulesets(WatoMode): # Transform group argument to the "rule search arguments" # Keeping this for compatibility reasons for the moment if self._group_name: - try: - group_names = [ g[0] for g in g_rulespecs.get_group_choices(self._mode) ] - rulegroup_index = group_names.index(html.get_unicode_input("group")) - except (ValueError, IndexError): - raise MKUserError(None, _("Unknown ruleset group")) - html.set_var("search_p_ruleset_group", "%d" % rulegroup_index) + html.set_var("search_p_ruleset_group", + DropdownChoice.option_id(html.get_unicode_input("group"))) html.set_var("search_p_ruleset_group_USE", "on") html.del_var("group")

6 years, 12 months

4933 FIX Fixed possible KeyError event_host in EC views since 1.4.0p6

by Lars Michelsen

Module: check_mk Branch: master Commit: 3013e7c70e1fd7da5ff1631cf84367b337f9c7af URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3013e7c70e1fd7… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jul 3 15:26:22 2017 +0200 4933 FIX Fixed possible KeyError event_host in EC views since 1.4.0p6 This issue could occure when using customized EC views which did not render or filtr the origin event host name. Change-Id: I0318ac93b9187bde2e7632347a84e0cfea5285a9 --- .werks/4933 | 12 ++++++++++++ web/plugins/views/mkeventd.py | 8 +++----- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/.werks/4933 b/.werks/4933 new file mode 100644 index 0000000..83c5047 --- /dev/null +++ b/.werks/4933 @@ -0,0 +1,12 @@ +Title: Fixed possible KeyError event_host in EC views since 1.4.0p6 +Level: 1 +Component: ec +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i1 +Date: 1499088288 + +This issue could occure when using customized EC views which did not render or filtr the origin +event host name. diff --git a/web/plugins/views/mkeventd.py b/web/plugins/views/mkeventd.py index b5ea5c9..fcef27e 100644 --- a/web/plugins/views/mkeventd.py +++ b/web/plugins/views/mkeventd.py @@ -45,11 +45,6 @@ except: def query_ec_table(datasource, columns, add_columns, query, only_sites, limit, tablename): - if "event_contact_groups" not in columns: - columns.append("event_contact_groups") - if "host_contact_groups" not in columns: - columns.append("host_contact_groups") - rows = query_data(datasource, columns, add_columns, query, only_sites, limit, tablename=tablename) @@ -144,6 +139,8 @@ if mkeventd_enabled: "keys" : [], "idkeys" : [ 'site', 'host_name', 'event_id' ], "time_filters" : [ "event_first" ], + "add_columns" :[ "event_contact_groups", "host_contact_groups", "event_host" ], + } multisite_datasources["mkeventd_history"] = { @@ -154,6 +151,7 @@ if mkeventd_enabled: "keys" : [], "idkeys" : [ 'site', 'host_name', 'event_id', 'history_line' ], "time_filters" : [ "history_time" ], + "add_columns" :[ "event_contact_groups", "host_contact_groups", "event_host" ], }

6 years, 12 months

Updated bug entries #2176

by Lars Michelsen

Module: check_mk Branch: master Commit: 650e400ad7178bcecee44b02ba9a00c2433cc34c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=650e400ad7178b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jul 3 14:39:29 2017 +0200 Updated bug entries #2176 Change-Id: I0cd05e6859c9d956c3f9782ed0142e673df1b151 --- .bugs/2176 | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.bugs/2176 b/.bugs/2176 index 705cf9e..0aad377 100644 --- a/.bugs/2176 +++ b/.bugs/2176 @@ -8,3 +8,13 @@ Class: bug If logwatch detects a new logfile it starts at the end of this file. If a logfile is generated daily with a new timestamp the initial lines are skipped and error messages might get lost. + +The logwatch.cfg needs to be exteded to give the user the option to tell mk_logwatch +that to start from beginning of new files instead from the end of that file + +The option could be named e.g. "fromstart" + +Todos: + +- Add option parsing (line ~500) +- Implementation in process_logfile()

6 years, 12 months

Update for WK4840

by Andreas Boesl

Module: check_mk Branch: master Commit: 60604ce492c250b29f7571371e4cdedef8082470 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=60604ce492c250… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Jul 3 14:46:45 2017 +0200 Update for WK4840 Change-Id: I579755391da3c9c7dc0214d4c531737644092615 --- web/htdocs/valuespec.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index 1aae06c..490ed5e 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -4546,10 +4546,7 @@ class TimeperiodValuespec(ValueSpec): def canonical_value(self): - if self._is_active(value): - return self._get_timeperiod_valuespec().canonical_value(value, varprefix) - else: - return self._enclosed_valuespec.canonical_value(value, varprefix) + return self._enclosed_valuespec.canonical_value() def validate_datatype(self, value, varprefix):

6 years, 12 months

4932 FIX Timeperiod iCalendar import: Fixed broken import of full day entries

by Lars Michelsen

Module: check_mk Branch: master Commit: 1bafa660646ccf39809c930b84e9d933f2d81760 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1bafa660646ccf… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jul 3 14:48:43 2017 +0200 4932 FIX Timeperiod iCalendar import: Fixed broken import of full day entries Change-Id: I233cc1bde1f67f9505176b4cf1741b1613cefca2 --- .werks/4932 | 11 +++++++++++ web/htdocs/wato.py | 17 ++++++++++------- 2 files changed, 21 insertions(+), 7 deletions(-) diff --git a/.werks/4932 b/.werks/4932 new file mode 100644 index 0000000..20126a5 --- /dev/null +++ b/.werks/4932 @@ -0,0 +1,11 @@ +Title: Timeperiod iCalendar import: Fixed broken import of full day entries +Level: 1 +Component: wato +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i1 +Date: 1499086053 + + diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index f3dc7ae..621169a 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -8866,7 +8866,7 @@ def validate_ical_file(value, varprefix): # http://tools.ietf.org/html/rfc5545 # TODO: Let's use some sort of standard module in the future. Maybe we can then also handle # times instead of only full day events. -def parse_ical(ical_blob, horizon=10, times=(None, None, None)): +def parse_ical(ical_blob, horizon=10): ical = {'raw_events': []} def get_params(key): @@ -9042,7 +9042,7 @@ def mode_timeperiod_import_ical(phase): filename, ty, content = ical['file'] try: - data = parse_ical(content, ical['horizon'], ical['times']) + data = parse_ical(content, ical['horizon']) except Exception, e: if config.debug: raise @@ -9060,11 +9060,14 @@ def mode_timeperiod_import_ical(phase): index += 1 html.set_var('except_%d_0' % index, event['date']) html.set_var('except_indexof_%d' % index, "%d" % index) - for n, time_spec in enumerate(ical["times"]): - start_time = ":".join(map(str, time_spec[0])) - end_time = ":".join(map(str, time_spec[1])) - html.set_var('except_%d_1_%d_from' % (index, n), start_time) - html.set_var('except_%d_1_%d_until' % (index, n), end_time) + + if ical["times"]: + for n, time_spec in enumerate(ical["times"]): + start_time = ":".join(map(lambda x: "%02d" % x, time_spec[0])) + end_time = ":".join(map(lambda x: "%02d" % x, time_spec[1])) + html.set_var('except_%d_1_%d_from' % (index, n), start_time) + html.set_var('except_%d_1_%d_until' % (index, n), end_time) + return "edit_timeperiod" return

6 years, 12 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits July 2017