Checkmk git commits January 2018

checkmk-commits@lists.checkmk.com

10 participants
255 discussions

by Sven Panne

Module: check_mk Branch: master Commit: cbb4d3b7304e511a91b85e4941fc36a8d6a53273 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cbb4d3b7304e51… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon Jan 22 15:23:09 2018 +0100 Removed obsolete NOLINTs. Change-Id: I6500d003d8716fece81881c978666f8b9dfb198c --- livestatus/src/LogEntry.cc | 292 ++++++++++++++++++++++----------------------- livestatus/src/Logger.cc | 3 +- 2 files changed, 145 insertions(+), 150 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=cbb4d3b730…

6 years, 7 months

Tests: Not try to clean up versions when no version is installed

by Lars Michelsen

Module: check_mk Branch: master Commit: aac0e510bda6288bca53cc4b66327fa88fa16008 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=aac0e510bda628… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jan 19 19:17:55 2018 +0100 Tests: Not try to clean up versions when no version is installed Change-Id: I5f8dfdfc378af8f3fc216bdfb1160c07423f76b0 --- tests/testlib/__init__.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tests/testlib/__init__.py b/tests/testlib/__init__.py index d5b3570..19612fa 100644 --- a/tests/testlib/__init__.py +++ b/tests/testlib/__init__.py @@ -585,6 +585,9 @@ class Site(object): def cleanup_old_sites(self, cleanup_pattern): + if not os.path.exists("/omd/sites"): + return + for site_id in os.listdir("/omd/sites"): if site_id != self.id and site_id.startswith(cleanup_pattern): print "Cleaning up old site: %s" % site_id

6 years, 8 months

Use artful for windows agent builds - zesty is EOL

by Lars Michelsen

Module: check_mk Branch: master Commit: dd562a095120eac80b3147bc3e3b20b32c620e5d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dd562a095120ea… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jan 19 14:34:52 2018 +0100 Use artful for windows agent builds - zesty is EOL Change-Id: I22933521bba3b26c3a3a822e4660c1c032c84e43 --- agents/windows/make-chroot | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/agents/windows/make-chroot b/agents/windows/make-chroot index d586ec1..9b6824b 100755 --- a/agents/windows/make-chroot +++ b/agents/windows/make-chroot @@ -4,7 +4,7 @@ set -e -DISTRO=zesty +DISTRO=artful MIRROR=http://de.archive.ubuntu.com/ubuntu export HOSTNAME=cmk-windows-agent-chroot

6 years, 8 months

5611 BI rule: Icons can be added below 'Aggregation functions'

by Simon Betz

within any rule configuration which can be used for visual recognition Message-ID: <5a61e2a2.MdeedJfGKQ99lz3e%si(a)mathias-kettner.de> User-Agent: Heirloom mailx 12.5 6/20/10 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Module: check_mk Branch: master Commit: 966cc5a68374a5c77d1dc559188faa1a140a0813 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=966cc5a68374a5… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed Jan 10 10:10:45 2018 +0100 5611 BI rule: Icons can be added below 'Aggregation functions' within any rule configuration which can be used for visual recognition Change-Id: I79d2692eb7586c135e1dfd085b173e3c76eaa14c --- .werks/5611 | 10 ++++++++++ web/htdocs/bi.py | 13 ++++++++++--- web/plugins/wato/bi.py | 14 +++++++++++--- 3 files changed, 31 insertions(+), 6 deletions(-) diff --git a/.werks/5611 b/.werks/5611 new file mode 100644 index 0000000..97a89e9 --- /dev/null +++ b/.werks/5611 @@ -0,0 +1,10 @@ +Title: BI rule: Icons can be added below 'Aggregation functions' within any rule configuration which can be used for visual recognition +Level: 1 +Component: bi +Compatible: compat +Edition: cre +Version: 1.5.0i3 +Date: 1515575152 +Class: feature + + diff --git a/web/htdocs/bi.py b/web/htdocs/bi.py index 356a77c..56344b6 100644 --- a/web/htdocs/bi.py +++ b/web/htdocs/bi.py @@ -1966,6 +1966,7 @@ def compile_aggregation_rule(aggr_type, rule, args, lvl): nodes = rule.get("nodes", []) state_messages = rule.get("state_messages") docu_url = rule.get("docu_url") + icon = rule.get("icon") if lvl == 50: raise MKConfigError(_("BI depth limit reached: " @@ -2076,6 +2077,9 @@ def compile_aggregation_rule(aggr_type, rule, args, lvl): if docu_url: aggregation["docu_url"] = docu_url + if icon: + aggregation["icon"] = icon + # Handle REMAINING references, if we are a root node if lvl == 0: for hostspec, ref, placeholder in g_remaining_refs: @@ -2810,9 +2814,9 @@ def compute_output_message(effective_state, rule): str_state = str(effective_state["state"]) if str_state in rule.get("state_messages", {}): output.append(html.attrencode(rule["state_messages"][str_state])) - return ", ".join(output) + def render_tree_json(row): expansion_level = int(html.var("expansion_level", 999)) @@ -3073,6 +3077,8 @@ class FoldableTreeRendererTree(FoldableTreeRenderer): css_class = "open" if self._is_open(path) else "closed" with self._show_node(tree, show_host, mousecode=mc, img_class=css_class): + if tree[2].get('icon'): + html.write(html.render_icon(tree[2]['icon'])) if tree[2].get("docu_url"): html.icon_button(tree[2]["docu_url"], _("Context information about this rule"), "url", target="_blank") @@ -3678,12 +3684,13 @@ def _convert_legacy_aggregation_rule(rule): # Since version 1.4.0b4 # - werk 4460 introduced 'state_messages'. # Since version 1.5.0i3 - # - werk 5617 introduced 'docu_url' + # - werk 5617 introduced 'docu_url' and + # - werk introduced 'icon'. # zip function: # The returned list is truncated in length to the length of the # shortest argument sequence. return dict(zip(["title", "params", "aggregation", "nodes", - "state_messages", "docu_url"], rule)) + "state_messages", "docu_url", "icon"], rule)) raise MKConfigError(_("Invalid BI aggregation rule: " "Aggregation rules must contain at least four elements: " diff --git a/web/plugins/wato/bi.py b/web/plugins/wato/bi.py index ecc1324..5d578e5 100644 --- a/web/plugins/wato/bi.py +++ b/web/plugins/wato/bi.py @@ -1393,7 +1393,13 @@ class ModeBIRules(ModeBI): table.text_cell(_("Level"), level or "", css="number") table.text_cell(_("ID"), html.render_a(rule_id, edit_url)) table.text_cell(_("Parameters"), " ".join(rule["params"])) - table.text_cell(_("Title"), rule["title"]) + + if rule.get('icon'): + title = html.render_icon(rule["icon"]) + rule["title"] + else: + title = rule["title"] + table.text_cell(_("Title"), title) + table.text_cell(_("Aggregation"), "/".join([rule["aggregation"][0]] + map(str, rule["aggregation"][1]))) table.text_cell(_("Nodes"), len(rule["nodes"]), css="number") table.cell(_("Used by")) @@ -1405,6 +1411,7 @@ class ModeBIRules(ModeBI): html.a(self.aggregation_title(aggregation), href=aggr_url) html.br() have_this.add(aggr_id) + table.text_cell(_("Comment"), rule.get("comment", "")) table.text_cell(_("Documentation URL"), rule.get("docu_url", "")) table.end() @@ -1801,7 +1808,8 @@ class ModeBIEditRule(ModeBI): "check plugins."), label = _("Add messages") ) - ) + ), + ("icon", IconSelector(title=_("Icon"))), ] return Dictionary( @@ -1812,7 +1820,7 @@ class ModeBIEditRule(ModeBI): headers = [ ( _("Rule Properties"), [ "id", "title", "docu_url", "comment", "params", "disabled" ]), ( _("Child Node Generation"), [ "nodes" ] ), - ( _("Aggregation Function"), [ "aggregation", "state_messages" ], ), + ( _("Aggregation Function"), [ "aggregation", "state_messages", "icon" ], ), ] )

6 years, 8 months

5617 BI rule: Documentation-URL is configurable within 'Rule Properties'

by Simon Betz

Module: check_mk Branch: master Commit: a0cafd2a87fb90a7b64419b5607dc58d73e36a65 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a0cafd2a87fb90… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed Jan 17 11:48:15 2018 +0100 5617 BI rule: Documentation-URL is configurable within 'Rule Properties' Change-Id: I36f6cad69cd345111476145e12f72eb08a01c9b0 --- .werks/5617 | 10 ++++++++++ web/htdocs/bi.py | 13 ++++++++++++- web/htdocs/wato.py | 2 +- web/plugins/wato/bi.py | 12 ++++++++++++ 4 files changed, 35 insertions(+), 2 deletions(-) diff --git a/.werks/5617 b/.werks/5617 new file mode 100644 index 0000000..79f9ff0 --- /dev/null +++ b/.werks/5617 @@ -0,0 +1,10 @@ +Title: BI rule: Documentation-URL is configurable within 'Rule Properties' +Level: 1 +Component: bi +Compatible: compat +Edition: cre +Version: 1.5.0i3 +Date: 1516046491 +Class: feature + + diff --git a/web/htdocs/bi.py b/web/htdocs/bi.py index 73e2864..356a77c 100644 --- a/web/htdocs/bi.py +++ b/web/htdocs/bi.py @@ -1965,6 +1965,7 @@ def compile_aggregation_rule(aggr_type, rule, args, lvl): funcname = rule.get("aggregation", "worst") nodes = rule.get("nodes", []) state_messages = rule.get("state_messages") + docu_url = rule.get("docu_url") if lvl == 50: raise MKConfigError(_("BI depth limit reached: " @@ -2072,6 +2073,9 @@ def compile_aggregation_rule(aggr_type, rule, args, lvl): if state_messages: aggregation["state_messages"] = state_messages + if docu_url: + aggregation["docu_url"] = docu_url + # Handle REMAINING references, if we are a root node if lvl == 0: for hostspec, ref, placeholder in g_remaining_refs: @@ -3069,6 +3073,10 @@ class FoldableTreeRendererTree(FoldableTreeRenderer): css_class = "open" if self._is_open(path) else "closed" with self._show_node(tree, show_host, mousecode=mc, img_class=css_class): + if tree[2].get("docu_url"): + html.icon_button(tree[2]["docu_url"], _("Context information about this rule"), + "url", target="_blank") + html.write(" ") html.write_text(tree[2]["title"]) if not is_empty: @@ -3669,10 +3677,13 @@ def _convert_legacy_aggregation_rule(rule): # Rule has at least four entries. # Since version 1.4.0b4 # - werk 4460 introduced 'state_messages'. + # Since version 1.5.0i3 + # - werk 5617 introduced 'docu_url' # zip function: # The returned list is truncated in length to the length of the # shortest argument sequence. - return dict(zip(["title", "params", "aggregation", "nodes", "state_messages"], rule)) + return dict(zip(["title", "params", "aggregation", "nodes", + "state_messages", "docu_url"], rule)) raise MKConfigError(_("Invalid BI aggregation rule: " "Aggregation rules must contain at least four elements: " diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index ad7fd76..4982c96 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -17348,7 +17348,7 @@ def rule_option_elements(disabling=True): ( "comment", RuleComment()), ( "docu_url", TextAscii( - title = _("Documentation-URL"), + title = _("Documentation URL"), help = HTML(_("An optional URL pointing to documentation or any other page. This will be displayed " "as an icon <img class=icon src='images/button_url.png'> and open a new page when clicked. " "You can use either global URLs (beginning with <tt>http://</tt>), absolute local urls " diff --git a/web/plugins/wato/bi.py b/web/plugins/wato/bi.py index 048918c..ecc1324 100644 --- a/web/plugins/wato/bi.py +++ b/web/plugins/wato/bi.py @@ -1406,6 +1406,7 @@ class ModeBIRules(ModeBI): html.br() have_this.add(aggr_id) table.text_cell(_("Comment"), rule.get("comment", "")) + table.text_cell(_("Documentation URL"), rule.get("docu_url", "")) table.end() @@ -1727,6 +1728,17 @@ class ModeBIEditRule(ModeBI): rows = 4, ), ), + ( "docu_url", + TextAscii( + title = _("Documentation URL"), + help = HTML(_("An optional URL pointing to documentation or any other page. This will be " + "displayed as an icon <img class=icon src='images/button_url.png'> and open " + "a new page when clicked. You can use either global URLs (beginning with " + "<tt>http://</tt>), absolute local urls (beginning with <tt>/</tt>) or relative " + "URLs (that are relative to <tt>check_mk/</tt>).")), + size = 80, + ), + ), ( "params", ListOfStrings( title = _("Parameters"),

6 years, 8 months

More build dependencies...

by Sven Panne

Module: check_mk Branch: master Commit: 40f11ce783d2066f18b28370c7c1300d403a535d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=40f11ce783d206… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Jan 19 12:57:17 2018 +0100 More build dependencies... Change-Id: I15f475d925d5cf25505a518a0be202fdfdaa219b --- Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 0c26ee9..367c345 100644 --- a/Makefile +++ b/Makefile @@ -397,6 +397,7 @@ setup: clang-5.0 \ clang-format-5.0 \ clang-tidy-5.0 \ + doxygen \ figlet \ g++ \ libboost-dev \ @@ -406,7 +407,8 @@ setup: librrd-dev \ llvm-5.0-dev \ pngcrush \ - slimit + slimit \ + valgrind $(MAKE) -C tests setup $(MAKE) -C omd setup

6 years, 8 months

checktestlib: Extract tuple representation logic to base class, make it also available to BasicCheckResult

by Konstantin Büttner

Module: check_mk Branch: master Commit: 8fa2d4104172d7ace6972d2409b393655f4d97d9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8fa2d4104172d7… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Fri Jan 19 12:55:44 2018 +0100 checktestlib: Extract tuple representation logic to base class, make it also available to BasicCheckResult Change-Id: Iabbfc8603641d91c438e43409577c4057c0f3463 --- tests/checks/checktestlib.py | 34 +++++++++++++++++++--------------- 1 file changed, 19 insertions(+), 15 deletions(-) diff --git a/tests/checks/checktestlib.py b/tests/checks/checktestlib.py index 6115725..6ab4f8d 100644 --- a/tests/checks/checktestlib.py +++ b/tests/checks/checktestlib.py @@ -1,6 +1,23 @@ import types -class PerfValue(object): +class Tuploid(object): + """Base class for values with variadic tuple representations""" + + def __eq__(self, other_value): + if isinstance(other_value, self.__class__): + return all(x==y for x, y in zip(other_value.tuple, self.tuple)) + elif type(other_value) == tuple: + return all(x==y for x, y in zip(other_value, self.tuple)) + + def __ne__(self, other_value): + return not self.__eq__(other_value) + + @property + def tuple(self): + return (self.key, self.value, self.warn, self.crit, self.minimum, self.maximum) + + +class PerfValue(Tuploid): """Represents a single perf value""" def __init__(self, key, value, warn=None, crit=None, minimum=None, maximum=None): @@ -27,21 +44,8 @@ class PerfValue(object): assert type(maximum) in [int, float, types.NoneType] self.maximum = maximum - def __eq__(self, other_value): - if isinstance(other_value, self.__class__): - return all(x==y for x, y in zip(other_value.tuple, self.tuple)) - elif type(other_value) == tuple: - return all(x==y for x, y in zip(other_value, self.tuple)) - - def __ne__(self, other_value): - return not self.__eq__(other_value) - - @property - def tuple(self): - return (self.key, self.value, self.warn, self.crit, self.minimum, self.maximum) - -class BasicCheckResult(object): +class BasicCheckResult(Tuploid): """ A basic check result

6 years, 8 months

checktestlib.PerfValue: Minor cleanup

by Konstantin Büttner

Module: check_mk Branch: master Commit: 97db169d88d728630be2058a0eec22985510e80f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=97db169d88d728… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Fri Jan 19 12:35:49 2018 +0100 checktestlib.PerfValue: Minor cleanup Change-Id: I67b384a874b87e899b58b88dd92bc09d9611cdba --- tests/checks/checktestlib.py | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/tests/checks/checktestlib.py b/tests/checks/checktestlib.py index e0288f9..6115725 100644 --- a/tests/checks/checktestlib.py +++ b/tests/checks/checktestlib.py @@ -29,14 +29,7 @@ class PerfValue(object): def __eq__(self, other_value): if isinstance(other_value, self.__class__): - return all([ - self.key == other_value.key, - self.value == other_value.value, - self.warn == other_value.warn, - self.crit == other_value.crit, - self.minimum == other_value.minimum, - self.maximum == other_value.maximum, - ]) + return all(x==y for x, y in zip(other_value.tuple, self.tuple)) elif type(other_value) == tuple: return all(x==y for x, y in zip(other_value, self.tuple))

6 years, 8 months

Minor cleanup of getting rule attributes in compile_aggregation_rule and added conversion of old aggregation rules

by Simon Betz

Module: check_mk Branch: master Commit: 4664cf8324347a793d7b0f82cfe83097737f2dca URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4664cf8324347a… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed Jan 17 11:39:54 2018 +0100 Minor cleanup of getting rule attributes in compile_aggregation_rule and added conversion of old aggregation rules Change-Id: I54f77f370a857d2a161afc98f19642161f145d1a --- web/htdocs/bi.py | 105 ++++++++++++++++++++++++++++++------------------------- 1 file changed, 58 insertions(+), 47 deletions(-) diff --git a/web/htdocs/bi.py b/web/htdocs/bi.py index 41d4c23..73e2864 100644 --- a/web/htdocs/bi.py +++ b/web/htdocs/bi.py @@ -1338,7 +1338,6 @@ def compile_forest_improved(only_hosts=None, only_groups=None): return html.set_cache(html_cache_id, "1") - compilation_start_time = time.time() log("###########################################################") log("Query only hosts: %d, only_groups: %d (%r)" % (len(only_hosts or []), len(only_groups or []), only_groups)) @@ -1417,7 +1416,6 @@ def compile_forest(user, only_hosts = None, only_groups = None): compile_forest_improved(only_hosts, only_groups) return - global g_cache, g_tree_cache global used_cache, did_compilation @@ -1962,23 +1960,11 @@ def compile_aggregation_rule(aggr_type, rule, args, lvl): global g_compiled_services_leafes g_compiled_services_leafes = {} - # Convert new dictionary style rule into old tuple based - # format - # TODO: O.o Remove this code, all of it... - if type(rule) == dict: - rule = ( - rule.get("title", _("Untitled BI rule")), - rule.get("params", []), - rule.get("aggregation", "worst"), - rule.get("nodes", []), - rule.get("state_messages") - ) - - if len(rule) != 5: - raise MKConfigError(_("Invalid BI aggregation rule: " - "Aggregation rules must contain four elements: description, argument list, " - "aggregation function and list of nodes. Your rule has %d elements: " - "<pre>%s</pre>") % (len(rule), pprint.pformat(rule))) + description = rule.get("title", _("Untitled BI rule")) + arglist = rule.get("params", []) + funcname = rule.get("aggregation", "worst") + nodes = rule.get("nodes", []) + state_messages = rule.get("state_messages") if lvl == 50: raise MKConfigError(_("BI depth limit reached: " @@ -1986,8 +1972,6 @@ def compile_aggregation_rule(aggr_type, rule, args, lvl): "too many levels or built an infinite recursion. This happened in rule %s") % pprint.pformat(rule)) - description, arglist, funcname, nodes, state_messages = rule - # check arguments and convert into dictionary if len(arglist) != len(args): raise MKConfigError(_("Invalid BI rule usage: " @@ -3638,33 +3622,60 @@ def get_state_name(node): def migrate_bi_configuration(): - def convert_aggregation(aggr_tuple): - if type(aggr_tuple[0]) == dict: - return aggr_tuple # already converted - - options = {} - map_class_to_key = { - config.DISABLED: "disabled", - config.HARD_STATES: "hard_states", - config.DT_AGGR_WARN: "downtime_aggr_warn", - } - for idx, token in enumerate(list(aggr_tuple)): - if token in map_class_to_key: - options[map_class_to_key[token]] = True - else: - aggr_tuple = aggr_tuple[idx:] - break - return (options,) + aggr_tuple - + converted_host_aggregations = [] + converted_aggregations = [] + converted_aggregation_rules = {} if config.bi_packs: for pack in config.bi_packs.values(): - config.aggregations += map(convert_aggregation, pack["aggregations"]) - config.host_aggregations += map(convert_aggregation, pack["host_aggregations"]) - config.aggregation_rules.update(pack["rules"]) + converted_host_aggregations += map(_convert_aggregation, pack["host_aggregations"]) + converted_aggregations += map(_convert_aggregation, pack["aggregations"]) + converted_aggregation_rules.update(pack["rules"]) config.bi_packs = {} - else: - if config.host_aggregations and type(config.host_aggregations[0]) != dict: - config.host_aggregations = map(convert_aggregation, config.host_aggregations) - if config.aggregations and type(config.aggregations[0]) != dict: - config.aggregations = map(convert_aggregation, config.aggregations) + converted_host_aggregations += map(_convert_aggregation, config.host_aggregations) + converted_aggregations += map(_convert_aggregation, config.aggregations) + converted_aggregation_rules.update({rule_id: _convert_legacy_aggregation_rule(rule) + for rule_id, rule in config.aggregation_rules.iteritems()}) + + config.host_aggregations = converted_host_aggregations + config.aggregations = converted_aggregations + config.aggregation_rules = converted_aggregation_rules + + +def _convert_aggregation(aggr_tuple): + if type(aggr_tuple[0]) == dict: + return aggr_tuple # already converted + + options = {} + map_class_to_key = { + config.DISABLED: "disabled", + config.HARD_STATES: "hard_states", + config.DT_AGGR_WARN: "downtime_aggr_warn", + } + for idx, token in enumerate(list(aggr_tuple)): + if token in map_class_to_key: + options[map_class_to_key[token]] = True + else: + aggr_tuple = aggr_tuple[idx:] + break + return (options,) + aggr_tuple + + +def _convert_legacy_aggregation_rule(rule): + if isinstance(rule, dict): + return rule + + if isinstance(rule, tuple) or isinstance(rule, list): + # Rule has at least four entries. + # Since version 1.4.0b4 + # - werk 4460 introduced 'state_messages'. + # zip function: + # The returned list is truncated in length to the length of the + # shortest argument sequence. + return dict(zip(["title", "params", "aggregation", "nodes", "state_messages"], rule)) + + raise MKConfigError(_("Invalid BI aggregation rule: " + "Aggregation rules must contain at least four elements: " + "description, argument list, aggregation function and " + "list of nodes. This rule is <pre>%s</pre>") % \ + pprint.pformat(rule))

6 years, 8 months

statgrab_cpu: Add basic perfdata test

by Konstantin Büttner

Module: check_mk Branch: master Commit: 47f2d9f973b76735bfe544fca278a099a0ce87e9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=47f2d9f973b767… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Fri Jan 19 12:08:25 2018 +0100 statgrab_cpu: Add basic perfdata test Change-Id: I81d00620a8b20fff9984027e623a139ddf1ee003 --- tests/checks/checktestlib.py | 25 ++++++++++++++++--------- tests/checks/test_statgrab_cpu_check.py | 22 +++++++++++++--------- 2 files changed, 29 insertions(+), 18 deletions(-) diff --git a/tests/checks/checktestlib.py b/tests/checks/checktestlib.py index 3a30989..e0288f9 100644 --- a/tests/checks/checktestlib.py +++ b/tests/checks/checktestlib.py @@ -28,18 +28,25 @@ class PerfValue(object): self.maximum = maximum def __eq__(self, other_value): - return all([ - self.key == other_value.key, - self.value == other_value.value, - self.warn == other_value.warn, - self.crit == other_value.crit, - self.minimum == other_value.minimum, - self.maximum == other_value.maximum, - ]) + if isinstance(other_value, self.__class__): + return all([ + self.key == other_value.key, + self.value == other_value.value, + self.warn == other_value.warn, + self.crit == other_value.crit, + self.minimum == other_value.minimum, + self.maximum == other_value.maximum, + ]) + elif type(other_value) == tuple: + return all(x==y for x, y in zip(other_value, self.tuple)) def __ne__(self, other_value): return not self.__eq__(other_value) + @property + def tuple(self): + return (self.key, self.value, self.warn, self.crit, self.minimum, self.maximum) + class BasicCheckResult(object): """ @@ -98,7 +105,7 @@ class CheckResult(object): else: self.subresults = [ BasicCheckResult(*result) ] - # TODO: @property this + @property def perfdata(self): perfdata = [] for subresult in self.subresults: diff --git a/tests/checks/test_statgrab_cpu_check.py b/tests/checks/test_statgrab_cpu_check.py index cfec920..e43b017 100644 --- a/tests/checks/test_statgrab_cpu_check.py +++ b/tests/checks/test_statgrab_cpu_check.py @@ -7,18 +7,21 @@ pytestmark = pytest.mark.checks info_statgrab_cpu_hpux = lambda t: [[u'idle', u'%d' % int(t*5)], - [u'iowait', u'%d' % int(t*10)], - [u'kernel', u'%d' % int(t*10)], - [u'nice', u'%d' % int(t*20)], + [u'iowait', u'%d' % int(t*5)], + [u'kernel', u'%d' % int(t*5)], + [u'nice', u'%d' % int(t*5)], [u'swap', u'0'], - [u'systime', u'%d' % int(t*25)], - [u'total', u'%d' % int(t*100)], - [u'user', u'%d' % int(t*30)]] + [u'systime', u'%d' % int(t*5)], + [u'total', u'%d' % int(t*30)], + [u'user', u'%d' % int(t*5)]] -(a)pytest.mark.parametrize("time_to_info,params,expected_result", [ -(info_statgrab_cpu_hpux, {}, {}), +(a)pytest.mark.parametrize("time_to_info,params,predicate", [ +(info_statgrab_cpu_hpux, {}, lambda cr: ("user", 40.0) in cr.perfdata and # TODO: This only represents the status quo - check whether this even makes sense. + ("system", 20.0) in cr.perfdata and # Note that systime and total are being ignored entirely by the check. + ("wait", 20.0) in cr.perfdata + ), ]) -def test_statgrab_cpu_check(check_manager, monkeypatch, time_to_info, params, expected_result): +def test_statgrab_cpu_check(check_manager, monkeypatch, time_to_info, params, predicate): import time check = check_manager.get_check("statgrab_cpu") try: @@ -27,3 +30,4 @@ def test_statgrab_cpu_check(check_manager, monkeypatch, time_to_info, params, ex pass monkeypatch.setattr("time.time", lambda: 60) result = checktestlib.CheckResult(check.run_check(None, params, time_to_info(60))) + assert predicate(result)

6 years, 8 months

← Newer
1
...
9
10
11
12
13
14
15
...
26
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits January 2018