Checkmk git commits January 2017

checkmk-commits@lists.checkmk.com

10 participants
302 discussions

Refactoring htmllib: changed mechanics of javascript_file.

by Roland Halbig

Module: check_mk Branch: master Commit: 660fefb0fd65921ee911c7a1acddc206a157d9e0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=660fefb0fd6592… Author: Roland Halbig <rh(a)mathias-kettner.de> Date: Thu Jan 12 09:43:45 2017 +0100 Refactoring htmllib: changed mechanics of javascript_file. Change-Id: Icb03c65bc481baba5006363aeb4fca39d1aa3d42 --- tests/web/classes.py | 27 +++++++++++---------------- tests/web/test_htmllib_integration.py | 16 +++++++--------- web/htdocs/html_mod_python.py | 2 +- web/htdocs/htmllib.py | 6 +++--- web/htdocs/valuespec.py | 2 +- 5 files changed, 23 insertions(+), 30 deletions(-) diff --git a/tests/web/classes.py b/tests/web/classes.py index 895e8ab..1caaef7 100644 --- a/tests/web/classes.py +++ b/tests/web/classes.py @@ -777,12 +777,6 @@ class HTMLTester(object): #raise NotImplementedError() return "file/name/css_%s" % css - - def javascript_filename_for_browser(self, jsname): - #raise NotImplementedError() - return "file/name/js_%s" % jsname - - def top_heading(self, title): self.top_heading_left(title) self.top_heading_right() @@ -800,21 +794,22 @@ class HTMLTester(object): return {"1": 1, "2": 2, "3": 3,} -class GeneratorTester(HTMLTester, HTMLGenerator): - def __init__(self): - super(GeneratorTester, self).__init__() - HTMLTester.__init__(self) - HTMLGenerator.__init__(self) +class HTMLCheck_MKTester(HTMLTester, html): + + def javascript_filename_for_browser(self, jsname): + #raise NotImplementedError() + return "js/file/name/js_%s.js" % jsname -class HTMLCheck_MKTester(HTMLTester, html): - pass -# def __init__(self): -# super(HTMLCheck_MKTester, self).__init__() class HTMLOrigTester(HTMLTester, DeprecatedRenderer): - pass + + def javascript_filename_for_browser(self, jsname): + #raise NotImplementedError() + return "file/name/js_%s" % jsname + + diff --git a/tests/web/test_htmllib_integration.py b/tests/web/test_htmllib_integration.py index e8558fd..0c264b3 100644 --- a/tests/web/test_htmllib_integration.py +++ b/tests/web/test_htmllib_integration.py @@ -15,13 +15,8 @@ import i18n # internal imports from htmllib import html from htmllib import HTMLGenerator, HTMLCheck_MK -from tools import compare_html , gentest, compare_and_empty -from classes import HTMLOrigTester, GeneratorTester, HTMLCheck_MKTester, DeprecatedRenderer - - - - - +from tools import compare_html, gentest, compare_and_empty +from classes import HTMLOrigTester, HTMLCheck_MKTester, DeprecatedRenderer def test_select(): @@ -168,10 +163,11 @@ def test_text_input(): new.user_errors = {v: "(not) a test error"} gentest(old, new, lambda x: x.text_input(v,d,c,l,i,s,a,**arg)) + def test_generator(): old = HTMLOrigTester() - new = GeneratorTester() + new = HTMLCheck_MKTester() old.plug() new.plug() @@ -185,7 +181,9 @@ def test_generator(): gentest(old, new, lambda x: x.javascript("set_reload(0, \'address\')")) - gentest(old, new, lambda x: x.javascript_file("Test")) + old.javascript_file("Test") + new.javascript_file("js/Test.js") + compare_and_empty(old, new) gentest(old, new, lambda x: x.play_sound("Test")) diff --git a/web/htdocs/html_mod_python.py b/web/htdocs/html_mod_python.py index abd5ab8..49eff00 100644 --- a/web/htdocs/html_mod_python.py +++ b/web/htdocs/html_mod_python.py @@ -329,7 +329,7 @@ class html_mod_python(htmllib.html): for min_part in min_parts: path_pattern = cmk.paths.omd_root + "%s" + rel_path + "/" + jsname + min_part + ".js" if os.path.exists(path_pattern % "") or os.path.exists(path_pattern % "/local"): - filename_for_browser = '%s%s-%s' % (jsname, min_part, cmk.__version__) + filename_for_browser = 'js/%s%s-%s.js' % (jsname, min_part, cmk.__version__) break return filename_for_browser diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index 35a019a..c9fdaf1 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -640,9 +640,9 @@ class HTMLGenerator(Escaper, OutputFunnel): return self.write(self.render_javascript(code)) - def javascript_file(self, filename): - """ <script type="text/javascript" src="js/%(name)s.js"/>\n """ - return self.write(self._render_content_tag('script', '', type_="text/javascript", src='js/%s.js' % filename)) + def javascript_file(self, src): + """ <script type="text/javascript" src="%(name)"/>\n """ + return self.write(self._render_content_tag('script', '', type_="text/javascript", src=src)) def render_img(self, src, **attrs): diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index e9410bf..f6d5ee8 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -4086,7 +4086,7 @@ class Color(ValueSpec): if not value: value = "#FFFFFF" - html.javascript_file("colorpicker") + html.javascript_file("js/colorpicker.js") # Holds the actual value for form submission html.hidden_field(varprefix + "_value", value or '', varprefix + "_value", add_var = True)

7 years, 8 months

4276 Actions can now access the event macros via environment variables

by Lars Michelsen

Module: check_mk Branch: master Commit: 52a5b426a11220cbc398dad80b1931b1a4eafbe4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=52a5b426a11220… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jan 12 12:00:24 2017 +0100 4276 Actions can now access the event macros via environment variables In previous versios the actions of the Event Console could only get the variables of the events via substitution of macros. These information are now also available as environment variables with the prefix <tt>EVENT_</tt>. For example the text of the event is available as <tt>EVENT_TEXT</tt> as environment variable. Change-Id: I2b0535af5415fbd865b261bf8e3010059e9610ea --- .werks/4276 | 14 ++++++++++++++ ChangeLog | 1 + bin/mkeventd | 35 ++++++++++++++++++++++++++--------- web/plugins/wato/mkeventd.py | 9 ++++++++- 4 files changed, 49 insertions(+), 10 deletions(-) diff --git a/.werks/4276 b/.werks/4276 new file mode 100644 index 0000000..644b9b8 --- /dev/null +++ b/.werks/4276 @@ -0,0 +1,14 @@ +Title: Actions can now access the event macros via environment variables +Level: 1 +Component: ec +Compatible: compat +Version: 1.4.0i4 +Date: 1484218737 +Class: feature + +In previous versios the actions of the Event Console could only get the +variables of the events via substitution of macros. + +These information are now also available as environment variables with +the prefix <tt>EVENT_</tt>. For example the text of the event is available as +<tt>EVENT_TEXT</tt> as environment variable. diff --git a/ChangeLog b/ChangeLog index 1d8cd99..2f56990 100644 --- a/ChangeLog +++ b/ChangeLog @@ -93,6 +93,7 @@ Event Console: * 4154 Do not send notifications if host found and currently in downtime... NOTE: Please refer to the migration notes! + * 4276 Actions can now access the event macros via environment variables... * 4155 FIX: Do not perform actions on events if overflow limit is active... * 4156 FIX: Fix off-by-one error in EC limit handling... * 4199 FIX: Fix detection of replication mode if EC is distributed... diff --git a/bin/mkeventd b/bin/mkeventd index 171ff3d..8461815 100755 --- a/bin/mkeventd +++ b/bin/mkeventd @@ -112,6 +112,7 @@ event_columns = [ ( "event_match_groups", "" ), ( "event_contact_groups", "" ), ( "event_ipaddress", "" ), # introduced in 1.2.7 + ( "event_orig_host", "" ), ] grepping_filters = [ @@ -3858,7 +3859,7 @@ def do_event_action(action, event, user=""): send_email(to, subject, body) log_event_history(event, "EMAIL", user, "%s|%s" % (to, subject)) elif action_type == 'script': - execute_script(escape_null_bytes(substitute_event_tags(settings["script"], get_quoted_event(event)))) + execute_script(escape_null_bytes(substitute_event_tags(settings["script"], get_quoted_event(event))), event) log_event_history(event, "SCRIPT", user, action['id']) else: log("Cannot execute action %s: invalid action type %s" % (action["id"], action_type)) @@ -3868,7 +3869,7 @@ def do_event_action(action, event, user=""): log("Error during execution of action %s: %s" % (action["id"], format_exception())) -def substitute_event_tags(text, event): +def get_event_tags(event): substs = [("match_group_%d" % (nr+1), g) for (nr, g) in enumerate(event.get("match_groups", ()))] @@ -3881,14 +3882,22 @@ def substitute_event_tags(text, event): if type(v) in [ str, unicode ]: return v else: - return str(v) + return "%s" % v + tags = {} for key, value in substs: if type(value) == tuple: value = " ".join(map(to_string, value)) else: value = to_string(value) + tags[key] = value + + return tags + + +def substitute_event_tags(text, event): + for key, value in get_event_tags(event).items(): text = text.replace('$%s$' % key.upper(), value) return text @@ -3923,7 +3932,16 @@ def send_email(to, subject, body): return True -def execute_script(body): +def execute_script(body, event): + script_env = os.environ.copy() + + for key, value in get_event_tags(event).items(): + if type(key) == unicode: + key = key.encode("utf-8") + if type(value) == unicode: + value = value.encode("utf-8") + script_env["EVENT_" + key.upper()] = value + # Traps can contain 0-Bytes. We need to remove this from the script # body. Otherwise suprocess.Popen will crash. p = subprocess.Popen( @@ -3931,12 +3949,11 @@ def execute_script(body): shell = True, executable = '/bin/bash', stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, - close_fds=True + close_fds=True, + env = script_env, ) - output = p.stdout.read() - exitcode = p.wait() - - log(' Exitcode: %d' % exitcode) + output = p.communicate()[0] + log(' Exitcode: %d' % p.returncode) if output: log(' Output: %s' % output) diff --git a/web/plugins/wato/mkeventd.py b/web/plugins/wato/mkeventd.py index 67fd8dd..bbab703 100644 --- a/web/plugins/wato/mkeventd.py +++ b/web/plugins/wato/mkeventd.py @@ -48,6 +48,7 @@ mkeventd_status_file = cmk.paths.omd_root + "/var/mkeventd/status" # '----------------------------------------------------------------------' substitute_help = _(""" The following macros will be substituted by value from the actual event: +<br><br> <table class=help> <tr><td class=tt>$ID$</td><td>Event ID</td></tr> <tr><td class=tt>$COUNT$</td><td>Number of occurrances</td></tr> @@ -57,6 +58,7 @@ The following macros will be substituted by value from the actual event: <tr><td class=tt>$COMMENT$</td><td>Event comment</td></tr> <tr><td class=tt>$SL$</td><td>Service Level</td></tr> <tr><td class=tt>$HOST$</td><td>Host name (as sent by syslog)</td></tr> +<tr><td class=tt>$ORIG_HOST$</td><td>Original host name when host name has been rewritten, empty otherwise</td></tr> <tr><td class=tt>$CONTACT$</td><td>Contact information</td></tr> <tr><td class=tt>$APPLICATION$</td><td>Syslog tag / Application</td></tr> <tr><td class=tt>$PID$</td><td>Process ID of the origin process</td></tr> @@ -176,7 +178,12 @@ vs_mkeventd_actions = \ ( "script", TextAreaUnicode( title = _("Script body"), - help = _("This script will be executed using the BASH shell. ") + substitute_help, + help = _("This script will be executed using the BASH shell. ") \ + + substitute_help \ + + "<br>" \ + + _("These information are also available as environment variables with the prefix " + "<tt>EVENT_</tt>. For example the text of the event is available as " + "<tt>EVENT_TEXT</tt> as environment variable."), cols = 64, rows = 10, attrencode = True,

7 years, 8 months

4277 Script actions: New event macro ORIG_HOST

by Lars Michelsen

Module: check_mk Branch: master Commit: 6b3f2f3ce33e83b33a0eb4a3aa9dfce639f2c988 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6b3f2f3ce33e83… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jan 12 12:01:55 2017 +0100 4277 Script actions: New event macro ORIG_HOST The scripts can now access a macros $ORIG_HOST$ (or environment var EVENT_ORIG_HOST) to get the original host name when host name has been rewritten. The value is empty when not doing host name rewrite. Change-Id: I6ca609383e1cc085af0d1716e5a021c0f46fb4f3 --- .werks/4277 | 11 +++++++++++ ChangeLog | 1 + 2 files changed, 12 insertions(+) diff --git a/.werks/4277 b/.werks/4277 new file mode 100644 index 0000000..b842a47 --- /dev/null +++ b/.werks/4277 @@ -0,0 +1,11 @@ +Title: Script actions: New event macro ORIG_HOST +Level: 1 +Component: ec +Compatible: compat +Version: 1.4.0i4 +Date: 1484218852 +Class: feature + +The scripts can now access a macros $ORIG_HOST$ (or environment var EVENT_ORIG_HOST) +to get the original host name when host name has been rewritten. The value is empty +when not doing host name rewrite. diff --git a/ChangeLog b/ChangeLog index 2f56990..5919c17 100644 --- a/ChangeLog +++ b/ChangeLog @@ -94,6 +94,7 @@ * 4154 Do not send notifications if host found and currently in downtime... NOTE: Please refer to the migration notes! * 4276 Actions can now access the event macros via environment variables... + * 4277 Script actions: New event macro ORIG_HOST... * 4155 FIX: Do not perform actions on events if overflow limit is active... * 4156 FIX: Fix off-by-one error in EC limit handling... * 4199 FIX: Fix detection of replication mode if EC is distributed...

7 years, 8 months

tests: Added missing .f12

by Lars Michelsen

Module: check_mk Branch: master Commit: fc12392efc5eab772eda1e4bc87e3a6ec795346a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fc12392efc5eab… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jan 12 11:30:34 2017 +0100 tests: Added missing .f12 Change-Id: I1e2e28188b00d56a6dcd782f527248ee3fe317a6 --- tests/testlib/__init__.py | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/testlib/__init__.py b/tests/testlib/__init__.py index 62f473d..fc56e38 100644 --- a/tests/testlib/__init__.py +++ b/tests/testlib/__init__.py @@ -263,6 +263,7 @@ class Site(object): cmk_path() + "/notifications", cmk_path() + "/livestatus", cmk_path() + "/livestatus/api/python", + cmk_path() + "/.werks", cmc_path() + "/bin", cmc_path() + "/modules",

7 years, 8 months

werks: Cleaned up import

by Lars Michelsen

Module: check_mk Branch: master Commit: b951500a45ddc706bcd3a3522a116299b2674225 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b951500a45ddc7… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jan 12 11:15:19 2017 +0100 werks: Cleaned up import Change-Id: Ia8d1f537736a4854e284162012961a4a14d95a00 --- lib/werks.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/lib/werks.py b/lib/werks.py index cb5dad7..07b5e3d 100644 --- a/lib/werks.py +++ b/lib/werks.py @@ -28,11 +28,7 @@ so it's best place is in the central library.""" import os - -try: - import simplejson as json -except ImportError: - import json +import json import cmk.paths import cmk.store as store

7 years, 8 months

Updated gitignore

by Lars Michelsen

Module: check_mk Branch: master Commit: 98620aaecc1e778a8286e2f7b3261f69a17ad5c1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=98620aaecc1e77… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jan 12 11:08:09 2017 +0100 Updated gitignore Change-Id: I3ae8541e8203f7a5287a9a85bc62ca69430cf81b --- .gitignore | 2 -- .werks/.gitignore | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 55dfa22..15094db 100644 --- a/.gitignore +++ b/.gitignore @@ -15,8 +15,6 @@ check-mk-*.exe var/ .bugs/.my_ids .bugs/.last -.werks/.my_ids -.werks/.last check-mk-agent-*.exe check-mk-agent-*.exe check-mk-agent-*.msi diff --git a/.werks/.gitignore b/.werks/.gitignore index 4e564a8..1bb40e7 100644 --- a/.werks/.gitignore +++ b/.werks/.gitignore @@ -1 +1,3 @@ werks +.my_ids +.last

7 years, 8 months

Tests: fixed inconvenience in table test, created test shell script.

by Roland Halbig

Module: check_mk Branch: master Commit: 3a255ae8126764221caf21cadc6fde27dc421db9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3a255ae8126764… Author: Roland Halbig <rh(a)mathias-kettner.de> Date: Thu Jan 12 09:42:39 2017 +0100 Tests: fixed inconvenience in table test, created test shell script. Change-Id: I5ec9d1457bb0f40f10350dae7ee8b759e847caed --- tests/web/html_tests.sh | 6 ++++++ tests/web/test_table.py | 5 +++++ 2 files changed, 11 insertions(+) diff --git a/tests/web/html_tests.sh b/tests/web/html_tests.sh new file mode 100755 index 0000000..fa0b745 --- /dev/null +++ b/tests/web/html_tests.sh @@ -0,0 +1,6 @@ +#!/bin/sh + +pytest test_html.py +pytest test_generator.py +pytest test_table.py +pytest test_htmllib_integration.py diff --git a/tests/web/test_table.py b/tests/web/test_table.py index 1590175..c94a34f 100644 --- a/tests/web/test_table.py +++ b/tests/web/test_table.py @@ -118,6 +118,11 @@ def table_test_cubical(sortable, searchable, limit, output_format): # write to file: This is part of the test! Look at the generated HTML! filename = "./web/testtable_%s_%s_%s.html" % ("sortable" * sortable, "searchable" * searchable, limit) + try: + with open(filename, "w") as html_file: + pass + except: + filename = filename[6:] text = html.written_text with open(filename, "w") as html_file: html_file.write(text)

7 years, 8 months

Performance improvement: Shipping werks as precompiled file instead of thousands of single files

by Lars Michelsen

Module: check_mk Branch: master Commit: 306a681c04648dfa5e9321b92cbb628b7557916e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=306a681c04648d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jan 12 09:41:26 2017 +0100 Performance improvement: Shipping werks as precompiled file instead of thousands of single files Change-Id: I1d1902846efbb4a6a65ef5b1afe47fef7e3dd01b --- .werks/.f12 | 3 +- .werks/.gitignore | 1 + Makefile | 8 +++- lib/werks.py | 109 ++++++++++++++++++++++++++++++++++++++++++++++++++++ web/htdocs/werks.py | 38 +----------------- 5 files changed, 120 insertions(+), 39 deletions(-) diff --git a/.werks/.f12 b/.werks/.f12 index 41267ad..a02f4b9 100644 --- a/.werks/.f12 +++ b/.werks/.f12 @@ -2,4 +2,5 @@ SITE=${SITE:-$(cat ../.site)} SITE=${SITE:-$(omd sites --bare | head -n 1)} sudo mkdir -p /omd/sites/$SITE/share/check_mk/werks/ -sudo rsync -varx [0-9]* /omd/sites/$SITE/share/check_mk/werks/ +make -C .. precompile-werks +sudo install -m 640 -g $SITE -o $SITE werks /omd/sites/$SITE/share/check_mk/werks/werks diff --git a/.werks/.gitignore b/.werks/.gitignore new file mode 100644 index 0000000..4e564a8 --- /dev/null +++ b/.werks/.gitignore @@ -0,0 +1 @@ +werks diff --git a/Makefile b/Makefile index ff34b46..bb9706d 100644 --- a/Makefile +++ b/Makefile @@ -98,7 +98,10 @@ check-binaries: check: check-spaces check-permissions check-binaries check-version -dist: mk-livestatus +precompile-werks: + python -c "import cmk.werks ; cmk.werks.write_precompiled_werks('.werks/werks', cmk.werks.load_raw_files('.werks'))" + +dist: mk-livestatus precompile-werks @echo "Making $(DISTNAME)" rm -rf $(DISTNAME) mkdir -p $(DISTNAME) @@ -111,7 +114,7 @@ dist: mk-livestatus tar czf $(DISTNAME)/base.tar.gz $(TAROPTS) cmk_base/*.py* ; \ rm cmk_base/*.pyc tar czf $(DISTNAME)/share.tar.gz $(TAROPTS) check_mk_templates.cfg - tar czf $(DISTNAME)/werks.tar.gz $(TAROPTS) -C .werks $$(cd .werks ; ls [0-9]*) + tar czf $(DISTNAME)/werks.tar.gz $(TAROPTS) -C .werks werks tar czf $(DISTNAME)/checks.tar.gz $(TAROPTS) -C checks $$(cd checks ; ls) tar czf $(DISTNAME)/active_checks.tar.gz $(TAROPTS) -C active_checks $$(cd active_checks ; ls) tar czf $(DISTNAME)/notifications.tar.gz $(TAROPTS) -C notifications $$(cd notifications ; ls) @@ -260,6 +263,7 @@ clean: $(NAME)-*.tar.gz *~ counters autochecks \ precompiled cache web/htdocs/js/*_min.js \ $(addprefix livestatus/,$(LIVESTATUS_AUTO)) + rm .werks/werks || true find -name "*~" | xargs rm -f mrproper: diff --git a/lib/werks.py b/lib/werks.py new file mode 100644 index 0000000..cb5dad7 --- /dev/null +++ b/lib/werks.py @@ -0,0 +1,109 @@ +#!/usr/bin/python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2016 mk(a)mathias-kettner.de | +# +------------------------------------------------------------------+ +# +# This file is part of Check_MK. +# The official homepage is at http://mathias-kettner.de/check_mk. +# +# check_mk is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation in version 2. check_mk is distributed +# in the hope that it will be useful, but WITHOUT ANY WARRANTY; with- +# out even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. See the GNU General Public License for more de- +# tails. You should have received a copy of the GNU General Public +# 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. + +"""Code for processing Check_MK werks. This is needed by several components, +so it's best place is in the central library.""" + +import os + +try: + import simplejson as json +except ImportError: + import json + +import cmk.paths +import cmk.store as store + +from .exceptions import MKGeneralException + +# TODO: Clean this up one day by using the way recommended by gettext. +# (See https://docs.python.org/2/library/gettext.html). For this we +# need the path to the locale files here. +try: + _ +except NameError: + _ = lambda x: x # Fake i18n when not available + + +def load(): + werks = {} + for werk_id, werk in json.load(open(cmk.paths.share_dir + "/werks/werks")).items(): + werks[int(werk_id)] = werk + return werks + + +def load_raw_files(werks_dir): + werks = {} + + if werks_dir is None: + werks_dir = cmk.paths.share_dir + "/werks" + + try: + for file_name in os.listdir(werks_dir): + if file_name[0].isdigit(): + werk_id = int(file_name) + try: + werk = _load_werk(os.path.join(werks_dir, file_name)) + werk["id"] = werk_id + werks[werk_id] = werk + except Exception, e: + raise MKGeneralException(_("Failed to load werk \"%s\": %s") % (werk_id, e)) + except OSError, e: + if e.errno == 2: + pass # werk directory not existing + else: + raise + + return werks + + +def _load_werk(path): + werk = { + "body" : [], + } + in_header = True + for line in file(path): + line = line.strip().decode("utf-8") + if in_header and not line: + in_header = False + elif in_header: + key, text = line.split(":", 1) + try: + value = int(text.strip()) + except ValueError: + value = text.strip() + werk[key.lower()] = value + else: + werk["body"].append(line) + if "compatible" not in werk: # missing in some legacy werks + werk["compatible"] = "compat" + return werk + + +def write_precompiled_werks(path, werks): + with open(path, "w") as f: + json.dump(werks, f, check_circular=False) + #store.save_data_to_file(path, werks, pretty=False) diff --git a/web/htdocs/werks.py b/web/htdocs/werks.py index abdb1ba..6176461 100644 --- a/web/htdocs/werks.py +++ b/web/htdocs/werks.py @@ -33,6 +33,7 @@ from lib import * from valuespec import * import cmk.store as store import cmk.paths +import cmk.werks acknowledgement_path = cmk.paths.var_dir + "/acknowledged_werks.mk" @@ -157,23 +158,7 @@ def page_werk(): def load_werks(): global g_werks if g_werks == None: - g_werks = {} - werks_dir = cmk.paths.share_dir + "/werks/" - try: - for file_name in os.listdir(werks_dir): - if file_name[0].isdigit(): - werk_id = int(file_name) - try: - werk = load_werk(werks_dir + file_name) - werk["id"] = werk_id - g_werks[werk_id] = werk - except Exception, e: - html.show_error(_("Failed to load werk \"%s\": %s") % (werk_id, e)) - except OSError, e: - if e.errno == 2: - pass # werk directory not existing - else: - raise + g_werks = cmk.werks.load() ack_ids = load_acknowledgements() for werk in g_werks.values(): @@ -217,25 +202,6 @@ def werk_is_pre_127(werk): or werk["version"].startswith("1.2.6") -def load_werk(path): - werk = { - "body" : [], - } - in_header = True - for line in file(path): - line = line.strip().decode("utf-8") - if in_header and not line: - in_header = False - elif in_header: - key, text = line.split(":", 1) - werk[key.lower()] = tryint(text.strip()) - else: - werk["body"].append(line) - if "compatible" not in werk: # missing in some legacy werks - werk["compatible"] = "compat" - return werk - - def load_acknowledgements(): return store.load_data_from_file(acknowledgement_path, [])

7 years, 8 months

Updated bug entries #2471

by Lars Michelsen

Module: check_mk Branch: master Commit: 945543eb384346669c7b832d8f37a709c6ac5dff URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=945543eb384346… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jan 12 09:41:41 2017 +0100 Updated bug entries #2471 Change-Id: Ic54d17ee657357ba83bb66884e8a32b2e75a9d9a --- .bugs/2471 | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.bugs/2471 b/.bugs/2471 index 67cb037..564e4a8 100644 --- a/.bugs/2471 +++ b/.bugs/2471 @@ -1,10 +1,12 @@ Title: Sidebar slow on new apache process because of werk loading Component: multisite -State: open +Class: bug +State: done Date: 2016-09-28 11:33:19 Targetversion: 1.2.8 -Class: bug When rendering the side bar for the first time in a new apache process, all werk files are loaded which seem to take a lot of time in some installations. This should be optimized. + +2017-01-12 09:41:39: changed state open -> done

7 years, 8 months

Updated bug entries #2490

by Lars Michelsen

Module: check_mk Branch: master Commit: 6d8d54036c7f4246ffdf0155befa90c49957cf17 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6d8d54036c7f42… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jan 12 07:59:28 2017 +0100 Updated bug entries #2490 Change-Id: Iecf3f5017ad58feb380c9b0e311ea5d689380aaf --- .bugs/2490 | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.bugs/2490 b/.bugs/2490 index 4769b8f..7f3118e 100644 --- a/.bugs/2490 +++ b/.bugs/2490 @@ -1,9 +1,11 @@ Title: Buttons for downtimes (e.g. "This week") noch localized Component: multisite -State: open +Class: bug +State: done Date: 2016-05-04 11:07:20 Targetversion: future -Class: bug Since this is now configured via a global option the translation does not work anymore. Maybe we need to use the user_localizations for this. + +2017-01-12 07:59:24: changed state open -> done

7 years, 8 months

← Newer
1
...
15
16
17
18
19
20
21
...
31
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits January 2017