Checkmk git commits August 2016

checkmk-commits@lists.checkmk.com

8 participants
256 discussions

fixed usage of parse function in ipmi check

by Simon Betz

Module: check_mk Branch: master Commit: acea9a70950bbfbf991483b10b639b8166797509 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=acea9a70950bbf… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue Aug 2 10:42:42 2016 +0200 fixed usage of parse function in ipmi check --- checks/ipmi | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/checks/ipmi b/checks/ipmi index 5b49124..4492b2e 100644 --- a/checks/ipmi +++ b/checks/ipmi @@ -162,7 +162,8 @@ def parse_ipmi(info): return parsed -def inventory_ipmi(parsed): +def inventory_ipmi(info): + parsed = parse_ipmi(info) summarize = True rules = host_extra_conf(g_hostname, inventory_ipmi_rules) if rules: @@ -179,7 +180,8 @@ def inventory_ipmi(parsed): yield "Summary", None -def check_ipmi(item, params, parsed): +def check_ipmi(item, params, info): + parsed = parse_ipmi(info) if item == "Summary": return check_ipmi_summarized(parsed, params) else: @@ -296,7 +298,6 @@ check_config_variables.append("ipmi_ignored_sensors") check_info["ipmi"] = { - 'parse_function' : parse_ipmi, 'inventory_function' : inventory_ipmi, 'check_function' : check_ipmi, 'service_description' : 'IPMI Sensor %s',

8 years, 1 month

Revert "Removed man page of deprecated check"

by Lars Michelsen

Module: check_mk Branch: master Commit: e55c0616cf98ca0cb2d51088bf2440fd23fca72b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e55c0616cf98ca… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Aug 2 10:40:35 2016 +0200 Revert "Removed man page of deprecated check" This reverts commit ba0b9ad8f6c93f66172a872dfead0be835238ab6. --- checkman/{sap.value_groups => sap.value-groups} | 0 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/checkman/sap.value_groups b/checkman/sap.value-groups similarity index 100% rename from checkman/sap.value_groups rename to checkman/sap.value-groups

8 years, 1 month

3733 FIX BI rule editor: Increased size of argument/parameter/

by Lars Michelsen

id input fields Message-ID: <57a05b7a.CPHk4tQ5Q73sHgmU%lm(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: 7293a4a5ef2608c61977b49d43b4eb3d98d5185d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7293a4a5ef2608… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Aug 2 10:35:56 2016 +0200 3733 FIX BI rule editor: Increased size of argument/parameter/id input fields --- .werks/3733 | 9 +++++++++ ChangeLog | 1 + web/htdocs/check_mk.css | 3 --- web/plugins/wato/bi.py | 8 ++++---- 4 files changed, 14 insertions(+), 7 deletions(-) diff --git a/.werks/3733 b/.werks/3733 new file mode 100644 index 0000000..28a5bd9 --- /dev/null +++ b/.werks/3733 @@ -0,0 +1,9 @@ +Title: BI rule editor: Increased size of argument/parameter/id input fields +Level: 1 +Component: wato +Compatible: compat +Version: 1.4.0i1 +Date: 1470126934 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 164cf38..1417ca9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -517,6 +517,7 @@ * 3718 FIX: Changes not needing a core restart are not showing up pending changes anymore... * 3719 FIX: Fixed possible wrong encoding of audit log messages when editing global settings * 3726 FIX: Web API: Fixed default output format - using JSON as intended... + * 3733 FIX: BI rule editor: Increased size of argument/parameter/id input fields Notifications: * 3263 Notifications: allow users to restrict by their contact groups... diff --git a/web/htdocs/check_mk.css b/web/htdocs/check_mk.css index eefa989..96f1069 100644 --- a/web/htdocs/check_mk.css +++ b/web/htdocs/check_mk.css @@ -524,9 +524,6 @@ div.listofstrings.horizontal > div { float: left; margin-right: 2px; } -div.listofstrings.horizontal > div:last-child { - float: none; -} table.listchoice { border-collapse: collapse; diff --git a/web/plugins/wato/bi.py b/web/plugins/wato/bi.py index 2d98aa6..4ca024d 100644 --- a/web/plugins/wato/bi.py +++ b/web/plugins/wato/bi.py @@ -439,7 +439,7 @@ class ModeBI(WatoMode): ), ListOfStrings( orientation = "horizontal", - size = 12, + size = 24, title = _("Arguments:"), ), ], @@ -959,7 +959,7 @@ class ModeBIEditPack(ModeBI): title = _("BI pack ID"), help = _("A unique ID of this BI pack."), allow_empty = False, - size = 12, + size = 24, ) return Dictionary( title = _("BI Pack Properties"), @@ -1426,7 +1426,7 @@ class ModeBIEditRule(ModeBI): "(enclosed in dollar signs)."), orientation = "horizontal", valuespec = TextAscii( - size = 12, + size = 24, regex = '[A-Za-z_][A-Za-z0-9_]*', regex_error = _("Parameters must contain only A-Z, a-z, 0-9 and _ " "and must not begin with a digit."), @@ -1461,7 +1461,7 @@ class ModeBIEditRule(ModeBI): "when rules refer to each other. The rule IDs will not be visible in the status " "GUI. They are just used within the configuration."), allow_empty = False, - size = 12, + size = 24, ), )] + elements

8 years, 1 month

mssql_counters.sqlstats: Time from counter instead of time.time()

by Konstantin Büttner

Module: check_mk Branch: master Commit: ec8838e58b9763de5f0f43044bd4c5df8633bf06 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ec8838e58b9763… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Mon Aug 1 17:20:08 2016 +0200 mssql_counters.sqlstats: Time from counter instead of time.time() --- checks/mssql_counters | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/checks/mssql_counters b/checks/mssql_counters index 4d22632..71ab47d 100644 --- a/checks/mssql_counters +++ b/checks/mssql_counters @@ -247,11 +247,14 @@ check_info['mssql_counters.locks'] = { def check_mssql_counters_sqlstats(item, params, info): + now = mssql_time_from_counter(info) + if now is None: + now = time.time() for line in info: if mssql_counters_item(line, True) == item: counter_type = item.split()[-1] rate = get_rate("mssql_counters_sqlstats.%s.%s" % \ - (counter_type, item), time.time(), float(line[-1])) + (counter_type, item), now, float(line[-1])) status = 0 infotext = "%.1f/sec" % rate

8 years, 1 month

Fixed pylint error

by Lars Michelsen

Module: check_mk Branch: master Commit: ef58b7bd4e4e7a7cce9b6b0e341d56f6adc1d902 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ef58b7bd4e4e7a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Aug 1 15:46:18 2016 +0200 Fixed pylint error --- checks/sap | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/checks/sap b/checks/sap index 8f879aa..64fbab0 100644 --- a/checks/sap +++ b/checks/sap @@ -264,8 +264,9 @@ def check_sap_value_groups(item, params, info, deprecated=False): # Deprecated with 1.4.0i1. Remove some versions after! check_info['sap.value-groups'] = { - 'check_function' : lambda *args: check_sap_value_groups(*args, deprecated=True), - 'inventory_function' : lambda *args: [], + 'check_function' : lambda (item, params, info): \ + check_sap_value_groups(item, params, info, deprecated=True), + 'inventory_function' : lambda (info): [], 'service_description' : "%s", } precompile_params['sap.value-groups'] = sap_value_groups_precompile

8 years, 1 month

3742 FIX ps: Fixed broken averaging

by Konstantin Büttner

Module: check_mk Branch: master Commit: aa245b6c80951905c19c3f7783e7db9c48eb0bc8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=aa245b6c809519… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Mon Aug 1 15:46:19 2016 +0200 3742 FIX ps: Fixed broken averaging Averaging for CPU util always returned the current value. This has been fixed. --- .werks/3742 | 10 ++++++++++ ChangeLog | 1 + checks/ps | 2 +- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/3742 b/.werks/3742 new file mode 100644 index 0000000..3e8c2f1 --- /dev/null +++ b/.werks/3742 @@ -0,0 +1,10 @@ +Title: ps: Fixed broken averaging +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.4.0i1 +Date: 1470059119 + +Averaging for CPU util always returned the current value. This has been fixed. diff --git a/ChangeLog b/ChangeLog index 01d517a..164cf38 100644 --- a/ChangeLog +++ b/ChangeLog @@ -321,6 +321,7 @@ * 3672 FIX: Agent sections cached by the agent could cause stale services... * 3727 FIX: fc_port: Fixed broken interpretation of counter values leading to wrong measurements * 3731 FIX: sap.value-groups: Replaced this check with sap.value_groups... + * 3742 FIX: ps: Fixed broken averaging... Multisite: * 3187 notification view: new filter for log command via regex diff --git a/checks/ps b/checks/ps index cf02118..394b106 100644 --- a/checks/ps +++ b/checks/ps @@ -111,7 +111,7 @@ def ps_get_counters_to_delete(pids): continue pid = check_ident.split(".")[-1] - if pid not in pids: + if pid.isdigit() and pid not in pids: counters_to_delete.append(ident) return counters_to_delete

8 years, 1 month

Reserved 10 Werk IDS

by Konstantin Büttner

Module: check_mk Branch: master Commit: c451bb250d8d800c6258f6913c75f0d63bb5ebd3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c451bb250d8d80… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Mon Aug 1 15:44:56 2016 +0200 Reserved 10 Werk IDS --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index a746e3c..25e632a 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -3742 +3752

8 years, 1 month

3732 esx_vsphere_hostsystem.mem_usage esx_vsphere_hostsystem.mem_usage_cluster : Providing mem_total as dedicated metric

by Lars Michelsen

Module: check_mk Branch: master Commit: 528626db7dda0b1d5888461716109297d9cb84b3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=528626db7dda0b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Aug 1 15:31:33 2016 +0200 3732 esx_vsphere_hostsystem.mem_usage esx_vsphere_hostsystem.mem_usage_cluster: Providing mem_total as dedicated metric --- .werks/3732 | 9 +++++++++ ChangeLog | 1 + checks/esx_vsphere_hostsystem | 6 ++++-- web/plugins/metrics/check_mk.py | 8 +++++++- 4 files changed, 21 insertions(+), 3 deletions(-) diff --git a/.werks/3732 b/.werks/3732 new file mode 100644 index 0000000..503884f --- /dev/null +++ b/.werks/3732 @@ -0,0 +1,9 @@ +Title: esx_vsphere_hostsystem.mem_usage esx_vsphere_hostsystem.mem_usage_cluster: Providing mem_total as dedicated metric +Level: 1 +Component: checks +Compatible: compat +Version: 1.4.0i1 +Date: 1470058271 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index ee7cfd3..01d517a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -121,6 +121,7 @@ * 2241 check_mk_agent.openwrt: Added section for local scripts and plugins... * 3697 sym_brightmail_queues: added support for newer symantec brightmail version * 3725 mssql_instance: Changed MSSQL monitoring to report connection issues with only one service... + * 3732 esx_vsphere_hostsystem.mem_usage esx_vsphere_hostsystem.mem_usage_cluster: Providing mem_total as dedicated metric * 3073 FIX: windows agent: relative paths to mrpe scripts are now treated as relative to the agent installation directory... * 3061 FIX: mk_jolokia: Fixed debugging of the agent plugin * 3074 FIX: windows agent: fixed incorrect values for 32-bit performance counters diff --git a/checks/esx_vsphere_hostsystem b/checks/esx_vsphere_hostsystem index 3e88dd5..2b1688d 100644 --- a/checks/esx_vsphere_hostsystem +++ b/checks/esx_vsphere_hostsystem @@ -137,7 +137,8 @@ def check_esx_vsphere_hostsystem_mem_cluster(item, params, info): label = " (Levels at %d%%/%d%%)" % (warn, crit) break - perf = [("usage", total_memory_usage, warn_perf, crit_perf, 0, total_memory_size)] + perf = [("usage", total_memory_usage, warn_perf, crit_perf, 0, total_memory_size), + ("mem_total", total_memory_size)] yield state, "%d%%%s used - %s/%s" % \ (level, label, get_bytes_human_readable(total_memory_usage), get_bytes_human_readable(total_memory_size)), perf @@ -264,7 +265,8 @@ def check_esx_vsphere_hostsystem_mem(item, params, info): message = "%d%%%s used - %s/%s" % \ (level, label, get_bytes_human_readable(memory_usage), get_bytes_human_readable(memory_size)) - perf = [("usage", memory_usage, warn * memory_size / 100, crit * memory_size / 100, 0, memory_size)] + perf = [("usage", memory_usage, warn * memory_size / 100, crit * memory_size / 100, 0, memory_size), + ("mem_total", memory_size)] return(state, message, perf) diff --git a/web/plugins/metrics/check_mk.py b/web/plugins/metrics/check_mk.py index 887740f..89f19f8 100644 --- a/web/plugins/metrics/check_mk.py +++ b/web/plugins/metrics/check_mk.py @@ -4129,7 +4129,13 @@ check_metrics["check_mk-ibm_svc_systemstats.cache"] = { } check_metrics["check_mk-esx_vsphere_hostsystem.mem_usage"] = { - "usage" : { "name" : "mem_used" } + "usage" : { "name" : "mem_used" }, + "mem_total" : { "auto_graph" : False }, +} + +check_metrics["check_mk-esx_vsphere_hostsystem.mem_usage_cluster"] = { + "usage" : { "name" : "mem_used" }, + "mem_total" : { "auto_graph" : False }, } check_metrics["check_mk-ibm_svc_host"] = {

8 years, 1 month

Removed man page of deprecated check

by Lars Michelsen

Module: check_mk Branch: master Commit: ba0b9ad8f6c93f66172a872dfead0be835238ab6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ba0b9ad8f6c93f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Aug 1 15:15:22 2016 +0200 Removed man page of deprecated check --- checkman/{sap.value-groups => sap.value_groups} | 0 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/checkman/sap.value-groups b/checkman/sap.value_groups similarity index 100% rename from checkman/sap.value-groups rename to checkman/sap.value_groups

8 years, 1 month

3731 FIX sap.value-groups: Replaced this check with sap.value_groups

by Lars Michelsen

Module: check_mk Branch: master Commit: 73ef53566be335fe6df5d1de789596f84920e3d9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=73ef53566be335… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Aug 1 15:14:23 2016 +0200 3731 FIX sap.value-groups: Replaced this check with sap.value_groups The old check name was not allowed because it contained a dash. The check has now been renamed. You will get a warning message when the old check is executed and only need to rediscover the services of the affected hosts. You don't need to migrate anything here. --- .werks/3731 | 12 ++++++++++++ ChangeLog | 1 + checks/sap | 40 +++++++++++++++++++++++++++++----------- 3 files changed, 42 insertions(+), 11 deletions(-) diff --git a/.werks/3731 b/.werks/3731 new file mode 100644 index 0000000..bc0f2c1 --- /dev/null +++ b/.werks/3731 @@ -0,0 +1,12 @@ +Title: sap.value-groups: Replaced this check with sap.value_groups +Level: 1 +Component: checks +Compatible: compat +Version: 1.4.0i1 +Date: 1470057200 +Class: fix + +The old check name was not allowed because it contained a dash. The +check has now been renamed. You will get a warning message when the +old check is executed and only need to rediscover the services of +the affected hosts. You don't need to migrate anything here. diff --git a/ChangeLog b/ChangeLog index e7b428f..ee7cfd3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -319,6 +319,7 @@ * 3709 FIX: cisco_wlc, cisco_wlc_clients: fixed scan function and incomplete listing of interfaces * 3672 FIX: Agent sections cached by the agent could cause stale services... * 3727 FIX: fc_port: Fixed broken interpretation of counter values leading to wrong measurements + * 3731 FIX: sap.value-groups: Replaced this check with sap.value_groups... Multisite: * 3187 notification view: new filter for log command via regex diff --git a/checks/sap b/checks/sap index 3f85f66..8f879aa 100644 --- a/checks/sap +++ b/checks/sap @@ -226,11 +226,9 @@ def inventory_sap_value_groups( info ): found_groups.append(group) return inventory -def check_sap_value_groups( item, params, info ): - frontend = [] - backend = [] - count_ok = 0 - count_crit = 0 +def check_sap_value_groups(item, params, info, deprecated=False): + crit_texts, all_texts = [], [] + count_ok, count_crit = 0, 0 state = None for line in info: path = line[3] @@ -239,23 +237,43 @@ def check_sap_value_groups( item, params, info ): output = '' if line[4] == '-': output = ' '.join(line[6:]) - backend.append( path + output + " " + core_state_names[status] ) + + all_texts.append(path + output + " " + core_state_names[status]) state = max(state, status) if status > 0: count_crit += 1 - frontend.append( path + output + " " + core_state_names[status] ) + crit_texts.append( path + output + " " + core_state_names[status] ) else: count_ok += 1 if state is None: raise MKCounterWrapped("no output about sap value groups in agent output") - return state, "%s OK, %s Crit %s\n%s" % ( count_ok, count_crit, ", ".join(frontend), "\n".join(backend) ) + yield state, "%s OK, %s Critical" % (count_ok, count_crit) + + if crit_texts: + yield 0, ", ".join(crit_texts) + + if deprecated: + yield 1, "This service uses a deprecated check. Please rediscover the services "\ + "of this host to get this fixed automatically" + + if all_texts: + yield 0, "\n%s" + "\n".join(all_texts) +# Deprecated with 1.4.0i1. Remove some versions after! check_info['sap.value-groups'] = { - 'check_function': check_sap_value_groups, - 'inventory_function': inventory_sap_value_groups, - 'service_description': "%s", + 'check_function' : lambda *args: check_sap_value_groups(*args, deprecated=True), + 'inventory_function' : lambda *args: [], + 'service_description' : "%s", } precompile_params['sap.value-groups'] = sap_value_groups_precompile + + +check_info['sap.value_groups'] = { + 'check_function' : check_sap_value_groups, + 'inventory_function' : inventory_sap_value_groups, + 'service_description' : "%s", +} +precompile_params['sap.value_groups'] = sap_value_groups_precompile

8 years, 1 month

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits August 2016