Checkmk git commits January 2019

checkmk-commits@lists.checkmk.com

15 participants
490 discussions

6999 FIX ipmi_sensors: Treat "S0/G0" as "System full operational, working" state

by Simon Betz

Module: check_mk Branch: master Commit: 80f75d6038960e3a20a9a3b31c5644d543fa227c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=80f75d6038960e… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue Jan 8 12:53:35 2019 +0100 6999 FIX ipmi_sensors: Treat "S0/G0" as "System full operational, working" state Change-Id: I38003b0b5416bfd0cfa7718169b73204694194a5 --- .werks/6999 | 11 +++++++++++ checks/ipmi_sensors.include | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/6999 b/.werks/6999 new file mode 100644 index 0000000..c339490 --- /dev/null +++ b/.werks/6999 @@ -0,0 +1,11 @@ +Title: ipmi_sensors: Treat "S0/G0" as "System full operational, working" state +Level: 1 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1546948273 + + diff --git a/checks/ipmi_sensors.include b/checks/ipmi_sensors.include index b1857ae..865ef3d 100644 --- a/checks/ipmi_sensors.include +++ b/checks/ipmi_sensors.include @@ -124,7 +124,7 @@ def parse_freeipmi(info): status_txt = status_txt[:-1] if status_txt in ["NA", "N/A", "Unknown"] or "_=_" in status_txt: status_txt = None - elif status_txt == "S0G0": + elif status_txt in ["S0G0", "S0/G0"]: status_txt = "System full operational, working" else: status_txt = status_txt.replace("_", " ")

5 years, 5 months

aws_elb_summary, aws_elb_health: Checks for AWS/ELB (elastic load balancer )

by Simon Betz

Module: check_mk Branch: master Commit: ce4e768ca69a9c4fa473ffff21425277c6800a7f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ce4e768ca69a9c… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Dec 20 10:37:41 2018 +0100 aws_elb_summary, aws_elb_health: Checks for AWS/ELB (elastic load balancer) Change-Id: Iec15456770c2a91c1f238aef8de66b9372804fbc --- checkman/aws_elb_health | 15 ++++++++++ checkman/aws_elb_summary | 12 ++++++++ checks/aws_elb_health | 72 ++++++++++++++++++++++++++++++++++++++++++++++ checks/aws_elb_summary | 74 ++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 173 insertions(+) diff --git a/checkman/aws_elb_health b/checkman/aws_elb_health new file mode 100644 index 0000000..e8dc160 --- /dev/null +++ b/checkman/aws_elb_health @@ -0,0 +1,15 @@ +title: AWS ELB Health +agents: aws +catalog: cloud/aws +license: GPL +distribution: check_mk +description: + This check monitors all AWS ELB and reports a summary of their states. + To make this check work you have to configure the related special agent + {{Amazon Web Services (AWS)}}. + + If the elastic load balancer is "in service" the check stats is OK, + if it is "out of service" the check state is WARN, otherwise UNKNOWN. + +inventory: + One service is created. diff --git a/checkman/aws_elb_summary b/checkman/aws_elb_summary new file mode 100644 index 0000000..d5a2596 --- /dev/null +++ b/checkman/aws_elb_summary @@ -0,0 +1,12 @@ +title: AWS ELB Summary +agents: aws +catalog: cloud/aws +license: GPL +distribution: check_mk +description: + This check monitors all AWS ELB and reports a summary of their states. + To make this check work you have to configure the related special agent + {{Amazon Web Services (AWS)}}. + +inventory: + One summary service is created. diff --git a/checks/aws_elb_health b/checks/aws_elb_health new file mode 100644 index 0000000..99570c2 --- /dev/null +++ b/checks/aws_elb_health @@ -0,0 +1,72 @@ +#!/usr/bin/python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2018 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. + +AWSELBHealthMap = { + "InService": "in service", + "OutOfService": "out of service", + "Unknown": "unknown", +} + + +def parse_aws_elb_health(info): + try: + return parse_aws(info)[-1] + except IndexError: + return {} + + +def inventory_aws_elb_health(parsed): + if parsed: + return [(None, {})] + + +def check_aws_elb_health(item, params, parsed): + state_readable = AWSELBHealthMap[parsed['State']] + if state_readable == "in service": + state = 0 + elif state_readable == "out of service": + state = 1 + else: + state = 3 + yield state, 'Status: %s' % state_readable + yield 0, 'Instance: %s' % parsed['InstanceId'] + + reason_code = parsed['ReasonCode'] + if reason_code not in [None, "", "N/A"]: + yield 0, 'Reason: %s' % reason_code + + description = parsed['Description'] + if description not in [None, "", "N/A"]: + yield 0, 'Description: %s' % description + + +check_info['aws_elb_health'] = { + 'parse_function': parse_aws_elb_health, + 'inventory_function': inventory_aws_elb_health, + 'check_function': check_aws_elb_health, + 'service_description': 'AWS/ELB Health ', + 'includes': ['aws.include'], +} diff --git a/checks/aws_elb_summary b/checks/aws_elb_summary new file mode 100644 index 0000000..49e7ed6 --- /dev/null +++ b/checks/aws_elb_summary @@ -0,0 +1,74 @@ +#!/usr/bin/python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2018 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. + +AWSAvailabilityZoneMap = { + "us-east-1": "Virginia", + "us-west-1": "N. California", + "us-west-2": "Oregon", + "eu-west-1": "Ireland", + "eu-central-1": "Frankfurt", + "ap-southeast-1": "Singapore", + "ap-southeast-2": "Sydney", + "ap-northeast-1": "Tokyo", + "sa-east-1": "Sao Paulo", +} + + +def inventory_aws_elb_summary(parsed): + if parsed: + return [(None, {})] + + +def check_aws_elb_summary(item, params, parsed): + yield 0, "Balancers: %s" % len(parsed) + + balancers_by_avail_zone = {} + long_output = [] + for row in parsed: + balancer_name = row['LoadBalancerName'] + avail_zones_txt = [] + for avail_zone in row['AvailabilityZones']: + avail_zone_readable = "%s (%s)" % (AWSAvailabilityZoneMap[avail_zone[:-1]], + avail_zone[-1]) + balancers_by_avail_zone.setdefault(avail_zone_readable, []).append(balancer_name) + avail_zones_txt.append(avail_zone_readable) + long_output.append("Balancer: %s, Availability zones: %s"\ + % (balancer_name, ", ".join(avail_zones_txt))) + + for avail_zone, balancers in balancers_by_avail_zone.iteritems(): + yield 0, "%s: %s" % (avail_zone, len(balancers)) + + if long_output: + yield 0, '\n%s' % '\n'.join(long_output) + + +check_info['aws_elb_summary'] = { + 'parse_function': parse_aws, + 'inventory_function': inventory_aws_elb_summary, + 'check_function': check_aws_elb_summary, + 'service_description': 'AWS/ELB Summary', + 'includes': ['aws.include'], +}

5 years, 5 months

Removed MultiSelect ValueSpec.

by Sven Panne

Module: check_mk Branch: master Commit: 3443fe05b997e127b1f968fcc2aa42cedad45b1f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3443fe05b997e1… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Jan 8 11:44:00 2019 +0100 Removed MultiSelect ValueSpec. It has been dead for 7 years now and has probably bit-rotted. Furthermore, it is one of the two remaining list_var() callers. Change-Id: I75bcb9513311dfb1cf589d82feb7416804bcf51d --- cmk/gui/valuespec.py | 29 ----------------------------- 1 file changed, 29 deletions(-) diff --git a/cmk/gui/valuespec.py b/cmk/gui/valuespec.py index f822c93..e1d7b38 100644 --- a/cmk/gui/valuespec.py +++ b/cmk/gui/valuespec.py @@ -2229,35 +2229,6 @@ class ListChoice(ValueSpec): return value not in d -# A alternative way of editing list choices -class MultiSelect(ListChoice): - def __init__(self, **kwargs): - ListChoice.__init__(self, **kwargs) - - def _render_field(self, name, choices, selected=None): - if selected is None: - selected = [] - html.open_select(multiple="", name=name) - for key, title in choices: - html.option(title, value=key, selected='' if key in selected else None) - - html.close_select() - - def render_input(self, varprefix, value): - self.classtype_info() - self.load_elements() - self._render_field(varprefix, self._elements, value) - - def from_html_vars(self, varprefix): - self.load_elements() - value = [] - hv = html.request.list_var(varprefix) - for key, _title in self._elements: - if key in hv: - value.append(key) - return value - - # Implements a choice of items which is realized with # two ListChoices select fields. One contains all available # items and one contains all selected items.

5 years, 5 months

Make test_start_job a bit more stable.

by Sven Panne

Module: check_mk Branch: master Commit: 7771d591e0b3fef7f7d89cebe60b05a340b3e2d4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7771d591e0b3fe… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Jan 8 11:55:03 2019 +0100 Make test_start_job a bit more stable. Basically the test is fundamentally broken, we just make it a bit more likely that it succeeds, see a similar commit for test_locking... :-P Change-Id: I0a8bb6d74e0fefbce00e657a668e88c119d68bdf --- tests/unit/cmk/gui/test_background_job.py | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/unit/cmk/gui/test_background_job.py b/tests/unit/cmk/gui/test_background_job.py index 4a17e82..fadd6a0 100644 --- a/tests/unit/cmk/gui/test_background_job.py +++ b/tests/unit/cmk/gui/test_background_job.py @@ -67,6 +67,7 @@ def test_start_job(): assert status["state"] == background_job.JobStatus.state_initialized job.start() + time.sleep(0.2) assert job.is_running() with pytest.raises(background_job.BackgroundJobAlreadyRunning):

5 years, 5 months

Updated haproxy section to also handle /var/lib/haproxy/stats

by Lars Michelsen

Module: check_mk Branch: master Commit: 39be35628be1e25fc71bcc077ca37c09a3992d56 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=39be35628be1e2… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jan 8 11:54:06 2019 +0100 Updated haproxy section to also handle /var/lib/haproxy/stats Change-Id: I4741861de154bc449ea24a2ad780ea255aa2684f --- agents/check_mk_agent.linux | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index 8e895b0..5e42273 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -1032,10 +1032,12 @@ if type pvecm > /dev/null 2>&1 ; then pvecm nodes fi -if [ -r /run/haproxy/admin.sock ] && type socat >/dev/null 2>&1; then - echo "<<<haproxy:sep(44)>>>" - echo "show stat" | socat - UNIX-CONNECT:/run/haproxy/admin.sock -fi +for HAPROXY_SOCK in /run/haproxy/admin.sock /var/lib/haproxy/stats; do + if [ -r "$HAPROXY_SOCK" ] && type socat >/dev/null 2>&1; then + echo "<<<haproxy:sep(44)>>>" + echo "show stat" | socat - "UNIX-CONNECT:$HAPROXY_SOCK" + fi +done # Start new liveupdate process in background on each agent execution. Starting # a new live update process will terminate the old one automatically after

5 years, 5 months

6998 aws_costs_and_usage, aws_costs_and_usage.per_service: New check which give an overview over the unblended costs of AWS accounts

by Simon Betz

Module: check_mk Branch: master Commit: 7866cfd32d6f75bb9a5b5c1de68a5024e538ab4a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7866cfd32d6f75… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Dec 20 15:13:18 2018 +0100 6998 aws_costs_and_usage, aws_costs_and_usage.per_service: New check which give an overview over the unblended costs of AWS accounts Change-Id: I0d3f012175dd78c546b1cd390f311214780fad1b --- .werks/6998 | 10 +++ agents/special/agent_aws | 59 +++++++++++++ checkman/aws_costs_and_usage | 13 +++ checkman/aws_costs_and_usage.per_service | 14 +++ checks/aws_costs_and_usage | 123 +++++++++++++++++++++++++++ cmk/gui/plugins/metrics/check_mk.py | 6 ++ cmk/gui/plugins/wato/check_parameters/aws.py | 15 ++++ tests/unit/cmk/gui/test_watolib.py | 2 + 8 files changed, 242 insertions(+) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=7866cfd32d…

5 years, 5 months

agent_aws: Improved persisted section header

by Simon Betz

Module: check_mk Branch: master Commit: 337d7f7d3bdbfcc6e71774289be7cea5085d33af URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=337d7f7d3bdbfc… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue Jan 8 10:59:13 2019 +0100 agent_aws: Improved persisted section header Change-Id: I3c0e2c07ddcf0e7446cc2a56871798e8db2514c1 --- agents/special/agent_aws | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/agents/special/agent_aws b/agents/special/agent_aws index d6b66f8..d921d92 100755 --- a/agents/special/agent_aws +++ b/agents/special/agent_aws @@ -924,11 +924,15 @@ class AWSSections(object): logging.info(msg) raise AWSSectionError(msg) + persist_suffix = "" + if section_interval > 60: + persist_suffix = ":persist(%s)" % int(now + section_interval + 60) + if any([r.content for r in result]): - self._write_section_result(section_name, int(now + section_interval + 60), result) + self._write_section_result(section_name, persist_suffix, result) - def _write_section_result(self, section_name, until, result): - section_header = "<<<aws_%s:persist(%s)>>>\n" % (section_name, until) + def _write_section_result(self, section_name, persist_suffix, result): + section_header = "<<<aws_%s%s>>>\n" % (section_name, persist_suffix) for row in result: write_piggyback_header = row.piggyback_hostname\ and row.piggyback_hostname != self._hostname

5 years, 5 months

Discovery: Fixed bulk actions affecting services of other tables

by Lars Michelsen

Module: check_mk Branch: master Commit: 603f2d71481f65ac2d598b25f46deb34f1d3926e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=603f2d71481f65… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jan 8 11:35:03 2019 +0100 Discovery: Fixed bulk actions affecting services of other tables Change-Id: Ibdffd42933c27550d97cc4ec8f1972661ad8672b --- cmk/gui/wato/pages/services.py | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/cmk/gui/wato/pages/services.py b/cmk/gui/wato/pages/services.py index a61af83..768ada8 100644 --- a/cmk/gui/wato/pages/services.py +++ b/cmk/gui/wato/pages/services.py @@ -462,6 +462,7 @@ class ModeAjaxServiceDiscovery(WatoWebApiMode): request = self.webapi_request() html.del_var("request") # Do not add this to URLs constructed later request.setdefault("update_target", None) + request.setdefault("update_source", None) request.setdefault("update_services", []) folder = watolib.Folder.folder(request["folder_path"]) @@ -806,6 +807,9 @@ class ModeAjaxServiceDiscovery(WatoWebApiMode): return table_source # should never happen if self._options.action == DiscoveryAction.BULK_UPDATE: + if table_source != request["update_source"]: + return table_source + if not self._options.show_checkboxes: return update_target @@ -1062,7 +1066,11 @@ class DiscoveryPageRenderer(object): html.jsbutton( "_bulk_%s_%s" % (source, target), target_label, - self._start_js_call(options, request_vars={"update_target": target}), + self._start_js_call( + options, request_vars={ + "update_target": target, + "update_source": source, + }), title=_("Move %s to %s services") % (label, target), disabled=self._is_running(discovery_result), ) @@ -1269,6 +1277,7 @@ class DiscoveryPageRenderer(object): options, request_vars={ "update_target": table_target, + "update_source": table_source, "update_services": [checkbox_name], }), ) @@ -1284,6 +1293,7 @@ class DiscoveryPageRenderer(object): options, request_vars={ "update_target": DiscoveryState.REMOVED, + "update_source": table_source, "update_services": [checkbox_name], }), )

5 years, 5 months

Removed dead add_var() methods.

by Sven Panne

Module: check_mk Branch: master Commit: 9fc838f4cc3e7f973c84eea46d56fd0d9299cd42 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9fc838f4cc3e7f… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Jan 8 09:48:33 2019 +0100 Removed dead add_var() methods. Change-Id: Id45f7ac99ebee484e13f3c65d3280a354344c944 --- cmk/gui/htmllib.py | 5 ----- cmk/gui/http.py | 6 ------ tests/unit/cmk/gui/old/html_tests.py | 2 +- tests/unit/cmk/gui/test_http.py | 4 ++-- tests/unit/cmk/gui/test_table.py | 4 ++-- 5 files changed, 5 insertions(+), 16 deletions(-) diff --git a/cmk/gui/htmllib.py b/cmk/gui/htmllib.py index 8828f34..79d4a71 100644 --- a/cmk/gui/htmllib.py +++ b/cmk/gui/htmllib.py @@ -1134,11 +1134,6 @@ class html(HTMLGenerator): def all_varnames_with_prefix(self, prefix): return self.request.all_varnames_with_prefix(prefix) - # Adds a variable to listvars and also set it - # TODO: Refactor call sites to html.request.* - def add_var(self, varname, value): - self.request.add_var(varname, value) - # TODO: Refactor call sites to html.request.* def set_var(self, varname, value): self.request.set_var(varname, value) diff --git a/cmk/gui/http.py b/cmk/gui/http.py index 5fb71c6..47c7fb1 100644 --- a/cmk/gui/http.py +++ b/cmk/gui/http.py @@ -185,12 +185,6 @@ class Request(object): return [self.vars[varname]] return [] - # Adds a variable to _listvars and also set it - def add_var(self, varname, value): - self._listvars.setdefault(varname, []) - self._listvars[varname].append(value) - self.vars[varname] = value - # TODO: self.vars should be strictly read only in the Request() object def set_var(self, varname, value): if value is None: diff --git a/tests/unit/cmk/gui/old/html_tests.py b/tests/unit/cmk/gui/old/html_tests.py index decd326..23f5aba 100644 --- a/tests/unit/cmk/gui/old/html_tests.py +++ b/tests/unit/cmk/gui/old/html_tests.py @@ -156,7 +156,7 @@ def add_html_vars(html, add_vars): return for key, value in add_vars.iteritems(): if value is not None: - html.add_var(key, value) + html.set_var(key, value) # set the state of an html object diff --git a/tests/unit/cmk/gui/test_http.py b/tests/unit/cmk/gui/test_http.py index c35858d..2ac4928 100644 --- a/tests/unit/cmk/gui/test_http.py +++ b/tests/unit/cmk/gui/test_http.py @@ -30,8 +30,8 @@ def test_cookie_handling(register_builtin_html, monkeypatch): # TODO: Write valid test def test_request_processing(register_builtin_html): - html.add_var("varname", "1a") - html.add_var("varname2", 1) + html.set_var("varname", "1a") + html.set_var("varname2", "1") html.get_unicode_input("varname", deflt = "lol") html.get_integer_input("varname2") diff --git a/tests/unit/cmk/gui/test_table.py b/tests/unit/cmk/gui/test_table.py index 9966f13..1eee83c 100644 --- a/tests/unit/cmk/gui/test_table.py +++ b/tests/unit/cmk/gui/test_table.py @@ -178,8 +178,8 @@ def test_table_cubical(register_builtin_html, monkeypatch, sortable, searchable, table_id = 0 title = " TEST " separator = ';' - html.add_var('_%s_sort' % table_id, "1,0") - html.add_var('_%s_actions' % table_id, '1') + html.set_var('_%s_sort' % table_id, "1,0") + html.set_var('_%s_actions' % table_id, '1') # Table construction with html.plugged():

5 years, 5 months

Fix new styled dropdowns for dropdowns added dynamically (e.g. with ListOf )

by Lars Michelsen

Module: check_mk Branch: master Commit: 8c8917b84efdd5d3cd62ba06c97daae465f7a9fe URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8c8917b84efdd5… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jan 8 11:12:58 2019 +0100 Fix new styled dropdowns for dropdowns added dynamically (e.g. with ListOf) Initialize select2 only for the visible dropdowns and call the initialization dynamically after adding the new dropdown in ListOf code CMK-1504 Change-Id: I2509640158ac635a85e22a95023c4608cf21ddd0 --- web/htdocs/js/modules/forms.js | 10 ++++++++-- web/htdocs/js/modules/valuespecs.js | 2 ++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/web/htdocs/js/modules/forms.js b/web/htdocs/js/modules/forms.js index 29f65cb..a81ab30 100644 --- a/web/htdocs/js/modules/forms.js +++ b/web/htdocs/js/modules/forms.js @@ -29,8 +29,14 @@ import * as utils from "utils"; // html.dropdown() adds the .select2-enable class for all dropdowns // that should use the select2 powered dropdowns -export function enable_select2() { - $(".select2-enable").select2({ +export function enable_select2(container=null) { + let elements; + if (container) + elements = $(container).find(".select2-enable:visible"); + else + elements = $(".select2-enable:visible"); + + elements.select2({ dropdownAutoWidth : true, minimumResultsForSearch: 5 }); diff --git a/web/htdocs/js/modules/valuespecs.js b/web/htdocs/js/modules/valuespecs.js index 4f31d33..57d9318 100644 --- a/web/htdocs/js/modules/valuespecs.js +++ b/web/htdocs/js/modules/valuespecs.js @@ -25,6 +25,7 @@ import * as utils from "utils"; import * as popup_menu from "popup_menu"; import * as ajax from "ajax"; +import * as forms from "forms"; import * as colorpicker from "colorpicker"; //# +--------------------------------------------------------------------+ @@ -209,6 +210,7 @@ export function listof_add(varprefix, magic, style) container.appendChild(new_child); utils.execute_javascript_by_object(new_child); + forms.enable_select2(new_child); listof_update_indices(varprefix); }

5 years, 5 months

← Newer
1
...
41
42
43
44
45
46
47
48
49
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits January 2019