Checkmk git commits September 2013

checkmk-commits@lists.checkmk.com

6 participants
227 discussions

Check_MK Git: check_mk: Updated bug entries #0996

by Mathias Kettner

Module: check_mk Branch: master Commit: 703f1ad1fbb537356a8c04a425d07543b2977322 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=703f1ad1fbb537… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Sep 27 11:48:07 2013 +0200 Updated bug entries #0996 --- .bugs/996 | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.bugs/996 b/.bugs/996 new file mode 100644 index 0000000..390a04a --- /dev/null +++ b/.bugs/996 @@ -0,0 +1,9 @@ +Title: Active check definition for check_icmp +Component: wato +State: open +Date: 2013-09-27 11:47:28 +Targetversion: 1.4.0 +Class: feature + +This is especially useful for CMC where you use Smart PING. +A simple plain formalization like check_http, etc.

11 years

Check_MK Git: check_mk: check man page for new check "APC self test"

by Götz Golla

Module: check_mk Branch: master Commit: 379049875753d2d0c6451ba40f4110fa0953e582 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=379049875753d2… Author: Götz Golla <gg(a)mathias-kettner.de> Date: Fri Sep 27 11:39:58 2013 +0200 check man page for new check "APC self test" --- checkman/apc_symmetra_test | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/checkman/apc_symmetra_test b/checkman/apc_symmetra_test new file mode 100644 index 0000000..396109e --- /dev/null +++ b/checkman/apc_symmetra_test @@ -0,0 +1,27 @@ +title: APC self test +agents: snmp +catalog: hw/power +license: GPL +distribution: check_mk +description: + This check monitors two OIDs of APC Symmetra UPS devices: The result of the last self test + and the last date of the self test run. The check becomes critical if the test result is + "failed" and it has a warning or ciritical state if the date of the last self test is more + than the warning or critical level ago. + +examples: + # sets the warning and critical levels to 5 and 10 days, respectively + ups_test_default = ( 5, 10 ) + +inventory: + The inventory process checks if the device has a system description OIDs (.1.3.6.1.2.1.1.2.0) + and if the name of this OID is known to the test. If this is true the system is inventorized. + +[parameters] +parameters(tuple): parameters is a tuple of two values + + warn (int): The warning level in days + crit (int): The critical level in days + +[configuration] +ups_test_default (tuple): This variable is preset to { (0,0) }

11 years

Check_MK Git: check_mk: fixed .f12 in pnp-templates

by Mathias Kettner

Module: check_mk Branch: master Commit: 624b9c889f2dcbf06576f0e2a612aab77db767c9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=624b9c889f2dcb… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Sep 27 11:37:35 2013 +0200 fixed .f12 in pnp-templates --- pnp-templates/.f12 | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pnp-templates/.f12 b/pnp-templates/.f12 index 01e6d45..3dd8927 100644 --- a/pnp-templates/.f12 +++ b/pnp-templates/.f12 @@ -1,5 +1,7 @@ +#!/bin/bash +SITE=${SITE:-$(cat ../.site || true)} SITE=${SITE:-$(omd sites --bare | head -n 1)} -sudo cp * /omd/sites/$SITE/share/check_mk/pnp-templates +sudo rsync -varx * /omd/sites/$SITE/share/check_mk/pnp-templates # do nc to port 32000 only if there is someone listening # (otherwise complete f12 script breaks if no listener on 32000)

11 years

Check_MK Git: check_mk: Updated bug entries #0992, #0993, #0994, #0995, #0991

by Mathias Kettner

Module: check_mk Branch: master Commit: e94edf469a33bdaa3f6519065506343c9ccb1f02 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e94edf469a33bd… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Sep 27 11:21:00 2013 +0200 Updated bug entries #0992, #0993, #0994, #0995, #0991 --- .bugs/991 | 10 ++++++++++ .bugs/992 | 10 ++++++++++ .bugs/993 | 10 ++++++++++ .bugs/994 | 11 +++++++++++ .bugs/995 | 11 +++++++++++ 5 files changed, 52 insertions(+) diff --git a/.bugs/991 b/.bugs/991 new file mode 100644 index 0000000..d5513ab --- /dev/null +++ b/.bugs/991 @@ -0,0 +1,10 @@ +Title: LDAP Updates creates Auditlog entries with random user names +Component: multisite +State: open +Date: 2013-09-27 11:02:23 +Targetversion: 1.2.3i3 +Class: nastiness + +Due to the cache every couple of minutes a random user might trigger +an LDAP update and thus an entry in the audit log with his/her username. +Better leave the user empty here or add some dummy entry. diff --git a/.bugs/992 b/.bugs/992 new file mode 100644 index 0000000..0ff5aef --- /dev/null +++ b/.bugs/992 @@ -0,0 +1,10 @@ +Title: Notification spooling: only for certain plugin types or users +Component: core +State: open +Date: 2013-09-27 11:15:30 +Targetversion: 1.4.0 +Class: feature + +It would be helpful if the notification spooling to a central +site could selectively be configured on a per-users and/or +per check-type base. diff --git a/.bugs/993 b/.bugs/993 new file mode 100644 index 0000000..e5a1de2 --- /dev/null +++ b/.bugs/993 @@ -0,0 +1,10 @@ +Title: Notification spooling: deliver locally in case of an error +Component: core +State: open +Date: 2013-09-27 11:16:24 +Targetversion: future +Class: feature + +Currently there is a setting "also deliver locally". Nice would be +a third choice: "also deliver locally in case the central site cannot be reached +and make this text shorter in the first place." diff --git a/.bugs/994 b/.bugs/994 new file mode 100644 index 0000000..eab916c --- /dev/null +++ b/.bugs/994 @@ -0,0 +1,11 @@ +Title: Notification digest +Component: core +State: open +Date: 2013-09-27 11:17:40 +Targetversion: future +Class: feature + +It would be nice if a user could have a "notification digest" +instead of one notification per problem. Something like in +mailinglists. If we implement such a feature, then the digest +should be on a per-checktype-base. diff --git a/.bugs/995 b/.bugs/995 new file mode 100644 index 0000000..b6bde05 --- /dev/null +++ b/.bugs/995 @@ -0,0 +1,11 @@ +Title: EC: owner field is not being used +Component: ec +State: open +Date: 2013-09-27 11:18:36 +Targetversion: future +Class: nastiness + +The EC has a field "owner" for each event. When is this field +being used? I fear that it isn't used at all. We could use this +in order to store the name of the last one that has updated +the event.

11 years

Check_MK Git: check_mk: new version of apc_symmetra check is now reflected in check man page

by Götz Golla

Module: check_mk Branch: master Commit: 3fe9d64d9cb46eefdbc43bee01bc65ae67a62c23 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3fe9d64d9cb46e… Author: Götz Golla <gg(a)mathias-kettner.de> Date: Fri Sep 27 11:16:40 2013 +0200 new version of apc_symmetra check is now reflected in check man page --- checkman/apc_symmetra | 63 ++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 52 insertions(+), 11 deletions(-) diff --git a/checkman/apc_symmetra b/checkman/apc_symmetra index 6231480..0b83668 100644 --- a/checkman/apc_symmetra +++ b/checkman/apc_symmetra @@ -8,16 +8,49 @@ description: {(2)} the output status, {(3)} the battery capacity, {(4)} the battery temperature, {(5)} the battery current, {(6)} the output voltage and {(7)} the output current, {(8)} the remaing run time. The output current and - remaining run time are not checked against - a level but just being displayed. + remaining run time are not checked against a level but are just displayed. + + The check output includes the calibration status of the UPS. During a + calibration the check result in section {(2)} is OK even though the UPS is running + on battery. + The check reads the date of the last calibration and optionally applies an alternative + level for the battery capacity on the day of the calibration. This is because the battery + capacity is reduced after calibration and may cause an unwanted critical condition + with the standard level. In addition a time span after the day of the calibration + can be configured during which the post-calibration phase still persists. examples: - # Set the critical levels for all APC checks to: + # Set the critical levels for the normal operation mode of all APC checks to: # - battery capacity at 90% or lower # - battery temperature to 38C or higher # - battery current to 10A or higher # - output voltage to 225V or lower - apc_default_levels = (90, 38, 10, 225) + # old method, unsets the post calibration levels + apc_default_levels = ( 90, 38, 10, 225 ) + # new method + apc_default_levels = { + "levels": ( 90, 38, 10, 225 ) + } + + # also set the alternative level for the battery capacity and the delay time span + apc_default_levels = { + "levels": ( 90, 38, 10, 225 ), + "post_calibration_levels": { + "altcapacity": 50, # in percent + "additional_time_span": 60 # in minutes + } + + # checkgroup_parameters syntax + # please note that the name of the group is apc_symentra, NOT apc_symmetra ! + checkgroup_parameters.setdefault('apc_symentra', []) + + checkgroup_parameters['apc_symentra'] += [ + # All UPS in production get other critical levels + ( { "levels": (85, 35, 2, 210) }, ["prod"], ALL_HOSTS ), + # All UPS get post calibration level of 50% + ( { "post_calibration_levels": { "altcapacity": 50 } }, ["prod"],ALL_HOSTS ), + ( { "post_calibration_levels": { "additional_time_span": 60 } }, ["prod"], ALL_HOSTS ), + ] perfdata: This check outputs five performance values: the battery capacity, @@ -25,14 +58,22 @@ perfdata: the output current. inventory: - Supported. + The inventory process checks if the device has a system description OIDs (.1.3.6.1.2.1.1.2.0) + and if the name of this OID is known to the test. If this is true the system is inventorized. [parameters] -crit_capacity (int): The battery capacity in percent at and below which a critical state is be triggered -crit_batt_temp (int): The critical temperature of the battery -crit_batt_curr (int): The critical battery current in Ampere -crit_voltage (int): The output voltage at and below which a critical state is triggered. +parameters(dict): parameters is a dictionary with two keys + + {"levels"}: a tuple of critical levels for battery capacity, temperature, current and output + voltage. The numbers are integers. + + {"post_calibration_levels"}: a dictionary of two parameters: {"altcapacity"} is the alternative + critical level for the battery capacity in the post-calibration phase in precent. {"additional_time_span"} + is a time span the post-calibration phase is extended past the day of the calibration in minutes. + +parameters(tuple): The old format of a tuple of 4 values is also still supported, containing what + is found in the key {"levels"} in the dictionary. + [configuration] -apc_default_levels (int, int, int, int): The default levels to be used - for inventorized checks. This variable is preset to {(95, 40, 1, 220)} +apc_default_levels (dict): This variable is preset to {{ "levels": ( 95, 40, 1, 220 ) }}

11 years

Check_MK Git: check_mk: LDAP Cache Livetime: use better ValueSpec "Age"

by Mathias Kettner

Module: check_mk Branch: master Commit: ee57f70eb2fbc76c9d097460cb95cd7bb32bb95c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ee57f70eb2fbc7… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Sep 27 11:02:03 2013 +0200 LDAP Cache Livetime: use better ValueSpec "Age" --- web/plugins/wato/check_mk_configuration.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/plugins/wato/check_mk_configuration.py b/web/plugins/wato/check_mk_configuration.py index ec25642..52df834 100644 --- a/web/plugins/wato/check_mk_configuration.py +++ b/web/plugins/wato/check_mk_configuration.py @@ -731,7 +731,7 @@ register_configvar(group, register_configvar(group, "ldap_cache_livetime", - Integer( + Age( title = _('LDAP Cache Livetime'), help = _('This option defines the maximum age for using the cached LDAP data. The time of the ' 'last LDAP synchronisation is saved and checked on every request to the multisite '

11 years

Check_MK Git: check_mk: Updated some inline documentation

by Mathias Kettner

Module: check_mk Branch: master Commit: 0c8dfb5f48e6df4518866eb2356b7bea93b71ec5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0c8dfb5f48e6df… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Sep 26 23:27:40 2013 +0200 Updated some inline documentation --- modules/check_mk.py | 48 ++++++++++++++++++++++++++---------------------- 1 file changed, 26 insertions(+), 22 deletions(-) diff --git a/modules/check_mk.py b/modules/check_mk.py index a1bc479..9611dd2 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -48,6 +48,17 @@ else: opt_verbose = False opt_debug = False +#. +# .--Pathnames-----------------------------------------------------------. +# | ____ _ _ | +# | | _ \ __ _| |_| |__ _ __ __ _ _ __ ___ ___ ___ | +# | | |_) / _` | __| '_ \| '_ \ / _` | '_ ` _ \ / _ \/ __| | +# | | __/ (_| | |_| | | | | | | (_| | | | | | | __/\__ \ | +# | |_| \__,_|\__|_| |_|_| |_|\__,_|_| |_| |_|\___||___/ | +# | | +# '----------------------------------------------------------------------' + + # are we running OMD? If yes, honor local/ hierarchy omd_root = os.getenv("OMD_ROOT", None) if omd_root: @@ -72,15 +83,6 @@ else: local_doc_dir = None local_locale_dir = None -# +----------------------------------------------------------------------+ -# | ____ _ _ | -# | | _ \ __ _| |_| |__ _ __ __ _ _ __ ___ ___ ___ | -# | | |_) / _` | __| '_ \| '_ \ / _` | '_ ` _ \ / _ \/ __| | -# | | __/ (_| | |_| | | | | | | (_| | | | | | | __/\__ \ | -# | |_| \__,_|\__|_| |_|_| |_|\__,_|_| |_| |_|\___||___/ | -# | | -# +----------------------------------------------------------------------+ - # Pathnames, directories and other settings. All these settings # should be overriden by /usr/share/check_mk/modules/defaults, which # is created by setup.sh. The user might override those values again @@ -185,18 +187,18 @@ else: check_mk_basedir = default_config_dir check_mk_configfile = default_config_dir + "/main.mk" - -# +----------------------------------------------------------------------+ -# | ____ _ ____ __ _ _ | -# | / ___| ___| |_ | _ \ ___ / _| __ _ _ _| | |_ ___ | -# | \___ \ / _ \ __| | | | |/ _ \ |_ / _` | | | | | __/ __| | -# | ___) | __/ |_ | |_| | __/ _| (_| | |_| | | |_\__ \ | -# | |____/ \___|\__| |____/ \___|_| \__,_|\__,_|_|\__|___/ | +#. +# .--Defaults------------------------------------------------------------. +# | ____ __ _ _ | +# | | _ \ ___ / _| __ _ _ _| | |_ ___ | +# | | | | |/ _ \ |_ / _` | | | | | __/ __| | +# | | |_| | __/ _| (_| | |_| | | |_\__ \ | +# | |____/ \___|_| \__,_|\__,_|_|\__|___/ | # | | # +----------------------------------------------------------------------+ - -# Before we read the configuration files we create default settings -# for all variables. The user can easily override them. +# | Before we read the configuration files we create default settings | +# | for all variables. The user can easily override them. | +# '----------------------------------------------------------------------' # define magic keys for use in host extraconf lists PHYSICAL_HOSTS = [ '@physical' ] # all hosts but not clusters @@ -571,6 +573,7 @@ def aggregated_service_name(hostname, servicedesc): return aggrname return "" +#. # .--Helpers-------------------------------------------------------------. # | _ _ _ | # | | | | | ___| |_ __ ___ _ __ ___ | @@ -2459,9 +2462,8 @@ def quote_nagios_string(s): return "'" + s.replace('\\', '\\\\').replace("'", "'\"'\"'").replace('!', '\\!') + "'" - - -# +----------------------------------------------------------------------+ +#. +# .--Inventory-----------------------------------------------------------. # | ___ _ | # | |_ _|_ ____ _____ _ __ | |_ ___ _ __ _ _ | # | | || '_ \ \ / / _ \ '_ \| __/ _ \| '__| | | | | @@ -2469,6 +2471,8 @@ def quote_nagios_string(s): # | |___|_| |_|\_/ \___|_| |_|\__\___/|_| \__, | | # | |___/ | # +----------------------------------------------------------------------+ +# | Automatic service detection | +# '----------------------------------------------------------------------' def inventorable_checktypes(what): # snmp, tcp, all

11 years

Check_MK Git: check_mk: Minor code cleanup

by Mathias Kettner

Module: check_mk Branch: master Commit: 4406f8e83d1d8bdf14562b71282b4422d5299b46 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4406f8e83d1d8b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Sep 26 17:36:24 2013 +0200 Minor code cleanup --- modules/automation.py | 1 + modules/check_mk.py | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/automation.py b/modules/automation.py index 00c6674..b5fd676 100644 --- a/modules/automation.py +++ b/modules/automation.py @@ -216,6 +216,7 @@ def automation_try_inventory_node(hostname): snmp_error = str(e) tcp_error = None + # Honor piggy_back data, even if host is not declared as TCP host if is_tcp_host(hostname) or \ get_piggyback_info(hostname) or get_piggyback_info(ipaddress): diff --git a/modules/check_mk.py b/modules/check_mk.py index f518e88..a1bc479 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -2707,7 +2707,6 @@ def make_inventory(checkname, hostnamelist, check_only=False, include_state=Fals except KeyboardInterrupt: sys.stderr.write('<Interrupted>\n') - if not check_only: if newchecks != []: filename = autochecksdir + "/" + checkname + "-" + time.strftime("%Y-%m-%d_%H.%M.%S")

11 years

Check_MK Git: check_mk: Staleness: red color also for host staleness

by Mathias Kettner

Module: check_mk Branch: master Commit: d3dbcd694c11b6f639b612fa88270b43228d6f4f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d3dbcd694c11b6… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Sep 26 11:00:40 2013 +0200 Staleness: red color also for host staleness --- web/plugins/views/painters.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/web/plugins/views/painters.py b/web/plugins/views/painters.py index 463f764..bb450e0 100644 --- a/web/plugins/views/painters.py +++ b/web/plugins/views/painters.py @@ -491,8 +491,8 @@ multisite_painters["svc_state_age"] = { "sorter" : "stateage", } -def paint_checked(row): - css, td = paint_age(row["service_last_check"], row["service_has_been_checked"] == 1, 0) +def paint_checked(what, row): + css, td = paint_age(row[what + "_last_check"], row[what + "_has_been_checked"] == 1, 0) if is_stale(row): css += " staletime" return css, td @@ -502,7 +502,7 @@ multisite_painters["svc_check_age"] = { "short" : _("Checked"), "columns" : [ "service_has_been_checked", "service_last_check" ], "options" : [ "ts_format", "ts_date" ], - "paint" : paint_checked, + "paint" : lambda row: paint_checked("service", row), } multisite_painters["svc_next_check"] = { @@ -868,7 +868,7 @@ multisite_painters["host_check_age"] = { "short" : _("Checked"), "columns" : [ "host_has_been_checked", "host_last_check" ], "options" : [ "ts_format", "ts_date" ], - "paint" : lambda row: paint_age(row["host_last_check"], row["host_has_been_checked"] == 1, 0), + "paint" : lambda row: paint_checked("host", row), } multisite_painters["host_next_check"] = {

11 years

Check_MK Git: check_mk: typo in ups capacity rule fixed

by Götz Golla

Module: check_mk Branch: master Commit: 4e83803b147ca1deb9f1172cf239b0c72e0068f2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4e83803b147ca1… Author: Götz Golla <gg(a)mathias-kettner.de> Date: Thu Sep 26 10:58:45 2013 +0200 typo in ups capacity rule fixed --- web/plugins/wato/check_parameters.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index defab5d..20a7f35 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -3281,7 +3281,7 @@ register_check_parameters( Integer( title = _("Warning Level"), help = _("Time left on Battery at and below which a warning state is triggered"), - unit = _("%"), + unit = _("min"), default_value = 0, ), Integer(

11 years

← Newer
1
2
3
4
5
6
7
...
23
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits September 2013