Checkmk git commits April 2019

checkmk-commits@lists.checkmk.com

15 participants
599 discussions

by Lars Michelsen

Module: check_mk Branch: master Commit: cabe4eceb7ae68c5d120b117f6e9a02ae125331a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cabe4eceb7ae68… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Mar 29 13:33:22 2019 +0100 Rule editor works Change-Id: I3844f9e10ccd21f176d9e0273048657d00fdba83 --- cmk/gui/forms.py | 10 ++++++-- cmk/gui/wato/pages/rulesets.py | 55 ++++++++++++++++++++++++++++++++++++------ web/htdocs/js/modules/wato.js | 6 +++++ 3 files changed, 61 insertions(+), 10 deletions(-) diff --git a/cmk/gui/forms.py b/cmk/gui/forms.py index 0aaac26..6639cbf 100644 --- a/cmk/gui/forms.py +++ b/cmk/gui/forms.py @@ -272,14 +272,20 @@ def space(): html.tr(html.render_td('', colspan=2, style="height:15px;")) -def section(title=None, checkbox=None, section_id=None, simple=False, hide=False, legend=True): +def section(title=None, + checkbox=None, + section_id=None, + simple=False, + hide=False, + legend=True, + css=None): global g_section_open if g_section_open: html.close_td() html.close_tr() html.open_tr( id_=section_id, - class_="open" if g_section_isopen else "closed", + class_=["open" if g_section_isopen else "closed", css], style="display:none;" if hide else None) if legend: diff --git a/cmk/gui/wato/pages/rulesets.py b/cmk/gui/wato/pages/rulesets.py index 97ae9b9..740c261 100644 --- a/cmk/gui/wato/pages/rulesets.py +++ b/cmk/gui/wato/pages/rulesets.py @@ -28,6 +28,7 @@ import abc import itertools import pprint +import json import re from cmk.utils.regex import escape_regex_chars @@ -1434,16 +1435,54 @@ class EditRuleMode(WatoMode): html.end_form() def _show_conditions(self): - # Conditions forms.header(_("Conditions")) + # TODO! + condition_type = "explicit" + + forms.section(_("Condition type")) + self._vs_condition_type().render_input(varprefix="condition_type", value=condition_type) + self._show_predefined_conditions() + self._show_explicit_conditions() + html.javascript("cmk.wato.toggle_rule_condition_type(%s)" % json.dumps(condition_type)) + + def _vs_condition_type(self): + return DropdownChoice( + title=_("Condition type"), + help=_("You can either specify individual conditions for this rule, or use a set of " + "predefined conditions, which may be handy if you have to configure the " + "same conditions in different rulesets."), + choices=[ + ("explicit", _("Explicit conditions")), + ("predefined", _("Predefined conditions")), + ], + on_change="cmk.wato.toggle_rule_condition_type(this.value)", + encode_value=False, + ) + + def _show_predefined_conditions(self): + # TODO: value + forms.section(_("Predefined condition"), css="condition predefined") + self._vs_predefined_conditions().render_input( + varprefix="predefined_condition_id", value=None) + + def _vs_predefined_conditions(self): + return DropdownChoice( + title=_("Predefined condition"), + choices=[ + ("predef1", _("BLAAAAA")), + ("predef2", _("BLUUUB")), + ], + ) + + def _show_explicit_conditions(self): # Rule folder - forms.section(_("Folder")) + forms.section(_("Folder"), css="condition explicit") html.dropdown("new_rule_folder", watolib.Folder.folder_choices(), deflt=self._folder.path()) html.help(_("The rule is only applied to hosts directly in or below this folder.")) # Host tags - forms.section(_("Host tags")) + forms.section(_("Host tags"), css="condition explicit") HostTagCondition().render_input(varprefix="", value=self._rule.tag_specs) html.help( _("The rule will only be applied to hosts fulfilling all " @@ -1451,7 +1490,7 @@ class EditRuleMode(WatoMode): "in the list of explicit host names.")) # Explicit hosts / watolib.ALL_HOSTS - forms.section(_("Explicit hosts")) + forms.section(_("Explicit hosts"), css="condition explicit") div_id = "div_all_hosts" checked = self._rule.host_list != watolib.ALL_HOSTS @@ -1486,7 +1525,7 @@ class EditRuleMode(WatoMode): itemtype = self._ruleset.item_type() if itemtype: if itemtype == "service": - forms.section(_("Services")) + forms.section(_("Services"), css="condition explicit") html.help( _("Specify a list of service patterns this rule shall apply to. " "The patterns must match the <b>beginning</b> of the service " @@ -1494,9 +1533,9 @@ class EditRuleMode(WatoMode): "match. Pattern use <b>regular expressions</b>. A <tt>.*</tt> will " "match an arbitrary text.")) elif itemtype == "checktype": - forms.section(_("Check types")) + forms.section(_("Check types"), css="condition explicit") elif itemtype == "item": - forms.section(self._ruleset.item_name().title()) + forms.section(self._ruleset.item_name().title(), css="condition explicit") if self._ruleset.item_help(): html.help(self._ruleset.item_help()) else: @@ -1568,7 +1607,7 @@ class EditRuleMode(WatoMode): html.close_table() html.close_center() - def _vs_service_conditions(self,): + def _vs_service_conditions(self): return ListOfStrings( orientation="horizontal", valuespec=RegExpUnicode(size=30, mode=RegExpUnicode.prefix), diff --git a/web/htdocs/js/modules/wato.js b/web/htdocs/js/modules/wato.js index 829717d..359ce60 100644 --- a/web/htdocs/js/modules/wato.js +++ b/web/htdocs/js/modules/wato.js @@ -22,6 +22,7 @@ // to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, // Boston, MA 02110-1301 USA. +import $ from "jquery"; import * as utils from "utils"; // ---------------------------------------------------------------------------- @@ -320,3 +321,8 @@ export function toggle_folder(event, oDiv, on) { } } } + +export function toggle_rule_condition_type(value) { + $(".condition").hide(); + $(".condition."+value).show(); +}

5 years, 3 months

7359 FIX aix_hacmp_resources: Skip header line; This led to a 'IndexError' crash

by Simon Betz

Module: check_mk Branch: master Commit: c7bd33e4b8bec6f44cf96f25ac2c1d54e66a163a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c7bd33e4b8bec6… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue Apr 2 11:10:31 2019 +0200 7359 FIX aix_hacmp_resources: Skip header line; This led to a 'IndexError' crash Change-Id: I7f1553ca4e4ec0db78adc419b619e70b495da998 --- .werks/7359 | 10 ++++++++++ checks/aix_hacmp_resources | 9 +++------ 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/.werks/7359 b/.werks/7359 new file mode 100644 index 0000000..bf9e3b6 --- /dev/null +++ b/.werks/7359 @@ -0,0 +1,10 @@ +Title: aix_hacmp_resources: Skip header line; This led to a 'IndexError' crash +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1554196167 +Class: fix + + diff --git a/checks/aix_hacmp_resources b/checks/aix_hacmp_resources index cfdd38d..f588159 100644 --- a/checks/aix_hacmp_resources +++ b/checks/aix_hacmp_resources @@ -42,13 +42,10 @@ factory_settings["aix_hacmp_resources"] = { def parse_aix_hacmp_resources(info): parsed = {} for line in info: - if 'There is no cluster definition.' in " ".join(line): + joined_line = " ".join(line) + if 'There is no cluster definition' in joined_line or 'Status of the RSCT subsystems' in joined_line: continue - if line[0] not in parsed: - parsed[line[0]] = [(line[2], line[1].lower())] - else: - parsed[line[0]].append((line[2], line[1].lower())) - + parsed.setdefault(line[0], []).append((line[2], line[1].lower())) return parsed

5 years, 3 months

7239 FIX Service discovery: Fix creating disabled services rule for services with special characters

by Lars Michelsen

Module: check_mk Branch: master Commit: 42b2734ad1e48db0d8939f736818459ae4974ade URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=42b2734ad1e48d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Apr 2 13:48:49 2019 +0200 7239 FIX Service discovery: Fix creating disabled services rule for services with special characters Services with e.g. "[" in their names could not be disabled using the service discovery page. Change-Id: I592ee8757cc194f087a14842ea04548be5066666 --- .werks/7239 | 11 +++++++++++ cmk/gui/wato/pages/services.py | 3 ++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/.werks/7239 b/.werks/7239 new file mode 100644 index 0000000..89070b1 --- /dev/null +++ b/.werks/7239 @@ -0,0 +1,11 @@ +Title: Service discovery: Fix creating disabled services rule for services with special characters +Level: 1 +Component: wato +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1552549690 + +Services with e.g. "[" in their names could not be disabled using the service discovery page. diff --git a/cmk/gui/wato/pages/services.py b/cmk/gui/wato/pages/services.py index 5d97db7..e376c49 100644 --- a/cmk/gui/wato/pages/services.py +++ b/cmk/gui/wato/pages/services.py @@ -32,6 +32,7 @@ import traceback import time import pprint import sys +import re from hashlib import sha256 from typing import NamedTuple, Text, List, Optional # pylint: disable=unused-import @@ -787,7 +788,7 @@ class ModeAjaxServiceDiscovery(WatoWebApiMode): return def _compile_patterns(services): - return ["%s$" % s.replace("\\", "\\\\") for s in services] + return ["%s$" % re.escape(s) for s in services] rulesets = watolib.AllRulesets() rulesets.load()

5 years, 3 months

Disable custom variable / tag test with nagios core for the moment

by Lars Michelsen

Module: check_mk Branch: master Commit: 646019945d2566b1db0f08d0aea043a38381cdb2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=646019945d2566… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Apr 2 13:28:53 2019 +0200 Disable custom variable / tag test with nagios core for the moment Change-Id: I3fb3d5697dbdc416513d299b3bc644399f8ac1d9 --- tests/integration/livestatus/test_livestatus.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tests/integration/livestatus/test_livestatus.py b/tests/integration/livestatus/test_livestatus.py index 8e9465e..b44d2e4 100644 --- a/tests/integration/livestatus/test_livestatus.py +++ b/tests/integration/livestatus/test_livestatus.py @@ -48,6 +48,9 @@ def test_host_table(default_cfg, site): def test_host_custom_variables(default_cfg, site): + if default_cfg.core == "nagios": + pytest.skip("Disabled until tags column is supported by play nagios") + rows = site.live.query( "GET hosts\nColumns: custom_variables tags\nFilter: name = livestatus-test-host\n") assert isinstance(rows, list)

5 years, 3 months

Cleanup unused pytest-stepwise dev dependency; remove ancient html_gentest marker

by Lars Michelsen

Module: check_mk Branch: master Commit: d1fc9a7fbf9fee01ad7c4dfe772bcd5350d04bbc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d1fc9a7fbf9fee… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Apr 2 13:06:04 2019 +0200 Cleanup unused pytest-stepwise dev dependency; remove ancient html_gentest marker Change-Id: Ifc54935d9819757496c272710c0aaf708026b9ad --- Pipfile | 1 - Pipfile.lock | 168 +++++++++++------------- omd/packages/python-modules/python-modules.make | 1 - pytest.ini | 5 +- 4 files changed, 81 insertions(+), 94 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=d1fc9a7fbf…

5 years, 3 months

Fixed hard coded site id in test

by Lars Michelsen

Module: check_mk Branch: master Commit: 9e4364fccdffe35dc3d578f1d4aa41f98e3ae39f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9e4364fccdffe3… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Apr 2 12:51:38 2019 +0200 Fixed hard coded site id in test Change-Id: I1da3bfc40fec1883d9aa6454359618713b219f74 --- tests/integration/livestatus/test_livestatus.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tests/integration/livestatus/test_livestatus.py b/tests/integration/livestatus/test_livestatus.py index f9d1ac3..8e9465e 100644 --- a/tests/integration/livestatus/test_livestatus.py +++ b/tests/integration/livestatus/test_livestatus.py @@ -55,7 +55,9 @@ def test_host_custom_variables(default_cfg, site): custom_variables, tags = rows[0] assert custom_variables == { u'ADDRESS_FAMILY': u'4', - u'TAGS': u'/wato/ auto-piggyback cmk-agent ip-v4 ip-v4-only lan no-snmp prod site:heute tcp wato', + u'TAGS': + u'/wato/ auto-piggyback cmk-agent ip-v4 ip-v4-only lan no-snmp prod site:%s tcp wato' % + site.id, u'FILENAME': u'/wato/hosts.mk', u'ADDRESS_4': u'127.0.0.1', u'ADDRESS_6': u'', @@ -67,7 +69,7 @@ def test_host_custom_variables(default_cfg, site): u'ip-v4': u'ip-v4', u'networking': u'lan', u'piggyback': u'auto-piggyback', - u'site': u'heute', + u'site': unicode(site.id), u'snmp': u'no-snmp', u'tcp': u'tcp', }

5 years, 3 months

mssql_blocked_sessions: Minor cleanup

by Simon Betz

Module: check_mk Branch: master Commit: 0f51e513ba84d8688ccdb441c74ac59bb9c875dd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0f51e513ba84d8… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue Apr 2 11:59:42 2019 +0200 mssql_blocked_sessions: Minor cleanup Change-Id: Ia2c9296ce348a33d071f64908d116164470109db --- checkman/mssql_blocked_sessions | 3 --- checks/mssql_blocked_sessions | 16 +++++++++------- .../wato/check_parameters/mssql_blocked_sessions.py | 4 +--- .../check_parameters/mssql_instance_blocked_sessions.py | 4 +--- 4 files changed, 11 insertions(+), 16 deletions(-) diff --git a/checkman/mssql_blocked_sessions b/checkman/mssql_blocked_sessions index 076f75d..76f8d64 100644 --- a/checkman/mssql_blocked_sessions +++ b/checkman/mssql_blocked_sessions @@ -11,9 +11,6 @@ description: Alternatively you can configure thresholds for the SQL output "wait_duration_ms". - These two options can {not} be combined. If thresholds are set, - they will have precedence. - This check needs the Check_MK mssql.vbs -plugin installed in the agent. Please refer to the online documentation for how to install that plugin. diff --git a/checks/mssql_blocked_sessions b/checks/mssql_blocked_sessions index 077ef55..aa9426a 100644 --- a/checks/mssql_blocked_sessions +++ b/checks/mssql_blocked_sessions @@ -80,25 +80,27 @@ def check_mssql_blocked_sessions(item, params, parsed): ignored_waittypes.add(db_inst.wait_type) continue - level_info = "" - state = 0 if crit is not None and db_inst.wait_duration >= crit: state = 2 elif warn is not None and db_inst.wait_duration >= warn: state = 1 - if state: - level_info = " (warn/crit at %s/%s)" % (get_age_human_readable(warn), - get_age_human_readable(crit)) + else: + state = 0 summary.setdefault(db_inst.session_id, 0) summary[db_inst.session_id] += 1 - details.append((state, "Session %s blocked by %s (Type: %s, Wait: %s)%s" % \ + details.append((state, "Session %s blocked by %s (Type: %s, Wait: %s)" % \ (db_inst.session_id, db_inst.blocking_session_id, db_inst.wait_type, - get_age_human_readable(db_inst.wait_duration), level_info))) + get_age_human_readable(db_inst.wait_duration)))) if summary: yield params['state'], "Summary: %s" % (", ".join( ["%s blocked by %s ID(s)" % (k, v) for k, v in summary.iteritems()])) + + max_state = max([state for state, _infotext in details]) + if max_state: + yield max_state, 'At least one session above thresholds (warn/crit at %s/%s)' % ( + get_age_human_readable(warn), get_age_human_readable(crit)) for state, infotext in details: yield state, "\n%s" % infotext diff --git a/cmk/gui/plugins/wato/check_parameters/mssql_blocked_sessions.py b/cmk/gui/plugins/wato/check_parameters/mssql_blocked_sessions.py index b831436..ee825c0 100644 --- a/cmk/gui/plugins/wato/check_parameters/mssql_blocked_sessions.py +++ b/cmk/gui/plugins/wato/check_parameters/mssql_blocked_sessions.py @@ -477,9 +477,7 @@ class RulespecCheckgroupParametersMssqlBlockedSessions(CheckParameterRulespecWit elements=[ ("state", MonitoringState( - title=_("State of MSSQL Blocked Sessions is treated as"), - help=_("The default state if there is at least one " - "blocked session."), + title=_("State if at least one blocked session"), default_value=2, )), ("waittime", diff --git a/cmk/gui/plugins/wato/check_parameters/mssql_instance_blocked_sessions.py b/cmk/gui/plugins/wato/check_parameters/mssql_instance_blocked_sessions.py index 3182058..60f71d9 100644 --- a/cmk/gui/plugins/wato/check_parameters/mssql_instance_blocked_sessions.py +++ b/cmk/gui/plugins/wato/check_parameters/mssql_instance_blocked_sessions.py @@ -66,9 +66,7 @@ class RulespecCheckgroupParametersMssqlInstanceBlockedSessions(CheckParameterRul elements=[ ("state", MonitoringState( - title=_("State of MSSQL Blocked Sessions is treated as"), - help=_("The default state if there is at least one " - "blocked session."), + title=_("State if at least one blocked session"), default_value=2, )), ("waittime",

5 years, 3 months

7358 FIX sap_hana_license: Fixed WARNING state of expiration date for unlimited licenses

by Simon Betz

Module: check_mk Branch: master Commit: 58765ac19db1d5f6d90bfe186d51b0749da29802 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=58765ac19db1d5… Author: Simon Betz <si(a)mathias-kettner.de> Date: Mon Apr 1 13:37:00 2019 +0200 7358 FIX sap_hana_license: Fixed WARNING state of expiration date for unlimited licenses Change-Id: I5dd9e44829b819002b7ae815cad34670f9e11864 --- .werks/7358 | 10 ++++++++++ checks/sap_hana_license | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.werks/7358 b/.werks/7358 new file mode 100644 index 0000000..2907e6f --- /dev/null +++ b/.werks/7358 @@ -0,0 +1,10 @@ +Title: sap_hana_license: Fixed WARNING state of expiration date for unlimited licenses +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1554118519 +Class: fix + + diff --git a/checks/sap_hana_license b/checks/sap_hana_license index 90abfe7..3aca5f1 100644 --- a/checks/sap_hana_license +++ b/checks/sap_hana_license @@ -100,7 +100,7 @@ def check_sap_hana_license(item, params, parsed): yield 1, 'not %s' % valid.value expiration_date = data["expiration_date"] - if expiration_date == "?": + if expiration_date != "?": yield 1, 'Expiration date: %s' % expiration_date

5 years, 3 months

Fix integration test after 96e37d8a45c256c3ab08e60a26704600c2989c2c

by Lars Michelsen

Module: check_mk Branch: master Commit: 55135b690e479cf030b109d2b6c04f4536a78884 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=55135b690e479c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Apr 2 11:58:28 2019 +0200 Fix integration test after 96e37d8a45c256c3ab08e60a26704600c2989c2c Change-Id: Icfec89fd0e22cff9f0c1a47030ec626d39000303 --- tests/integration/cmk/gui/test_webapi.py | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/integration/cmk/gui/test_webapi.py b/tests/integration/cmk/gui/test_webapi.py index 055fa57..991ce76 100644 --- a/tests/integration/cmk/gui/test_webapi.py +++ b/tests/integration/cmk/gui/test_webapi.py @@ -318,6 +318,7 @@ def test_write_host_tags(web, site): cfg = { "FOLDER_PATH": "/", "all_hosts": [], + "host_tags": {}, "ipaddresses": {}, "host_attributes": {}, }

5 years, 3 months

Cleaned up ancient entry in gitignore

by Lars Michelsen

Module: check_mk Branch: master Commit: 0cb1e8c494e40354312ffac2e8e00d6799953b4e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0cb1e8c494e403… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Apr 2 11:23:55 2019 +0200 Cleaned up ancient entry in gitignore Change-Id: I3ad5fa438b92d4aaa817571380b7ad350e9686ff --- .gitignore | 2 -- 1 file changed, 2 deletions(-) diff --git a/.gitignore b/.gitignore index 3fbdbbe..ba86fc8 100644 --- a/.gitignore +++ b/.gitignore @@ -41,8 +41,6 @@ depcomp install-sh missing mk-livestatus-*.tar.gz -mkeventd-*.tar.gz -mkeventd/ stamp-h1 tags tests/web/data/*

5 years, 3 months

← Newer
1
...
53
54
55
56
57
58
59
60
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits April 2019