Checkmk git commits November 2016

checkmk-commits@lists.checkmk.com

9 participants
299 discussions

by Simon Betz

Module: check_mk Branch: master Commit: 9d6cd1aec9e35ffe4c5f8ef18d32a1a5fd545a4c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9d6cd1aec9e35f… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed Nov 30 18:38:55 2016 +0100 more readable code --- web/htdocs/wato.py | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 98648c1..4c37c7e 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -15068,11 +15068,11 @@ def mode_check_plugins(phase): # the global settings. if topic and not search: - render_manpage_topic(manpages, titles, has_second_level, path, topic_title) + render_manpage_topic( manpages, titles, has_second_level, path, topic_title ) elif search: - for path, manpages in get_manpages_after_search(manpages, search): - render_manpage_list(manpages, titles, path, titles.get(path, path)) + for path, manpages in get_manpages_after_search( manpages, search ): + render_manpage_list( manpages, titles, path, titles.get( path, path ) ) else: menu_items = [] @@ -15082,30 +15082,32 @@ def mode_check_plugins(phase): render_main_menu(menu_items) -def get_manpages_after_search(manpages, search): +def get_manpages_after_search( manpages, search ): this_search = search collection = {} # searches in {"name" : "asd", "title" : "das", ...} def get_matched_entry( entry ): - if type(entry) == dict: - name = entry.get("name", "") - if type(name) == str: - name = name.decode("utf8") - title = entry.get("title", "") - if type(title) == str: - title = title.decode("utf8") + if type( entry ) == dict: + name = entry.get( "name", "" ) + if type( name ) == str: + name = name.decode( "utf8" ) + + title = entry.get( "title", "" ) + if type( title ) == str: + title = title.decode( "utf8" ) if this_search in name.lower() or this_search in title.lower(): return entry + return None def check_entries( key, entries ): - if type(entries) == list: + if type( entries ) == list: these_matches = [] for entry in entries: - match = get_matched_entry(entry) + match = get_matched_entry( entry ) if match: - these_matches.append(match) + these_matches.append( match ) if these_matches: collection.setdefault( key, [] )

7 years, 6 months

3997 New metric for check_icmp

by Andreas Boesl

Module: check_mk Branch: master Commit: fd61a4c9a3e58137bdd1c079d70c3a81aeaa8b26 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fd61a4c9a3e581… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Nov 30 17:05:34 2016 +0100 3997 New metric for check_icmp This metric may be required by an check_icmp plugin configured as mrpe check. --- .werks/3997 | 2 +- ChangeLog | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.werks/3997 b/.werks/3997 index b32fc8a..b49eaef 100644 --- a/.werks/3997 +++ b/.werks/3997 @@ -1,4 +1,4 @@ -Title: New metric for check_icmp +Title: New metric for mrpe/check_icmp Level: 1 Component: multisite Compatible: compat diff --git a/ChangeLog b/ChangeLog index de65da4..f5492e3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -44,7 +44,7 @@ * 4095 new filter host auxiliary tags * 4106 new filter host/service-service-level... * 4107 Now you are able to search for check plugins - * 3997 New metric for check_icmp... + * 3997 New metric for mrpe/check_icmp... * 3974 FIX: Sorting comments in hover menu of comments icon by time now * 4040 FIX: Fix error in view about "No WATO folder ..." in case of host imported via cmcdump... * 4046 FIX: Repaired html rendering....

7 years, 6 months

3997 New metric for check_icmp

by Andreas Boesl

Module: check_mk Branch: master Commit: 6028cc12fbd6d3ed5cbc4957dee8d663b0e6af99 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6028cc12fbd6d3… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Nov 30 17:05:34 2016 +0100 3997 New metric for check_icmp This metric may be required by an check_icmp plugin configured as mrpe check. --- .werks/3997 | 9 +++++++++ ChangeLog | 1 + web/plugins/metrics/check_mk.py | 7 +++++++ 3 files changed, 17 insertions(+) diff --git a/.werks/3997 b/.werks/3997 new file mode 100644 index 0000000..b32fc8a --- /dev/null +++ b/.werks/3997 @@ -0,0 +1,9 @@ +Title: New metric for check_icmp +Level: 1 +Component: multisite +Compatible: compat +Version: 1.4.0i3 +Date: 1480521650 +Class: feature + +This metric may be required by an check_icmp plugin configured as mrpe check. diff --git a/ChangeLog b/ChangeLog index 12ea4d3..de65da4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -44,6 +44,7 @@ * 4095 new filter host auxiliary tags * 4106 new filter host/service-service-level... * 4107 Now you are able to search for check plugins + * 3997 New metric for check_icmp... * 3974 FIX: Sorting comments in hover menu of comments icon by time now * 4040 FIX: Fix error in view about "No WATO folder ..." in case of host imported via cmcdump... * 4046 FIX: Repaired html rendering.... diff --git a/web/plugins/metrics/check_mk.py b/web/plugins/metrics/check_mk.py index 0127824..aef51ac 100644 --- a/web/plugins/metrics/check_mk.py +++ b/web/plugins/metrics/check_mk.py @@ -3789,6 +3789,13 @@ check_metrics["check_mk_active-icmp"] = { "rtmin" : { "scale" : m }, } +# This metric is not for an official Check_MK check +# It may be provided by an check_icmp check configured as mrpe +check_metrics["check_icmp"] = { + "rta" : { "scale" : m }, + "rtmax" : { "scale" : m }, + "rtmin" : { "scale" : m }, +} check_metrics["check-mk-host-ping"] = { "rta" : { "scale" : m },

7 years, 6 months

netapp_api_luns: fixed invalid default levels variable

by Andreas Boesl

Module: check_mk Branch: master Commit: 66bba7eeb4cb64093d4f2b43caf1bb7c67e67579 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=66bba7eeb4cb64… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Nov 30 16:37:54 2016 +0100 netapp_api_luns: fixed invalid default levels variable --- checks/netapp_api_luns | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/checks/netapp_api_luns b/checks/netapp_api_luns index bad6515..285166a 100644 --- a/checks/netapp_api_luns +++ b/checks/netapp_api_luns @@ -27,6 +27,12 @@ # <<<netapp_api_luns:sep(9)>>> # lun /vol/iscsi_crm_dblogs/crm_dblogs_lu01 read-only false size 644286182400 vserver ISCSI_CRM size-used 538924421120 online true volume iscsi_crm_dblogs +factory_settings["netapp_api_luns_default_levels"] = { + "levels" : (80.0, 90.0), # warn/crit in percent + "trend_range" : 24, + "trend_perfdata" : True, # do send performance data for trends +} + def inventory_netapp_api_luns(parsed): for lun in parsed.keys(): yield lun, {} @@ -65,5 +71,5 @@ check_info["netapp_api_luns"] = { 'has_perfdata' : True, 'group' : "netapp_luns", 'includes' : [ "df.include", "netapp_api.include" ], - "default_levels_variable" : "filesystem_default_levels", + "default_levels_variable" : "netapp_api_luns_default_levels", }

7 years, 6 months

Tests: Write out executed commands in all cases, do not suppress output anymore

by Lars Michelsen

Module: check_mk Branch: master Commit: 3fddbc6bee16920f30745f23fa04281c5cf61981 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3fddbc6bee1692… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Nov 30 16:18:02 2016 +0100 Tests: Write out executed commands in all cases, do not suppress output anymore --- tests/testlib/__init__.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/testlib/__init__.py b/tests/testlib/__init__.py index 8cbe151..eceb571 100644 --- a/tests/testlib/__init__.py +++ b/tests/testlib/__init__.py @@ -47,7 +47,9 @@ def var_dir(): def omd(cmd): - return os.system(" ".join(["sudo", "/usr/bin/omd"] + cmd + [">/dev/null"])) >> 8 + cmdline = " ".join(["sudo", "/usr/bin/omd"] + cmd) + print "Executing: %s" % cmdline + return os.system(cmdline) >> 8 # It's ok to make it currently only work on debian based distros

7 years, 6 months

Fixed .f12 deployment of bin, cmk_base, cmk during integration tests

by Lars Michelsen

Module: check_mk Branch: master Commit: 3a91f4c3a3d15a3a3873b0651721d80e33d6057b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3a91f4c3a3d15a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Nov 30 16:21:15 2016 +0100 Fixed .f12 deployment of bin, cmk_base, cmk during integration tests --- tests/testlib/__init__.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/testlib/__init__.py b/tests/testlib/__init__.py index eceb571..3dd9cd5 100644 --- a/tests/testlib/__init__.py +++ b/tests/testlib/__init__.py @@ -232,10 +232,10 @@ class Site(object): def _update_with_f12_files(self): paths = [ - cmc_path() + "/bin", + cmk_path() + "/bin", cmk_path() + "/modules", - cmc_path() + "/cmk_base", - cmc_path() + "/cmk", + cmk_path() + "/cmk_base", + cmk_path() + "/cmk", cmk_path() + "/checks", cmk_path() + "/checkman", cmk_path() + "/web",

7 years, 6 months

fixed undefined var

by Simon Betz

Module: check_mk Branch: master Commit: 45b77cf2f082b7e2803a9e46a089c728740ad7eb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=45b77cf2f082b7… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed Nov 30 15:58:04 2016 +0100 fixed undefined var --- checks/ipmi_sensors | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checks/ipmi_sensors b/checks/ipmi_sensors index b92ff59..ae20319 100644 --- a/checks/ipmi_sensors +++ b/checks/ipmi_sensors @@ -162,7 +162,7 @@ def parse_freeipmi(info): lower_nc, upper_nc, upper_c, upper_nr = stripped_line[:-1] add_valid_values( [ ("value", reading_str, float), ("unit", unit, str), ("crit_low", lower_c, float), ("warn_low", lower_nc, float), - ("warn_high", upper_nw, float), ("crit_high", upper_c, float) ] ) + ("warn_high", upper_nc, float), ("crit_high", upper_c, float) ] ) return parsed

7 years, 6 months

4108 ipmi_sensors: new options available

by Simon Betz

Module: check_mk Branch: master Commit: a4dafd898231d9d762e0fa0f6399742084468570 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a4dafd898231d9… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed Nov 30 15:52:39 2016 +0100 4108 ipmi_sensors: new options available The special agent ipmi_sensors has now further options: <ul> <li>Specify IPMI driver.</li> <li>Do not output information about cache creation/deletion.</li> <li>Automatically recreate the sensor data repository (SDR) cache.</li> <li>Attempt to interpret OEM data.</li> <li>Output sensor state in output.</li> <li>Ignore not-available (i.e. N/A) sensors in output.</li> <li>Specify the driver type to use instead of doing an auto selection.</li> <li>Output sensor thresholds in output.</li> <li>Specify the K_g BMC key to use when authenticating with the remote host for IPMI 2.0.</li> </ul> --- .werks/4108 | 20 +++ ChangeLog | 1 + agents/special/agent_ipmi_sensors | 207 +++++++++++++++++++------------- checks/agent_ipmi_sensors | 30 ++++- checks/ipmi_sensors | 45 +++++-- web/plugins/wato/datasource_programs.py | 27 ++++- 6 files changed, 226 insertions(+), 104 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=a4dafd8982…

7 years, 6 months

3996 agent_netapp clustermode: now uses a fallback query to determine the node name if the intial query fails

by Andreas Boesl

Module: check_mk Branch: master Commit: 3c24b9797486e9e5378a804086a2eaf70194820c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3c24b9797486e9… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Nov 30 15:41:31 2016 +0100 3996 agent_netapp clustermode: now uses a fallback query to determine the node name if the intial query fails --- .werks/3996 | 9 +++++++++ ChangeLog | 1 + agents/special/agent_netapp | 17 +++++++++++++++-- 3 files changed, 25 insertions(+), 2 deletions(-) diff --git a/.werks/3996 b/.werks/3996 new file mode 100644 index 0000000..96ffcbb --- /dev/null +++ b/.werks/3996 @@ -0,0 +1,9 @@ +Title: agent_netapp clustermode: now uses a fallback query to determine the node name if the intial query fails +Level: 1 +Component: checks +Compatible: compat +Version: 1.4.0i3 +Date: 1480516853 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index cf6575f..f27c983 100644 --- a/ChangeLog +++ b/ChangeLog @@ -15,6 +15,7 @@ * 4116 mk_oracle.ps1: added Oracle wallet support to Windows plugin... * 3995 skype check: updated perfvariable and metric names, making their purpose more clear... NOTE: Please refer to the migration notes! + * 3996 agent_netapp clustermode: now uses a fallback query to determine the node name if the intial query fails * 3987 FIX: Check_MK Agent Access: Windows agent reported incorrect only from value * 3952 FIX: diskstat: fixed bug if multipath devices having an alias... * 3939 FIX: f5_bigip_conns: readded performance data and graphs... diff --git a/agents/special/agent_netapp b/agents/special/agent_netapp index a3b7960..2f1d3a4 100755 --- a/agents/special/agent_netapp +++ b/agents/special/agent_netapp @@ -559,13 +559,26 @@ def query_nodes(what, node_attribute = "node-name"): results["%s.%s" % (what, node)] = response else: if not nodes: + # This query may fail for unknown reasons. Some clustermode systems report 0 results response = server.get_response(["system-get-node-info-iter", []]) if response.results_status() == "failed": return + nodename_field = "system-name" + attr_list = response.get_results().child_get("attributes-list") + + # Fallback query to determine the available node names + if not attr_list: + response = server.get_response(["system-node-get-iter", []]) + if response.results_status() == "failed": + return + + attr_list = response.get_results().child_get("attributes-list") + nodename_field = "node" + nodes = [] - for instance in response.get_results().child_get("attributes-list").children_get(): - nodes.append(instance.child_get_string("system-name")) + for instance in attr_list.children_get(): + nodes.append(instance.child_get_string(nodename_field)) results = {} for node in nodes:

7 years, 6 months

agent_netapp: increased max-records when querying configurations -> less server requests sent

by Andreas Boesl

Module: check_mk Branch: master Commit: 016b3b135e7f5ff3d2c0e0dfff75606926d458e9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=016b3b135e7f5f… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Nov 30 14:48:00 2016 +0100 agent_netapp: increased max-records when querying configurations -> less server requests sent --- agents/special/agent_netapp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/agents/special/agent_netapp b/agents/special/agent_netapp index 65605e2..a3b7960 100755 --- a/agents/special/agent_netapp +++ b/agents/special/agent_netapp @@ -596,10 +596,10 @@ def query(what, return_toplevel_node = False): section_errors.append("In class %s: %s" % (what, results.results_reason())) return else: - record_size = "80" + max_records = "2000" if isinstance(what, str): if what.endswith("iter"): - response = server.get_response([what, [["max-records", record_size]]]) + response = server.get_response([what, [["max-records", max_records]]]) else: response = server.get_response([what]) else: @@ -612,7 +612,7 @@ def query(what, return_toplevel_node = False): tag_string = results.child_get_string("next-tag") while tag_string: # We need to start additinal query until all data is fetched - tag_response = server.get_response([what, [["max-records", record_size],["tag", tag_string]]]) + tag_response = server.get_response([what, [["max-records", max_records],["tag", tag_string]]]) # Get attributes-list and add this content to the initial response tag_string = tag_response.get_results().child_get_string("next-tag") @@ -665,16 +665,16 @@ def query_counters(what): return response.child_get("instances") else: if netapp_mode == "clustermode": - record_size = "3000" + max_records = "3000" response = server.get_response(["perf-object-instance-list-info-iter", - [["objectname", what], ["max-records", record_size]]]) + [["objectname", what], ["max-records", max_records]]]) results = response.get_results() tag_string = results.child_get_string("next-tag") while tag_string: # We need to start additinal query until all data is fetched tag_response = server.get_response(["perf-object-instance-list-info-iter", - [["objectname", what], ["max-records", record_size], ["tag", tag_string]]]) + [["objectname", what], ["max-records", max_records], ["tag", tag_string]]]) # Get attributes-list and add this content to the initial response tag_string = tag_response.get_results().child_get_string("next-tag")

7 years, 6 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits November 2016