Checkmk git commits December 2018

checkmk-commits@lists.checkmk.com

15 participants
342 discussions

by Lars Michelsen

Module: check_mk Branch: master Commit: d87a4174f3f36bb112b45b3e7d273fe06ff5fe70 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d87a4174f3f36b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Dec 6 15:10:25 2018 +0100 Improved handling of locked attributes The attribute locking (which was introduced with the commit 66eab3c7d01f803b433376640e9348a2b03971a1) has been reworked a bit. * The single attribute has been split into two dependent attributes "locked_by" and "locked_attributes" to be able to search for only the "locked_by" value. * The attributes are now displayed with their title instead of the internal ID * Totally hide disabled checkboxes for the locked attributes instead of displaying them without functionality. This is now equal to the user attribute locking. * Each connection of the dynamic configuration now links to a list of hosts that are managed by this connection. This is done using the existing host search logic. Change-Id: I5f3de560377b7654824c8fb6b74c4ba2cc75dd86 --- cmk/gui/plugins/wato/builtin_attributes.py | 57 ++++++++++++++++++------------ cmk/gui/plugins/wato/utils/__init__.py | 7 ++-- web/htdocs/check_mk.css | 4 +++ 3 files changed, 44 insertions(+), 24 deletions(-) diff --git a/cmk/gui/plugins/wato/builtin_attributes.py b/cmk/gui/plugins/wato/builtin_attributes.py index ec2f31b..a6d3794 100644 --- a/cmk/gui/plugins/wato/builtin_attributes.py +++ b/cmk/gui/plugins/wato/builtin_attributes.py @@ -51,6 +51,7 @@ from cmk.gui.valuespec import ( TextUnicode, SiteChoice, ID, + Transform, ) from cmk.gui.exceptions import MKUserError @@ -581,28 +582,40 @@ declare_host_attribute( declare_host_attribute( ValueSpecAttribute( - "locked", - Dictionary( - title=_("Locked"), - help=_("The host is (partially) managed by an automatic data source like the " - "Dynamic Configuration."), - elements=[ - ("locked_by", - Tuple( - orientation="horizontal", - title_br=False, - elements=[ - SiteChoice(), - ID(title=_("Program"),), - ID(title=_("Connection ID"),), - ], - title=_("Locked by"), - )), - ("attributes", ListOf( - ID(), - title=_("Locked attributes"), - )), - ], + "locked_by", + Transform( + Tuple( + orientation="horizontal", + title_br=False, + elements=[ + SiteChoice(), + ID(title=_("Program"),), + ID(title=_("Connection ID"),), + ], + title=_("Locked by"), + help=_("The host is (partially) managed by an automatic data source like the " + "Dynamic Configuration."), + ), + forth=tuple, + back=list, + )), + show_in_table=False, + show_in_form=True, + show_in_folder=True, + show_in_host_search=True, + show_inherited_value=False, + editable=False, +) + +declare_host_attribute( + ValueSpecAttribute( + "locked_attributes", + ListOf( + DropdownChoice( + choices=lambda: [(a.name(), a.title()) for a in watolib.g_host_attribute.values()], + sorted=True, + ), + title=_("Locked attributes"), )), show_in_table=False, show_in_form=True, diff --git a/cmk/gui/plugins/wato/utils/__init__.py b/cmk/gui/plugins/wato/utils/__init__.py index 8a30fba..5dfeab2 100644 --- a/cmk/gui/plugins/wato/utils/__init__.py +++ b/cmk/gui/plugins/wato/utils/__init__.py @@ -1660,8 +1660,9 @@ def configure_attributes(new, if not host: continue - locked = host.attribute("locked") - if locked and attrname in locked["attributes"]: + locked_by = host.attribute("locked_by") + locked_attributes = host.attribute("locked_attributes") + if locked_by and locked_attributes and attrname in locked_attributes: num_have_locked_it += 1 if host.has_explicit_attribute(attrname): @@ -1759,6 +1760,8 @@ def configure_attributes(new, active = False is_editable = attr.editable() and attr.may_edit() and num_have_locked_it == 0 + if for_what == "host_search": + is_editable = True if not new and not is_editable: # Bug in pylint 1.9.2 https://github.com/PyCQA/pylint/issues/1984, already fixed in master. diff --git a/web/htdocs/check_mk.css b/web/htdocs/check_mk.css index 33589c5..7849e74 100644 --- a/web/htdocs/check_mk.css +++ b/web/htdocs/check_mk.css @@ -134,6 +134,10 @@ input[type="checkbox"] { display: none; } +input[type="checkbox"][disabled] + label:before { + display: none; +} + input[type="checkbox"] + label:before { box-shadow: 0.1px 1.0px 1.2px 0 #888 inset; border: 1px #73767A solid;

5 years, 9 months

lnx_thermal: Fix nastiness in GUI complaining about int parameters when expecting float

by Konstantin Büttner

Module: check_mk Branch: master Commit: 7f4be2aa34db019a8740e59c4778cf181a575846 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7f4be2aa34db01… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Fri Dec 14 09:30:11 2018 +0100 lnx_thermal: Fix nastiness in GUI complaining about int parameters when expecting float CMK-1428 Change-Id: I1e1420c15829c227924f95ebb166e37a4f0a0443 --- checks/lnx_thermal | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checks/lnx_thermal b/checks/lnx_thermal index c9a244a..356fecf 100644 --- a/checks/lnx_thermal +++ b/checks/lnx_thermal @@ -36,7 +36,7 @@ # thermal_zone1 pkg-temp-0 44000 0 passive 0 passive factory_settings["lnx_thermal_default_levels"] = { - "levels": (70, 80), + "levels": (70.0, 80.0), "device_levels_handling": "devdefault", }

5 years, 9 months

6872 AIX agent: added inodes information to df section

by Marcel Schulte

Module: check_mk Branch: master Commit: 58f5ce566298fce6502376a073d8b557807de720 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=58f5ce566298fc… Author: Marcel Schulte <ms(a)mathias-kettner.de> Date: Wed Dec 12 11:40:49 2018 +0100 6872 AIX agent: added inodes information to df section In case /usr/opt/freeware/bin/df is available, the Check_MK agent for AIX also reports inodes usage now. Change-Id: Ib9422cf1a8b8d6b7f87eac78e0a5e5548748a8fc --- .werks/6872 | 10 ++++++++++ agents/check_mk_agent.aix | 8 ++++++++ 2 files changed, 18 insertions(+) diff --git a/.werks/6872 b/.werks/6872 new file mode 100644 index 0000000..0a577a4 --- /dev/null +++ b/.werks/6872 @@ -0,0 +1,10 @@ +Title: AIX agent: added inodes information to df section +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1544611035 +Class: feature + +In case /usr/opt/freeware/bin/df is available, the Check_MK agent for AIX also reports inodes usage now. diff --git a/agents/check_mk_agent.aix b/agents/check_mk_agent.aix index 3436368..9e0ba21 100755 --- a/agents/check_mk_agent.aix +++ b/agents/check_mk_agent.aix @@ -140,7 +140,15 @@ echo "LocalDirectory: $LOCALDIR" echo '<<<df>>>' if [ -x /usr/opt/freeware/bin/df ] ; then excludefs="-x smbfs -x cifs -x iso9660 -x udf -x nfsv4 -x nfs -x mvfs -x zfs -x cdrfs" + # shellcheck disable=SC2086 /usr/opt/freeware/bin/df -PTlk $excludefs | sed 1d + + # df inodes information + echo '<<<df>>>' + echo '[df_inodes_start]' + # shellcheck disable=SC2086 + /usr/opt/freeware/bin/df -PTli $excludefs | sed 1d + echo '[df_inodes_end]' else df -kP | sed 's/ / - /' | grep -v ^/proc | grep -v ^Filesystem | grep -v : fi

5 years, 9 months

Renamed test file

by Lars Michelsen

Module: check_mk Branch: master Commit: b1430e4e756591e2766e855e8f8c36a7d3f32205 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b1430e4e756591… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Dec 14 09:38:16 2018 +0100 Renamed test file Change-Id: I15690de8b196493d80c2a3f7bdf9eae13a498352 --- tests/unit/omdlib/{test_main.py => test_omdlib_main.py} | 0 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/tests/unit/omdlib/test_main.py b/tests/unit/omdlib/test_omdlib_main.py similarity index 100% rename from tests/unit/omdlib/test_main.py rename to tests/unit/omdlib/test_omdlib_main.py

5 years, 9 months

Refreshed Pipfile.lock.

by Sven Panne

Module: check_mk Branch: master Commit: 2c05d312f81c571a600b73dcd682e283aad7e5d5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2c05d312f81c57… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Dec 14 08:49:58 2018 +0100 Refreshed Pipfile.lock. Change-Id: Iae4994f1388a591d81445be9245a2ca0352b68c1 --- tests/static/Pipfile.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/static/Pipfile.lock b/tests/static/Pipfile.lock index d8f3371..bc60565 100644 --- a/tests/static/Pipfile.lock +++ b/tests/static/Pipfile.lock @@ -18,11 +18,11 @@ "default": { "mypy": { "hashes": [ - "sha256:8e071ec32cc226e948a34bbb3d196eb0fd96f3ac69b6843a5aff9bd4efa14455", - "sha256:fb90c804b84cfd8133d3ddfbd630252694d11ccc1eb0166a1b2efb5da37ecab2" + "sha256:12d965c9c4e8a625673aec493162cf390e66de12ef176b1f4821ac00d55f3ab3", + "sha256:38d5b5f835a81817dcc0af8d155bce4e9aefa03794fe32ed154d6612e83feafa" ], "index": "pypi", - "version": "==0.641" + "version": "==0.650" }, "mypy-extensions": { "hashes": [

5 years, 9 months

Fixed permission issue after refactoring

by Lars Michelsen

Module: check_mk Branch: master Commit: df32f710975a1768347905956baa6d7a13185bea URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=df32f710975a17… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Dec 14 08:49:02 2018 +0100 Fixed permission issue after refactoring Change-Id: Icaada477643d1090b4f515cd13aeaff47f5cb5da --- omd/packages/omd/omdlib/main.py | 2 ++ tests/unit/omdlib/test_main.py | 14 ++++++++++++++ 2 files changed, 16 insertions(+) diff --git a/omd/packages/omd/omdlib/main.py b/omd/packages/omd/omdlib/main.py index d56cf17..3138db8 100644 --- a/omd/packages/omd/omdlib/main.py +++ b/omd/packages/omd/omdlib/main.py @@ -654,6 +654,7 @@ g_skel_permissions = {} # type: Dict[str, int] def read_skel_permissions(): + global g_skel_permissions g_skel_permissions = load_skel_permissions(omdlib.__version__) if not g_skel_permissions: bail_out("%s is missing or currupted." % skel_permissions_file_path(omdlib.__version__)) @@ -2883,6 +2884,7 @@ def main_enable(site, args, options): def set_conflict_option(options): + global opt_conflict opt_conflict = options.get("conflict", "ask") if opt_conflict not in ["ask", "install", "keepold", "abort"]: diff --git a/tests/unit/omdlib/test_main.py b/tests/unit/omdlib/test_main.py new file mode 100644 index 0000000..fba7420 --- /dev/null +++ b/tests/unit/omdlib/test_main.py @@ -0,0 +1,14 @@ +from pathlib2 import Path + +import omdlib.main + + +def test_read_skel_permissions(monkeypatch, tmpdir): + tmp_path = Path("%s" % tmpdir) + pfile = tmp_path / "skel.permissions" + pfile.open("w", encoding="utf-8").write(u"bla 755\nblub 644\n") # pylint: disable=no-member + + monkeypatch.setattr(omdlib.main, "skel_permissions_file_path", lambda v: "%s" % (pfile)) + + omdlib.main.read_skel_permissions() + assert omdlib.main.g_skel_permissions == {'bla': 493, 'blub': 420}

5 years, 9 months

Added a type of W&T Thermosensors

by Tom Baerwinkel

Module: check_mk Branch: master Commit: b83d2088c422218d4601f2fa8033a16547353695 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b83d2088c42221… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Thu Dec 13 18:01:18 2018 +0100 Added a type of W&T Thermosensors Change-Id: I0e46555270b6cc1d1049d0b925830a469eff9508 --- checks/wut_webtherm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checks/wut_webtherm b/checks/wut_webtherm index 2f09fbf..c8cb475 100644 --- a/checks/wut_webtherm +++ b/checks/wut_webtherm @@ -101,7 +101,7 @@ check_info["wut_webtherm"] = { 'has_perfdata': True, 'snmp_info': ( '.1.3.6.1.4.1.5040.1.2', - ['1', '2', '3', '6', '7', '8', '9', '16', '18', '36', '37', '42'], + ['1', '2', '3', '6', '7', '8', '9', '16', '18', '36', '37', '38', '42'], [ '1.2.1.1', # WebGraph-Thermo-Hygro-Barometer-MIB::wtWebGraphThermoBaroSensorNo '1.3.1.1', # WebGraph-Thermo-Hygro-Barometer-MIB::wtWebGraphThermoBaroTempValue

5 years, 9 months

pylint: Fixed some redefined-outer-name issues

by Lars Michelsen

Module: check_mk Branch: master Commit: eb5d2d4f85dc7c7ddd8ad5f63e71c870e456b470 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=eb5d2d4f85dc7c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Dec 13 07:34:22 2018 +0100 pylint: Fixed some redefined-outer-name issues Change-Id: Ifed19159472fedb9cdd906be1880eaff442018c2 --- agents/plugins/apache_status | 6 ++--- agents/plugins/isc_dhcpd | 8 +++--- agents/special/agent_activemq | 4 +-- agents/special/agent_fritzbox | 8 +++--- agents/special/agent_ruckus_spot | 13 +++++---- cmk/gui/bi.py | 6 ++--- cmk/gui/inventory.py | 9 ++++--- cmk/gui/mkeventd.py | 6 ++--- cmk/gui/multitar.py | 2 +- cmk/gui/plugins/views/sorters.py | 16 +++++------ cmk/gui/plugins/wato/ac_tests.py | 4 +-- cmk/gui/sites.py | 6 ++--- cmk/gui/valuespec.py | 53 ++++++++++++++++++------------------- cmk/gui/visuals.py | 6 ++--- cmk/gui/wato/__init__.py | 4 +-- cmk/gui/wato/pages/notifications.py | 6 ++--- cmk/gui/wato/pages/timeperiods.py | 4 +-- cmk/gui/wato/user_profile.py | 4 +-- cmk/schedule.py | 10 +++---- cmk_base/automations/check_mk.py | 29 ++++++-------------- cmk_base/check_api_utils.py | 6 ++--- cmk_base/checking.py | 5 ++-- cmk_base/events.py | 10 +++---- cmk_base/notify.py | 30 ++++++++++----------- cmk_base/snmp.py | 12 ++++----- 25 files changed, 126 insertions(+), 141 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=eb5d2d4f85…

5 years, 9 months

6826 FIX kemp_loadmaster_services: Do not discover disabled services

by Simon Betz

Module: check_mk Branch: master Commit: 5c04f311cfc6a2dc81f33e1bf956c80ed61c679b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5c04f311cfc6a2… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Dec 13 16:34:47 2018 +0100 6826 FIX kemp_loadmaster_services: Do not discover disabled services Change-Id: Id60ae52f562a34e9b80803c855bbb4d07b7bd759 --- .werks/6826 | 11 ++++++++++ checks/kemp_loadmaster_services | 47 ++++++++++++++++++++--------------------- 2 files changed, 34 insertions(+), 24 deletions(-) diff --git a/.werks/6826 b/.werks/6826 new file mode 100644 index 0000000..09a2301 --- /dev/null +++ b/.werks/6826 @@ -0,0 +1,11 @@ +Title: kemp_loadmaster_services: Do not discover disabled services +Level: 1 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1544714022 + + diff --git a/checks/kemp_loadmaster_services b/checks/kemp_loadmaster_services index 1b0ae84..8a23c1d 100644 --- a/checks/kemp_loadmaster_services +++ b/checks/kemp_loadmaster_services @@ -53,44 +53,43 @@ kemp_loadmaster_service_default_levels = (1500, 2000) def parse_kemp_loadmaster_services(info): - map_states = { - "1": (0, 'in service'), - "2": (2, 'out of service'), - "3": (2, 'failed'), - "4": (3, 'disabled'), - "5": (1, 'sorry'), - "6": (0, 'redirect'), - "7": (2, 'error message'), - } - parsed = {} for name, status, conns in info: - if not (name == "" or len(status) > 1): - parsed.setdefault(name, {"state": map_states[status]}) - if conns.isdigit(): - parsed[name].update({"conns": int(conns)}) + if name == "" or len(status) > 1: + continue + inst = parsed.setdefault(name, {"device_state": status}) + try: + inst.update({"conns": int(conns)}) + except ValueError: + pass return parsed def inventory_kemp_loadmaster_services(parsed): for item, iteminfo in parsed.items(): - if iteminfo["state"] not in ["4", ""]: + if iteminfo["device_state"] not in ["4", ""]: yield item, kemp_loadmaster_service_default_levels def check_kemp_loadmaster_services(item, _no_params, parsed): + map_states = { + "1": (0, 'in service'), + "2": (2, 'out of service'), + "3": (2, 'failed'), + "4": (3, 'disabled'), + "5": (1, 'sorry'), + "6": (0, 'redirect'), + "7": (2, 'error message'), + } + if item in parsed: data = parsed[item] - state, state_readable = data["state"] - infotext = "State: %s" % state_readable - - perfdata = [] - if data.get("conns"): - infotext += ", Active connections: %s" % data["conns"] - perfdata.append(('conns', data["conns"])) - - return state, infotext, perfdata + state, state_readable = map_states[data["device_state"]] + yield state, "Status: %s" % state_readable + conns = data.get("conns") + if conns is not None: + yield 0, "Active connections: %s" % conns, [('conns', conns)] check_info["kemp_loadmaster_services"] = {

5 years, 9 months

Use pathlib2 a bit more often.

by Sven Panne

Module: check_mk Branch: master Commit: 3aa01e3f06e66070c7c3f91c3fbb6f0ec5b25849 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3aa01e3f06e660… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Dec 13 13:38:04 2018 +0100 Use pathlib2 a bit more often. Change-Id: I205f2f415344cf50c45b1adbb1c2528461d5c97c --- cmk/gui/wato/pages/audit_log.py | 25 ++++++++--------- cmk/man_pages.py | 36 ++++++++++++++----------- cmk/werks.py | 58 ++++++++++++++++------------------------ doc/treasures/wiki_painter.py | 5 ++-- scripts/create-changelog.py | 3 ++- scripts/precompile-werks.py | 24 +++++++---------- tests/unit/cmk/test_man_pages.py | 40 +++++++++++++-------------- tests/unit/cmk/test_werks.py | 18 ++++++------- 8 files changed, 99 insertions(+), 110 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=3aa01e3f06…

5 years, 9 months

← Newer
1
...
16
17
18
19
20
21
22
...
35
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits December 2018