Checkmk git commits October 2016

checkmk-commits@lists.checkmk.com

10 participants
276 discussions

RegExp() valuespec case_sensitive is now set to True by default

by Lars Michelsen

Module: check_mk Branch: master Commit: fa3562e405e808bd173cc0aab883689cd1e801d3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fa3562e405e808… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Oct 10 13:35:07 2016 +0200 RegExp() valuespec case_sensitive is now set to True by default --- web/htdocs/valuespec.py | 5 +---- web/htdocs/wato.py | 10 ---------- web/plugins/wato/active_checks.py | 2 -- web/plugins/wato/builtin_attributes.py | 1 - web/plugins/wato/check_mk_configuration.py | 1 - web/plugins/wato/check_parameters.py | 11 ----------- web/plugins/wato/mkeventd.py | 3 --- 7 files changed, 1 insertion(+), 32 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=fa3562e405…

7 years, 11 months

Improved general regex help texts a bit; removed special help text from rule editor

by Lars Michelsen

Module: check_mk Branch: master Commit: 2a328ebdce3d153974fa7641df929989f7e48eb8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2a328ebdce3d15… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Oct 10 14:12:46 2016 +0200 Improved general regex help texts a bit; removed special help text from rule editor --- web/htdocs/valuespec.py | 23 +++++++++++++++++++---- web/htdocs/wato.py | 7 ------- 2 files changed, 19 insertions(+), 11 deletions(-) diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index d6e3f0d..c451805 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -542,17 +542,28 @@ class RegExp(TextAscii): help_text.append(_("The text entered here is handled as a regular expression pattern.")) if self._mode == RegExp.infix: - help_text.append(_("The pattern is applied as infix search.")) + help_text.append(_("The pattern is applied as infix search. Add a leading <tt>^</tt> " + "to make it match from the beginning and/or a tailing <tt>$</tt> " + "to match till the end of the text.")) elif self._mode == RegExp.prefix: - help_text.append(_("The pattern is matched from the beginning.")) + help_text.append(_("The pattern is matched from the beginning. Add a tailing " + "<tt>$</tt> to change it to a whole text match.")) elif self._mode == RegExp.complete: - help_text.append(_("The pattern is matching the whole text.")) + help_text.append(_("The pattern is matching the whole text. You can add <tt>.*</tt> " + "in front or at the end of your pattern to make it either a prefix " + "or infix search.")) if self._case_sensitive == True: help_text.append(_("The match is performed case sensitive.")) elif self._case_sensitive == False: help_text.append(_("The match is performed case insensitive.")) + help_text.append( + _("Please note that any backslashes need to be escaped using a backslash, " + "for example you need to insert <tt>C:\\\\windows\\\\</tt> if you want to match " + "<tt>c:\windows\</tt>.") + ) + return " ".join(help_text) @@ -1050,8 +1061,10 @@ class ListOfStrings(ValueSpec): help_text = ValueSpec.help(self) field_help = self._valuespec.help() - if field_help: + if help_text and field_help: return help_text + " " + field_help + elif field_help: + return field_help else: return help_text @@ -1074,6 +1087,8 @@ class ListOfStrings(ValueSpec): self._valuespec.render_input(vp + "_%d" % nr, s) html.write('</div>') html.write('</div>') + html.write("<div style=\"clear:left\"></div>") + html.help(self.help()) html.javascript("list_of_strings_init('%s');" % vp); def canonical_value(self): diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index a85bf7b..0334d7e 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -13314,17 +13314,10 @@ def mode_edit_rule(phase, new = False): itemspec.render_input("item", value) else: vs_rule_service_conditions().render_input("itemlist", cleaned_item_list) - html.write("<br><br>") html.checkbox("negate_entries", negate_entries, label = _("<b>Negate:</b> make rule apply for <b>all but</b> the above entries")) - if not itemenum: - html.help(_("The entries here are regular expressions to match the beginning. " - "Add a <tt>$</tt> for an exact match. An arbitrary substring is matched " - "with <tt>.*</tt><br>Please note that on windows systems any backslashes need to be escaped." - "For example C:\\\\tmp\\\\message.log")) - html.write("</div>") forms.end()

7 years, 11 months

tests: Now stop/ start site when enabling livestatus via tcp when site was already running

by Lars Michelsen

Module: check_mk Branch: master Commit: 66c42e6e575d0bd7b341a74adda812c0e2683587 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=66c42e6e575d0b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Oct 10 13:26:45 2016 +0200 tests: Now stop/start site when enabling livestatus via tcp when site was already running --- tests/testlib/__init__.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/tests/testlib/__init__.py b/tests/testlib/__init__.py index 16b2eff..4179054 100644 --- a/tests/testlib/__init__.py +++ b/tests/testlib/__init__.py @@ -276,14 +276,18 @@ class Site(object): # This opens a currently free TCP port and remembers it in the object for later use # Not free of races, but should be sufficient. def open_livestatus_tcp(self): + start_again = False + if self.is_running(): - assert self.get_config("LIVESTATUS_TCP") == "on", \ - "Livestatus-TCP disabled (Site is running, so could not enable it)" - return + start_again = True + self.stop() self.set_config("LIVESTATUS_TCP", "on") self.set_config("LIVESTATUS_TCP_PORT", str(self._livestatus_port)) + if start_again: + self.start() + def _gather_livestatus_port(self): if self.reuse and self.exists():

7 years, 11 months

Fixed wrong rule event limit number in overflow event text

by Lars Michelsen

Module: check_mk Branch: master Commit: cdb9fa27837210869664995af376ca6352521027 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cdb9fa27837210… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Oct 10 13:12:31 2016 +0200 Fixed wrong rule event limit number in overflow event text --- bin/mkeventd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/mkeventd b/bin/mkeventd index 7d54cfa..08f5c13 100755 --- a/bin/mkeventd +++ b/bin/mkeventd @@ -2829,7 +2829,7 @@ class EventServer: "The rule event limit of %d open events has been reached for rule \"%s\". " "Not opening any additional event for this rule until open events have " "been archived." % - (g_config["event_limit"]["by_host"]["limit"], event["rule_id"]) + (g_config["event_limit"]["by_rule"]["limit"], event["rule_id"]) ) })

7 years, 11 months

fixed typo in activate changes webapi leading to invalid request key validiation

by Andreas Boesl

Module: check_mk Branch: master Commit: 5a24210a8710499a8971de466cccfedf52d0d88e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5a24210a871049… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Oct 10 11:01:46 2016 +0200 fixed typo in activate changes webapi leading to invalid request key validiation --- web/plugins/webapi/webapi.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/plugins/webapi/webapi.py b/web/plugins/webapi/webapi.py index 47a2b0a..23a068e 100644 --- a/web/plugins/webapi/webapi.py +++ b/web/plugins/webapi/webapi.py @@ -295,7 +295,7 @@ api_actions["discover_services"] = { ############### def action_activate_changes(request): - validate_request_keys(request, ["modes", "sites"]) + validate_request_keys(request, ["mode", "sites"]) mode = html.var("mode") and html.var("mode") or "dirty" if html.var("allow_foreign_changes"):

7 years, 11 months

Slightly cleaned up user file saving code

by Lars Michelsen

Module: check_mk Branch: master Commit: daa764ecad40170b7f5f765824d06c8ae52df2a3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=daa764ecad4017… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Oct 10 10:26:00 2016 +0200 Slightly cleaned up user file saving code --- web/htdocs/config.py | 5 ++--- web/htdocs/weblib.py | 7 ++----- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/web/htdocs/config.py b/web/htdocs/config.py index 3d8b331..879aab1 100644 --- a/web/htdocs/config.py +++ b/web/htdocs/config.py @@ -569,9 +569,8 @@ def user_may(user_id, pname): # TODO: Check all calls for arguments (changed optional user to 3rd positional) def save_user_file(name, data, user, unlock=False): - dirname = config_dir + "/" + user.encode("utf-8") - make_nagios_directory(dirname) - path = dirname + "/" + name + ".mk" + path = config_dir + "/" + user.encode("utf-8") + "/" + name + ".mk" + make_nagios_directory(os.path.dirname(path)) store.save_data_to_file(path, data) diff --git a/web/htdocs/weblib.py b/web/htdocs/weblib.py index a4fb170..50b5868 100644 --- a/web/htdocs/weblib.py +++ b/web/htdocs/weblib.py @@ -96,7 +96,7 @@ def get_rowselection(ident): return vo.get(ident, []) def set_rowselection(ident, rows, action): - vo = config.user.load_file("rowselection/%s" % selection_id(), {}, True) + vo = config.user.load_file("rowselection/%s" % selection_id(), {}, lock=True) if action == 'set': vo[ident] = rows @@ -110,10 +110,7 @@ def set_rowselection(ident, rows, action): elif action == 'unset': del vo[ident] - if not os.path.exists(config.user.confdir + '/rowselection'): - make_nagios_directory(config.user.confdir + '/rowselection') - - config.user.save_file("rowselection/%s" % selection_id(), vo, True) + config.user.save_file("rowselection/%s" % selection_id(), vo, unlock=True) def ajax_set_rowselection(): ident = html.var('id')

7 years, 11 months

Fixed use of icinga core

by Lars Michelsen

Module: check_mk Branch: master Commit: 81b78ff9280f47736a171df0c2158ba918348d6a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=81b78ff9280f47… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Oct 10 10:18:37 2016 +0200 Fixed use of icinga core --- lib/paths.py | 43 ++++++++++++++++++++++++++++++++++++++----- 1 file changed, 38 insertions(+), 5 deletions(-) diff --git a/lib/paths.py b/lib/paths.py index 82e2ae2..0a4bcfd 100644 --- a/lib/paths.py +++ b/lib/paths.py @@ -125,14 +125,14 @@ def _set_paths(): "tcp_cache_dir" : os.path.join(omd_root, "tmp/check_mk/cache"), "tmp_dir" : os.path.join(omd_root, "tmp/check_mk"), "logwatch_dir" : os.path.join(omd_root, "var/check_mk/logwatch"), + "nagios_startscript" : os.path.join(omd_root, "etc/init.d/core"), + + # Switched via symlinks on icinga/nagios change + "nagios_conf_dir" : os.path.join(omd_root, "etc/nagios/conf.d"), "nagios_objects_file" : os.path.join(omd_root, "etc/nagios/conf.d/check_mk_objects.cfg"), - "nagios_command_pipe_path" : os.path.join(omd_root, "tmp/run/nagios.cmd"), "check_result_path" : os.path.join(omd_root, "tmp/nagios/checkresults"), "nagios_status_file" : os.path.join(omd_root, "tmp/nagios/status.dat"), - "nagios_conf_dir" : os.path.join(omd_root, "etc/nagios/conf.d"), - "nagios_config_file" : os.path.join(omd_root, "tmp/nagios/nagios.cfg"), - "nagios_startscript" : os.path.join(omd_root, "etc/init.d/core"), - "nagios_binary" : os.path.join(omd_root, "bin/nagios"), + "apache_config_dir" : os.path.join(omd_root, "etc/apache"), "htpasswd_file" : os.path.join(omd_root, "etc/htpasswd"), "livestatus_unix_socket" : os.path.join(omd_root, "tmp/run/live"), @@ -140,6 +140,7 @@ def _set_paths(): "livebackendsdir" : os.path.join(omd_root, "share/check_mk/livestatus"), }) + _set_core_specific_paths() _set_overridable_paths() _set_overridable_paths(local=True) @@ -152,6 +153,38 @@ def _omd_root(): # "only execute this in an OMD site.")) +def _set_core_specific_paths(): + omd_root = _omd_root() + core = _get_core_name() + + if core == "icinga": + globals().update({ + "nagios_binary" : os.path.join(omd_root, "bin/icinga"), + "nagios_config_file" : os.path.join(omd_root, "tmp/icinga/icinga.cfg"), + "nagios_command_pipe_path" : os.path.join(omd_root, "tmp/run/icinga.cmd"), + }) + else: + globals().update({ + "nagios_binary" : os.path.join(omd_root, "bin/nagios"), + "nagios_config_file" : os.path.join(omd_root, "tmp/nagios/nagios.cfg"), + "nagios_command_pipe_path" : os.path.join(omd_root, "tmp/run/nagios.cmd"), + }) + + +def _get_core_name(): + try: + for l in open(os.path.join(omd_root, "etc/omd/site.conf")): + if l.startswith("CONFIG_CORE='"): + return l.split("'")[1] + except IOError, e: + # At least in test environment the file is not available. We only added this try/except for + # this case. This should better be solved in a cleaner way. + if e.errno == 2: + pass + else: + raise + + def _set_overridable_paths(local=False): rel_base = "local" if local else "" var_prefix = "local_" if local else ""

7 years, 11 months

Added test to load all man pages (check for syntax errors)

by Lars Michelsen

Module: check_mk Branch: master Commit: 2d0f4d607a7fc0565d2a708f5ca7e05620a7bf03 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2d0f4d607a7fc0… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Oct 10 09:42:23 2016 +0200 Added test to load all man pages (check for syntax errors) --- tests/lib/test_man_pages.py | 36 +++++++++++++++++++++++++++++++----- 1 file changed, 31 insertions(+), 5 deletions(-) diff --git a/tests/lib/test_man_pages.py b/tests/lib/test_man_pages.py index a28ae73..c845dbe 100644 --- a/tests/lib/test_man_pages.py +++ b/tests/lib/test_man_pages.py @@ -65,6 +65,13 @@ def test_all_man_pages(tmpdir): assert pages["if64"] == "%s/checkman/if64" % cmk_path() +def test_load_all_man_pages(): + for name in man_pages.all_man_pages().keys(): + man_page = man_pages.load_man_page(name) + assert type(man_page) == dict + _check_man_page_structure(man_page) + + def test_print_man_page_table(capsys): man_pages.print_man_page_table() out, err = capsys.readouterr() @@ -123,16 +130,35 @@ def test_load_man_page_not_existing(): assert man_pages.load_man_page("not_existing") == None +def _check_man_page_structure(page): + for key in [ "header" ]: + assert key in page + + for key in [ 'description', 'license', 'title', + 'catalog', 'agents', + 'distribution']: + assert key in page["header"] + + if "configuration" in page: + assert type(page["configuration"]) == list + + if "parameters" in page: + assert type(page["parameters"]) == list + + if "inventory" in page: + assert type(page["inventory"]) == list + + assert type(page["header"]["agents"]) == list + + def test_load_man_page_format(): page = man_pages.load_man_page("if64") assert type(page) == dict - for key in [ "header", "configuration", "parameters" ]: - assert key in page + _check_man_page_structure(page) - for key in [ 'description', 'license', 'title', 'perfdata', - 'item', 'catalog', 'agents', 'inventory', - 'distribution', 'examples']: + # Check optional keys + for key in [ 'perfdata', 'item', 'examples', 'inventory']: assert key in page["header"] for entry in page["configuration"]:

7 years, 11 months

Fixed syntax error in man page

by Lars Michelsen

Module: check_mk Branch: master Commit: e0700ee05f3d0ece1f344c841347a55aa2e925a5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e0700ee05f3d0e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Oct 10 09:42:11 2016 +0200 Fixed syntax error in man page --- checkman/cups_queues | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/checkman/cups_queues b/checkman/cups_queues index 1f92e2d..abae460 100644 --- a/checkman/cups_queues +++ b/checkman/cups_queues @@ -28,10 +28,10 @@ inventory: Checks are created for all available printers in {lpstat -p} output. [parameters] - job_count (int, int): WARN/CRIT if number of jobs are above - job_age (int, int): WARN/CRIT if oldest job is above in seconds - is_idle (int): Internal state for pritner state "is idle" +job_count (int, int): WARN/CRIT if number of jobs are above +job_age (int, int): WARN/CRIT if oldest job is above in seconds +is_idle (int): Internal state for pritner state "is idle" [configuration] - cups_queues_default_levels (int, int, int, int): The global default levels for +cups_queues_default_levels (int, int, int, int): The global default levels for all checks of this type. This is {(5, 10, 360, 720)}.

7 years, 11 months

Cleaned up subprocess calls

by Lars Michelsen

Module: check_mk Branch: master Commit: a31a0d9796ac65816f98052290e18528174a9900 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a31a0d9796ac65… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Sat Oct 8 14:13:42 2016 +0200 Cleaned up subprocess calls Calls to subprocess.Popen() must be treated carefully: a) Try to avoid shell=True. In case a shell is invoked and someone is able to add user input, for example in case a validation of user input is not sufficient, the user is able to inject commands. b) Removing shell=True also saves performance (not spawning a shell) c) Use close_fds=True to prevent file descriptor leaks or accidentially closed file descriptors. Same applies to os.popen() and os.system() calls which have not been checked nor cleaned up yet. --- bin/mkbackup | 4 +- bin/mkeventd | 21 +++++------ modules/automation.py | 7 +++- modules/check_mk.py | 87 +++++++++++++++++++++++++------------------ modules/notify.py | 14 ++++--- modules/snmp.py | 10 +++-- web/htdocs/backup.py | 2 +- web/htdocs/crash_reporting.py | 4 +- web/htdocs/multitar.py | 3 +- web/htdocs/notify.py | 2 +- web/htdocs/wato.py | 17 +++++---- 11 files changed, 100 insertions(+), 71 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=a31a0d9796…

7 years, 11 months

← Newer
1
...
21
22
23
24
25
26
27
28
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits October 2016