Checkmk git commits August 2016

checkmk-commits@lists.checkmk.com

8 participants
256 discussions

by Lars Michelsen

Module: check_mk Branch: master Commit: 2032063331d51bf4a1c9d3984d81c40f1d98b61b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2032063331d51b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Aug 2 16:12:04 2016 +0200 Improved help text --- web/htdocs/wato.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 888bcc0..07280f6 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -16467,7 +16467,8 @@ def monitoring_macro_help(): "<li><tt>$_HOSTADDRESS_6$</tt>: The IPv6 address of the host</li>" "<li><tt>$_HOSTADDRESS_FAMILY$</tt>: The primary address family of the host</li>" "</ul>" - "All custom variables defined for the host are available as <tt>$_HOST[VARNAME]$</tt>.") + "All custom variables defined for the host are available as <tt>$_HOST[VARNAME]$</tt>. " + "Replace <tt>[VARNAME]</tt> with the <i>upper case</i> name of your variable.") #.

8 years, 1 month

Fixed exception on network scan page

by Lars Michelsen

Module: check_mk Branch: master Commit: 505af41230ce38d1718018e7803456cd2eb98844 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=505af41230ce38… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Aug 2 16:16:27 2016 +0200 Fixed exception on network scan page --- web/plugins/wato/builtin_attributes.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/plugins/wato/builtin_attributes.py b/web/plugins/wato/builtin_attributes.py index 32af24f..2beba20 100644 --- a/web/plugins/wato/builtin_attributes.py +++ b/web/plugins/wato/builtin_attributes.py @@ -121,7 +121,7 @@ class SNMPCredentials(Alternative): ), ] ), - forth = lambda x: len(x) == 2 and x or (x[0], "") + forth = lambda x: (x and len(x) == 2) and x or ("noAuthNoPriv", "") ), Tuple( title = _("Credentials for SNMPv3 with authentication but without privacy (authNoPriv)"),

8 years, 1 month

3734 FIX esx_vsphere_hostsystem.cpu_usage esx_vsphere_hostsystem.mem_usage esx_vsphere_hostsystem.maintenance : Fixed exception when needed data is missing

by Lars Michelsen

Module: check_mk Branch: master Commit: 0d1a517f4f353bb6a4d2557639d4cfb9382270a0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0d1a517f4f353b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Aug 2 16:58:54 2016 +0200 3734 FIX esx_vsphere_hostsystem.cpu_usage esx_vsphere_hostsystem.mem_usage esx_vsphere_hostsystem.maintenance: Fixed exception when needed data is missing --- .werks/3734 | 9 +++++++++ ChangeLog | 1 + checks/esx_vsphere_hostsystem | 12 ++++++++++++ 3 files changed, 22 insertions(+) diff --git a/.werks/3734 b/.werks/3734 new file mode 100644 index 0000000..ded1cf0 --- /dev/null +++ b/.werks/3734 @@ -0,0 +1,9 @@ +Title: esx_vsphere_hostsystem.cpu_usage esx_vsphere_hostsystem.mem_usage esx_vsphere_hostsystem.maintenance: Fixed exception when needed data is missing +Level: 1 +Component: checks +Compatible: compat +Version: 1.4.0i1 +Date: 1470149835 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index a58b579..345e837 100644 --- a/ChangeLog +++ b/ChangeLog @@ -324,6 +324,7 @@ * 3731 FIX: sap.value-groups: Replaced this check with sap.value_groups... * 3742 FIX: ps: Fixed broken averaging... * 3711 FIX: ipmi: fixed wrong status handling if sensor status is ok but failures detected + * 3734 FIX: esx_vsphere_hostsystem.cpu_usage esx_vsphere_hostsystem.mem_usage esx_vsphere_hostsystem.maintenance: Fixed exception when needed data is missing Multisite: * 3187 notification view: new filter for log command via regex diff --git a/checks/esx_vsphere_hostsystem b/checks/esx_vsphere_hostsystem index 2b1688d..4a29001 100644 --- a/checks/esx_vsphere_hostsystem +++ b/checks/esx_vsphere_hostsystem @@ -59,6 +59,10 @@ def inventory_esx_vsphere_hostsystem_cpu(info): def check_esx_vsphere_hostsystem_cpu(item, params, info): data = esx_vsphere_hostsystem_convert(info) + + if "summary.quickStats.overallCpuUsage" not in data: + return + num_sockets = int(data['hardware.cpuInfo.numCpuPackages'][0]) num_cores = int(data['hardware.cpuInfo.numCpuCores'][0]) num_threads = int(data['hardware.cpuInfo.numCpuThreads'][0]) @@ -249,6 +253,10 @@ def inventory_esx_vsphere_hostsystem_mem(info): def check_esx_vsphere_hostsystem_mem(item, params, info): data = esx_vsphere_hostsystem_convert(info) + + if "summary.quickStats.overallMemoryUsage" not in data: + return + memory_usage = savefloat(data['summary.quickStats.overallMemoryUsage'][0]) * 1024 * 1024 memory_size = savefloat(data['hardware.memorySize'][0]) level = memory_usage / memory_size * 100 @@ -341,6 +349,10 @@ def inventory_esx_vsphere_hostsystem_maintenance(info): def check_esx_vsphere_hostsystem_maintenance(_no_item, params, info): data = esx_vsphere_hostsystem_convert(info) target_state = params['target_state'] + + if "runtime.inMaintenanceMode" not in data: + return + current_state = str(data['runtime.inMaintenanceMode'][0]).lower() state = 0 if target_state != current_state:

8 years, 1 month

Reserved 20 Werk IDS

by Lars Michelsen

Module: check_mk Branch: master Commit: 2b9a14dc882a85619281f28e63c751ee0224d6f3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2b9a14dc882a85… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Aug 3 10:35:18 2016 +0200 Reserved 20 Werk IDS --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index 25e632a..791d825 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -3752 +3772

8 years, 1 month

Fixed issue with concurrent ajax calls overwriting their arguments

by Lars Michelsen

Module: check_mk Branch: master Commit: 092658f2c836151e92a060b6c0a9c7cf9b2b83cf URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=092658f2c83615… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Aug 2 16:49:42 2016 +0200 Fixed issue with concurrent ajax calls overwriting their arguments --- web/htdocs/js/checkmk.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/htdocs/js/checkmk.js b/web/htdocs/js/checkmk.js index 272242b..9ae2c60 100644 --- a/web/htdocs/js/checkmk.js +++ b/web/htdocs/js/checkmk.js @@ -427,7 +427,7 @@ if (!("nextElementSibling" in document.documentElement)) { function call_ajax(url, optional_args) { - args = merge_args({ + var args = merge_args({ add_ajax_id : true, plain_error : false, response_handler : null,

8 years, 1 month

3735 FIX Fixed wrong host search link in case of deleting site with hosts assigned

by Lars Michelsen

Module: check_mk Branch: master Commit: 869d4387f6bdd54ee72ebf3679ac42eb57d41941 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=869d4387f6bdd5… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Aug 3 08:56:32 2016 +0200 3735 FIX Fixed wrong host search link in case of deleting site with hosts assigned --- .werks/3735 | 10 ++++++++++ ChangeLog | 1 + web/htdocs/wato.py | 2 +- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/3735 b/.werks/3735 new file mode 100644 index 0000000..2ad7b02 --- /dev/null +++ b/.werks/3735 @@ -0,0 +1,10 @@ +Title: Fixed wrong host search link in case of deleting site with hosts assigned +Level: 1 +Component: wato +Class: fix +Compatible: compat +State: unknown +Version: 1.4.0i1 +Date: 1470207376 + + diff --git a/ChangeLog b/ChangeLog index 345e837..dfeca84 100644 --- a/ChangeLog +++ b/ChangeLog @@ -521,6 +521,7 @@ * 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 + * 3735 FIX: Fixed wrong host search link in case of deleting site with hosts assigned Notifications: * 3263 Notifications: allow users to restrict by their contact groups... diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 07280f6..5288484 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -8898,7 +8898,7 @@ def mode_sites(phase): # Make sure that site is not being used by hosts and folders if delid in Folder.root_folder().all_site_ids(): search_url = html.makeactionuri([ - ("_change_site", "1"), + ("host_search_change_site", "on"), ("host_search_site", delid), ("host_search", "1"), ("folder", ""),

8 years, 1 month

ipmi: Added comment

by Konstantin Büttner

Module: check_mk Branch: master Commit: 785795304f5500a35df515fbf211b55a52a9cda2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=785795304f5500… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Wed Aug 3 09:36:24 2016 +0200 ipmi: Added comment --- checks/ipmi | 2 ++ 1 file changed, 2 insertions(+) diff --git a/checks/ipmi b/checks/ipmi index 4492b2e..9f76df2 100644 --- a/checks/ipmi +++ b/checks/ipmi @@ -181,6 +181,8 @@ def inventory_ipmi(info): def check_ipmi(item, params, info): + # TODO: Cleanup Check API so extra_sections can be passed to parse_function. + # For the moment, this seemingly strange contraption has to remain as is. parsed = parse_ipmi(info) if item == "Summary": return check_ipmi_summarized(parsed, params)

8 years, 1 month

3712 ispro_sensors_temp, ispro_sensors_humid, ispro_sensors_digital: new checks which monitor Interseptro Pro devices which support the ISPRO-MIB

by Simon Betz

Module: check_mk Branch: master Commit: 0020bc19ebfda6f40b23b3ba401de8d5aa3b72a8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0020bc19ebfda6… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue Aug 2 16:14:22 2016 +0200 3712 ispro_sensors_temp, ispro_sensors_humid, ispro_sensors_digital: new checks which monitor Interseptro Pro devices which support the ISPRO-MIB --- .werks/3712 | 9 +++++ ChangeLog | 1 + checkman/ispro_sensors_digital | 17 ++++++++++ checkman/ispro_sensors_humid | 21 ++++++++++++ checkman/ispro_sensors_temp | 21 ++++++++++++ checks/ispro.include | 41 ++++++++++++++++++++++ checks/ispro_sensors_digital | 73 ++++++++++++++++++++++++++++++++++++++++ checks/ispro_sensors_humid | 59 ++++++++++++++++++++++++++++++++ checks/ispro_sensors_temp | 70 ++++++++++++++++++++++++++++++++++++++ 9 files changed, 312 insertions(+) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=0020bc19eb…

8 years, 1 month

Added man page for sap.value_groups

by Lars Michelsen

Module: check_mk Branch: master Commit: 2e20a95c7388296aaf0d74d7c7e0c8ffdf36a37c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2e20a95c738829… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Aug 2 10:43:44 2016 +0200 Added man page for sap.value_groups --- checkman/sap.value_groups | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/checkman/sap.value_groups b/checkman/sap.value_groups new file mode 100644 index 0000000..5afb4ae --- /dev/null +++ b/checkman/sap.value_groups @@ -0,0 +1,20 @@ +title: SAP Single Value Monitoring Groups +agents: linux +catalog: app/sap +license: GPL +distribution: check_mk +description: + Please refer to {sap.value} for details. + This check is only a subchecks who enables you to create Groups of values. + + The rule "SAP R/3 Single Value Inventory" is not necessary for that, you + only need the rule "SAP Value Grouping Patterns" to define a name and an include + nor and exclusion list. + After the service detection, the check will display the total number of OK and Critical values, + in case of Critical values also these. + +item: + The Name of the Group + +inventory: + The check does not inventory all available values by default.

8 years, 1 month

3711 FIX ipmi: fixed wrong status handling if sensor status is ok but failures detected

by Simon Betz

Module: check_mk Branch: master Commit: b1a96428f32d20f524db4a4a19859b96615954d8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b1a96428f32d20… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue Aug 2 10:35:57 2016 +0200 3711 FIX ipmi: fixed wrong status handling if sensor status is ok but failures detected --- .werks/3711 | 10 ++++++++++ ChangeLog | 1 + checks/ipmi | 16 +++++++++------- 3 files changed, 20 insertions(+), 7 deletions(-) diff --git a/.werks/3711 b/.werks/3711 new file mode 100644 index 0000000..50e37e1 --- /dev/null +++ b/.werks/3711 @@ -0,0 +1,10 @@ +Title: ipmi: fixed wrong status handling if sensor status is ok but failures detected +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.4.0i1 +Date: 1470126829 + + diff --git a/ChangeLog b/ChangeLog index 1417ca9..7a57a45 100644 --- a/ChangeLog +++ b/ChangeLog @@ -322,6 +322,7 @@ * 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... + * 3711 FIX: ipmi: fixed wrong status handling if sensor status is ok but failures detected Multisite: * 3187 notification view: new filter for log command via regex diff --git a/checks/ipmi b/checks/ipmi index cb18678..5b49124 100644 --- a/checks/ipmi +++ b/checks/ipmi @@ -104,11 +104,13 @@ # Fan 2 | 8557.000 | RPM | ok | na | 1720.000 | 1978.000 | na | na | na # Fan 3 | 7611.000 | RPM | ok | na | 1720.000 | 1978.000 | na | na | na # <<<ipmi_discrete:sep(124)>>> -# PS3 Status | C8h | ok | 10.1 | Presence detected -# PS4 Status | C9h | ok | 10.2 | Presence detected -# Pwr Unit Stat | 01h | ok | 21.1 | -# Power Redundancy | 02h | ok | 21.1 | Fully Redundant -# BMC Watchdog | 03h | ok | 7.1 | +# PS3 Status | C8h | ok | 10.1 | Presence detected +# PS4 Status | C9h | ok | 10.2 | Presence detected +# Pwr Unit Stat | 01h | ok | 21.1 | +# Power Redundancy | 02h | ok | 21.1 | Fully Redundant +# BMC Watchdog | 03h | ok | 7.1 | +# PS1 Status | C8h | ok | 10.1 | Presence detected, Failure detected <= NOT OK !! +# PS2 Status | C9h | ok | 10.2 | Presence detected ipmi_summarize = True @@ -207,7 +209,7 @@ def check_ipmi_detailed(item, parsed): else: perfdata = [] - if status.startswith('ok'): + if status.startswith('ok') and not "failure detected" in status.lower(): state = 0 elif status.startswith('nc'): state = 1 @@ -248,7 +250,7 @@ def check_ipmi_summarized(parsed, params): elif status.startswith('nr') and ipmi_ignore_nr: pass - elif not status.startswith('ok'): + elif not status.startswith('ok') or "failure detected" in status.lower(): worst_status = 2 crit_texts.append(infotext)

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