Checkmk git commits July 2018

checkmk-commits@lists.checkmk.com

10 participants
467 discussions

Fixed missing packaging of new app directory

by Lars Michelsen

Module: check_mk Branch: master Commit: 85f6bdd1d0f2e37c5741f2ddf11ac6658d723d5f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=85f6bdd1d0f2e3… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jul 5 08:46:26 2018 +0200 Fixed missing packaging of new app directory Change-Id: I6e08a66c2fe7758005cf4d011540ed2c026c33c5 --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index da477c2..04a14c4 100644 --- a/Makefile +++ b/Makefile @@ -235,7 +235,7 @@ $(DISTNAME).tar.gz: mk-livestatus-$(VERSION).tar.gz .werks/werks $(JAVASCRIPT_MI tar czf $(DISTNAME)/notifications.tar.gz $(TAROPTS) -C notifications $$(cd notifications ; ls) tar czf $(DISTNAME)/inventory.tar.gz $(TAROPTS) -C inventory $$(cd inventory ; ls) tar czf $(DISTNAME)/checkman.tar.gz $(TAROPTS) -C checkman $$(cd checkman ; ls) - tar czf $(DISTNAME)/web.tar.gz $(TAROPTS) -C web htdocs plugins + tar czf $(DISTNAME)/web.tar.gz $(TAROPTS) -C web htdocs plugins app tar xzf mk-livestatus-$(VERSION).tar.gz tar czf $(DISTNAME)/livestatus.tar.gz $(TAROPTS) -C mk-livestatus-$(VERSION) $$(cd mk-livestatus-$(VERSION) ; ls -A )

6 years, 2 months

Fix mod_wsgi compilation on SLES11

by Lars Michelsen

Module: check_mk Branch: master Commit: 28ce3600c2d67e674d27313f9b3a2c09084c728a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=28ce3600c2d67e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jul 5 08:32:32 2018 +0200 Fix mod_wsgi compilation on SLES11 Change-Id: Ie82983240abbcbefc83419c10e466e913cf357b1 --- omd/packages/mod_wsgi/Makefile | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/omd/packages/mod_wsgi/Makefile b/omd/packages/mod_wsgi/Makefile index ebd90da..9f2c247 100644 --- a/omd/packages/mod_wsgi/Makefile +++ b/omd/packages/mod_wsgi/Makefile @@ -14,6 +14,12 @@ endif ifneq ("$(wildcard /usr/bin/apxs2)","") APXS=/usr/bin/apxs2 endif +# Special case to make compilation work with SLES11. It has apxs2 but we need +# to use the MPM specific apxs2-prefork binary to make compilation find the +# correct mpm.h. +ifneq ("$(wildcard /usr/bin/apxs2-prefork)","") + APXS=/usr/bin/apxs2-prefork +endif build: check-python

6 years, 2 months

vms_users: don't change info.

by Moritz Kiemer

Module: check_mk Branch: master Commit: 6431e9c7897651189f00f362e6621fdca8180689 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6431e9c7897651… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Wed Jul 4 14:13:21 2018 +0200 vms_users: don't change info. Change-Id: Iea8f9d5c562e87df90210b879e6200594f5b0454 --- checks/vms_users | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/checks/vms_users b/checks/vms_users index a3554a1..e750bc6 100644 --- a/checks/vms_users +++ b/checks/vms_users @@ -41,8 +41,8 @@ def check_vms_users(item, params, info): num_sessions = 0 for line in info: # complete missing columns - line += ['-'] * (5-len(line)) - interactive, subproc, batch, network = map(saveint, line[1:]) + padding = [0] * (5 - len(line)) + interactive, subproc, batch, network = map(saveint, line[1:]) + padding if interactive: num_sessions += interactive infos.append(("%s: %d" % (line[0], interactive)))

6 years, 2 months

Minor cleanup

by Simon Betz

Module: check_mk Branch: master Commit: 787290a26a0cbf8ae5557a4d2cec3d5bea5b4ffd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=787290a26a0cbf… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Jul 5 07:30:41 2018 +0200 Minor cleanup Change-Id: I47affbc63a8d38e311f9f2ec105b2b7e4f911dd9 --- checks/ucd_hr.include | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checks/ucd_hr.include b/checks/ucd_hr.include index 1310a52..e632ff7 100644 --- a/checks/ucd_hr.include +++ b/checks/ucd_hr.include @@ -100,7 +100,7 @@ def _is_ucd_mem(oid): # Astaro Firewall is Linux but should use hr_mem # Otherwise Cache/Buffers are included in used memory # generating critical state - if oid (".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.8072."): + if oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.8072."): return False # Otherwise use ucd_mem for listed devices in _is_ucd.

6 years, 2 months

md: don't change info.

by Moritz Kiemer

Module: check_mk Branch: master Commit: 11e1e049e4162e4f6ff340853f66094fd588d5e7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=11e1e049e4162e… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Wed Jul 4 14:03:10 2018 +0200 md: don't change info. Change-Id: I66eabbbf1493cc58badce915e37fbf5a6092615c --- checks/md | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/checks/md b/checks/md index c92891f..0492eec 100644 --- a/checks/md +++ b/checks/md @@ -131,13 +131,14 @@ def check_md(item, _no_params, info): raid_state = line[2] if raid_state != 'active' and raid_state != 'active(auto-read-only)': return (2, "raid state is '%s' (should be 'active')" % (raid_state,)) + disk_list = line[4:] # Usually (auto-read-only) sticks to active without a space. # But on some kernels it appears separated by a space if line[3] == '(auto-read-only)': - del line[3] - all_disks = len([x for x in line[4:]]) # all disks - spare_disks = len([x for x in line[4:] if x.endswith("(S)") ]) # spare disks - failed_disks = len([x for x in line[4:] if x.endswith("(F)") ]) # failed disks + disk_list.pop(0) + all_disks = len(disk_list) # all disks + spare_disks = len([x for x in disk_list if x.endswith("(S)") ]) # spare disks + failed_disks = len([x for x in disk_list if x.endswith("(F)") ]) # failed disks active_disks = all_disks - spare_disks - failed_disks its_next = True elif its_next:

6 years, 2 months

windows_os_bonding: don't change info.

by Moritz Kiemer

Module: check_mk Branch: master Commit: fbd57a11eef25422febed8d17215039c0df86daf URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fbd57a11eef254… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Wed Jul 4 14:22:13 2018 +0200 windows_os_bonding: don't change info. Change-Id: I6b909409f5d858c230910799bf619f0358766848 --- checks/windows_os_bonding | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/checks/windows_os_bonding b/checks/windows_os_bonding index 9f162d8..165f057 100644 --- a/checks/windows_os_bonding +++ b/checks/windows_os_bonding @@ -49,24 +49,24 @@ def parse_windows_os_bonding(info): for line in info: if len(line)>1: - line[1] = re.sub("^ +", "", line[1]) + item = line[1].lstrip() if line[0] == "Team Name": - bond = line[1] + bond = item bonds[bond] = {} bonds[bond]["interfaces"] = {} elif line[0] == "Bonding Mode": - bonds[bond]["mode"] = line[1] + bonds[bond]["mode"] = item elif line[0] == "Status": - bonds[bond]["status"] = line[1].lower() + bonds[bond]["status"] = item.lower() elif line[0] == "Speed": - bonds[bond]["speed"] = line[1] + bonds[bond]["speed"] = item elif line[0] == "Slave Name": - slave = line[1] + slave = item bonds[bond]["interfaces"][slave] = {} elif line[0] == "Slave Status": - bonds[bond]["interfaces"][slave]["status"] = line[1].lower() + bonds[bond]["interfaces"][slave]["status"] = item.lower() elif line[0] == "Slave MAC address": - bonds[bond]["interfaces"][slave]["hwaddr"] = line[1].lower().replace("-", ":") + bonds[bond]["interfaces"][slave]["hwaddr"] = item.lower().replace("-", ":") return bonds

6 years, 2 months

wmi.include: Improve Table object

by Moritz Kiemer

Module: check_mk Branch: master Commit: c3d61ce4a34620e77fb10e65af4222607ad312dc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c3d61ce4a34620… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Wed Jul 4 15:51:15 2018 +0200 wmi.include: Improve Table object Inherit table from object, so we can determine its instance. Also add __eq__ and __ne__ methods, so that we can compare it in testing. Change-Id: Ia83a475f1c60330144eba03eb55c33cc7ab28831 --- checks/wmi.include | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/checks/wmi.include b/checks/wmi.include index e2cb069..16036bf 100644 --- a/checks/wmi.include +++ b/checks/wmi.include @@ -57,7 +57,7 @@ def parse_wmi_table(info, key="Name"): # the table can also contain the sample time where the metrics were read, # otherwise the caller will have to assume the sampletime is one of the # metrics - class Table: + class Table(object): TOTAL_NAMES = ["_Total", "", "__Total__", "_Global"] @@ -89,10 +89,16 @@ def parse_wmi_table(info, key="Name"): self.__row_lookup = {} self.__rows = [] - def __repr__(self): return repr((self.__headers, self.__rows)) + def __eq__(self, other): + if isinstance(other, self.__class__): + return self.__dict__ == other.__dict__ + return False + + def __ne__(self, other): + return not self == other def add_row(self, row): row = row[:] @@ -104,7 +110,6 @@ def parse_wmi_table(info, key="Name"): self.__row_lookup[key] = len(self.__rows) self.__rows.append(row) - def get(self, row, column): if isinstance(row, int): row_index = row

6 years, 2 months

Minor cleanups of html.debug()

by Lars Michelsen

Module: check_mk Branch: master Commit: 11a5c8d52ceeae2e6bcf86013a385f5655d93203 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=11a5c8d52ceeae… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jul 4 17:01:31 2018 +0200 Minor cleanups of html.debug() * Don't use _lowlevel_write(). It should use .write() just like others. * Moved pprint import to module level Change-Id: Ifed6f7ae696ddf67df0694ed6a785eaf6c343e7b --- web/htdocs/htmllib.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index 54ccf1f..3e516db 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -66,6 +66,7 @@ import __builtin__ import signal import json import abc +import pprint from collections import deque from contextlib import contextmanager @@ -1657,13 +1658,12 @@ class html(HTMLGenerator): # def debug(self, *x): - import pprint for element in x: try: formatted = pprint.pformat(element) except UnicodeDecodeError: formatted = repr(element) - self._lowlevel_write("%s" % self.render_pre(formatted)) + self.write(self.render_pre(formatted)) #

6 years, 2 months

6096 Check_MK GUI is now shipped via mod_wsgi as WSGI application

by Lars Michelsen

Module: check_mk Branch: master Commit: f8ffb7079b0c41d374516eed5cb3af62c6a27334 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f8ffb7079b0c41… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed May 16 19:18:51 2018 +0200 6096 Check_MK GUI is now shipped via mod_wsgi as WSGI application This change should be seamless for most users, but may be interesting especially for users that use custom GUI extensions. In case you only use the GUI as it is and are not interested in technical details, you can skip the following details. With this change we replaced mod_python apache module with mod_wsgi. Mod_python has been "deprecated" for several years. These days all modern python based web applications are built using the WSGI standard. There are a lot of implementations of WSGI applications out there. To have a smooth transition we decided to use the mod_wsgi apache module as application server for the GUI. It is now shipped with Check_MK instead of mod_python. We have made the necessary changes to the GUI to work as WSGI application. Some other cleanups and modifications have been made on the way. <ul> <li>Move index file to dedicated app folder as recommended for WSGI apps</li> <li>Move several things from htmllib.html to dedicated helper classes <ul> <li>http.Request -> HTTP request parsing (from WSGI env)</li> <li>http.Response -> HTTP response processing (for WSGI)</li> <li>htmllib.TimeoutManager -> Handle GUI task timeouts</li> <li>htmllib.TransactionManager -> Mange GUI action transaction IDs</li> </ul> </li> <li>Cleaned up several other things in the htmllib and parent classes</li> </ul> The following changes have been made to the htmllib.html API: html.set_cookie() -> html.response.set_cookie() html.del_cookie() -> html.response.del_cookie() html.get_request_header() -> html.request.get_request_header() html.lowlevel_write() -> html._lowlevel_write() html.remote_ip() -> html.request.remote_ip html.is_ssl_request() -> html.request.is_ssl_request html.request_method() -> html.request.request_method html.get_user_agent() -> html.request.user_agent html.get_referer() -> html.request.referer html.requested_url() -> html.request.requested_url html.request_uri() -> html.request.requested_url html.http_redirect() -> html.response.http_redirect() html.client_request_timeout() -> html.request.request_timeout html.get_cookie_names() -> html.request.get_cookie_names() html.has_cookie() -> html.request.has_cookie() html.cookie() -> html.request.cookie() html.uploaded_file() -> html.request.uploaded_file() html.request_timeout() -> html.request.request_timeout html.get_request_timeout() -> html.request.request_timeout html.set_ignore_transids() -> html.transaction_ids.ignore() html.get_transid() -> html.transaction_ids.get() html.store_new_transids() -> html.transaction_ids.store_new() html.urlencode_plus() -> html.urlencode() Dropped things: html.add_keybinding() html.add_keybidings() html.disable_keybindings() html.keybindings_enabled html.keybindings html.RETURN html.SHIFT html.CTRL html.ALT html.BACKSPACE html.F1 html.u8() html.utf8_to_entities() html.varencode() Change-Id: I233d3361ba52bb9a3db353c3d7c1a6018defb19e --- .werks/6096 | 81 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 81 insertions(+) diff --git a/.werks/6096 b/.werks/6096 new file mode 100644 index 0000000..2eaa12f --- /dev/null +++ b/.werks/6096 @@ -0,0 +1,81 @@ +Title: Check_MK GUI is now shipped via mod_wsgi as WSGI application +Level: 2 +Component: multisite +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1526490553 +Class: feature + +This change should be seamless for most users, but may be interesting +especially for users that use custom GUI extensions. In case you only use the +GUI as it is and are not interested in technical details, you can skip the +following details. + +With this change we replaced mod_python apache module with mod_wsgi. +Mod_python has been "deprecated" for several years. These days all modern +python based web applications are built using the WSGI standard. There are a +lot of implementations of WSGI applications out there. To have a smooth +transition we decided to use the mod_wsgi apache module as application server +for the GUI. It is now shipped with Check_MK instead of mod_python. + +We have made the necessary changes to the GUI to work as WSGI application. + +Some other cleanups and modifications have been made on the way. + +<ul> +<li>Move index file to dedicated app folder as recommended for WSGI apps</li> +<li>Move several things from htmllib.html to dedicated helper classes + <ul> + <li>http.Request -> HTTP request parsing (from WSGI env)</li> + <li>http.Response -> HTTP response processing (for WSGI)</li> + <li>htmllib.TimeoutManager -> Handle GUI task timeouts</li> + <li>htmllib.TransactionManager -> Mange GUI action transaction IDs</li> + </ul> +</li> +<li>Cleaned up several other things in the htmllib and parent classes</li> +</ul> + +The following changes have been made to the htmllib.html API: + +html.set_cookie() -> html.response.set_cookie() +html.del_cookie() -> html.response.del_cookie() +html.get_request_header() -> html.request.get_request_header() +html.lowlevel_write() -> html._lowlevel_write() +html.remote_ip() -> html.request.remote_ip +html.is_ssl_request() -> html.request.is_ssl_request +html.request_method() -> html.request.request_method +html.get_user_agent() -> html.request.user_agent +html.get_referer() -> html.request.referer +html.requested_url() -> html.request.requested_url +html.request_uri() -> html.request.requested_url +html.http_redirect() -> html.response.http_redirect() +html.client_request_timeout() -> html.request.request_timeout +html.get_cookie_names() -> html.request.get_cookie_names() +html.has_cookie() -> html.request.has_cookie() +html.cookie() -> html.request.cookie() +html.uploaded_file() -> html.request.uploaded_file() +html.request_timeout() -> html.request.request_timeout +html.get_request_timeout() -> html.request.request_timeout +html.set_ignore_transids() -> html.transaction_ids.ignore() +html.get_transid() -> html.transaction_ids.get() +html.store_new_transids() -> html.transaction_ids.store_new() +html.urlencode_plus() -> html.urlencode() + +Dropped things: + +html.add_keybinding() +html.add_keybidings() +html.disable_keybindings() +html.keybindings_enabled +html.keybindings +html.RETURN +html.SHIFT +html.CTRL +html.ALT +html.BACKSPACE +html.F1 +html.u8() +html.utf8_to_entities() +html.varencode() +

6 years, 2 months

Removed unused stuff from HTMLGenerator

by Lars Michelsen

Module: check_mk Branch: master Commit: 70348ecd16ec622a2109a53a0ffd07bb29cf9ae1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=70348ecd16ec62… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed May 23 17:53:11 2018 +0200 Removed unused stuff from HTMLGenerator Change-Id: I8d8a6e152bb247767065cc1d273028f53686e54f --- tests/unit/web/test_htmllib_HTML.py | 1 + web/htdocs/htmllib.py | 38 ++++++------------------------------- 2 files changed, 7 insertions(+), 32 deletions(-) diff --git a/tests/unit/web/test_htmllib_HTML.py b/tests/unit/web/test_htmllib_HTML.py index 231f59d..7bc3bde 100644 --- a/tests/unit/web/test_htmllib_HTML.py +++ b/tests/unit/web/test_htmllib_HTML.py @@ -11,6 +11,7 @@ _default.default = json.JSONEncoder().default # Save unmodified default. json.JSONEncoder.default = _default # replacement +# TODO: Split this up into multiple tests def test_class_HTML(): a = "Oneüლ,ᔑ•ﺪ͟͠•ᔐ.ლ" b = "two" diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index b97610f..54ccf1f 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -81,6 +81,7 @@ import cmk.paths from cmk.exceptions import MKGeneralException from gui_exceptions import MKUserError, RequestTimeout +import utils import config import log @@ -537,12 +538,6 @@ class HTMLGenerator(OutputFunnel): def __init__(self): super(HTMLGenerator, self).__init__() - - self.indent_level = 0 - self.indent = 2 - - self.testing_mode = False - self.escaper = Escaper() @@ -552,16 +547,6 @@ class HTMLGenerator(OutputFunnel): def _render_attributes(self, **attrs): - # TODO: REMOVE AFTER REFACTORING IS DONE!! - if self.testing_mode: - for key in attrs: - assert key.rstrip('_') in ['class', 'id', 'src', 'type', 'name',\ - 'onclick', 'ondblclick', 'onsubmit', 'onmouseover', 'onmouseout', 'onfocus', 'onkeydown', 'onchange',\ - 'size', 'autocomplete', 'readonly', 'value', 'checked','rows', 'cols',\ - 'content', 'href', 'http-equiv', 'rel', 'for', 'title', 'target','multiple',\ - 'align', 'valign', 'style', 'width', 'height', 'colspan', 'data-type', 'data-role','selected',\ - 'cellspacing', 'cellpadding', 'border', 'allowTransparency', 'frameborder'], key - # make class attribute foolproof css = [] for k in ["class_", "css", "cssclass", "class"]: @@ -613,16 +598,13 @@ class HTMLGenerator(OutputFunnel): def _render_opening_tag(self, tag_name, close_tag=False, **attrs): """ You have to replace attributes which are also python elements such as 'class', 'id', 'for' or 'type' using a trailing underscore (e.g. 'class_' or 'id_'). """ - #self.indent_level += self.indent - indent = ' ' * (self.indent_level - self.indent) - return HTML("%s<%s%s%s>" % (indent, tag_name,\ + return HTML("<%s%s%s>" % (tag_name,\ '' if not attrs else ''.join(self._render_attributes(**attrs)),\ '' if not close_tag else ' /')) def _render_closing_tag(self, tag_name): - #self.indent_level -= self.indent if self.indent_level < 0 else 0 - return HTML("%s</%s>" % (' ' * self.indent_level, tag_name)) + return HTML("</%s>" % (tag_name)) def _render_content_tag(self, tag_name, tag_content, **attrs): @@ -640,7 +622,6 @@ class HTMLGenerator(OutputFunnel): tag += "</%s>" % (tag_name) - #self.indent_level -= 1 return HTML(tag) @@ -1109,9 +1090,6 @@ class html(HTMLGenerator): self.start_time = time.time() self.last_measurement = self.start_time - # FIXME: Drop this - self.auto_id = 0 - # Variable management self._var_stash = [] @@ -1471,12 +1449,6 @@ class html(HTMLGenerator): # Other things # - # TODO: Can this please be dropped? - def some_id(self): - self.auto_id += 1 - return "id_%d" % self.auto_id - - def measure_time(self, name): self.times.setdefault(name, 0.0) now = time.time() @@ -2131,7 +2103,7 @@ class html(HTMLGenerator): if add_transid: href += "&_transid=%s" % self.transaction_manager.get() if not obj_id: - obj_id = self.some_id() + obj_id = utils.gen_id() self.input(name=obj_id, type_="button", id_=obj_id, class_=["button", "buttonlink"], value=text, style=style, @@ -2961,6 +2933,8 @@ class html(HTMLGenerator): # # Per request caching + # TODO: Remove this cache here. Do we need some generic functionality + # like this? Probably use some more generic / standard thing. #

6 years, 2 months

← Newer
1
...
37
38
39
40
41
42
43
...
47
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits July 2018