Checkmk git commits October 2018

checkmk-commits@lists.checkmk.com

15 participants
308 discussions

by Óscar Nájera

Module: check_mk Branch: master Commit: 5b45692f5329aad5ead02d8be5c7f4634f4ed0bb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5b45692f5329aa… Author: Óscar Nájera <on(a)mathias-kettner.de> Date: Tue Oct 9 14:50:58 2018 +0200 use id_ and type_ as function arguments _render_attributes elimintates the trailing underscores in keywords, and can thus be used. html_escape function from python language is used Change-Id: I6b654652aaef44b75cd275d5b51584f26141b401 --- cmk/gui/htmllib.py | 21 +++++++++++++-------- cmk/gui/wato/__init__.py | 4 ++-- tests/unit/cmk/gui/test_htmllib_HTMLGenerator.py | 2 +- 3 files changed, 16 insertions(+), 11 deletions(-) diff --git a/cmk/gui/htmllib.py b/cmk/gui/htmllib.py index ea08ab2..c5a4619 100644 --- a/cmk/gui/htmllib.py +++ b/cmk/gui/htmllib.py @@ -69,6 +69,13 @@ import pprint from contextlib import contextmanager +try: + # First try python3 + from html import escape as html_escape +except ImportError: + # Default to python2 + from cgi import escape as html_escape + # Monkey patch in order to make the HTML class below json-serializable without changing the default json calls. def _default(self, obj): return getattr(obj.__class__, "to_json", _default.default)(obj) @@ -120,13 +127,11 @@ class Escaper(object): return "%s" % value # This is HTML code which must not be escaped elif attr_type not in [str, unicode]: # also possible: type Exception! value = "%s" % value # Note: this allows Unicode. value might not have type str now - return value.replace("&", "&")\ - .replace('"', """)\ - .replace("<", "<")\ - .replace(">", ">") + return html_escape(value, quote=True) def unescape_attributes(self, value): + # In python3 use html.unescape return value.replace("&", "&")\ .replace(""", "\"")\ .replace("<", "<")\ @@ -2332,7 +2337,7 @@ class html(HTMLGenerator): if label: self.label(label, for_=id_) - self.write_html(self.render_input(varname, type_=args.get("type", "text"), **attributes)) + self.write_html(self.render_input(varname, type_=args.get("type_", "text"), **attributes)) if error: self.close_x() @@ -2377,7 +2382,7 @@ class html(HTMLGenerator): def password_input(self, varname, default_value = "", size=12, **args): - self.text_input(varname, default_value, type="password", size = size, **args) + self.text_input(varname, default_value, type_="password", size = size, **args) def text_area(self, varname, deflt="", rows=4, cols=30, attrs=None, try_max_width=False): @@ -2636,7 +2641,7 @@ class html(HTMLGenerator): if icon: self.img(class_=["treeangle", "title"], src="images/icon_%s.png" % icon) else: - self.img(id=img_id, class_=["treeangle", "nform", "open" if isopen else "closed"], + self.img(id_=img_id, class_=["treeangle", "nform", "open" if isopen else "closed"], src="images/%s_closed.png" % tree_img, align="absbottom") self.write_text(title) self.close_td() @@ -2645,7 +2650,7 @@ class html(HTMLGenerator): self.open_div(class_="foldable") if not icon: - self.img(id="treeimg.%s.%s" % (treename, id_), + self.img(id_="treeimg.%s.%s" % (treename, id_), class_=["treeangle", "open" if isopen else "closed"], src="images/%s_closed.png" % tree_img, align="absbottom", onclick=onclick) if isinstance(title, HTML): # custom HTML code diff --git a/cmk/gui/wato/__init__.py b/cmk/gui/wato/__init__.py index 5044f4a..2f59e0f 100644 --- a/cmk/gui/wato/__init__.py +++ b/cmk/gui/wato/__init__.py @@ -3035,9 +3035,9 @@ class ModeDiagHost(WatoMode): html.open_td(class_="icons") html.open_div() - html.img("images/icon_reload.png", class_="icon", id="%s_img" % ident) + html.img("images/icon_reload.png", class_="icon", id_="%s_img" % ident) html.open_a(href="") - html.img("images/icon_reload.png", class_=["icon", "retry"], id="%s_retry" % ident, title=_('Retry this test')) + html.img("images/icon_reload.png", class_=["icon", "retry"], id_="%s_retry" % ident, title=_('Retry this test')) html.close_a() html.close_div() html.close_td() diff --git a/tests/unit/cmk/gui/test_htmllib_HTMLGenerator.py b/tests/unit/cmk/gui/test_htmllib_HTMLGenerator.py index 02fdb21..1a792b0 100644 --- a/tests/unit/cmk/gui/test_htmllib_HTMLGenerator.py +++ b/tests/unit/cmk/gui/test_htmllib_HTMLGenerator.py @@ -51,7 +51,7 @@ def test_HTMLGenerator(register_builtin_html): def test_multiclass_call(register_builtin_html): - html.div('', class_="1", css="3", cssclass = "4", **{"class": "2"}) + html.div('', class_="1", css="3", cssclass="4", **{"class": "2"}) written_text = "".join(html.response.flush_output()) assert tools.compare_html(written_text, "<div class=\"1 3 4 2\"></div>")

5 years, 8 months

inventory/docker_node_images: fix

by Moritz Kiemer

Module: check_mk Branch: master Commit: 554b56b0a4b6286a65e34841f114812bda6a745f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=554b56b0a4b628… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Fri Oct 5 14:36:51 2018 +0200 inventory/docker_node_images: fix The attribution of the containers/images was not working properly. This has bin been fixed. Also note that this is an intermediate commit, The parse function is not meant to stay this way. Change-Id: Id3e813422dfbe365807d75723c6d929159f332a4 --- inventory/docker_node_images | 128 ++++++++++++++++++++++++------------------- 1 file changed, 71 insertions(+), 57 deletions(-) diff --git a/inventory/docker_node_images b/inventory/docker_node_images index fcb99b7..d254884 100644 --- a/inventory/docker_node_images +++ b/inventory/docker_node_images @@ -23,49 +23,91 @@ # 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. +import json -def _parse_docker_node_images(info): - import json - parsed = {} - section_name = None - for line in info: - if line[0].startswith("[[[") and line[0].endswith("]]]"): - section_name = line[0][3:-3] +def _split_subsections(info): + subname = '' + subsections = {} + for row in info: + if not row: + continue + if row[0].startswith('[[[') and row[0].endswith(']]]'): + subname = row[0].strip('[]') continue + subsections.setdefault(subname, []).append(row) + return subsections + + +def _parse_subsection_images(subinfo): + '''parse output of "docker images"''' + parsed = {} + for row in subinfo: + data = json.loads(" ".join(row)) + parsed.setdefault(data["ID"], data) + return parsed - data = json.loads(" ".join(line)) - if section_name == "images" and data: - parsed.setdefault(data["ID"], data) +def _parse_subsection_labels(subinfo): + return [json.loads(" ".join(row)) for row in subinfo] - elif section_name == "images_labels": - if len(data) == 2: - image_id, labels = data - image = parsed.get(image_id) - if image is not None and labels: - image.setdefault("__labels__", labels) - elif section_name == "containers": - image_name = data["Image"] - if ":" in image_name: - repository, tag = image_name.split(":", 1) - else: - repository, tag = image_name, "latest" +def _parse_subsection_containers(subinfo): + parsed = {} + for row in subinfo: + data = json.loads(" ".join(row)) - image = parsed.get((repository, tag)) - if image is not None: - image.setdefault("__containers__", []).append(data) + image_name = data["Image"] + if ":" in image_name: + data["Repository"], data["Tag"] = image_name.split(":", 1) + else: + data["Repository"], data["Tag"] = image_name, "latest" + parsed[data["ID"]] = data return parsed +def parse_docker_node_images(info): + '''parse output of <<<docker_node_images>>> + + $ echo "[[[images]]]" + $ docker images + $ echo "[[[image_labels]]]" + $ IMAGE_IDS=$(docker images ls | awk 'BEGIN {ORF=" "} NR>1 {print $3}') + $ docker image inspect "$IMAGE_IDS" + $ echo "[[[containers]]]" + $ docker ps --all + ''' + subsections = _split_subsections(info) + + images = _parse_subsection_images(subsections.get("images", [])) + label_data = _parse_subsection_labels(subsections.get("images_labels", [])) + containers = _parse_subsection_containers(subsections.get("containers", [])) + + for image_id, labels in label_data: + image = images.get(image_id) + if None not in (image_id, labels, image): + image.setdefault("__labels__", {}).update(labels) + + mapping = {(i['Repository'], i['Tag']): i['ID'] for i in images} + for c in containers: + image_id = mapping.get((c["Repository"], c["Tag"])) + image = images.get(image_id) + if image is not None: + image.setdefault("__containers__", []).append(c) + + lab = (p.split("=", 1) for p in c.get("Labels", []).split(",")) + c["Labels"] = list(lab) + + return {"images": images, "containers": containers} + + def inv_docker_node_images(info, inventory_tree, status_data_tree): - parsed = _parse_docker_node_images(info) + images = parse_docker_node_images(info).get("images", {}) path = "software.applications.docker.images:" inv_node = inventory_tree.get_list(path) status_node = status_data_tree.get_list(path) - for image_id, image in sorted(parsed.iteritems()): + for image_id, image in sorted(images.iteritems()): inv_node.append({ "repository" : image["Repository"], "tag" : image["Tag"], @@ -89,39 +131,11 @@ inv_info['docker_node_images'] = { } -def _parse_docker_node_containers(info): - import json - parsed = {} - section_name = None - for line in info: - if line[0].startswith("[[[") and line[0].endswith("]]]"): - section_name = line[0][3:-3] - continue - - if section_name != "containers": - continue - - data = json.loads(" ".join(line)) - - image_name = data["Image"] - if ":" in image_name: - data["Repository"], data["Tag"] = image_name.split(":", 1) - else: - data["Repository"], data["Tag"] = image_name, "latest" - - data["Labels"] = [ p.split("=", 1) for p in data["Labels"].split(",") ] - - parsed[data["ID"]] = data - - - return parsed - - def inv_docker_node_images_containers(info, inventory_tree, status_data_tree): - parsed = _parse_docker_node_containers(info) + containers = parse_docker_node_images(info).get("containers", {}) status_node = status_data_tree.get_list("software.applications.docker.containers:") - for id_, container in sorted(parsed.iteritems()): + for id_, container in sorted(containers.iteritems()): status_node.append({ "id" : id_, "repository" : container["Repository"],

5 years, 8 months

Fixed integration test after e9355e6a114c1fcb2f648a3b6e4eb0a63f620be7

by Lars Michelsen

Module: check_mk Branch: master Commit: c6770f3530f1dbc7ce6879860d4e71961632c22c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c6770f3530f1db… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Oct 9 19:05:55 2018 +0200 Fixed integration test after e9355e6a114c1fcb2f648a3b6e4eb0a63f620be7 Change-Id: I90ad485ecfe0828c206a7269f435ee660084c14f --- cmk_base/data_sources/tcp.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/cmk_base/data_sources/tcp.py b/cmk_base/data_sources/tcp.py index a8993ea..a1339bb 100644 --- a/cmk_base/data_sources/tcp.py +++ b/cmk_base/data_sources/tcp.py @@ -213,7 +213,11 @@ class TCPDataSource(CheckMKAgentDataSource): def _sub_result_only_from(self, agent_info): agent_only_from = agent_info.get("onlyfrom") + ruleset = config.agent_config.get("only_from") + if not ruleset: + return 0, '' + entries = config.host_extra_conf(self._hostname, ruleset) config_only_from = entries[0] if entries else None if None in (agent_only_from, config_only_from):

5 years, 8 months

Fixed incompletely configured dashlets being added to dashboards

by Lars Michelsen

Module: check_mk Branch: master Commit: dac6dc0850065ab753a9fec3063d5d68916ddb83 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dac6dc0850065a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Oct 3 23:00:03 2018 +0200 Fixed incompletely configured dashlets being added to dashboards Change-Id: I148a03e058950ae16be3e4a70c77abc8aa89265c --- cmk/gui/dashboard.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/cmk/gui/dashboard.py b/cmk/gui/dashboard.py index e0e888f..506f7dd 100644 --- a/cmk/gui/dashboard.py +++ b/cmk/gui/dashboard.py @@ -1098,8 +1098,7 @@ def page_edit_dashlet(): 'single_infos' : dashlet_type.single_infos(), 'type' : ty, } - ident = len(dashboard['dashlets']) - dashboard['dashlets'].append(dashlet) + ident = len(dashboard['dashlets']) single_infos_raw = html.var('single_infos') single_infos = [] @@ -1223,6 +1222,9 @@ def page_edit_dashlet(): if context_specs: dashlet['context'] = visuals.process_context_specs(context_specs) + if mode == "add": + dashboard['dashlets'].append(dashlet) + visuals.save('dashboards', dashboards) html.immediate_browser_redirect(1, next_url)

5 years, 8 months

6412 FIX mk_docker_container_piggybacked: don' t try to execute the check_mk_agent inside a container if no bash is available

by Tom Baerwinkel

Module: check_mk Branch: master Commit: f15226dfdad483003f29f80962a450e22cc4187c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f15226dfdad483… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Tue Oct 9 16:20:39 2018 +0200 6412 FIX mk_docker_container_piggybacked: don't try to execute the check_mk_agent inside a container if no bash is available If bash is not available in a docker container docker reports the error on stdout. The mk_docker_container_piggybacked plugin misinterpreted the error as an available check_mk_agent inside of the container. Affected hosts using the mk_docker_container_piggybacked plugin have to update the plugin to the new version to avoid this behaviour. Change-Id: If851fe33dea6cb861feb9bf416416e0ac802568d --- .werks/6412 | 16 ++++++++++++++++ agents/plugins/mk_docker_container_piggybacked | 2 +- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/.werks/6412 b/.werks/6412 new file mode 100644 index 0000000..464e282 --- /dev/null +++ b/.werks/6412 @@ -0,0 +1,16 @@ +Title: mk_docker_container_piggybacked: don't try to execute the check_mk_agent inside a container if no bash is available +Level: 1 +Component: checks +Class: fix +Compatible: incomp +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1539094056 + +If bash is not available in a docker container docker reports the error on stdout. +The mk_docker_container_piggybacked plugin misinterpreted the error as an +available check_mk_agent inside of the container. + +Affected hosts using the mk_docker_container_piggybacked plugin have to update +the plugin to the new version to avoid this behaviour. diff --git a/agents/plugins/mk_docker_container_piggybacked b/agents/plugins/mk_docker_container_piggybacked index 5d8ca3e..36cf98c 100755 --- a/agents/plugins/mk_docker_container_piggybacked +++ b/agents/plugins/mk_docker_container_piggybacked @@ -42,7 +42,7 @@ if type docker > /dev/null 2>&1; then # the container. # Once it comes to plugins and custom configuration the user needs to use # a little more complex setup. Have a look at the documentation. - AGENT_PATH=$(docker container exec "$CONTAINER_ID" bash -c "type check_mk_agent" 2>/dev/null) + AGENT_PATH=$(docker container exec "$CONTAINER_ID" bash -c "type check_mk_agent" 2>/dev/null) || AGENT_PATH= if [ -n "$AGENT_PATH" ]; then docker container exec --env "REMOTE=$REMOTE" "$CONTAINER_ID" check_mk_agent elif docker container exec "$CONTAINER_ID" which bash >/dev/null 2>&1; then

5 years, 8 months

ups_socomec_outphase: Minor cleanup in check

by Konstantin Büttner

Module: check_mk Branch: master Commit: 576333632a1d91731fe340d9f61d50fcfd782136 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=576333632a1d91… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Tue Oct 9 15:38:49 2018 +0200 ups_socomec_outphase: Minor cleanup in check Change-Id: I6d003c80dbeccda14dcc4805830d480b8d4ec93a --- checks/ups_socomec_outphase | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/checks/ups_socomec_outphase b/checks/ups_socomec_outphase index 43d1fd5..c709dae 100644 --- a/checks/ups_socomec_outphase +++ b/checks/ups_socomec_outphase @@ -42,11 +42,11 @@ def parse_ups_socomec_outphase(info): return parsed -def check_ups_socomec_outphase(item, params, info): +def check_ups_socomec_outphase(item, params, parsed): if not item.startswith("Phase"): # fix item names discovered before 1.2.7 item = "Phase %s" % item - return check_elphase(item, params, info) + return check_elphase(item, params, parsed) check_info['ups_socomec_outphase'] = {

5 years, 8 months

Improved start_url input validation

by Lars Michelsen

Module: check_mk Branch: master Commit: 042edf72b897367a4f20f6556d97272f4996aa1d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=042edf72b89736… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Oct 1 19:40:56 2018 +0200 Improved start_url input validation Change-Id: I5a595ba5efd9cf4bbef19cf35ef9158a140323c4 --- cmk/gui/plugins/userdb/user_attributes.py | 9 +++++++-- cmk/gui/plugins/wato/check_mk_configuration.py | 15 +++++++++------ cmk/gui/utils.py | 7 +++++++ cmk/gui/watolib.py | 1 - 4 files changed, 23 insertions(+), 9 deletions(-) diff --git a/cmk/gui/plugins/userdb/user_attributes.py b/cmk/gui/plugins/userdb/user_attributes.py index 426ba21..35d457b 100644 --- a/cmk/gui/plugins/userdb/user_attributes.py +++ b/cmk/gui/plugins/userdb/user_attributes.py @@ -28,7 +28,10 @@ from cmk.gui.config import theme_choices from cmk.gui.valuespec import * from cmk.gui.i18n import _ from cmk.gui.globals import html -from . import UserAttribute, user_attribute_registry +from cmk.gui.plugins.userdb import ( + UserAttribute, + user_attribute_registry, +) @user_attribute_registry.register class ForceAuthUserUserAttribute(UserAttribute): @@ -160,7 +163,9 @@ class StartURLUserAttribute(UserAttribute): "URL you like here."), size = 80, default_value = "dashboard.py", - attrencode = True + attrencode = True, + allow_empty = False, + validate = utils.validate_start_url, ), ], ), diff --git a/cmk/gui/plugins/wato/check_mk_configuration.py b/cmk/gui/plugins/wato/check_mk_configuration.py index 3bb1c1d..2ada3c8 100644 --- a/cmk/gui/plugins/wato/check_mk_configuration.py +++ b/cmk/gui/plugins/wato/check_mk_configuration.py @@ -304,12 +304,15 @@ register_configvar(group, register_configvar(group, "start_url", - TextAscii(title = _("Start URL to display in main frame"), - help = _("When you point your browser to the Check_MK GUI, usually the dashboard " - "is shown in the main (right) frame. You can replace this with any other " - "URL you like here."), - size = 80, - attrencode = True), + TextAscii( + title = _("Start URL to display in main frame"), + help = _("When you point your browser to the Check_MK GUI, usually the dashboard " + "is shown in the main (right) frame. You can replace this with any other " + "URL you like here."), + size = 80, + allow_empty = False, + validate = utils.validate_start_url, + ), domain = "multisite") register_configvar(group, diff --git a/cmk/gui/utils.py b/cmk/gui/utils.py index 23f625f..80fae55 100644 --- a/cmk/gui/utils.py +++ b/cmk/gui/utils.py @@ -39,6 +39,7 @@ import cmk.paths from cmk.gui.i18n import _ from cmk.gui.globals import html +from cmk.gui.exceptions import MKUserError def drop_dotzero(v, digits=2): @@ -95,6 +96,12 @@ def is_allowed_url(url): return True +def validate_start_url(value, varprefix): + if not is_allowed_url(value): + raise MKUserError(varprefix, _("The given value is not allowed. You may only configure " + "relative URLs like <tt>dashboard.py?name=my_dashboard</tt>.")) + + def cmp_version(a, b): """Compare two version numbers with each other Allow numeric version numbers, but also characters. diff --git a/cmk/gui/watolib.py b/cmk/gui/watolib.py index e1b531a..83a177b 100644 --- a/cmk/gui/watolib.py +++ b/cmk/gui/watolib.py @@ -10536,7 +10536,6 @@ class LivestatusViaTCP(Dictionary): kwargs["optional_keys"] = [ "only_from" ] super(LivestatusViaTCP, self).__init__(**kwargs) - #. # .--CME-----------------------------------------------------------------. # | ____ __ __ _____ |

5 years, 8 months

Improved validation of urls retrieved from HTTP vars

by Lars Michelsen

Module: check_mk Branch: master Commit: 92cafff4781ed3dcc455375e67f2107e7ddeaaa1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=92cafff4781ed3… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Oct 1 20:06:39 2018 +0200 Improved validation of urls retrieved from HTTP vars Change-Id: Id82bb76e70c51bb5d326eb94b16cc7ae45cfb399 --- cmk/gui/dashboard.py | 8 ++++---- cmk/gui/notifications.py | 2 +- cmk/gui/pagetypes.py | 2 +- cmk/gui/plugins/views/icons/wato.py | 2 +- cmk/gui/plugins/wato/background_job.py | 2 +- cmk/gui/valuespec.py | 2 +- cmk/gui/wato/__init__.py | 10 +++++----- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/cmk/gui/dashboard.py b/cmk/gui/dashboard.py index cce3321..e0e888f 100644 --- a/cmk/gui/dashboard.py +++ b/cmk/gui/dashboard.py @@ -1020,7 +1020,7 @@ def choose_view(name): html.header(_('Create Dashlet from existing View'), stylesheets=["pages"]) html.begin_context_buttons() - back_url = html.var("back", "dashboard.py?edit=1&name=%s" % html.urlencode(html.var('name'))) + back_url = html.get_url_input("back", "dashboard.py?edit=1&name=%s" % html.urlencode(html.var('name'))) html.context_button(_("Back"), back_url, "back") html.end_context_buttons() @@ -1129,8 +1129,8 @@ def page_edit_dashlet(): html.header(title, stylesheets=["pages","views"]) html.begin_context_buttons() - back_url = html.var('back', 'dashboard.py?name=%s&edit=1' % board) - next_url = html.var('next', back_url) + back_url = html.get_url_input('back', 'dashboard.py?name=%s&edit=1' % board) + next_url = html.get_url_input('next', back_url) html.context_button(_('Back'), back_url, 'back') html.context_button(_('All Dashboards'), 'edit_dashboards.py', 'dashboard') html.end_context_buttons() @@ -1283,7 +1283,7 @@ def page_delete_dashlet(): html.header(_('Confirm Dashlet Deletion'), stylesheets=["pages","views"]) html.begin_context_buttons() - back_url = html.var('back', 'dashboard.py?name=%s&edit=1' % board) + back_url = html.get_url_input('back', 'dashboard.py?name=%s&edit=1' % board) html.context_button(_('Back'), back_url, 'back') html.end_context_buttons() diff --git a/cmk/gui/notifications.py b/cmk/gui/notifications.py index dea72eb..9dca5b7 100644 --- a/cmk/gui/notifications.py +++ b/cmk/gui/notifications.py @@ -196,7 +196,7 @@ def page_clear(): else: acktime = float(acktime) - prev_url = html.var('prev_url') + prev_url = html.get_url_input('prev_url') if html.var('_confirm'): acknowledge_failed_notifications(acktime) html.reload_sidebar() diff --git a/cmk/gui/pagetypes.py b/cmk/gui/pagetypes.py index daffe1d..2c6d75d 100644 --- a/cmk/gui/pagetypes.py +++ b/cmk/gui/pagetypes.py @@ -1043,7 +1043,7 @@ class Overridable(Base): # Page for editing an existing page, or creating a new one @classmethod def page_edit(cls): - back_url = html.var("back", cls.list_url()) + back_url = html.get_url_input("back", cls.list_url()) cls.load() cls.need_overriding_permission("edit") diff --git a/cmk/gui/plugins/views/icons/wato.py b/cmk/gui/plugins/views/icons/wato.py index e3e4ecb..62e7d9f 100644 --- a/cmk/gui/plugins/views/icons/wato.py +++ b/cmk/gui/plugins/views/icons/wato.py @@ -123,7 +123,7 @@ def paint_download_host_info(what, row, tags, host_custom_vars, ty): # When the download icon is part of the host/service action menu, then # the _back_url set in paint_action_menu() needs to be used. Otherwise # html.makeuri([]) (not html.requested_uri()) is the right choice. - back_url = html.var("_back_url", html.makeuri([])) + back_url = html.get_url_input("_back_url", html.makeuri([])) if back_url: params.append(("back_url", back_url)) diff --git a/cmk/gui/plugins/wato/background_job.py b/cmk/gui/plugins/wato/background_job.py index 1f9f4b7..6f68ec5 100644 --- a/cmk/gui/plugins/wato/background_job.py +++ b/cmk/gui/plugins/wato/background_job.py @@ -111,7 +111,7 @@ class ModeBackgroundJobDetails(WatoMode): def _back_url(self): - return html.var("back_url") + return html.get_url_input("back_url") def page(self): diff --git a/cmk/gui/valuespec.py b/cmk/gui/valuespec.py index 434520c..cc1bd32 100644 --- a/cmk/gui/valuespec.py +++ b/cmk/gui/valuespec.py @@ -4349,7 +4349,7 @@ class IconSelector(ValueSpec): import cmk.gui.config as config # FIXME: Clean this up. But how? if config.user.may('wato.icons'): - back_param = '&back='+html.urlencode(html.var('back')) if html.has_var('back') else '' + back_param = '&back='+html.urlencode(html.get_url_input('back')) if html.has_var('back') else '' html.buttonlink('wato.py?mode=icons' + back_param, _('Manage')) html.close_div() diff --git a/cmk/gui/wato/__init__.py b/cmk/gui/wato/__init__.py index fca9605..5044f4a 100644 --- a/cmk/gui/wato/__init__.py +++ b/cmk/gui/wato/__init__.py @@ -1230,7 +1230,7 @@ class ModeAjaxPopupMoveToFolder(WatoWebApiMode): self._ident = html.var("ident") - self._back_url = html.var("back_url") + self._back_url = html.get_url_input("back_url") if not self._back_url or not self._back_url.startswith("wato.py"): raise MKUserError("back_url", _("Invalid back URL provided.")) @@ -12635,7 +12635,7 @@ class AgentOutputPage(object): raise MKGeneralException(_("Invalid type specified.")) self._ty = ty - self._back_url = html.var("back_url") + self._back_url = html.get_url_input("back_url") init_wato_datastructures(with_wato_lock=True) @@ -13505,8 +13505,8 @@ class ModeCheckManPage(WatoMode): def buttons(self): global_buttons() - if html.var("back"): - back_url = html.var("back") + if html.has_var("back"): + back_url = html.get_url_input("back") html.context_button(_("Back"), back_url, "back") html.context_button(_("All Check Plugins"), html.makeuri_contextless([("mode", "check_plugins")]), "check_plugins") @@ -13621,7 +13621,7 @@ class ModeIcons(WatoMode): def buttons(self): - back_url = html.var("back") + back_url = html.get_url_input("back") if back_url: html.context_button(_("Back"), back_url, "back") else:

5 years, 8 months

6187 Dropped external SNMP related dependencies

by Lars Michelsen

Module: check_mk Branch: master Commit: b1e5845e4b28710d67bc8b4bb1544c8874eb1046 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b1e5845e4b2871… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed May 30 20:30:22 2018 +0200 6187 Dropped external SNMP related dependencies Check_MK is shipping it's own version of Net-SNMP for a long time now. There will still some things used from the OS depdencies (e.g. the perl modules). These have now been cleaned up. The perl scripts now also use the shipped Net-SNMP version. Change-Id: I422c7f973fafcbd18520d9012a3115b0c7541b09 --- .werks/6187 | 13 +++++++++++++ omd/distros/CENTOS_5.mk | 4 ---- omd/distros/CENTOS_6.mk | 5 ----- omd/distros/CENTOS_7.mk | 5 ----- omd/distros/DEBIAN_5.mk | 4 ---- omd/distros/DEBIAN_6.mk | 4 ---- omd/distros/DEBIAN_7.mk | 4 ---- omd/distros/DEBIAN_8.mk | 4 ---- omd/distros/DEBIAN_9.mk | 4 ---- omd/distros/SLES_11SP1.mk | 4 ---- omd/distros/SLES_11SP2.mk | 4 ---- omd/distros/SLES_11SP3.mk | 4 ---- omd/distros/SLES_11SP4.mk | 4 ---- omd/distros/SLES_12.mk | 4 ---- omd/distros/SLES_12SP1.mk | 4 ---- omd/distros/SLES_12SP2.mk | 4 ---- omd/distros/SLES_12SP3.mk | 4 ---- omd/distros/SLES_15.mk | 4 ---- omd/distros/UBUNTU_12.04.mk | 4 ---- omd/distros/UBUNTU_13.04.mk | 4 ---- omd/distros/UBUNTU_14.04.mk | 4 ---- omd/distros/UBUNTU_15.04.mk | 4 ---- omd/distros/UBUNTU_16.04.mk | 4 ---- omd/distros/UBUNTU_16.10.mk | 4 ---- omd/distros/UBUNTU_17.04.mk | 4 ---- omd/distros/UBUNTU_17.10.mk | 4 ---- omd/distros/UBUNTU_18.04.mk | 4 ---- omd/packages/net-snmp/Makefile | 15 ++++++++++++++- 28 files changed, 27 insertions(+), 107 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=b1e5845e4b…

5 years, 8 months

6515 Dropped libmcrypt / php-mcrypt dependency

by Lars Michelsen

Module: check_mk Branch: master Commit: 8a7f27ed6156bec61b0c5f73f91a160e8fffc7d1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8a7f27ed6156be… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Aug 29 20:53:27 2018 +0200 6515 Dropped libmcrypt / php-mcrypt dependency The libmcrypt library and the mcrypt php module is not necessary for Check_MK and it's major components. We drop it because it is the last dependency on RedHat distros that is fetched from the EPEL repositories. This means that we can now skip this step during initial installation and thus simplify the installation process on these systems a bit more. The only component left that uses libmcrypt is the fairly old NSCA receiver which is still shipped with Check_MK. We keep this component for the moment since it's used by several installations and we currently have no 1:1 replacement for it. In case you need to use NSCAs encryption, which is highly recommended when you use NSCA, you may have to install libmcrypt by hand to make it work. Change-Id: If15cedea5cd3d20323ec469ee102db17d1787618 --- .werks/6515 | 21 +++++++++++++++++++++ omd/distros/CENTOS_5.mk | 1 - omd/distros/CENTOS_6.mk | 1 - omd/distros/CENTOS_7.mk | 1 - omd/distros/DEBIAN_5.mk | 1 - omd/distros/DEBIAN_6.mk | 1 - omd/distros/DEBIAN_7.mk | 1 - omd/distros/DEBIAN_8.mk | 1 - omd/distros/DEBIAN_9.mk | 1 - omd/distros/SLES_11SP1.mk | 1 - omd/distros/SLES_11SP2.mk | 1 - omd/distros/SLES_11SP3.mk | 1 - omd/distros/SLES_11SP4.mk | 1 - omd/distros/SLES_12.mk | 1 - omd/distros/SLES_12SP1.mk | 1 - omd/distros/SLES_12SP2.mk | 1 - omd/distros/SLES_12SP3.mk | 1 - omd/distros/SLES_15.mk | 1 - omd/distros/UBUNTU_12.04.mk | 1 - omd/distros/UBUNTU_13.04.mk | 1 - omd/distros/UBUNTU_14.04.mk | 1 - omd/distros/UBUNTU_15.04.mk | 1 - omd/distros/UBUNTU_16.04.mk | 1 - omd/distros/UBUNTU_16.10.mk | 1 - omd/distros/UBUNTU_17.04.mk | 1 - omd/distros/UBUNTU_17.10.mk | 1 - 26 files changed, 21 insertions(+), 25 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=8a7f27ed61…

5 years, 8 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits October 2018