Checkmk git commits July 2018

checkmk-commits@lists.checkmk.com

10 participants
467 discussions

Removed the now useless config option "Buffered HTTP stream"

by Lars Michelsen

Module: check_mk Branch: master Commit: 2b72ae47df617ceb93ab98386173422459694619 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2b72ae47df617c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed May 16 15:27:16 2018 +0200 Removed the now useless config option "Buffered HTTP stream" Change-Id: I42174b57b11d9999809e1d09ee86be9ef655bf33 --- web/htdocs/htmllib.py | 6 ------ web/htdocs/http.py | 4 ---- web/plugins/config/builtin.py | 3 --- web/plugins/wato/check_mk_configuration.py | 12 ------------ 4 files changed, 25 deletions(-) diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index 3404c76..c0f8a9d 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -1121,7 +1121,6 @@ class html(HTMLGenerator): # Settings self.mobile = False - self.buffering = True # Forms self.form_name = None @@ -1173,7 +1172,6 @@ class html(HTMLGenerator): self._init_screenshot_mode() self._init_debug_mode() - self.set_buffering(config.buffered_http_stream) def _verify_not_using_threaded_mpm(self): @@ -1527,10 +1525,6 @@ class html(HTMLGenerator): self.page_context = c - def set_buffering(self, b): - self.buffering = b - - def set_link_target(self, framename): self.link_target = framename diff --git a/web/htdocs/http.py b/web/htdocs/http.py index 9f5abd0..e18cfd8 100644 --- a/web/htdocs/http.py +++ b/web/htdocs/http.py @@ -420,10 +420,6 @@ class Response(object): def write(self, text): """Extend the response body with the given text""" - # TODO - #if self.buffering: - # self.req.write(text, 0) - #else: self._output.append(text) diff --git a/web/plugins/config/builtin.py b/web/plugins/config/builtin.py index e66a917..f310b5c 100644 --- a/web/plugins/config/builtin.py +++ b/web/plugins/config/builtin.py @@ -230,9 +230,6 @@ default_ts_format = 'mixed' # always all buttons to be shown context_buttons_to_show = 5 -# Buffering of HTML output stream -buffered_http_stream = True - # Maximum livetime of unmodified selections selection_livetime = 3600 diff --git a/web/plugins/wato/check_mk_configuration.py b/web/plugins/wato/check_mk_configuration.py index c9a41f2..de9ea03 100644 --- a/web/plugins/wato/check_mk_configuration.py +++ b/web/plugins/wato/check_mk_configuration.py @@ -140,18 +140,6 @@ register_configvar(group, register_configvar(group, - "buffered_http_stream", - Checkbox(title = _("Buffered HTTP stream"), - label = _("enable buffering"), - help = _("When buffering the HTTP stream is enabled, then Multisite " - "will not send single TCP segments for each particle of HTML " - "output but try to make larger segments. This saves bandwidth " - "especially when using HTTPS. On the backside there might be " - "a higher latency for the beginning of pages being displayed."), - ), - domain = "multisite") - -register_configvar(group, "selection_livetime", Integer( title = _('Checkbox Selection Livetime'),

6 years, 2 months

Simplified htmllib.Encoder()

by Lars Michelsen

Module: check_mk Branch: master Commit: 49f1cbeb134a80d888354a1619a0cd505303c77b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=49f1cbeb134a80… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed May 23 08:59:23 2018 +0200 Simplified htmllib.Encoder() * Replaced Check_MK specific encoding logic with standard urllib calls * html.urlencode() now uses html.urlencode_plus() logic * Cleaned up html.urlencode_plus() Change-Id: I4838ca293d508ba4ebf50b238293bb2409b42cb1 --- tests/unit/web/test_htmllib_Encoder.py | 28 +++--------------- web/htdocs/htmllib.py | 54 +++++++++------------------------- web/plugins/views/painters.py | 2 +- 3 files changed, 19 insertions(+), 65 deletions(-) diff --git a/tests/unit/web/test_htmllib_Encoder.py b/tests/unit/web/test_htmllib_Encoder.py index b0bd054..74dfa83 100644 --- a/tests/unit/web/test_htmllib_Encoder.py +++ b/tests/unit/web/test_htmllib_Encoder.py @@ -10,7 +10,6 @@ def test_htmllib_integration(register_builtin_html): assert html.urlencode_vars([]) == "" assert html.urlencode("") == "" - assert html.urlencode_plus("") == "" @pytest.mark.parametrize("inp,out", [ @@ -21,8 +20,8 @@ def test_htmllib_integration(register_builtin_html): ([("a", "_-.")], "a=_-."), ([("a", "#")], "a=%23"), ([("a", "+")], "a=%2B"), - ([("a", " ")], "a=%20"), - ([("a", "/")], "a=/"), + ([("a", " ")], "a=+"), + ([("a", "/")], "a=%2F"), ]) def test_urlencode_vars(inp, out): result = htmllib.Encoder().urlencode_vars(inp) @@ -31,24 +30,6 @@ def test_urlencode_vars(inp, out): @pytest.mark.parametrize("inp,out", [ - (u"välue", "v%c3%a4lue"), - # TODO: None / int handling inconsistent with urlencode_vars() - (None, ""), - ("ä", "%c3%a4"), - ("_-.", "_-."), - ("#", "%23"), - ("+", "%2b"), - # TODO: Why + instead of %20? - (" ", "+"), - ("/", "/"), -]) -def test_urlencode(inp, out): - result = htmllib.Encoder().urlencode(inp) - assert type(result) == str - assert result == out - - -(a)pytest.mark.parametrize("inp,out", [ (u"välue", "v%C3%A4lue"), # TODO: None / int handling inconsistent with urlencode_vars() (None, ""), @@ -56,11 +37,10 @@ def test_urlencode(inp, out): ("_-.", "_-."), ("#", "%23"), ("+", "%2B"), - # TODO: Why + instead of %20? (" ", "+"), ("/", "%2F"), ]) -def test_urlencode_plus(inp, out): - result = htmllib.Encoder().urlencode_plus(inp) +def test_urlencode(inp, out): + result = htmllib.Encoder().urlencode(inp) assert type(result) == str assert result == out diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index 75e3cc7..b97610f 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -165,20 +165,15 @@ class Escaper(object): # '----------------------------------------------------------------------' class Encoder(object): - # This function returns a str object, never unicode! - # Beware: this code is crucial for the performance of Multisite! - # Changing from the self coded urlencode to urllib.quote - # is saving more then 90% of the total HTML generating time - # on more complex pages! - # - # TODO: Cleanup self.urlencode_vars, self.urlencode and self.urlencode_plus. - # urlencode_vars() should directly use urlencode or urlencode_vars and - # not fallback to self.urlencode on it's own. self.urlencode() should - # work for a single value exacly as urlencode_vars() does for multiple - # TODO: Refactor to use urllib.urlencode() def urlencode_vars(self, vars): + """Convert a mapping object or a sequence of two-element tuples to a “percent-encoded” string + + This function returns a str object, never unicode! + Note: This should be changed once we change everything to + unicode internally. + """ assert type(vars) == list - output = [] + pairs = [] for varname, value in sorted(vars): assert type(varname) == str @@ -189,35 +184,18 @@ class Encoder(object): #assert type(value) == str, "%s: %s" % (varname, value) - try: - # urllib is not able to encode non-Ascii characters. Yurks - output.append(varname + '=' + urllib.quote(value)) - except: - output.append(varname + '=' + self.urlencode(value)) # slow but working + pairs.append((varname, value)) - return '&'.join(output) + return urllib.urlencode(pairs) def urlencode(self, value): - if type(value) == unicode: - value = value.encode("utf-8") - elif value == None: - return "" + """Replace special characters in string using the %xx escape. - assert type(value) == str - - ret = "" - for c in value: - if c == " ": - c = "+" - elif ord(c) <= 32 or ord(c) > 127 or c in [ '#', '+', '"', "'", "=", "&", ":", "%" ]: - c = "%%%02x" % ord(c) - ret += c - return ret - - - # Like urllib.quote() but also replaces spaces and / - def urlencode_plus(self, value): + This function returns a str object, never unicode! + Note: This should be changed once we change everything to + unicode internally. + """ if type(value) == unicode: value = value.encode("utf-8") elif value == None: @@ -1387,10 +1365,6 @@ class html(HTMLGenerator): def urlencode(self, value): return self.encoder.urlencode(value) - # TODO: Cleanup all call sites to self.encoder.* - def urlencode_plus(self, value): - return self.encoder.urlencode_plus(value) - # # escaping - deprecated functions # diff --git a/web/plugins/views/painters.py b/web/plugins/views/painters.py index 2c12297..07ffb00 100644 --- a/web/plugins/views/painters.py +++ b/web/plugins/views/painters.py @@ -402,7 +402,7 @@ def replace_action_url_macros(url, what, row): for key, val in macros.items(): url = url.replace("$%s$" % key, val) - url = url.replace("$%s_URL_ENCODED$" % key, html.urlencode_plus(val)) + url = url.replace("$%s_URL_ENCODED$" % key, html.urlencode(val)) return url

6 years, 2 months

Make the GUI work as WSGI application

by Lars Michelsen

Module: check_mk Branch: master Commit: 9abec457324fb18232a4edbe709ebfe84e83e1f4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9abec457324fb1… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Sun Mar 25 18:46:33 2018 +0200 Make the GUI work as WSGI application Some other cleanups and modifications have been made on the way: * Move index file to dedicated app folder as recommended for WSGI apps * Moved several things from htmllib.html to dedicated helper classes http.Request -> HTTP request parsing (from WSGI env) http.Response -> HTTP response processing (for WSGI) htmllib.TimeoutManager -> Handle GUI task timeouts htmllib.TransactionManager -> Mange GUI action transaction IDs * Cleaned up several other things in the htmllib and parent classes Change-Id: I6be1d5a90bfdc48c7a2d6e60c5b388f4c67310b1 --- .../check_mk/skel/etc/check_mk/apache.conf | 57 +- .../mod_wsgi/skel/etc/apache/conf.d/01_wsgi.conf | 2 +- omd/packages/omd/skel/etc/apache/conf.d/omd.conf | 6 +- ...utputFunnel.py => test_htmllib_OutputFunnel.py} | 43 +- web/.f12 | 2 +- web/app/index.wsgi | 289 +++++ web/htdocs/backup.py | 4 +- web/htdocs/crash_reporting.py | 10 +- web/htdocs/dashboard.py | 2 +- web/htdocs/gui_exceptions.py | 32 +- web/htdocs/html_mod_python.py | 335 ------ web/htdocs/htmllib.py | 1128 ++++++++++---------- web/htdocs/http.py | 448 ++++++++ web/htdocs/i18n.py | 6 +- web/htdocs/index.py | 287 ----- web/htdocs/log.py | 2 +- web/htdocs/login.py | 60 +- web/htdocs/metrics.py | 2 +- web/htdocs/mobile.py | 3 +- web/htdocs/modules.py | 5 +- web/htdocs/sidebar.py | 8 +- web/htdocs/valuespec.py | 4 +- web/htdocs/views.py | 6 +- web/htdocs/visuals.py | 2 +- web/htdocs/wato.py | 21 +- web/htdocs/watolib.py | 4 +- web/plugins/pages/guitester.py | 31 - web/plugins/sidebar/shipped.py | 2 +- web/plugins/views/availability.py | 4 +- web/plugins/views/webservice.py | 2 +- web/plugins/wato/ac_tests.py | 2 +- web/plugins/wato/background_job.py | 2 +- web/plugins/wato/mkeventd.py | 2 +- web/plugins/wato/notifications.py | 2 +- 34 files changed, 1459 insertions(+), 1356 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=9abec45732…

6 years, 2 months

Added some more tests for the GUI

by Lars Michelsen

Module: check_mk Branch: master Commit: 5a952cea79d61c48ea388acf07830d3ec8ba4457 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5a952cea79d61c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed May 16 20:07:19 2018 +0200 Added some more tests for the GUI * Integration: Add some basic tests to verify access to the Check_MK web URLs * Unit tests: Add new for html() helpers * Unit tests: Simplified and cleaned up existing tests * Unit tests: Testing cookie setting / deleting Change-Id: I4cf86abbf10e26680db1cc3ae9f5d3d6ed17df36 --- tests/integration/omd/test_web_access.py | 83 + tests/unit/web/auto_build_test.py | 179 -- tests/unit/web/auto_refactor.py | 264 --- tests/unit/web/class_deprecated_renderer.py | 780 ------ tests/unit/web/classes.py | 181 -- tests/unit/web/conftest.py | 20 + tests/unit/web/generate_integration.py | 314 --- tests/unit/web/old/classes.py | 94 + tests/unit/web/{ => old}/html_tests.py | 79 +- tests/unit/web/{ => old}/test_integration.py | 18 +- .../{ => old}/unittest_files/body_start.unittest | 8 +- .../web/{ => old}/unittest_files/button.unittest | 0 .../{ => old}/unittest_files/buttonlink.unittest | 0 .../web/{ => old}/unittest_files/checkbox.unittest | 0 .../unittest_files/context_button_test.unittest | 1153 +++++++++ .../unittest_files/default_html_headers.unittest | 0 .../{ => old}/unittest_files/empty_icon.unittest | 0 .../web/{ => old}/unittest_files/header.unittest | 16 +- .../web/{ => old}/unittest_files/help.unittest | 0 .../{ => old}/unittest_files/hidden_field.unittest | 0 .../{ => old}/unittest_files/html_foot.unittest | 0 .../{ => old}/unittest_files/html_head.unittest | 14 +- .../web/{ => old}/unittest_files/icon.unittest | 2 +- .../{ => old}/unittest_files/icon_button.unittest | 0 .../{ => old}/unittest_files/icon_select.unittest | 0 .../{ => old}/unittest_files/javascript.unittest | 0 .../unittest_files/javascript_file.unittest | 0 .../{ => old}/unittest_files/play_sound.unittest | 0 .../unittest_files/popup_trigger.unittest | 0 .../{ => old}/unittest_files/radiobuttons.unittest | 0 .../{ => old}/unittest_files/render_icon.unittest | 2 +- .../unittest_files/render_icon_button.unittest | 0 .../web/{ => old}/unittest_files/select.unittest | 0 .../{ => old}/unittest_files/stylesheet.unittest | 0 .../web/{ => old}/unittest_files/test_1.unittest | 0 .../web/{ => old}/unittest_files/test_2.unittest | 0 .../web/{ => old}/unittest_files/test_3.unittest | 0 .../{ => old}/unittest_files/text_area.unittest | 0 .../{ => old}/unittest_files/text_input.unittest | 0 .../{ => old}/unittest_files/top_heading.unittest | 2 +- .../unittest_files/top_heading_left.unittest | 0 .../unittest_files/top_heading_right.unittest | 2 +- tests/unit/web/test_escaping.py | 49 - tests/unit/web/test_html.sh | 6 - tests/unit/web/test_html_tests.py | 110 - tests/unit/web/test_htmllib_Encoder.py | 66 + tests/unit/web/test_htmllib_Escaper.py | 56 + .../web/{test_html.py => test_htmllib_HTML.py} | 17 +- ..._generator.py => test_htmllib_HTMLGenerator.py} | 27 +- tests/unit/web/test_htmllib_OutputFunnel.py | 45 +- tests/unit/web/test_htmllib_TimeoutManager.py | 29 + tests/unit/web/test_htmllib_TransactionManager.py | 89 + tests/unit/web/test_http.py | 84 + tests/unit/web/test_request_handler.py | 107 - tests/unit/web/test_table.py | 133 +- .../unittest_files/context_button_test.unittest | 2496 -------------------- tests/unit/web/unittest_generation/README.md | 24 - .../unit/web/unittest_generation/checkbox.testgen | 13 - tests/unit/web/unittest_generation/help.testgen | 3 - web/htdocs/htmllib.py | 2 +- 60 files changed, 1790 insertions(+), 4777 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=5a952cea79…

6 years, 2 months

Updated Check_MK apache config to WSGI

by Lars Michelsen

Module: check_mk Branch: master Commit: df6b3ba3fd9bf361f5c490530be5a113379f4445 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=df6b3ba3fd9bf3… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Sun Mar 25 15:13:48 2018 +0200 Updated Check_MK apache config to WSGI Change-Id: Iee0ea51f25677db88ab23aa34147c308b8c0eb90 --- omd/packages/check_mk/.f12 | 9 + .../check_mk/skel/etc/check_mk/apache.conf | 208 ++++++++++----------- omd/packages/mod_wsgi/.f12 | 2 + 3 files changed, 112 insertions(+), 107 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=df6b3ba3fd…

6 years, 2 months

Cleaned up duplicated code (Moved request_uri() to requested_url())

by Lars Michelsen

Module: check_mk Branch: master Commit: f95cc99396aa103f0a6746c3f417034b9d69bfdf URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f95cc99396aa10… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Sun Mar 25 15:33:53 2018 +0200 Cleaned up duplicated code (Moved request_uri() to requested_url()) Change-Id: Ic7d1041ce6d00126fb12fca142c10eedd0d24f5d --- web/htdocs/htmllib.py | 18 +++++++++++------- web/htdocs/sidebar.py | 2 +- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index f6d7430..f211f6f 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -917,6 +917,7 @@ class RequestHandler(object): self.uploads = {} self.var_stash = [] self.cookies = {} + self._requested_url = None # Transaction IDs self.new_transids = [] @@ -938,6 +939,10 @@ class RequestHandler(object): raise NotImplementedError() + def remote_ip(self): + raise NotImplementedError() + + def is_ssl_request(self): raise NotImplementedError() @@ -958,6 +963,12 @@ class RequestHandler(object): raise MKGeneralException("http_redirect not implemented") + def requested_url(self): + """Returns the URL requested by the user. + This is not the bare original URL used by the user. Some HTTP variables may + have been filtered by Check_MK while parsing the incoming request.""" + return self._requested_url + # # Request Processing # @@ -1422,7 +1433,6 @@ class html(HTMLGenerator, RequestHandler): self.browser_redirect = '' self.link_target = None self.keybindings_enabled = True - self._requested_url = None self.myfile = None # Browser options @@ -1766,12 +1776,6 @@ class html(HTMLGenerator, RequestHandler): # URL building # - def requested_url(self): - """Returns the URL requested by the user. - This is not the bare original URL used by the user. Some HTTP variables may - have been filtered by Check_MK while parsing the incoming request.""" - return self._requested_url - # [('varname1', value1), ('varname2', value2) ] def makeuri(self, addvars, remove_prefix=None, filename=None, delvars=None): new_vars = [ nv[0] for nv in addvars ] diff --git a/web/htdocs/sidebar.py b/web/htdocs/sidebar.py index c72306e..b35807e 100644 --- a/web/htdocs/sidebar.py +++ b/web/htdocs/sidebar.py @@ -494,7 +494,7 @@ def ajax_snapin(): except Exception, e: write_snapin_exception(e) e_message = _("Exception during snapin refresh (snapin \'%s\')") % snapname - logger.error("%s %s: %s" % (html.request_uri(), e_message, traceback.format_exc())) + logger.error("%s %s: %s" % (html.requested_url(), e_message, traceback.format_exc())) finally: snapin_code.append(html.drain())

6 years, 2 months

Integrated mod_wsgi into Check_MK packaging

by Lars Michelsen

Module: check_mk Branch: master Commit: 265efc7c0b413186446b2456c6220182de5e1d57 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=265efc7c0b4131… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Sat Mar 24 20:11:54 2018 +0100 Integrated mod_wsgi into Check_MK packaging Change-Id: Ide21c5cf4cecc849511d398e52362a299ff7fecd --- omd/Makefile | 2 +- omd/packages/mod_wsgi/.f12 | 10 +++++ omd/packages/mod_wsgi/.gitignore | 1 + omd/packages/mod_wsgi/Makefile | 42 +++++++++++++++++++++ omd/packages/mod_wsgi/mod_wsgi-4.6.4.tar.gz | Bin 0 -> 2593324 bytes .../mod_wsgi/skel/etc/apache/conf.d/01_wsgi.conf | 5 +++ 6 files changed, 59 insertions(+), 1 deletion(-) diff --git a/omd/Makefile b/omd/Makefile index 1935c8b..1be2c20 100644 --- a/omd/Makefile +++ b/omd/Makefile @@ -22,8 +22,8 @@ PACKAGES=\ msitools \ net-snmp \ apache-omd \ - mod_python \ mod_fcgid \ + mod_wsgi \ check_mk \ check_multi \ check_mysql_health \ diff --git a/omd/packages/mod_wsgi/.f12 b/omd/packages/mod_wsgi/.f12 new file mode 100755 index 0000000..77150ea --- /dev/null +++ b/omd/packages/mod_wsgi/.f12 @@ -0,0 +1,10 @@ +#!/bin/bash -e +set -e + +SITE=${SITE:-$(cat ../../../.site 2>/dev/null || true)} +SITE=${SITE:-$(omd sites --bare | head -n 1)} +ROOT=/omd/sites/$SITE + +make -C mod_wsgi-4.6.4 clean all +sudo make install OMD_ROOT=$ROOT +sudo omd restart $SITE apache diff --git a/omd/packages/mod_wsgi/.gitignore b/omd/packages/mod_wsgi/.gitignore new file mode 100644 index 0000000..1d537aa --- /dev/null +++ b/omd/packages/mod_wsgi/.gitignore @@ -0,0 +1 @@ +mod_wsgi-[0-9].[0-9].[0-9] diff --git a/omd/packages/mod_wsgi/Makefile b/omd/packages/mod_wsgi/Makefile new file mode 100644 index 0000000..ebd90da --- /dev/null +++ b/omd/packages/mod_wsgi/Makefile @@ -0,0 +1,42 @@ +include ../../Makefile.omd + +NAME = mod_wsgi +VERSION = 4.6.4 +DIR = $(NAME)-$(VERSION) + +# Try to find the apxs binary +ifneq ("$(wildcard /usr/sbin/apxs)","") + APXS=/usr/sbin/apxs +endif +ifneq ("$(wildcard /usr/sbin/apxs2)","") + APXS=/usr/sbin/apxs2 +endif +ifneq ("$(wildcard /usr/bin/apxs2)","") + APXS=/usr/bin/apxs2 +endif + + +build: check-python + tar xzf $(DIR).tar.gz + + set -e ; \ + export PYTHONPATH="$$PYTHONPATH:$(PACKAGE_PYTHON_PYTHONPATH)" ; \ + export LDFLAGS="$(PACKAGE_PYTHON_LDFLAGS)" ; \ + export LD_LIBRARY_PATH="$(PACKAGE_PYTHON_LD_LIBRARY_PATH)" ; \ + export CFLAGS="-I$(PACKAGE_PYTHON_DESTDIR)/include/python2.7" ; \ + cd $(DIR) ; \ + ./configure \ + --prefix=$(OMD_ROOT) \ + --with-apxs=$(APXS) \ + --with-python=$(PACKAGE_PYTHON_EXECUTABLE) ; \ + make + +install: + mkdir -p $(DESTDIR)$(OMD_ROOT)/lib/apache/modules + cp $(DIR)/src/server/.libs/mod_wsgi.so $(DESTDIR)$(OMD_ROOT)/lib/apache/modules + chmod 644 $(DESTDIR)$(OMD_ROOT)/lib/apache/modules/mod_wsgi.so + +skel: + +clean: + rm -rf $(NAME)-[0-9].[0-9].[0-9] diff --git a/omd/packages/mod_wsgi/mod_wsgi-4.6.4.tar.gz b/omd/packages/mod_wsgi/mod_wsgi-4.6.4.tar.gz new file mode 100644 index 0000000..cfd092d Binary files /dev/null and b/omd/packages/mod_wsgi/mod_wsgi-4.6.4.tar.gz differ diff --git a/omd/packages/mod_wsgi/skel/etc/apache/conf.d/01_wsgi.conf b/omd/packages/mod_wsgi/skel/etc/apache/conf.d/01_wsgi.conf new file mode 100644 index 0000000..4e31c96 --- /dev/null +++ b/omd/packages/mod_wsgi/skel/etc/apache/conf.d/01_wsgi.conf @@ -0,0 +1,5 @@ +<IfModule !mod_wsgi.c> + LoadModule wsgi_module ###ROOT###/lib/apache/modules/mod_wsgi.so +</IfModule> + +WSGIPythonHome /omd/sites/heute

6 years, 2 months

Dropped unused keybinding freature

by Lars Michelsen

Module: check_mk Branch: master Commit: d9e8e1845fe2e8bdec1c417c447a24e2eefe7d38 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d9e8e1845fe2e8… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed May 16 14:16:27 2018 +0200 Dropped unused keybinding freature Change-Id: I11fe7a17c8af4cd32283cc9a733dc122f98a0394 --- web/htdocs/htmllib.py | 38 +++-------------------------- web/htdocs/js/checkmk.js | 62 ------------------------------------------------ 2 files changed, 3 insertions(+), 97 deletions(-) diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index f211f6f..5abca2c 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -1432,7 +1432,6 @@ class html(HTMLGenerator, RequestHandler): self.browser_reload = 0 self.browser_redirect = '' self.link_target = None - self.keybindings_enabled = True self.myfile = None # Browser options @@ -1450,8 +1449,6 @@ class html(HTMLGenerator, RequestHandler): self.io_error = False self.mobile = False self.buffering = True - self.keybindings_enabled = True - self.keybindings = [] # Forms self.form_name = None @@ -2016,12 +2013,6 @@ class html(HTMLGenerator, RequestHandler): def body_end(self): if self.have_help: self.javascript("enable_help();") - if self.keybindings_enabled and self.keybindings: - self.javascript("var keybindings = %s;\n" - "document.body.onkeydown = keybindings_keydown;\n" - "document.body.onkeyup = keybindings_keyup;\n" - "document.body.onfocus = keybindings_focus;\n" % - json.dumps(self.keybindings)) if self.final_javascript_code: self.javascript(self.final_javascript_code) self.javascript("initialize_visibility_detection();") @@ -2703,15 +2694,13 @@ class html(HTMLGenerator, RequestHandler): self.context_buttons_open = False - def context_button(self, title, url, icon=None, hot=False, id=None, bestof=None, hover_title=None, fkey=None, class_=None): + def context_button(self, title, url, icon=None, hot=False, id=None, bestof=None, hover_title=None, class_=None): # TODO: REFACTOR id_ = id - self._context_button(title, url, icon=icon, hot=hot, id_=id_, bestof=bestof, hover_title=hover_title, fkey=fkey, class_=class_) - if fkey and self.keybindings_enabled: - self.add_keybinding([self.F1 + (fkey - 1)], "document.location='%s';" % self.escaper.escape_attribute(url)) + self._context_button(title, url, icon=icon, hot=hot, id_=id_, bestof=bestof, hover_title=hover_title, class_=class_) - def _context_button(self, title, url, icon=None, hot=False, id_=None, bestof=None, hover_title=None, fkey=None, class_=None): + def _context_button(self, title, url, icon=None, hot=False, id_=None, bestof=None, hover_title=None, class_=None): title = self.attrencode(title) display = "block" if bestof: @@ -2729,8 +2718,6 @@ class html(HTMLGenerator, RequestHandler): css_classes = [ "contextlink" ] if hot: css_classes.append("hot") - if fkey and self.keybindings_enabled: - css_classes.append("button") if class_: if type(class_) == list: css_classes += class_ @@ -2746,8 +2733,6 @@ class html(HTMLGenerator, RequestHandler): self.span(title) - if fkey and self.keybindings_enabled: - self.div("F%d" % fkey, class_="keysym") self.close_a() self.close_div() @@ -3019,23 +3004,6 @@ class html(HTMLGenerator, RequestHandler): # - # Keyboard control - # TODO: Can we move this specific feature to AQ? - # - - def add_keybinding(self, keylist, jscode): - self.keybindings.append([keylist, jscode]) - - - def add_keybindings(self, bindings): - self.keybindings += bindings - - - def disable_keybindings(self): - self.keybindings_enabled = False - - - # # FIXME: Legacy functions # diff --git a/web/htdocs/js/checkmk.js b/web/htdocs/js/checkmk.js index 4a52655..c18a388 100644 --- a/web/htdocs/js/checkmk.js +++ b/web/htdocs/js/checkmk.js @@ -3047,68 +3047,6 @@ function sla_details_table_hover(tr, row_id, onoff) { } } - -//#. -//# .-Keybindings--------------------------------------------------------. -//# | _ __ _ _ _ _ | -//# | | |/ /___ _ _| |__ (_)_ __ __| (_)_ __ __ _ ___ | -//# | | ' // _ \ | | | '_ \| | '_ \ / _` | | '_ \ / _` / __| | -//# | | . \ __/ |_| | |_) | | | | | (_| | | | | | (_| \__ \ | -//# | |_|\_\___|\__, |_.__/|_|_| |_|\__,_|_|_| |_|\__, |___/ | -//# | |___/ |___/ | -//# +--------------------------------------------------------------------+ -//# | | -//# '--------------------------------------------------------------------' - -// var keybindings will be defined dynamically by htmllib.py -var keybindings_pressedkeys = []; - -function keybindings_keydown(e) { - if (!e) e = window.event; - var keyCode = e.which || e.keyCode; - keybindings_pressedkeys.push(keyCode); - return keybindings_check(e); -} - -function keybindings_keyup(e) { - if (!e) e = window.event; - var keyCode = e.which || e.keyCode; - for (var i in keybindings_pressedkeys) { - if (keybindings_pressedkeys[i] == keyCode) { - keybindings_pressedkeys.splice(i, 1); - break; - } - } -} - -function keybindings_focus(e) { - keybindings_pressedkeys = []; -} - -function keybindings_check(e) { - for (var i in keybindings) { - var keylist = keybindings[i][0]; - if (keybindings_check_keylist(keylist)) { - if (e.stopPropagation) - e.stopPropagation(); - e.cancelBubble = true; - var jscode = keybindings[i][1]; - eval(jscode); - return false; - } - } - return true; -} - -function keybindings_check_keylist(keylist) -{ - for (var i in keylist) { - if (keybindings_pressedkeys.indexOf(keylist[i]) < 0) - return false; - } - return true; -} - //#. //# .-Popup Menu---------------------------------------------------------. //# | ____ __ __ |

6 years, 2 months

Remove '<<<check_mk>>>' section from agent output.

by Moritz Kiemer

Module: check_mk Branch: master Commit: beef84b4b7b03d5985502e37c28483d0eef1aac8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=beef84b4b7b03d… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Wed May 23 11:02:13 2018 +0200 Remove '<<<check_mk>>>' section from agent output. The corresponding information is not lost, as it appears in '<<<esx_systeminfo>>>'. Change-Id: I7f435fd772d3be47e9f21baaf7403b40cdeb4f3d --- agents/special/agent_vsphere | 6 ------ 1 file changed, 6 deletions(-) diff --git a/agents/special/agent_vsphere b/agents/special/agent_vsphere index de75964..8a5cc94 100755 --- a/agents/special/agent_vsphere +++ b/agents/special/agent_vsphere @@ -1205,12 +1205,6 @@ if not error: # Note: If the cookie fails inbetween these calls, we also start a second run try: - ########################## - # Check MK header and Agent Version - output("<<<check_mk>>>") - output("Version: %.1f" % systeminfo["apiVersion"]) - output("AgentOS: %s" % systeminfo["name"]) - output("<<<esx_systeminfo>>>") for entry in systeminfo.items(): output("%s %s" % entry)

6 years, 2 months

6304 FIX sap_hana_filesystem, sap_hana_mem: Fixed wrong conversion of filesystem and memory values

by Simon Betz

Module: check_mk Branch: master Commit: 8a9d6e2e64542528fd3d703dfa879b721d6b97b3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8a9d6e2e645425… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed Jul 4 15:46:46 2018 +0200 6304 FIX sap_hana_filesystem, sap_hana_mem: Fixed wrong conversion of filesystem and memory values In order to get correct calculated values in the service details and graphs you have to install the latest {{mk_sap_hana}} agent plugin. The plugin now sends values in bytes and the check plugin can handle them correctly. Before the plugin reports these values as GB which were rounded to two decimal places. In turn the check plugin converts these values to bytes, applies parameters and finally converts them to a user friendly format. This whole process may produce unprecise results. Change-Id: Id4564477e3ffbe37f9b6c233a78bc18d4db42646 --- .werks/6304 | 20 ++++++++++++++++++++ agents/plugins/mk_sap_hana | 6 +++--- checks/sap_hana_filesystem | 4 ++-- checks/sap_hana_mem | 6 +++--- 4 files changed, 28 insertions(+), 8 deletions(-) diff --git a/.werks/6304 b/.werks/6304 new file mode 100644 index 0000000..134847e --- /dev/null +++ b/.werks/6304 @@ -0,0 +1,20 @@ +Title: sap_hana_filesystem, sap_hana_mem: Fixed wrong conversion of filesystem and memory values +Level: 1 +Component: checks +Compatible: incomp +Edition: cre +Version: 1.6.0i1 +Date: 1530711398 +Class: fix + +In order to get correct calculated values in the service details +and graphs you have to install the latest {{mk_sap_hana}} agent plugin. +The plugin now sends values in bytes and the check plugin can handle them +correctly. + +Before the plugin reports these values as GB which were rounded to two +decimal places. In turn the check plugin converts these values to +bytes, applies parameters and finally converts them to a user friendly +format. This whole process may produce unprecise results. + + diff --git a/agents/plugins/mk_sap_hana b/agents/plugins/mk_sap_hana index da945b3..acee074 100755 --- a/agents/plugins/mk_sap_hana +++ b/agents/plugins/mk_sap_hana @@ -101,9 +101,9 @@ function sap_hana_mem () { echo "<<<sap_hana_mem:sep(44)>>>" echo "[[[$sidadm_short]]]" echo "[[[resident]]]" - sudo -i -u "${sidadm}" hdbsql -n localhost -i "${inst_nr}" -u "${db_user}" -p "${db_password}" -j -a -x "SELECT HOST, ROUND(SUM(PHYSICAL_MEMORY_SIZE/1024/1024/1024),2) FROM M_SERVICE_MEMORY GROUP BY HOST;" + sudo -i -u "${sidadm}" hdbsql -n localhost -i "${inst_nr}" -u "${db_user}" -p "${db_password}" -j -a -x "SELECT HOST, SUM(PHYSICAL_MEMORY_SIZE) FROM M_SERVICE_MEMORY GROUP BY HOST;" echo "[[[database]]]" - sudo -i -u "${sidadm}" hdbsql -n localhost -i "${inst_nr}" -u "${db_user}" -p "${db_password}" -j -a -x "select HOST, round(INSTANCE_TOTAL_MEMORY_ALLOCATED_SIZE/(1024*1024*1024), 2), round(ALLOCATION_LIMIT/(1024*1024*1024), 2), ROUND((USED_PHYSICAL_MEMORY + FREE_PHYSICAL_MEMORY)/1024/1024/1024,2) from M_HOST_RESOURCE_UTILIZATION;" + sudo -i -u "${sidadm}" hdbsql -n localhost -i "${inst_nr}" -u "${db_user}" -p "${db_password}" -j -a -x "select HOST, INSTANCE_TOTAL_MEMORY_ALLOCATED_SIZE, ALLOCATION_LIMIT, USED_PHYSICAL_MEMORY + FREE_PHYSICAL_MEMORY from M_HOST_RESOURCE_UTILIZATION;" } @@ -116,7 +116,7 @@ function sap_hana_filesystem () { local sidadm_short=$5 echo "<<<sap_hana_filesystem:sep(44)>>>" echo "[[[$sidadm_short]]]" - sudo -i -u "${sidadm}" hdbsql -n localhost -i "${inst_nr}" -u "${db_user}" -p "${db_password}" -j -a -x "select D1.HOST, D1.USAGE_TYPE, ROUND(D2.USED_SIZE/1024/1024/1024,2),ROUND(D1.TOTAL_SIZE/1024/1024/1024,2) FROM M_DISKS AS D1 INNER JOIN M_DISK_USAGE AS D2 ON D1.USAGE_TYPE = D2.USAGE_TYPE;" + sudo -i -u "${sidadm}" hdbsql -n localhost -i "${inst_nr}" -u "${db_user}" -p "${db_password}" -j -a -x "select D1.HOST, D1.USAGE_TYPE, D2.USED_SIZE, D1.TOTAL_SIZE FROM M_DISKS AS D1 INNER JOIN M_DISK_USAGE AS D2 ON D1.USAGE_TYPE = D2.USAGE_TYPE;" } diff --git a/checks/sap_hana_filesystem b/checks/sap_hana_filesystem index 45ca658..8bf864a 100644 --- a/checks/sap_hana_filesystem +++ b/checks/sap_hana_filesystem @@ -33,8 +33,8 @@ def parse_sap_hana_filesystem(info): instance = line[0][3:-3] continue name, disk_type, used, size = [x.replace('"', '').strip() for x in line] - used_mb = float(used) - size_mb = float(size) + used_mb = int(used) / (1024**2) + size_mb = int(size) / (1024**2) avail_mb = size_mb - used_mb itemname = ("%s %s %s" % (instance, name, disk_type)).strip() parsed.append((itemname, size_mb, avail_mb, 0)) diff --git a/checks/sap_hana_mem b/checks/sap_hana_mem index 9cdcaf6..06d2188 100644 --- a/checks/sap_hana_mem +++ b/checks/sap_hana_mem @@ -46,13 +46,13 @@ def parse_sap_hana_mem(info): line = [x.replace('"', '').strip() for x in line] inst_data = pparsed.setdefault("%s %s" % (instance, line[0]), {}) - # all memory values in MB + # all memory values in bytes if section == 'resident': # used - data = float(line[1]) * 1024**2 + data = int(line[1]) elif section == 'database': # used, max, resident_max - data = map(lambda x: float(x) * 1024**2, line[1:]) + data = map(int, line[1:]) else: continue inst_data.setdefault(section, data)

6 years, 2 months

← Newer
1
...
38
39
40
41
42
43
44
...
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