Checkmk git commits October 2018

checkmk-commits@lists.checkmk.com

15 participants
308 discussions

by Óscar Nájera

Module: check_mk Branch: master Commit: 2fea626bbdb35b50e54fa75460e65d7d2520797c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2fea626bbdb35b… Author: Óscar Nájera <on(a)mathias-kettner.de> Date: Mon Oct 8 16:53:19 2018 +0200 6644 UPS output load WATO rules UPS output load includes default levels for warn and crit levels. This threshold levels are now configurable in WATO Change-Id: I3df9b5543f41746320530d9459b2f698e44284f8 --- .werks/6644 | 11 +++++++++++ checks/ups_out_load | 26 ++++++++++++++------------ cmk/gui/plugins/wato/check_parameters.py | 16 ++++++++++++++++ 3 files changed, 41 insertions(+), 12 deletions(-) diff --git a/.werks/6644 b/.werks/6644 new file mode 100644 index 0000000..d872a41 --- /dev/null +++ b/.werks/6644 @@ -0,0 +1,11 @@ +Title: UPS output load WATO rules +Level: 1 +Component: wato +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1539010234 +Class: feature + +UPS output load includes default levels for warn and crit levels. This +threshold levels are now configurable in WATO diff --git a/checks/ups_out_load b/checks/ups_out_load index 2289530..75aba5e 100644 --- a/checks/ups_out_load +++ b/checks/ups_out_load @@ -24,21 +24,21 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. +ups_out_load_default_levels = (85, 90) # warning / critical -ups_out_load_default_levels = (85, 90) # warning / critical def inventory_ups_out_load(info): if len(info) > 0: - return [ ( x[0], "ups_out_load_default_levels") for x in info if int(x[1]) > 0] + return [(x[0], "ups_out_load_default_levels") for x in info if int(x[1]) > 0] + def check_ups_out_load(item, params, info): warn, crit = params for line in info: if line[0] == item: power = int(line[1]) - perfdata = [ ( "out_load", power, warn, crit, 100 ) ] - infotext = "load: %d (warn/crit at %d/%d) " % \ - (power, warn, crit) + perfdata = [("out_load", power, warn, crit, 100)] + infotext = "load: %d (warn/crit at %d/%d) " % (power, warn, crit) if power >= crit: return (2, infotext, perfdata) @@ -48,12 +48,14 @@ def check_ups_out_load(item, params, info): return (3, "Phase %s not found in SNMP output" % item) + check_info['ups_out_load'] = { - "inventory_function" : inventory_ups_out_load, - "check_function" : check_ups_out_load, - "service_description" : "OUT load phase %s", - "has_perfdata" : True, - "snmp_info" : ( ".1.3.6.1.2.1.33.1.4.4.1", [ 0, 5 ] ), - "snmp_scan_function" : ups_generic_scan_function, - "includes" : [ "ups_generic.include" ], + "inventory_function": inventory_ups_out_load, + "check_function": check_ups_out_load, + "service_description": "OUT load phase %s", + "has_perfdata": True, + "snmp_info": (".1.3.6.1.2.1.33.1.4.4.1", [0, 5]), + "snmp_scan_function": ups_generic_scan_function, + "group": "ups_out_load", + "includes": ["ups_generic.include"], } diff --git a/cmk/gui/plugins/wato/check_parameters.py b/cmk/gui/plugins/wato/check_parameters.py index db4bc0d..9f94be3 100644 --- a/cmk/gui/plugins/wato/check_parameters.py +++ b/cmk/gui/plugins/wato/check_parameters.py @@ -13890,6 +13890,22 @@ register_check_parameters( register_check_parameters( subgroup_environment, + "ups_out_load", + _("Parameters for output loads of UPSs and PDUs"), + Tuple( + elements = [ + Integer(title = _("warning at"), unit = u"%", default_value = 85), + Integer(title = _("critical at"), unit = u"%", default_value = 90), + ] + ), + TextAscii( + title = _("Phase"), + help = _("The identifier of the phase the power is related to.")), + "first" +) + +register_check_parameters( + subgroup_environment, "epower_single", _("Electrical Power for Devices with only one phase"), Tuple(

5 years, 8 months

Improved dashlet rendering error handling

by Lars Michelsen

Module: check_mk Branch: master Commit: 1a72d801c4789d8a0d20c8aa9a4c051ac3758787 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1a72d801c4789d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Oct 2 09:33:14 2018 +0200 Improved dashlet rendering error handling Change-Id: I0cc3230cea65af4c291a4cabe8b20f0fb85c28b6 --- cmk/gui/dashboard.py | 108 +++++++++++++++++++++++++++-------------------- web/htdocs/dashboard.css | 14 +++--- 2 files changed, 71 insertions(+), 51 deletions(-) diff --git a/cmk/gui/dashboard.py b/cmk/gui/dashboard.py index 506f7dd..f4c43f1 100644 --- a/cmk/gui/dashboard.py +++ b/cmk/gui/dashboard.py @@ -27,7 +27,6 @@ import time import copy import json -import traceback import cmk.gui.pages import cmk.gui.notify as notify @@ -39,6 +38,7 @@ from cmk.gui.valuespec import * import cmk.gui.i18n from cmk.gui.i18n import _u, _ from cmk.gui.log import logger +from cmk.gui.htmllib import HTML from cmk.gui.globals import html from cmk.gui.exceptions import MKGeneralException, MKAuthException, MKUserError @@ -529,11 +529,12 @@ def draw_dashboard(name): dashlet_coords = [] # Dimensions and positions of dashlet on_resize_dashlets = [] # javascript function to execute after ressizing the dashlet for nr, dashlet in enumerate(board["dashlets"]): - dashlet_container_begin(nr, dashlet) - dashlet_type = get_dashlet_type(dashlet) - dashlet_instance = dashlet_type(name, board, nr, dashlet, wato_folder) - + dashlet_content_html = "" + dashlet_title_html = "" try: + dashlet_type = get_dashlet_type(dashlet) + dashlet_instance = dashlet_type(name, board, nr, dashlet, wato_folder) + refresh = get_dashlet_refresh(dashlet_instance) if refresh: refresh_dashlets.append(refresh) @@ -542,16 +543,15 @@ def draw_dashboard(name): if on_resize: on_resize_dashlets.append(on_resize) - draw_dashlet(dashlet_instance) - except MKUserError, e: - dashlet_error(nr, dashlet, e) + dashlet_title_html = render_dashlet_title_html(dashlet_instance) + dashlet_content_html = render_dashlet_content(dashlet_instance, is_update=False) + except Exception, e: - if config.debug: - detail = traceback.format_exc() - else: - detail = e - dashlet_error(nr, dashlet, detail) + dashlet_content_html = render_dashlet_exception_content(dashlet_instance, nr, e) + # Now after the dashlet content has been calculated render the whole dashlet + dashlet_container_begin(nr, dashlet) + draw_dashlet(dashlet_instance, dashlet_content_html, dashlet_title_html) dashlet_container_end() dashlet_coords.append(get_dashlet_dimensions(dashlet_instance)) @@ -590,16 +590,6 @@ dashboard_scheduler(1); html.body_end() # omit regular footer with status icons, etc. -def dashlet_error(nr, dashlet, msg): - html.open_div(id_="dashlet_inner_%d" % nr, class_=["dashlet_inner", "background", "err"]) - html.open_div() - html.write(_('Problem while rendering dashlet %d of type %s: ') % (nr, dashlet["type"])) - html.write(html.attrencode(msg).replace("\n", "<br>")) - logger.exception(_('Problem while rendering dashlet %d of type %s: ') % (nr, dashlet["type"])) - html.close_div() - html.close_div() - - def dashlet_container_begin(nr, dashlet): dashlet_type = get_dashlet_type(dashlet) @@ -614,7 +604,18 @@ def dashlet_container_end(): html.close_div() -def draw_dashlet_content(dashlet_instance, is_update, stash_html_vars=True): +def render_dashlet_title_html(dashlet_instance): + title = dashlet_instance.display_title() + if title is not None and dashlet_instance.show_title(): + url = dashlet_instance.title_url() + if url: + title = html.render_a(_u(title), url) + else: + title = _u(title) + return title + + +def render_dashlet_content(dashlet_instance, is_update, stash_html_vars=True): if stash_html_vars: html.stash_vars() html.del_all_vars() @@ -625,15 +626,32 @@ def draw_dashlet_content(dashlet_instance, is_update, stash_html_vars=True): if dashlet_instance.wato_folder is not None: html.set_var("wato_folder", dashlet_instance.wato_folder) - if not is_update: - dashlet_instance.show() - else: - dashlet_instance.update() + with html.plugged(): + if not is_update: + dashlet_instance.show() + else: + dashlet_instance.update() + + return html.drain() finally: if stash_html_vars: html.unstash_vars() +def render_dashlet_exception_content(dashlet_instance, nr, e): + logger.exception("Problem while rendering dashlet %d of type %s" % (nr, dashlet_instance.type_name())) + + # Unify different string types from exception messages to a unicode string + try: + exc_txt = unicode(e) + except UnicodeDecodeError: + exc_txt = str(e).decode("utf-8") + + return html.render_error( + _("Problem while rendering dashlet %d of type %s: %s. Have a look at <tt>var/log/web.log</tt> for " + "further information.") % (nr, dashlet_instance.type_name(), exc_txt)) + + def dashboard_edit_controls(name, board): # Show the edit menu to all users which are allowed to edit dashboards if not config.user.may("general.edit_dashboards"): @@ -798,19 +816,16 @@ def get_dashlet(board, ident): raise MKGeneralException(_('The dashlet does not exist.')) -# Create the HTML code for one dashlet. Each dashlet has an id "dashlet_%d", -# where %d is its index (in board["dashlets"]). Javascript uses that id -# for the resizing. Within that div there is an inner div containing the -# actual dashlet content. -def draw_dashlet(dashlet_instance): - title = dashlet_instance.display_title() - if title is not None and dashlet_instance.show_title(): - url = dashlet_instance.title_url() - if url: - title = html.render_a(_u(title), url) - else: - title = _u(title) - html.div(html.render_span(title), +def draw_dashlet(dashlet_instance, dashlet_content_html, dashlet_title_html): + """Draws the initial HTML code for one dashlet + + Each dashlet has an id "dashlet_%d", where %d is its index (in + board["dashlets"]). Javascript uses that id for the resizing. Within that + div there is an inner div containing the actual dashlet content. This content + is updated later using the dashboard_dashlet.py ajax call. + """ + if dashlet_title_html is not None and dashlet_instance.show_title(): + html.div(html.render_span(dashlet_title_html), id_="dashlet_title_%d" % dashlet_instance.dashlet_id, class_=["title"] ) @@ -820,9 +835,7 @@ def draw_dashlet(dashlet_instance): css.append("background") html.open_div(id_="dashlet_inner_%d" % dashlet_instance.dashlet_id, class_=css) - - draw_dashlet_content(dashlet_instance, is_update=False) - + html.write_html(dashlet_content_html) html.close_div() #. @@ -880,7 +893,12 @@ def ajax_dashlet(): dashlet_type = get_dashlet_type(the_dashlet) dashlet_instance = dashlet_type(name, board, ident, the_dashlet, wato_folder) - draw_dashlet_content(dashlet_instance, stash_html_vars=False, is_update=True) + try: + dashlet_content_html = render_dashlet_content(dashlet_instance, stash_html_vars=False, is_update=True) + except Exception, e: + dashlet_content_html = render_dashlet_exception_content(dashlet_instance, ident, e) + + html.write_html(dashlet_content_html) #. # .--Dashboard List------------------------------------------------------. diff --git a/web/htdocs/dashboard.css b/web/htdocs/dashboard.css index 89f92ba..d310295 100644 --- a/web/htdocs/dashboard.css +++ b/web/htdocs/dashboard.css @@ -64,12 +64,14 @@ div.dashlet div.dashlet_inner { background-color: #cbd6da; } -div.dashlet div.dashlet_inner.err { - color: #000; -} - -div.dashlet div.dashlet_inner.err div { - padding: 10px; +div.dashlet div.really, +div.dashlet div.success, +div.dashlet div.error, +div.dashelt div.message, +div.dashlet div.warning { + margin: 0; + border-radius: 0; + box-shadow: 0; } div.dashlet iframe {

5 years, 8 months

Fixed typo in login page to remote sites

by Marcel Arentz

Module: check_mk Branch: master Commit: bafeb608da3bcf9a45879e9accca2ff6e6547310 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bafeb608da3bcf… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Wed Oct 10 15:34:40 2018 +0200 Fixed typo in login page to remote sites Change-Id: I17b0d723b8464e80562da768976b535502790a7c --- cmk/gui/wato/pages/sites.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmk/gui/wato/pages/sites.py b/cmk/gui/wato/pages/sites.py index 9d85efe..50ab053 100644 --- a/cmk/gui/wato/pages/sites.py +++ b/cmk/gui/wato/pages/sites.py @@ -206,10 +206,10 @@ class ModeDistributedMonitoring(ModeSites): html.begin_form("login", method="POST") forms.header(_('Login credentials')) - forms.section(_('Adminstrator name:')) + forms.section(_('Administrator name:')) html.text_input("_name") html.set_focus("_name") - forms.section(_('Adminstrator password:')) + forms.section(_('Administrator password:')) html.password_input("_passwd") forms.end() html.button("_do_login", _("Login"))

5 years, 8 months

docker: refactoring (move to docker.include)

by Moritz Kiemer

Module: check_mk Branch: master Commit: bc246c0d12bd01f81dc7dbc1974908c5b4bac2d7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bc246c0d12bd01… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Wed Oct 10 08:16:57 2018 +0200 docker: refactoring (move to docker.include) Change-Id: I7cc2dda075e12ebd39e77ba947c43971027c5af9 --- checks/docker.include | 75 ++++++++++++++++++++++++++++++++++++++++++ inventory/docker_node_images | 78 ++------------------------------------------ 2 files changed, 77 insertions(+), 76 deletions(-) diff --git a/checks/docker.include b/checks/docker.include index b0cdf66..6fe5fe6 100644 --- a/checks/docker.include +++ b/checks/docker.include @@ -97,3 +97,78 @@ def parse_docker_node_disk_usage(info): return dict(map(_parse_docker_node_disk_usage_dict, data_dicts)) + +def _split_subsections(info): + subname = '' + subsections = {} + for row in info: + if not row: + continue + if row[0].startswith('[[[') and row[0].endswith(']]]'): + subname = row[0].strip('[]') + continue + subsections.setdefault(subname, []).append(row) + return subsections + + +def _parse_subsection_images(subinfo): + '''parse output of "docker images"''' + parsed = {} + for row in subinfo: + data = json.loads(" ".join(row)) + parsed.setdefault(data["ID"], data) + return parsed + + +def _parse_subsection_labels(subinfo): + return [json.loads(" ".join(row)) for row in subinfo] + + +def _parse_subsection_containers(subinfo): + parsed = {} + for row in subinfo: + data = json.loads(" ".join(row)) + + image_name = data["Image"] + if ":" in image_name: + data["Repository"], data["Tag"] = image_name.split(":", 1) + else: + data["Repository"], data["Tag"] = image_name, "latest" + parsed[data["ID"]] = data + return parsed + + +def parse_docker_node_images(info): + '''parse output of <<<docker_node_images>>> + + $ echo "[[[images]]]" + $ docker images + $ echo "[[[image_labels]]]" + $ IMAGE_IDS=$(docker images ls | awk 'BEGIN {ORF=" "} NR>1 {print $3}') + $ docker image inspect "$IMAGE_IDS" + $ echo "[[[containers]]]" + $ docker ps --all + ''' + subsections = _split_subsections(info) + + images = _parse_subsection_images(subsections.get("images", [])) + label_data = _parse_subsection_labels(subsections.get("images_labels", [])) + containers = _parse_subsection_containers(subsections.get("containers", [])) + + for image_id, labels in label_data: + image = images.get(image_id) + if None not in (image_id, labels, image): + image.setdefault("__labels__", {}).update(labels) + + mapping = {(i['Repository'], i['Tag']): i['ID'] for i in images} + for c in containers: + image_id = mapping.get((c["Repository"], c["Tag"])) + image = images.get(image_id) + if image is not None: + image.setdefault("__containers__", []).append(c) + + lab = (p.split("=", 1) for p in c.get("Labels", []).split(",")) + c["Labels"] = list(lab) + + return {"images": images, "containers": containers} + diff --git a/inventory/docker_node_images b/inventory/docker_node_images index d254884..ae8d6cc 100644 --- a/inventory/docker_node_images +++ b/inventory/docker_node_images @@ -23,82 +23,6 @@ # 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. -import json - - -def _split_subsections(info): - subname = '' - subsections = {} - for row in info: - if not row: - continue - if row[0].startswith('[[[') and row[0].endswith(']]]'): - subname = row[0].strip('[]') - continue - subsections.setdefault(subname, []).append(row) - return subsections - - -def _parse_subsection_images(subinfo): - '''parse output of "docker images"''' - parsed = {} - for row in subinfo: - data = json.loads(" ".join(row)) - parsed.setdefault(data["ID"], data) - return parsed - - -def _parse_subsection_labels(subinfo): - return [json.loads(" ".join(row)) for row in subinfo] - - -def _parse_subsection_containers(subinfo): - parsed = {} - for row in subinfo: - data = json.loads(" ".join(row)) - - image_name = data["Image"] - if ":" in image_name: - data["Repository"], data["Tag"] = image_name.split(":", 1) - else: - data["Repository"], data["Tag"] = image_name, "latest" - parsed[data["ID"]] = data - return parsed - - -def parse_docker_node_images(info): - '''parse output of <<<docker_node_images>>> - - $ echo "[[[images]]]" - $ docker images - $ echo "[[[image_labels]]]" - $ IMAGE_IDS=$(docker images ls | awk 'BEGIN {ORF=" "} NR>1 {print $3}') - $ docker image inspect "$IMAGE_IDS" - $ echo "[[[containers]]]" - $ docker ps --all - ''' - subsections = _split_subsections(info) - - images = _parse_subsection_images(subsections.get("images", [])) - label_data = _parse_subsection_labels(subsections.get("images_labels", [])) - containers = _parse_subsection_containers(subsections.get("containers", [])) - - for image_id, labels in label_data: - image = images.get(image_id) - if None not in (image_id, labels, image): - image.setdefault("__labels__", {}).update(labels) - - mapping = {(i['Repository'], i['Tag']): i['ID'] for i in images} - for c in containers: - image_id = mapping.get((c["Repository"], c["Tag"])) - image = images.get(image_id) - if image is not None: - image.setdefault("__containers__", []).append(c) - - lab = (p.split("=", 1) for p in c.get("Labels", []).split(",")) - c["Labels"] = list(lab) - - return {"images": images, "containers": containers} def inv_docker_node_images(info, inventory_tree, status_data_tree): @@ -126,6 +50,7 @@ def inv_docker_node_images(info, inventory_tree, status_data_tree): inv_info['docker_node_images'] = { + 'includes' : ['docker.include'], 'inv_function' : inv_docker_node_images, 'has_status_data' : True, } @@ -155,6 +80,7 @@ def _format_labels(labels): # using the extra_sections feature. In case this is not possible for the inventory # plugins at the moment we should make it possible. inv_info['docker_node_images.containers'] = { + 'includes' : ['docker.include'], 'inv_function' : inv_docker_node_images_containers, 'has_status_data' : True, }

5 years, 8 months

Fixed recently (92cafff4781ed3dcc455375e67f2107e7ddeaaa1)

by Lars Michelsen

introduced problem on icon management page Message-ID: <5bbdee8c.AdXJxamxEwJslGXN%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: 9e4cbe5320fc94da2ffac1454966ff2aec1d758f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9e4cbe5320fc94… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Oct 10 14:12:16 2018 +0200 Fixed recently (92cafff4781ed3dcc455375e67f2107e7ddeaaa1) introduced problem on icon management page Change-Id: I3c71775d3321dda6dd39994c1cc3c55570e228da --- cmk/gui/wato/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmk/gui/wato/__init__.py b/cmk/gui/wato/__init__.py index 2f59e0f..92701fd 100644 --- a/cmk/gui/wato/__init__.py +++ b/cmk/gui/wato/__init__.py @@ -13621,7 +13621,7 @@ class ModeIcons(WatoMode): def buttons(self): - back_url = html.get_url_input("back") + back_url = html.get_url_input("back", "") if back_url: html.context_button(_("Back"), back_url, "back") else:

5 years, 8 months

Add missing image for recently added dashlet type

by Lars Michelsen

Module: check_mk Branch: master Commit: eaa38956713cc42b3c0d3747be925a161e747a61 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=eaa38956713cc4… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Oct 10 14:10:35 2018 +0200 Add missing image for recently added dashlet type Change-Id: Iee8804e635accc8da59f852d8e94ed718462ef64 --- web/htdocs/images/dashlet_network_topology.png | Bin 0 -> 813 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/web/htdocs/images/dashlet_network_topology.png b/web/htdocs/images/dashlet_network_topology.png new file mode 100644 index 0000000..a52ae0d Binary files /dev/null and b/web/htdocs/images/dashlet_network_topology.png differ

5 years, 8 months

6776 FIX Timeperiod ical import: Fixed limitation to 100 events per multiple day event

by Lars Michelsen

Module: check_mk Branch: master Commit: a4cd2ba37fd9d8a2481e5356411f7f9092bc74fc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a4cd2ba37fd9d8… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Oct 10 13:52:25 2018 +0200 6776 FIX Timeperiod ical import: Fixed limitation to 100 events per multiple day event When a single repeating event creates events for more than 100 days, only the first 100 events were used by the import. This limitation has now been removed. Change-Id: I89db72ea0c5ecb492772fda662b2fdc7cf984bf0 --- .werks/6776 | 12 ++++++++++++ cmk/gui/wato/pages/timeperiods.py | 4 +--- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/.werks/6776 b/.werks/6776 new file mode 100644 index 0000000..c34f526 --- /dev/null +++ b/.werks/6776 @@ -0,0 +1,12 @@ +Title: Timeperiod ical import: Fixed limitation to 100 events per multiple day event +Level: 1 +Component: wato +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1539101414 + +When a single repeating event creates events for more than 100 days, only the first +100 events were used by the import. This limitation has now been removed. diff --git a/cmk/gui/wato/pages/timeperiods.py b/cmk/gui/wato/pages/timeperiods.py index e9d92aa..d86f442 100644 --- a/cmk/gui/wato/pages/timeperiods.py +++ b/cmk/gui/wato/pages/timeperiods.py @@ -518,9 +518,7 @@ class ModeTimeperiodImportICal(WatoMode): # Resolve multiple days resolved, cur_timestamp, day = [], time.mktime(cur_start_time), 1 - # day < 100 is just some plausibilty check. In case such an event - # is needed eventually remove this - while cur_timestamp < time.mktime(event["end"]) and day < 100: + while cur_timestamp < time.mktime(event["end"]): resolved.append({ "name" : "%s %s" % (event["name"], _(" (day %d)") % day), "date" : time.strftime("%Y-%m-%d", time.localtime(cur_timestamp)),

5 years, 8 months

Revert "Trigger pylint warning to debug our CI."

by Sven Panne

Module: check_mk Branch: master Commit: 20ad8775f7704b0f0ae6cb599d545511c530cdf6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=20ad8775f7704b… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed Oct 10 13:13:07 2018 +0200 Revert "Trigger pylint warning to debug our CI." This reverts commit ddd77bd47d2fd0f74e19b707c154141679459351. --- cmk/debug.py | 1 - 1 file changed, 1 deletion(-) diff --git a/cmk/debug.py b/cmk/debug.py index 11594a4..094b8a4 100644 --- a/cmk/debug.py +++ b/cmk/debug.py @@ -28,7 +28,6 @@ debug_mode = False def enabled(): - debug_mode == True # HACK: Intentionally triggers pylint warning! Only temporary... return debug_mode

5 years, 8 months

Trigger pylint warning to debug our CI.

by Sven Panne

Module: check_mk Branch: master Commit: ddd77bd47d2fd0f74e19b707c154141679459351 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ddd77bd47d2fd0… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed Oct 10 12:47:39 2018 +0200 Trigger pylint warning to debug our CI. Change-Id: I6279a1cdb328971ef1bfe2cd67707e456c78b06a --- cmk/debug.py | 1 + 1 file changed, 1 insertion(+) diff --git a/cmk/debug.py b/cmk/debug.py index 094b8a4..11594a4 100644 --- a/cmk/debug.py +++ b/cmk/debug.py @@ -28,6 +28,7 @@ debug_mode = False def enabled(): + debug_mode == True # HACK: Intentionally triggers pylint warning! Only temporary... return debug_mode

5 years, 8 months

CMK-436: Test for outdated (insecure python dependencies)

by Alex Zurhake

Module: check_mk Branch: master Commit: bc4b9d3f90c841d2ce523d511ba68f4c6ddd16cd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bc4b9d3f90c841… Author: Alex Zurhake <az(a)mathias-kettner.de> Date: Wed Oct 10 08:16:44 2018 +0200 CMK-436: Test for outdated (insecure python dependencies) Change-Id: Ia3815bf219e4ea18385b6a12f6972b6c29b48d8e --- tests/Makefile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tests/Makefile b/tests/Makefile index d42dcaa..80c8728 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -26,6 +26,9 @@ help: ../.venv: $(MAKE) -C .. .venv +pipenv-check: ../.venv + $(PIPENV) check + test-unit: ../.venv $(PYTEST) -T unit

5 years, 8 months

← Newer
1
...
20
21
22
23
24
25
26
...
31
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits October 2018