Checkmk git commits September 2016

checkmk-commits@lists.checkmk.com

9 participants
301 discussions

added tests form load_data_to_file/save_data_from_file

by Lars Michelsen

Module: check_mk Branch: master Commit: 2ce54cb6aa82fe08c6a514356ddf58f105ba9751 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2ce54cb6aa82fe… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Sep 29 08:04:24 2016 +0200 added tests form load_data_to_file/save_data_from_file --- lib/store.py | 26 ++++++++++++---------- tests/lib/test_store.py | 59 +++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 73 insertions(+), 12 deletions(-) diff --git a/lib/store.py b/lib/store.py index bc92d2b..8101918 100644 --- a/lib/store.py +++ b/lib/store.py @@ -152,13 +152,14 @@ def load_mk_file(path, default=None, lock=False): aquire_lock(path) try: - execfile(path, globals(), default) - return default - except IOError, e: - if e.errno == 2: # IOError: [Errno 2] No such file or directory + try: + execfile(path, globals(), default) return default - else: - raise + except IOError, e: + if e.errno == 2: # IOError: [Errno 2] No such file or directory + return default + else: + raise except Exception, e: # TODO: How to handle debug mode or logging? @@ -186,12 +187,13 @@ def load_data_from_file(path, default=None, lock=False): aquire_lock(path) try: - return ast.literal_eval(file(path).read()) - except IOError, e: - if e.errno == 2: # IOError: [Errno 2] No such file or directory - return default - else: - raise + try: + return ast.literal_eval(file(path).read()) + except IOError, e: + if e.errno == 2: # IOError: [Errno 2] No such file or directory + return default + else: + raise except Exception, e: # TODO: How to handle debug mode or logging? diff --git a/tests/lib/test_store.py b/tests/lib/test_store.py index 03d658c..e5ba7ea 100644 --- a/tests/lib/test_store.py +++ b/tests/lib/test_store.py @@ -1,8 +1,67 @@ +# encoding: utf-8 + import cmk.store as store +from cmk.exceptions import MKGeneralException import imp import sys import threading import time +import os +import pytest + +def test_load_data_from_file_not_existing(tmpdir): + data = store.load_data_from_file("%s/x" % tmpdir) + assert data == None + + data = store.load_data_from_file("%s/x" % tmpdir, "DEFAULT") + assert data == "DEFAULT" + + +def test_load_data_not_locked(tmpdir): + locked_file = tmpdir.join("locked_file") + locked_file.write("[1, 2]") + + data = store.load_data_from_file("%s" % locked_file) + assert store.have_lock("%s" % locked_file) == False + + +def test_load_data_from_file_locking(tmpdir): + locked_file = tmpdir.join("locked_file") + locked_file.write("[1, 2]") + + data = store.load_data_from_file("%s" % locked_file, lock=True) + assert data == [1, 2] + assert store.have_lock("%s" % locked_file) == True + + +def test_load_data_from_not_permitted_file(tmpdir): + locked_file = tmpdir.join("test") + locked_file.write("[1, 2]") + os.chmod("%s" % locked_file, 0200) + + with pytest.raises(MKGeneralException) as e: + store.load_data_from_file("%s" % locked_file) + assert "%s" % locked_file in "%s" % e + assert "Permission denied" in "%s" % e + + +def test_load_data_from_file_dict(tmpdir): + locked_file = tmpdir.join("test") + locked_file.write(repr({"1": 2, "ä": u"ß"})) + + data = store.load_data_from_file("%s" % locked_file) + assert type(data) == dict + assert data["1"] == 2 + assert type(data["ä"]) == unicode + assert data["ä"] == u"ß" + + +def test_save_data_to_file(tmpdir): + f = tmpdir.join("test") + path = "%s" % f + + store.save_data_to_file(path, [2, 3]) + assert store.load_data_from_file(path) == [2, 3] def test_acquire_lock_not_existing(tmpdir):

7 years, 11 months

store: Added test for handling empty file

by Lars Michelsen

Module: check_mk Branch: master Commit: f62401fa5be2e596a7bcf6d2929ac3ad72f7d978 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f62401fa5be2e5… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Sep 29 08:29:13 2016 +0200 store: Added test for handling empty file --- tests/lib/test_store.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/tests/lib/test_store.py b/tests/lib/test_store.py index e5ba7ea..1935991 100644 --- a/tests/lib/test_store.py +++ b/tests/lib/test_store.py @@ -17,6 +17,13 @@ def test_load_data_from_file_not_existing(tmpdir): assert data == "DEFAULT" +def test_load_data_from_file_empty(tmpdir): + locked_file = tmpdir.join("test") + locked_file.write("") + data = store.load_data_from_file("%s/x" % tmpdir, "DEF") + assert data == "DEF" + + def test_load_data_not_locked(tmpdir): locked_file = tmpdir.join("locked_file") locked_file.write("[1, 2]")

7 years, 11 months

Updated bug entries #2472

by Lars Michelsen

Module: check_mk Branch: master Commit: db912f33bb19702dda85d92446ddb98af6f71506 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=db912f33bb1970… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Sep 28 17:15:00 2016 +0200 Updated bug entries #2472 --- .bugs/2472 | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.bugs/2472 b/.bugs/2472 new file mode 100644 index 0000000..4ef48b6 --- /dev/null +++ b/.bugs/2472 @@ -0,0 +1,7 @@ +Title: WATO: deprecate wato_legacy_eval in mk_eval/mk_repr +Component: wato +State: open +Date: 2016-09-28 17:14:25 +Targetversion: 1.2.9 +Class: cleanup +

7 years, 11 months

Cleaned up some ast.literal_eval calls

by Lars Michelsen

Module: check_mk Branch: master Commit: ea67301f74388c73b17c2053f1a0434e1ba0a0d3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ea67301f74388c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Sep 28 17:21:08 2016 +0200 Cleaned up some ast.literal_eval calls --- web/htdocs/lib.py | 40 ---------------------------------------- web/htdocs/watolib.py | 8 +++++--- web/htdocs/werks.py | 9 ++------- 3 files changed, 7 insertions(+), 50 deletions(-) diff --git a/web/htdocs/lib.py b/web/htdocs/lib.py index e7f1602..f654dea 100644 --- a/web/htdocs/lib.py +++ b/web/htdocs/lib.py @@ -779,46 +779,6 @@ def file_size_human_readable(file_size): result = as_string + result return result - -try: - import ast - literal_eval = ast.literal_eval -except ImportError: - # pylint: disable=no-member - # Python <2.5 compatibility - try: - from compiler import parse - import compiler.ast - def literal_eval(node_or_string): - _safe_names = {'None': None, 'True': True, 'False': False} - - if isinstance(node_or_string, basestring): - node_or_string = parse(node_or_string, mode='eval') - if isinstance(node_or_string, compiler.ast.Expression): - node_or_string = node_or_string.node - - def _convert(node): - if isinstance(node, compiler.ast.Const) and isinstance(node.value, - (basestring, int, float, long, complex)): - return node.value - elif isinstance(node, compiler.ast.Tuple): - return tuple(map(_convert, node.nodes)) - elif isinstance(node, compiler.ast.List): - return list(map(_convert, node.nodes)) - elif isinstance(node, compiler.ast.Dict): - return dict((_convert(k), _convert(v)) for k, v - in node.items) - elif isinstance(node, compiler.ast.Name): - if node.name in _safe_names: - return _safe_names[node.name] - elif isinstance(node, compiler.ast.UnarySub): - return -_convert(node.expr) - raise ValueError('malformed string') - - return _convert(node_or_string) - except: - literal_eval = None - #. # .--Various Constants---------------------------------------------------. # | ____ _ _ | diff --git a/web/htdocs/watolib.py b/web/htdocs/watolib.py index 5ab49c8..de073db 100644 --- a/web/htdocs/watolib.py +++ b/web/htdocs/watolib.py @@ -46,6 +46,7 @@ import os, shutil, subprocess, base64, pickle, pwd import config, hooks, userdb, multitar import sites import traceback +import ast from lib import * from valuespec import * @@ -4808,10 +4809,11 @@ def rename_host_in_list(thelist, oldname, newname): return did_rename +# TODO: Deprecate this legacy format with 1.4.0 or later?! def mk_eval(s): try: - if literal_eval and not config.wato_legacy_eval: - return literal_eval(base64.b64decode(s)) + if not config.wato_legacy_eval: + return ast.literal_eval(base64.b64decode(s)) else: return pickle.loads(base64.b64decode(s)) except: @@ -4819,7 +4821,7 @@ def mk_eval(s): def mk_repr(s): - if literal_eval and not config.wato_legacy_eval: + if not config.wato_legacy_eval: return base64.b64encode(repr(s)) else: return base64.b64encode(pickle.dumps(s)) diff --git a/web/htdocs/werks.py b/web/htdocs/werks.py index 0f228b2..bd5be21 100644 --- a/web/htdocs/werks.py +++ b/web/htdocs/werks.py @@ -205,7 +205,7 @@ def acknowledge_werks(werks): def save_acknowledgements(acknowledged_werks): - store.save_file(acknowledgement_path, "%r\n" % acknowledged_werks) + store.save_data_to_file(acknowledged_werks) def acknowledge_all_werks(): @@ -238,12 +238,7 @@ def load_werk(path): def load_acknowledgements(): - if os.path.exists(acknowledgement_path): - content = file(acknowledgement_path).read().strip() - if content: - return literal_eval(file(acknowledgement_path).read()) - - return [] + return store.load_data_from_file(acknowledgement_path, []) def unacknowledged_incompatible_werks():

7 years, 11 months

Changed handling of empty files and name of tempfiles

by Lars Michelsen

Module: check_mk Branch: master Commit: f17ee3a57788d34749f849690bb69141345035ca URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f17ee3a57788d3… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Sep 29 08:28:53 2016 +0200 Changed handling of empty files and name of tempfiles --- lib/store.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/lib/store.py b/lib/store.py index 8101918..0783282 100644 --- a/lib/store.py +++ b/lib/store.py @@ -188,7 +188,12 @@ def load_data_from_file(path, default=None, lock=False): try: try: - return ast.literal_eval(file(path).read()) + content = file(path).read().strip() + if not content: + # May be created empty during locking + return default + else: + return ast.literal_eval(file(path).read()) except IOError, e: if e.errno == 2: # IOError: [Errno 2] No such file or directory return default @@ -212,7 +217,7 @@ def save_file(path, content, mode=0660): try: tmp_path = None with tempfile.NamedTemporaryFile("w", dir=os.path.dirname(path), - prefix=os.path.basename(path)+".new", + prefix=".%s.new" % os.path.basename(path), delete=False) as tmp: tmp_path = tmp.name os.chmod(tmp_path, mode)

7 years, 11 months

store: Added general method to deal with .mk files containing python data structures

by Lars Michelsen

Module: check_mk Branch: master Commit: f5a47739fd53934a42019bc00f2843c80a2112a3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f5a47739fd5393… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Sep 28 17:20:44 2016 +0200 store: Added general method to deal with .mk files containing python data structures --- lib/store.py | 30 +++++++++++++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) diff --git a/lib/store.py b/lib/store.py index dea4bce..bc92d2b 100644 --- a/lib/store.py +++ b/lib/store.py @@ -28,6 +28,7 @@ functionality is the locked file opening realized with the File() context manager.""" +import ast import fcntl import os import pprint @@ -139,7 +140,8 @@ open = LockedOpenWithTempfile # '----------------------------------------------------------------------' # This function generalizes reading from a .mk configuration file. It is basically meant to -# generalize the exception handling for all file IO. +# generalize the exception handling for all file IO. This function handles all those files +# that are read with execfile(). def load_mk_file(path, default=None, lock=False): if default == None: raise MKGeneralException(_("You need to provide a config dictionary to merge with the " @@ -176,6 +178,32 @@ def save_mk_file(path, mk_content): save_file(path, content) +# Handle .mk files that are only holding a python data structure and often +# directly read via file/open and then parsed using eval. +# TODO: Consolidate with load_mk_file? +def load_data_from_file(path, default=None, lock=False): + if lock: + aquire_lock(path) + + try: + return ast.literal_eval(file(path).read()) + except IOError, e: + if e.errno == 2: # IOError: [Errno 2] No such file or directory + return default + else: + raise + + except Exception, e: + # TODO: How to handle debug mode or logging? + raise MKGeneralException(_("Cannot read file \"%s\": %s") % (path, e)) + + +# A simple wrapper for cases where you want to store a python data +# structure that is then read by load_data_from_file() again +def save_data_to_file(path, data): + save_file(path, "%r\n" % data) + + # Saving assumes a locked destination file (usually done by loading code) # Then the new file is written to a temporary file and moved to the target path def save_file(path, content, mode=0660):

7 years, 11 months

updated werk text

by Simon Betz

Module: check_mk Branch: master Commit: 17615d2d14d19451090c3e8223e59850e6354b2f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=17615d2d14d194… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Sep 29 12:05:33 2016 +0200 updated werk text --- .werks/3905 | 5 ++++- ChangeLog | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.werks/3905 b/.werks/3905 index 4461fb2..1140bed 100644 --- a/.werks/3905 +++ b/.werks/3905 @@ -1,4 +1,4 @@ -Title: barracuda_mailqueues, nullmailer_mailq, postfix_mailq, qmail_stats: these checks now have items, postfix can now monitor multi directories +Title: barracuda_mailqueues, nullmailer_mailq, postfix_mailq, qmail_stats: these checks now have items, postfix can now monitor multi directories (linux agent) Level: 1 Component: checks Compatible: incomp @@ -6,6 +6,9 @@ Version: 1.4.0i1 Date: 1475141806 Class: feature +If postfix is configured with multi directories then the linux agent provides information +about deferred and active mail queue length of these directories. + Note: existing ruleset mailqueue length is now deprecated. These checks will work further on but the related ruleset won't be applied any more except default levels. Please use new service descriptions for these checks below global settings, rediscover the diff --git a/ChangeLog b/ChangeLog index 49bfa2e..58adf3b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -174,7 +174,7 @@ NOTE: Please refer to the migration notes! * 3879 ipmi, ipmi_sensors: unified ipmi checks which now work the same way... * 3747 epson_beamer_lamp: New check to monitor the lamp operation time of Epson beamers - * 3905 barracuda_mailqueues, nullmailer_mailq, postfix_mailq, qmail_stats: these checks now have items, postfix can now monitor multi directories... + * 3905 barracuda_mailqueues, nullmailer_mailq, postfix_mailq, qmail_stats: these checks now have items, postfix can now monitor multi directories (linux agent)... NOTE: Please refer to the migration notes! * 3073 FIX: windows agent: relative paths to mrpe scripts are now treated as relative to the agent installation directory... * 3061 FIX: mk_jolokia: Fixed debugging of the agent plugin

7 years, 11 months

3905 barracuda_mailqueues, nullmailer_mailq, postfix_mailq, qmail_stats: these checks now have items, postfix can now monitor multi directories

by Simon Betz

Module: check_mk Branch: master Commit: 7b37d1c2cadcc366ad4e72dcf217df1f5b232ffc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7b37d1c2cadcc3… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Sep 29 11:48:53 2016 +0200 3905 barracuda_mailqueues, nullmailer_mailq, postfix_mailq, qmail_stats: these checks now have items, postfix can now monitor multi directories Note: existing ruleset mailqueue length is now deprecated. These checks will work further on but the related ruleset won't be applied any more except default levels. Please use new service descriptions for these checks below global settings, rediscover the affected hosts and use new mail queue length ruleset. --- .werks/3905 | 12 +++ ChangeLog | 2 + agents/check_mk_agent.linux | 38 ++++++++- checks/barracuda_mailqueues | 13 ++-- checks/nullmailer_mailq | 8 +- checks/postfix_mailq | 121 +++++++++++++++++------------ checks/qmail_stats | 8 +- modules/check_mk.py | 4 + web/htdocs/wato.py | 4 + web/plugins/wato/check_mk_configuration.py | 4 + web/plugins/wato/check_parameters.py | 71 ++++++++++------- 11 files changed, 189 insertions(+), 96 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=7b37d1c2ca…

7 years, 11 months

3738 FIX Fixed sporadic pending changes due to (not) changed contact groups

by Mathias Kettner

Module: check_mk Branch: master Commit: 818d011f421239a43179de21f08772f31f040208 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=818d011f421239… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Sep 28 21:44:18 2016 +0200 3738 FIX Fixed sporadic pending changes due to (not) changed contact groups The LDAP connector sometimes creates pending changes because of changed contact groups. But the groups have not really changed. Just the order of the groups in the answer from the LDAP server has changed. This has been fixed. --- .werks/3738 | 13 +++++++++++++ ChangeLog | 1 + web/plugins/userdb/ldap.py | 2 +- 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/.werks/3738 b/.werks/3738 new file mode 100644 index 0000000..ca53508 --- /dev/null +++ b/.werks/3738 @@ -0,0 +1,13 @@ +Title: Fixed sporadic pending changes due to (not) changed contact groups +Level: 1 +Component: wato +Class: fix +Compatible: compat +State: unknown +Version: 1.4.0i1 +Date: 1475091791 + +The LDAP connector sometimes creates pending changes because of changed +contact groups. But the groups have not really changed. Just the order +of the groups in the answer from the LDAP server has changed. This +has been fixed. diff --git a/ChangeLog b/ChangeLog index b1ac70e..e41c28c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -645,6 +645,7 @@ * 3844 FIX: Fixed validation of host IPv4, IPv6 and management host address attributes... * 3845 FIX: Added missing validation of host attribute values to WATO Web API calls * 3881 FIX: fixed automation call 'delete piggyback host' + * 3738 FIX: Fixed sporadic pending changes due to (not) changed contact groups... Notifications: * 3263 Notifications: allow users to restrict by their contact groups... diff --git a/web/plugins/userdb/ldap.py b/web/plugins/userdb/ldap.py index 84a78ba..da505a1 100644 --- a/web/plugins/userdb/ldap.py +++ b/web/plugins/userdb/ldap.py @@ -1308,7 +1308,7 @@ def get_groups_of_user(connection, user_id, ldap_user, cg_names, nested, other_c if user_cmp_val in group['members']: group_cns.append(group['cn']) - return group_cns + return sorted(group_cns) group_membership_parameters = [

7 years, 11 months

fixed typo

by Marcel Arentz

Module: check_mk Branch: master Commit: 207c4c88d7c750ac847ff990f7ebda14bfc11b5e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=207c4c88d7c750… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Wed Sep 28 18:16:23 2016 +0200 fixed typo --- web/plugins/metrics/check_mk.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/plugins/metrics/check_mk.py b/web/plugins/metrics/check_mk.py index 68e6b06..b98f945 100644 --- a/web/plugins/metrics/check_mk.py +++ b/web/plugins/metrics/check_mk.py @@ -5781,7 +5781,7 @@ graph_info.append({ "title" : _("QoS class traffic"), "metrics" : [ ( "qos_outbound_bytes_rate,8,*@bits/s", "area", _("Qos outbound bits")), - ( "qos_dropped_bytes_rate,8,*@bits/s", "-area" _("QoS dropped bits")), + ( "qos_dropped_bytes_rate,8,*@bits/s", "-area", _("QoS dropped bits")), ], })

7 years, 11 months

← Newer
1
2
3
4
5
6
7
8
9
...
31
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits September 2016