Checkmk git commits January 2019

checkmk-commits@lists.checkmk.com

15 participants
490 discussions

by Óscar Nájera

Module: check_mk Branch: master Commit: 0bc0f8efd9c9a0f07be1e6cfe55ee65278a984f0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0bc0f8efd9c9a0… Author: Óscar Nájera <on(a)mathias-kettner.de> Date: Wed Jan 23 18:11:31 2019 +0100 if.include review - ordering in infotext - avoid repetition in infotext - types in perfdata - Test cases - Remove old pnp-templates, prefer current graphing system Change-Id: Ibfdc21c7d35cd87eee03b1caee541b60bf132c94 --- checks/if.include | 30 +-- pnp-templates/check_mk-esx_vsphere_counters.if.php | 1 - pnp-templates/check_mk-fritz.wan_if.php | 1 - pnp-templates/check_mk-hitachi_hnas_fc_if.php | 1 - pnp-templates/check_mk-hpux_if.php | 1 - pnp-templates/check_mk-if.php | 226 --------------------- pnp-templates/check_mk-if64.php | 1 - pnp-templates/check_mk-if64_tplink.php | 1 - pnp-templates/check_mk-if64adm.php | 1 - pnp-templates/check_mk-if_lancom.php | 1 - pnp-templates/check_mk-lnx_if.php | 1 - pnp-templates/check_mk-mcdata_fcport.php | 1 - pnp-templates/check_mk-netapp_api_if.php | 1 - pnp-templates/check_mk-statgrab_net.php | 1 - pnp-templates/check_mk-ucs_bladecenter_if.php | 1 - pnp-templates/check_mk-vms_if.php | 1 - pnp-templates/check_mk-winperf_if.php | 1 - tests/unit/checks/test_lnx_if.py | 103 ++++++++++ 18 files changed, 119 insertions(+), 255 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=0bc0f8efd9…

5 years, 8 months

move agent_azure_args to agent_azure for consistency

by Moritz Kiemer

Module: check_mk Branch: master Commit: 4b52885d2e68bb06efedf36c9ce1dcef09c2919c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4b52885d2e68bb… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Fri Jan 25 07:13:48 2019 +0100 move agent_azure_args to agent_azure for consistency Change-Id: Icbb1dc990112bdbf3c603dfe447a053e30df92da --- checks/{agent_azure_args => agent_azure} | 0 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/checks/agent_azure_args b/checks/agent_azure similarity index 100% rename from checks/agent_azure_args rename to checks/agent_azure

5 years, 8 months

7055 FIX jolokia_generic: remove duplicate MBean in item

by Tom Baerwinkel

Module: check_mk Branch: master Commit: 6fe88ecd7b14c53f7d36b95915788b954d08de71 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6fe88ecd7b14c5… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Fri Jan 25 09:33:14 2019 +0100 7055 FIX jolokia_generic: remove duplicate MBean in item Werk 6901 introduced an additional word "MBean" in the item of jolokia_generic checks. This changed the service description to "MBean text1 MBean text2". This werk reintroduces the old service description "MBean text1 text2". If you have services that contain two times the word "MBean" a service rediscovery is necessary to obtain the old format. Change-Id: I11710413f52e2a6ce2e720377c25814a83ccff4b --- .werks/7055 | 17 ++++++++++++++++ checks/jolokia_generic | 2 +- .../generictests/datasets/jolokia_generic.py | 18 ++++++++--------- tests/unit/checks/test_jolokia_generic.py | 23 ++++++++++++++++++++++ 4 files changed, 50 insertions(+), 10 deletions(-) diff --git a/.werks/7055 b/.werks/7055 new file mode 100644 index 0000000..20ccb96 --- /dev/null +++ b/.werks/7055 @@ -0,0 +1,17 @@ +Title: jolokia_generic: remove duplicate MBean in item +Level: 1 +Component: checks +Class: fix +Compatible: incomp +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1548350120 + +Werk 6901 introduced an additional word "MBean" in the item of +jolokia_generic checks. This changed the service description +to "MBean text1 MBean text2". This werk reintroduces the old +service description "MBean text1 text2". + +If you have services that contain two times the word "MBean" +a service rediscovery is necessary to obtain the old format. diff --git a/checks/jolokia_generic b/checks/jolokia_generic index 800b7c4..924c765 100644 --- a/checks/jolokia_generic +++ b/checks/jolokia_generic @@ -32,7 +32,7 @@ def parse_jolokia_generic(info): instance, mbean, value, type_ = jolokia_basic_split(line, 4) except ValueError: continue - item = "%s MBean %s" % (instance, mbean) + item = "%s %s" % (instance, mbean) parsed[item] = {"value": value, "type": type_} return parsed diff --git a/tests/unit/checks/generictests/datasets/jolokia_generic.py b/tests/unit/checks/generictests/datasets/jolokia_generic.py index 989df71..eae344f 100644 --- a/tests/unit/checks/generictests/datasets/jolokia_generic.py +++ b/tests/unit/checks/generictests/datasets/jolokia_generic.py @@ -15,9 +15,9 @@ info = [ discovery = { '': [ - ('Instance1 MBean Mitglieder_Anzahl', {}), - ('Instance2 MBean Mitglieder Anzahl', {}), - ('JIRA,com.atlassian.jira:type=web.requests,invocation.count MBean jira.value', {}), + ('Instance1 Mitglieder_Anzahl', {}), + ('Instance2 Mitglieder Anzahl', {}), + ('JIRA,com.atlassian.jira:type=web.requests,invocation.count jira.value', {}), ], 'rate': [], 'string': [] @@ -25,13 +25,13 @@ discovery = { checks = { '': [ - ('Instance1 MBean Mitglieder_Anzahl', {}, - [(0, '-23.0', [('generic_number', -23.0, None, None, None, None)])]), - ('Instance2 MBean Mitglieder Anzahl', {}, - [(0, '-23.0', [('generic_number', -23.0, None, None, None, None)])]), - ('JIRA,com.atlassian.jira:type=web.requests,invocation.count MBean jira.name', {}, + ('Instance1 Mitglieder_Anzahl', {}, [(0, '-23.0', [('generic_number', -23.0, None, None, + None, None)])]), + ('Instance2 Mitglieder Anzahl', {}, [(0, '-23.0', [('generic_number', -23.0, None, None, + None, None)])]), + ('JIRA,com.atlassian.jira:type=web.requests,invocation.count jira.name', {}, [(3, "Non-numeric MBean value", [])]), - ('JIRA,com.atlassian.jira:type=web.requests,invocation.count MBean jira.value', {}, + ('JIRA,com.atlassian.jira:type=web.requests,invocation.count jira.value', {}, [(0, "2624460.0", [('generic_number', 2624460.0, None, None, None, None)])]), ] } diff --git a/tests/unit/checks/test_jolokia_generic.py b/tests/unit/checks/test_jolokia_generic.py new file mode 100644 index 0000000..29c065e --- /dev/null +++ b/tests/unit/checks/test_jolokia_generic.py @@ -0,0 +1,23 @@ +import pytest +from checktestlib import assertDiscoveryResultsEqual, DiscoveryResult + +pytestmark = pytest.mark.checks + +info = [[u'PingFederate-CUK-CDI', u'TotalRequests', u'64790', u'number'], + [u'PingFederate-CUK-CDI', u'MaxRequestTime', u'2649', u'rate']] + + +(a)pytest.mark.parametrize("check,info,expected_result", [ + ('jolokia_generic', info, [(u'PingFederate-CUK-CDI TotalRequests', {})]), + ('jolokia_generic.rate', info, [(u'PingFederate-CUK-CDI MaxRequestTime', {})]), +]) +def test_jolokia_generic_discovery(check_manager, check, info, expected_result): + parsed = check_manager.get_check('jolokia_generic').run_parse(info) + + check = check_manager.get_check(check) + discovered = check.run_discovery(parsed) + assertDiscoveryResultsEqual( + check, + DiscoveryResult(discovered), + DiscoveryResult(expected_result), + )

5 years, 8 months

Refactored multisite_filters to plugin registry

by Lars Michelsen

Module: check_mk Branch: master Commit: b8839922f79e49ef093ae443521fdeb941fb2c39 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b8839922f79e49… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jan 21 14:53:20 2019 +0100 Refactored multisite_filters to plugin registry Change-Id: I858e8a6242db42f0c4b2705a98199104c4b2467b --- cmk/gui/bi.py | 10 +- cmk/gui/plugins/dashboard/stats.py | 3 +- cmk/gui/plugins/views/inventory.py | 76 +- cmk/gui/plugins/visuals/__init__.py | 4 +- cmk/gui/plugins/visuals/filters.py | 3204 ++++++++++++++++++++++++-------- cmk/gui/plugins/visuals/inventory.py | 240 ++- cmk/gui/plugins/visuals/utils.py | 151 +- cmk/gui/plugins/visuals/wato.py | 36 +- cmk/gui/views.py | 2 +- cmk/gui/visuals.py | 23 +- tests/unit/cmk/gui/test_visuals.py | 3396 ++++++++++++++++++++++++++++++++++ 11 files changed, 6196 insertions(+), 949 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=b8839922f7…

5 years, 8 months

Splitted up rulespec classes into several special classes

by Lars Michelsen

Module: check_mk Branch: master Commit: cdcbb0f64dc7aa19401b030af597532492143374 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cdcbb0f64dc7aa… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jan 24 13:13:32 2019 +0100 Splitted up rulespec classes into several special classes Depending on the type of base class the specific ruleet class needs to override another subset of properties. This makes things a little more explicit. * HostRulespec / ServiceRulespec: Managing the specification of a host or service ruleset that computes a value. * BinaryHostRulespec / BinaryServiceRulespec: Managing the specification of a host or service ruleset that computes a binary value for a host or service However, the single attributes all need to be checked and probably cleaned up. CMK-1572 Change-Id: I8f68a2f9e3f34d126efeb43c5c84497ef1483880 --- cmk/gui/plugins/wato/__init__.py | 4 + cmk/gui/plugins/wato/check_mk_configuration.py | 156 +++++++++--------- cmk/gui/plugins/wato/utils/__init__.py | 5 + cmk/gui/watolib/rulespecs.py | 212 ++++++++++++++++++++----- tests/unit/cmk/gui/watolib/test_rulespecs.py | 39 +++-- 5 files changed, 275 insertions(+), 141 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=cdcbb0f64d…

5 years, 8 months

Moved rulespec group specific methods from Rulespecs class to rulespec_group_registry

by Lars Michelsen

Module: check_mk Branch: master Commit: 1a7d83f01a3494e314eca0cb6545d631aa7bfc47 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1a7d83f01a3494… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jan 23 11:15:42 2019 +0100 Moved rulespec group specific methods from Rulespecs class to rulespec_group_registry CMK-1572 Change-Id: Ia330aebdb497a27c2190f1eb1f825ba5ac50e1f1 --- cmk/gui/wato/pages/object_parameters.py | 3 +- cmk/gui/wato/pages/rulesets.py | 12 ++- cmk/gui/watolib/rulesets.py | 7 +- cmk/gui/watolib/rulespecs.py | 143 +++++++++++++++------------ tests/unit/cmk/gui/watolib/test_rulespecs.py | 59 ++++++++--- 5 files changed, 141 insertions(+), 83 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=1a7d83f01a…

5 years, 8 months

Rulespec refers to groups by class references now

by Lars Michelsen

Module: check_mk Branch: master Commit: 3d0ef79373bd31486844c6fc2a10a2db61241f69 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3d0ef79373bd31… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jan 23 20:56:36 2019 +0100 Rulespec refers to groups by class references now CMK-1572 Change-Id: I107d0e3de84652da99b6aca39d7e0ad2a478a32a --- cmk/gui/plugins/wato/__init__.py | 2 ++ cmk/gui/plugins/wato/utils/__init__.py | 10 ++++++--- cmk/gui/watolib/rulespecs.py | 32 ++++++++++++---------------- tests/unit/cmk/gui/watolib/test_rulespecs.py | 2 +- 4 files changed, 24 insertions(+), 22 deletions(-) diff --git a/cmk/gui/plugins/wato/__init__.py b/cmk/gui/plugins/wato/__init__.py index 55a991f..6d8954e 100644 --- a/cmk/gui/plugins/wato/__init__.py +++ b/cmk/gui/plugins/wato/__init__.py @@ -97,6 +97,8 @@ from cmk.gui.plugins.wato.utils import ( register_modules, register_notification_parameters, register_rule, + rulespec_registry, + Rulespec, rulespec_group_registry, RulespecGroup, RulespecSubGroup, diff --git a/cmk/gui/plugins/wato/utils/__init__.py b/cmk/gui/plugins/wato/utils/__init__.py index 89b0f60..202af92 100644 --- a/cmk/gui/plugins/wato/utils/__init__.py +++ b/cmk/gui/plugins/wato/utils/__init__.py @@ -116,6 +116,13 @@ from cmk.gui.watolib.password_store import PasswordStore from cmk.gui.watolib.host_tags import group_hosttags_by_topic from cmk.gui.watolib.timeperiods import TimeperiodSelection from cmk.gui.watolib.users import notification_script_title +from cmk.gui.watolib.rulespecs import ( + rulespec_registry, + Rulespec, + rulespec_group_registry, + RulespecGroup, + RulespecSubGroup, +) from cmk.gui.watolib import ( multisite_dir, wato_root_dir, @@ -125,9 +132,6 @@ from cmk.gui.watolib import ( wato_fileheader, add_change, log_audit, - rulespec_group_registry, - RulespecGroup, - RulespecSubGroup, get_rulegroup, register_rule, declare_host_attribute, diff --git a/cmk/gui/watolib/rulespecs.py b/cmk/gui/watolib/rulespecs.py index 5bed91d..3d26bc7 100644 --- a/cmk/gui/watolib/rulespecs.py +++ b/cmk/gui/watolib/rulespecs.py @@ -271,20 +271,24 @@ class Rulespec(object): # type: () -> str raise NotImplementedError() - # TODO: Refactor to group object access @abc.abstractproperty - def group_name(self): - # type: () -> str + def group(self): + # type: () -> Type[RulespecGroup] raise NotImplementedError() @property + def group_name(self): + # type: () -> Text + return self.group().name + + @property def main_group_name(self): - # type: () -> str + # type: () -> Text return self.group_name.split("/")[0] @property def sub_group_name(self): - # type: () -> str + # type: () -> Text return self.group_name.split("/")[1] if "/" in self.group_name else "" @property @@ -372,14 +376,12 @@ def register_rule( **kwargs): factory_default = kwargs.get("factory_default", Rulespec.NO_FACTORY_DEFAULT) - # Added during 1.6 development for easier transition. Is not needed for - # pre 1.6 compatibility - if not isinstance(group, six.string_types) and issubclass(group, RulespecBaseGroup): - group = group().name + if isinstance(group, six.string_types): + group = get_rulegroup(group).__class__ class_attrs = { "name": varname, - "group_name": group, + "group": group, "valuespec": valuespec, "item_spec": itemspec, "item_type": itemtype, @@ -393,16 +395,10 @@ def register_rule( } if title: - class_attrs.update({ - "_title": title, - "title": property(lambda self: self._title), - }) + class_attrs["title"] = title if help: - class_attrs.update({ - "_help": help, - "help": property(lambda self: self._help), - }) + class_attrs["help"] = help rulespec_class = type("LegacyRulespec%s" % varname, (Rulespec,), class_attrs) rulespec_registry.register(rulespec_class) diff --git a/tests/unit/cmk/gui/watolib/test_rulespecs.py b/tests/unit/cmk/gui/watolib/test_rulespecs.py index e68af13..cc33375 100644 --- a/tests/unit/cmk/gui/watolib/test_rulespecs.py +++ b/tests/unit/cmk/gui/watolib/test_rulespecs.py @@ -1508,7 +1508,7 @@ class DummyGroup(RulespecGroup): class DummyRulespec(Rulespec): name = "name" - group_name = "group" + group = DummyGroup valuespec = FixedValue(None) item_spec = None item_type = None

5 years, 8 months

Add test to support rulespec registration migration

by Lars Michelsen

Module: check_mk Branch: master Commit: d0f470a0f92773f41a3d3ddf9534d1e25b538e76 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d0f470a0f92773… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jan 23 21:48:05 2019 +0100 Add test to support rulespec registration migration CMK-1572 Change-Id: I7c86c4f08c2772cf32910d73fa5925c9aad6f9e1 --- tests/unit/cmk/gui/watolib/test_rulespecs.py | 15862 +++++++++++++++++++++++++ 1 file changed, 15862 insertions(+) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=d0f470a0f9…

5 years, 8 months

Additional rulespec logic cleanups

by Lars Michelsen

Module: check_mk Branch: master Commit: 294afb4605006857105ede65a2aad0366791a5ac URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=294afb46050068… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jan 23 16:55:10 2019 +0100 Additional rulespec logic cleanups * Moved get_by_group() from Rulespecs() to rulespec_registry * Removed get_rulespecs() method and replaced call sites with keys iteration * Removed get_rulespecs() method and replaced call sites with item access * Removed get() method and replaced calls with direct item access * Register rulespecs to rulespec_registry * Fixed compatibility to legacy registration * Finally removed g_rulespecs and Rulespecs class * Made Rulespec() a ABC for all future rulespec declarations CMK-1572 Change-Id: I8f6c72d15785a344d2b9562fb37e249fa3a90514 --- cmk/gui/wato/pages/check_catalog.py | 48 +++--- cmk/gui/wato/pages/object_parameters.py | 19 ++- cmk/gui/wato/pages/rulesets.py | 9 +- cmk/gui/wato/pages/services.py | 49 +++--- cmk/gui/watolib/__init__.py | 2 - cmk/gui/watolib/rulesets.py | 10 +- cmk/gui/watolib/rulespecs.py | 222 ++++++++++++++++----------- tests/unit/cmk/gui/watolib/test_rulespecs.py | 125 +++++++-------- 8 files changed, 265 insertions(+), 219 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=294afb4605…

5 years, 8 months

Migrated some register_rule() calls to plugin registry

by Lars Michelsen

Module: check_mk Branch: master Commit: b2cebe2a384da5f64553c85b3f0c8033e57e8dd5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b2cebe2a384da5… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jan 24 08:26:00 2019 +0100 Migrated some register_rule() calls to plugin registry CMK-1572 Change-Id: I39757e9caef2dd8554f9a52a3b9df173e4b07999 --- cmk/gui/plugins/wato/check_mk_configuration.py | 3446 +++++++++++++++--------- tests/unit/cmk/gui/watolib/test_rulespecs.py | 2 +- 2 files changed, 2168 insertions(+), 1280 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=b2cebe2a38…

5 years, 8 months

← Newer
1
...
8
9
10
11
12
13
14
...
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