Checkmk git commits August 2017

checkmk-commits@lists.checkmk.com

10 participants
201 discussions

4542 watchdog_sensors: Added new checks for GEIST watchdog devices

by Marcel Arentz

Module: check_mk Branch: master Commit: 6dd393fea80968a1c5236bffdc1abbaa3e6bf468 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6dd393fea80968… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Wed Mar 15 18:02:10 2017 +0100 4542 watchdog_sensors: Added new checks for GEIST watchdog devices This feature contains the following checks: watchdog_sensors watchdog_sensors.temp watchdog_sensors.humidity watchdog_sensors.dew Please see the manpages for further information. Change-Id: I926867a884496823ace678ec4a725a063b58fb40 --- .werks/4542 | 16 +++ checkman/watchdog_sensors | 10 ++ checkman/watchdog_sensors.dew | 13 ++ checkman/watchdog_sensors.humidity | 14 ++ checkman/watchdog_sensors.temp | 14 ++ checks/watchdog_sensors | 278 +++++++++++++++++++++++++++++++++++++ lib/man_pages.py | 1 + 7 files changed, 346 insertions(+) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=6dd393fea8…

6 years, 11 months

fix typo in werk description

by Manfred Brunner

Module: check_mk Branch: master Commit: 172e3a1142f0ded31e3c818c13b848e65abad6ec URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=172e3a1142f0de… Author: Manfred Brunner <mb(a)mathias-kettner.de> Date: Mon Aug 7 13:45:39 2017 +0200 fix typo in werk description Change-Id: I1885e2b1e1d69b0d67663c2ef49fcd3b6c0106ab --- .werks/5099 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/5099 b/.werks/5099 index 41808ca..0a2d288 100644 --- a/.werks/5099 +++ b/.werks/5099 @@ -1,4 +1,4 @@ -Title: Fix custom user attributes un user form +Title: Fix custom user attributes in user form Level: 1 Component: wato Class: fix

6 years, 11 months

5099 FIX Fix custom user attributes un user form

by Manfred Brunner

Module: check_mk Branch: master Commit: 114c7d49176253aa8b2aeee7e7a848781b3b4852 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=114c7d49176253… Author: Manfred Brunner <mb(a)mathias-kettner.de> Date: Mon Aug 7 13:29:02 2017 +0200 5099 FIX Fix custom user attributes un user form if rule based notification are enabled the custom user attributes of type "Notification" will not be displayed in user form. Change-Id: Ie607fd289061165f1628b00a25ce010639da6a64 --- .werks/5099 | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/.werks/5099 b/.werks/5099 new file mode 100644 index 0000000..41808ca --- /dev/null +++ b/.werks/5099 @@ -0,0 +1,11 @@ +Title: Fix custom user attributes un user form +Level: 1 +Component: wato +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i1 +Date: 1502105090 + +if rule based notification are enabled the custom user attributes of type "Notification" will not be displayed in user form.

6 years, 11 months

Fix: Show custom user attributes for notification in all cases

by Manfred Brunner

Module: check_mk Branch: master Commit: 2ec8c72387c7865fe4e252244535134dae34522d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2ec8c72387c786… Author: Manfred Brunner <mb(a)mathias-kettner.de> Date: Mon Aug 7 11:17:54 2017 +0200 Fix: Show custom user attributes for notification in all cases Change-Id: Iece8899ab551842323082880a1da47d501347fde --- 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 d48914b..3b22505 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -11085,7 +11085,6 @@ def mode_edit_user(phase): forms.section(_("Notification Method")) get_vs_flexible_notifications().render_input("notification_method", user.get("notification_method")) - custom_user_attributes('notify') else: forms.section(_("Fallback notifications"), simple=True) @@ -11100,6 +11099,8 @@ def mode_edit_user(phase): "setting <a href=\"wato.py?mode=edit_configvar&varname=notification_fallback_email\">" "Fallback email address for notifications</a>.")) + custom_user_attributes('notify') + forms.header(_("Personal Settings"), isopen = False) select_language(user) custom_user_attributes('personal')

6 years, 11 months

Tiny simplification.

by Sven Panne

Module: check_mk Branch: master Commit: c48840b7d3da07d713f892ff25fcf676185b143c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c48840b7d3da07… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon Aug 7 11:42:52 2017 +0200 Tiny simplification. Change-Id: I14cd465bee24db3e029d2bd7430d6171ee81b1f5 --- livestatus/src/Logfile.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/livestatus/src/Logfile.cc b/livestatus/src/Logfile.cc index 83b59d6..70a38b4 100644 --- a/livestatus/src/Logfile.cc +++ b/livestatus/src/Logfile.cc @@ -209,7 +209,7 @@ bool Logfile::processLogLine(uint32_t lineno, string line, << entry->_complete; return false; } - _entries.emplace(key, entry.release()); + _entries[key] = std::move(entry); return true; }

6 years, 11 months

5012 lvm_lvs: New check vor LVM logical volume pools

by Marcel Arentz

Module: check_mk Branch: master Commit: 8d284ab7a20060d3546e2e9565b50267694e5234 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8d284ab7a20060… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Fri Aug 4 17:37:55 2017 +0200 5012 lvm_lvs: New check vor LVM logical volume pools In LVM you can configure thin provisioned logical volume pools. These can be overprovisioned. This checkplugin measures the usage of these pools. Change-Id: I50d509e5c9e606f9ba4fc733089e12c820a6feb8 --- .werks/5012 | 11 +++++ agents/plugins/lvm | 3 ++ checkman/lvm_lvs | 12 ++++++ checks/lvm_lvs | 82 ++++++++++++++++++++++++++++++++++++ web/plugins/wato/check_parameters.py | 33 +++++++++++++++ 5 files changed, 141 insertions(+) diff --git a/.werks/5012 b/.werks/5012 new file mode 100644 index 0000000..f5e07e2 --- /dev/null +++ b/.werks/5012 @@ -0,0 +1,11 @@ +Title: lvm_lvs: New check vor LVM logical volume pools +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1501861028 +Class: feature + +In LVM you can configure thin provisioned logical volume pools. These can +be overprovisioned. This checkplugin measures the usage of these pools. diff --git a/agents/plugins/lvm b/agents/plugins/lvm index 6f0b9de..00cd5fe 100755 --- a/agents/plugins/lvm +++ b/agents/plugins/lvm @@ -2,5 +2,8 @@ echo "<<<lvm_vgs>>>" vgs --units b --nosuffix --noheadings --separator ' ' +echo "<<<lvm_lvs:sep(124)>>>" +lvs --units b --nosuffix --noheadings --separator '|' + #echo "<<<lvm_pvs>>>" #pvs --units b --nosuffix --noheadings --separator ' ' diff --git a/checkman/lvm_lvs b/checkman/lvm_lvs new file mode 100644 index 0000000..d844767 --- /dev/null +++ b/checkman/lvm_lvs @@ -0,0 +1,12 @@ +title: LVM: Logical volumes +agents: linux +catalog: os/storage +license: GPL +distribution: check_mk +description: + + This check monitors the usage of LVM logical volumes. + +item: + +inventory: diff --git a/checks/lvm_lvs b/checks/lvm_lvs new file mode 100644 index 0000000..8bae5bd --- /dev/null +++ b/checks/lvm_lvs @@ -0,0 +1,82 @@ +#!/usr/bin/python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2017 mk(a)mathias-kettner.de | +# +------------------------------------------------------------------+ +# +# This file is part of Check_MK. +# The official homepage is at http://mathias-kettner.de/check_mk. +# +# check_mk is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation in version 2. check_mk is distributed +# in the hope that it will be useful, but WITHOUT ANY WARRANTY; with- +# out even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. See the GNU General Public License for more de- +# tails. You should have received a copy of the GNU General Public +# License along with GNU Make; see the file COPYING. If not, write +# to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, +# Boston, MA 02110-1301 USA. + + +# example output + +factory_settings["lvm_lvs_default_levels"] = { + "levels_data" : (80.0, 90.0), + "levels_meta" : (80.0, 90.0), +} + +def parse_lvm_lvs(info): + parsed = {} + for line in info: + item = "%s/%s" % (line[1], line[4]) + if not line[4] == "" and not item in parsed: + parsed[item] = [] + + for line in info: + item = "%s/%s" % (line[1], line[0]) + if item in parsed: + parsed[item] = {"data" : line[6], "meta" : line[7]} + + return parsed + + +def inventory_lvm_lvs(parsed): + for key, values in parsed.iteritems(): + yield ( key, {} ) + + +def check_lvm_lvs(item, params, parsed): + for key, values in parsed.iteritems(): + if item == key: + for key, value in values.iteritems(): + value = float(value) + warn, crit = params["levels_%s" % key] + if value >= crit: + state = 2 + elif value >= warn: + state = 1 + else: + state = 0 + + key = key[0].upper()+key[1:] + yield 0, "%s usage: %.2f %%" % (key, value) + if state: + yield state, "(warn/crit at %s/%s)" % (warn, crit) + + +check_info['lvm_lvs'] = { + 'parse_function' : parse_lvm_lvs, + 'inventory_function' : inventory_lvm_lvs, + 'check_function' : check_lvm_lvs, + 'service_description' : 'LVM LV Pool %s', + 'has_perfdata' : True, + 'default_levels_variable' : 'lvm_lvs_default_levels', + 'group' : 'lvm_lvs_pools', +} diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 26d3e30..07c4133 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -4595,6 +4595,39 @@ register_check_parameters( register_check_parameters( subgroup_storage, + "lvm_lvs_pools", + _("Logical Volume Pools (LVM)"), + Dictionary( + elements = [ + ( "levels_meta", Tuple( + title = _("Levels for Meta"), + default_value = (80.0, 90.0), + elements = [ + Percentage(title = _("Warning at"), unit = _("%")), + Percentage(title = _("Critical at"), unit = _("%")) + ] + ), + ), + ( "levels_data", Tuple( + title = _("Levels for Data"), + default_value = (80.0, 90.0), + elements = [ + Percentage(title = _("Warning at"), unit = _("%")), + Percentage(title = _("Critical at"), unit = _("%")) + ] + ), + ), + ] + ), + TextAscii( + title = _("Logical Volume Pool"), + allow_empty = True, + ), + match_type = "dict" +) + +register_check_parameters( + subgroup_storage, "filehandler", _("Filehandler"), Dictionary(

6 years, 11 months

4916 windows_multipath: Now configurable through agent bakery

by Marcel Arentz

Module: check_mk Branch: master Commit: 12844cbcf32fe3022cf8b9347d6622be7787c629 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=12844cbcf32fe3… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Tue Jul 11 15:38:28 2017 +0200 4916 windows_multipath: Now configurable through agent bakery Change-Id: I864871a8453ab66b7b9788580dbfda89dfcba15b --- .werks/4916 | 10 +++++++ checks/windows_multipath | 51 ++++++++++++++++++++++++------------ web/plugins/wato/check_parameters.py | 28 +++++++++++++++++++- 3 files changed, 71 insertions(+), 18 deletions(-) diff --git a/.werks/4916 b/.werks/4916 new file mode 100644 index 0000000..1d6be51 --- /dev/null +++ b/.werks/4916 @@ -0,0 +1,10 @@ +Title: windows_multipath: Now configurable through agent bakery +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1499780278 +Class: feature + + diff --git a/checks/windows_multipath b/checks/windows_multipath index faba5ef..0db8325 100644 --- a/checks/windows_multipath +++ b/checks/windows_multipath @@ -30,31 +30,48 @@ #4 # (yes, thats all) - def inventory_windows_multipath(info): if len(info) > 0: - num_paths = saveint(info[0][0]) - if num_paths > 0: - return [ (None, num_paths ) ] + num_active = int(info[0][0]) + if num_active> 0: + return [ (None, num_active ) ] return [] def check_windows_multipath(item, params, info): - num_paths = saveint(info[0][0]) - all_paths = params - - # Anything less than 51% of paths is considered crit - if num_paths == all_paths: - state = 0 - elif num_paths <= all_paths / 2: - state = 2 + num_active = int(info[0][0]) + + yield 0, "Paths active: %s" % (num_active) + + if isinstance(params, tuple): + num_paths, warn, crit = params + warn_num = (warn / 100.0) * num_paths + crit_num = (crit / 100.0) * num_paths + if num_active < crit_num: + state = 2 + elif num_active < warn_num: + state = 1 + else: + state = 0 + + if state > 0: + yield state, "(warn/crit below %d/%d)" % (warn_num, crit_num) else: - state = 1 + if isinstance(params, int): + num_paths = params + else: + num_paths = 4 + + yield 0, "Expected paths: %s" % num_paths + if num_active < num_paths: + yield 2, "(crit below %d)" % num_paths + elif num_active > num_paths: + yield 1, "(warn at %d)" % num_paths - return (state, "paths reported %d, expected paths %d" % (num_paths, all_paths) + state * "!") check_info["windows_multipath"] = { - "check_function" : check_windows_multipath, - "inventory_function" : inventory_windows_multipath, - "service_description": "Multipath", + "inventory_function" : inventory_windows_multipath, + "check_function" : check_windows_multipath, + "service_description" : "Multipath", + "group" : "windows_multipath", } diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 10855f1..26d3e30 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -10899,7 +10899,33 @@ register_check_parameters( ) register_check_parameters( - subgroup_storage, + subgroup_storage, + "windows_multipath", + _("Windows Multipath Count"), + Alternative( + help = _("This rules sets the expected number of active paths for a multipath LUN."), + title = _("Expected number of active paths"), + elements = [ + Integer( + title = _("Expected number of active paths")), + Tuple( + title = _("Expected percentage of active paths"), + elements = [ + Integer( + title = _("Expected number of active paths")), + Percentage( + title = _("Warning if less then")), + Percentage( + title = _("Critical if less then")), + ]), + ] + ), + None, + "first", +) + +register_check_parameters( + subgroup_storage, "multipath", _("Linux and Solaris Multipath Count"), Alternative(

6 years, 11 months

Reserved 10 Werk IDS

by Manfred Brunner

Module: check_mk Branch: master Commit: 6ae802af6555ea804c4ab322a26f42089fc201cb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6ae802af6555ea… Author: Manfred Brunner <mb(a)mathias-kettner.de> Date: Mon Aug 7 09:24:47 2017 +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 1a74b28..800920f 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -5098 +5108

6 years, 11 months

5098 FIX Fix sporadic exception during activation

by Manfred Brunner

Module: check_mk Branch: master Commit: 7b0f7ba7f4dab6029f703bf15c6ba71b9c4dd786 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7b0f7ba7f4dab6… Author: Manfred Brunner <mb(a)mathias-kettner.de> Date: Mon Aug 7 09:33:41 2017 +0200 5098 FIX Fix sporadic exception during activation In some case a race condition could lead to an OSError exception during activation due to vanished files. This has been fixed. --- .werks/5098 | 13 +++++++++++++ web/htdocs/multitar.py | 9 ++++++++- 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/.werks/5098 b/.werks/5098 new file mode 100644 index 0000000..f98b61b --- /dev/null +++ b/.werks/5098 @@ -0,0 +1,13 @@ +Title: Fix sporadic exception during activation +Level: 1 +Component: wato +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i1 +Date: 1502090720 + +In some case a race condition could lead to an OSError exception +during activation due to vanished files. +This has been fixed. diff --git a/web/htdocs/multitar.py b/web/htdocs/multitar.py index b6d3af5..c638d66 100644 --- a/web/htdocs/multitar.py +++ b/web/htdocs/multitar.py @@ -353,4 +353,11 @@ def wipe_directory(path): if os.path.isdir(p): shutil.rmtree(p) else: - os.remove(p) + try: + os.remove(p) + except OSError as e: + if e.errno == 2: # no such file or directory + continue + else: + raise +

6 years, 11 months

Fixed copy&paste error

by Marcel Arentz

Module: check_mk Branch: master Commit: 03480a3592aa95a6bd1626e779d00ffd0382e23e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=03480a3592aa95… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Mon Aug 7 09:17:39 2017 +0200 Fixed copy&paste error Change-Id: Id3ccad50ea9e6df3614bc29234af25f0fc7fbb43 --- checks/dell_om_fans | 2 +- checks/dell_om_power | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/checks/dell_om_fans b/checks/dell_om_fans index 82143a5..e4835f4 100644 --- a/checks/dell_om_fans +++ b/checks/dell_om_fans @@ -63,7 +63,7 @@ def check_dell_idrac_fans(item, params, info): yield check_fan(value, params) -check_info["dell_idrac_fans"] = { +check_info["dell_om_fans"] = { "check_function" : check_dell_idrac_fans, "inventory_function" : inventory_dell_idrac_fans, "service_description" : "Fan %s", diff --git a/checks/dell_om_power b/checks/dell_om_power index 784e492..93a8245 100644 --- a/checks/dell_om_power +++ b/checks/dell_om_power @@ -61,7 +61,7 @@ def check_dell_idrac_power(item, params, info): yield state, "Redundancy status: %s" % state_readable -check_info['dell_idrac_power'] = { +check_info['dell_om_power'] = { 'inventory_function' : inventory_dell_idrac_power, 'check_function' : check_dell_idrac_power, 'service_description' : 'Power Supply Redundancy %s', @@ -118,7 +118,7 @@ def check_dell_idrac_power_unit(item, _no_params, info): yield state, "Status: %s, Type: %s, Name: %s" % \ ( state_readable, psu_type_readable, location ) -check_info['dell_idrac_power.unit'] = { +check_info['dell_om_power.unit'] = { 'inventory_function' : inventory_dell_idrac_power_unit, 'check_function' : check_dell_idrac_power_unit, 'service_description' : 'Power Supply %s',

6 years, 11 months

← Newer
1
...
12
13
14
15
16
17
18
...
21
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits August 2017