Checkmk git commits August 2015

checkmk-commits@lists.checkmk.com

7 participants
211 discussions

Check_MK Git: check_mk: fjdarye101_disks.summary: Removed check from check group "raid_disk" ( it is a summary check using other parameters)

by Lars Michelsen

Module: check_mk Branch: master Commit: a51e32af645b2113050880cdce580eeaba82cc3f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a51e32af645b21… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Aug 27 11:36:51 2015 +0200 fjdarye101_disks.summary: Removed check from check group "raid_disk" (it is a summary check using other parameters) --- checks/fjdarye101_disks | 18 +++++++++--------- checks/fjdarye60_disks | 18 +++++++++--------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/checks/fjdarye101_disks b/checks/fjdarye101_disks index 6a2cc9f..dd097f2 100644 --- a/checks/fjdarye101_disks +++ b/checks/fjdarye101_disks @@ -24,22 +24,22 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. -check_info["fjdarye101_disks"] = { + +check_info["fjdarye101_disks.summary"] = { 'includes' : [ "fjdarye.include"], - 'check_function' : check_fjdarye_disks, - 'inventory_function' : inventory_fjdarye_disks, - 'service_description' : 'Disk %s', + 'check_function' : check_fjdarye_disks_summary, + 'inventory_function' : inventory_fjdarye_disks_summary, + 'service_description' : 'Disk summary', 'snmp_info' : ('.1.3.6.1.4.1.211.1.21.1.101.2.12.2.1', [1, 3]), 'snmp_scan_function' : \ lambda oid: oid(".1.3.6.1.2.1.1.2.0") == ".1.3.6.1.4.1.211.1.21.1.101", - 'group' : 'raid_disk', } -check_info["fjdarye101_disks.summary"] = { +check_info["fjdarye101_disks"] = { 'includes' : [ "fjdarye.include"], - 'check_function' : check_fjdarye_disks_summary, - 'inventory_function' : inventory_fjdarye_disks_summary, - 'service_description' : 'Disk summary', + 'check_function' : check_fjdarye_disks, + 'inventory_function' : inventory_fjdarye_disks, + 'service_description' : 'Disk %s', 'snmp_info' : ('.1.3.6.1.4.1.211.1.21.1.101.2.12.2.1', [1, 3]), 'snmp_scan_function' : \ lambda oid: oid(".1.3.6.1.2.1.1.2.0") == ".1.3.6.1.4.1.211.1.21.1.101", diff --git a/checks/fjdarye60_disks b/checks/fjdarye60_disks index c4cc4f3..b377705 100644 --- a/checks/fjdarye60_disks +++ b/checks/fjdarye60_disks @@ -34,21 +34,21 @@ check_includes['fjdarye60_disks.summary'] = ["fjdarye.include"] check_includes['fjdarye60_disks'] = ["fjdarye.include"] -check_info["fjdarye60_disks"] = { - 'check_function': check_fjdarye_disks, - 'inventory_function': inventory_fjdarye_disks, - 'service_description': 'Disk %s', +check_info["fjdarye60_disks.summary"] = { + 'check_function': check_fjdarye_disks_summary, + 'inventory_function': inventory_fjdarye_disks_summary, + 'service_description': 'Disk summary', 'snmp_info': ('.1.3.6.1.4.1.211.1.21.1.60.2.12.2.1', [1, 3]), 'snmp_scan_function': \ lambda oid: oid(".1.3.6.1.2.1.1.2.0") == ".1.3.6.1.4.1.211.1.21.1.60", - 'group': 'raid_disk', } -check_info["fjdarye60_disks.summary"] = { - 'check_function': check_fjdarye_disks_summary, - 'inventory_function': inventory_fjdarye_disks_summary, - 'service_description': 'Disk summary', +check_info["fjdarye60_disks"] = { + 'check_function': check_fjdarye_disks, + 'inventory_function': inventory_fjdarye_disks, + 'service_description': 'Disk %s', 'snmp_info': ('.1.3.6.1.4.1.211.1.21.1.60.2.12.2.1', [1, 3]), 'snmp_scan_function': \ lambda oid: oid(".1.3.6.1.2.1.1.2.0") == ".1.3.6.1.4.1.211.1.21.1.60", + 'group': 'raid_disk', }

8 years, 10 months

Check_MK Git: check_mk: ups_modulys_battery: Fixed problem with check having no item in checkgroup needing an item

by Lars Michelsen

Module: check_mk Branch: master Commit: 7701957107e604a4c53074abb51714b5c0abf8c5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7701957107e604… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Aug 27 11:22:17 2015 +0200 ups_modulys_battery: Fixed problem with check having no item in checkgroup needing an item --- checks/ups_modulys_battery | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/checks/ups_modulys_battery b/checks/ups_modulys_battery index f054996..f9bd24f 100644 --- a/checks/ups_modulys_battery +++ b/checks/ups_modulys_battery @@ -107,7 +107,7 @@ check_info["ups_modulys_battery"] = { def inventory_ups_modulys_battery_temp(info): for condition, elapsed_sec, remaining_min, capacity, temperature in info: if temperature: - yield "", {} + yield "Battery", {} def check_ups_modulys_battery_temp(item, params, info): @@ -119,7 +119,7 @@ check_info["ups_modulys_battery.temp"] = { "inventory_function" : inventory_ups_modulys_battery_temp, "check_function" : check_ups_modulys_battery_temp, "has_perfdata" : True, - "service_description" : "Temperature Battery", + "service_description" : "Temperature %s", "group" : "temperature", "default_levels_variable" : "ups_modulys_battery_temp_default_levels", }

8 years, 10 months

Check_MK Git: check_mk: #2543 FIX Fixed usage of icons/ actions configured directly with process rules

by Lars Michelsen

Module: check_mk Branch: master Commit: 5bc78ca54cc87ab5c52c792e75f9bf550fbe6b3b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5bc78ca54cc87a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Aug 27 10:51:13 2015 +0200 #2543 FIX Fixed usage of icons/actions configured directly with process rules --- .werks/2543 | 9 +++++++++ ChangeLog | 1 + checks/ps.include | 17 +++++++++++------ 3 files changed, 21 insertions(+), 6 deletions(-) diff --git a/.werks/2543 b/.werks/2543 new file mode 100644 index 0000000..141ec63 --- /dev/null +++ b/.werks/2543 @@ -0,0 +1,9 @@ +Title: Fixed usage of icons/actions configured directly with process rules +Level: 1 +Component: core +Compatible: compat +Version: 1.2.7i3 +Date: 1440665444 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index b55dbc7..1b34bfd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,6 +4,7 @@ * 2502 FIX: Fixed removing autochecks when a host is configured to be ping only... * 2526 FIX: Fixed crash in filesystem checks in case mountpoint contains non-ascii characters * 2540 FIX: Process piggy backed data even if host is set to "No Agent"... + * 2543 FIX: Fixed usage of icons/actions configured directly with process rules Checks & Agents: * 2312 New checks for EMC VPLEX: emc_vplex_cpu, emc_vplex_director_stats, emc_vplex_if, emc_vplex_volumes... diff --git a/checks/ps.include b/checks/ps.include index 9c29195..e73e000 100644 --- a/checks/ps.include +++ b/checks/ps.include @@ -61,7 +61,7 @@ def inventory_ps_common(invdata, invrules, info): inv_entry += ([],) default_levels = inv_entry[3:7] - entries.append(inv_entry[:3] + ({ "levels" : default_levels },)) + entries.append(inv_entry[:3] + [None] + ({ "levels" : default_levels },)) # Handle new WATO style inventory rules for rule in invrules: @@ -78,9 +78,9 @@ def inventory_ps_common(invdata, invrules, info): v = rule[0] - entries.append((v['descr'], v.get('match'), v.get('user'), v.get('default_params', v))) + entries.append((v['descr'], v.get('match'), v.get('user'), v.get('icon'), v.get('default_params', v))) - for servicedesc, pattern, userspec, default_params in entries: + for servicedesc, pattern, userspec, icon, default_params in entries: num_perc_s = servicedesc.count("%s") for line in info: # First entry in line is the node name or None for non-clusters @@ -113,17 +113,22 @@ def inventory_ps_common(invdata, invrules, info): # Problem here: We need to instantiate all subexpressions # with their actual values of the found process. i_pattern = instantiate_regex_pattern(pattern, matches) - inv_keys = { + + inv_params = { "process" : i_pattern, "user" : i_userspec, } + + if icon: + inv_params["icon"] = icon + # default_params is either a clean dict with optional parameters to set as default # or - from version 1.2.4 - the dict from the rule itself. In the later case # we need o remove the keys that do not specify default parameters for key, value in default_params.items(): if key not in ( "descr", "match", "user", "perfdata" ): - inv_keys.setdefault(key, value) - inv = ( i_servicedesc, inv_keys ) + inv_params.setdefault(key, value) + inv = ( i_servicedesc, inv_params ) if inv not in inventory: inventory.append(inv)

8 years, 10 months

Check_MK Git: check_mk: Reserved 20 Werk IDS

by Lars Michelsen

Module: check_mk Branch: master Commit: fbbec1efdff5b0f2c16a5e36dacbe09790afc6dc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fbbec1efdff5b0… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Aug 27 10:50:34 2015 +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 fe534ad..f9aadb0 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -2543 +2563

8 years, 10 months

Check_MK Git: check_mk: Fixed usage of icons/ actions by services defined by process rules

by Lars Michelsen

Module: check_mk Branch: master Commit: e9524d00390320b8f2421625a042e553f9639e24 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e9524d00390320… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Aug 27 10:44:38 2015 +0200 Fixed usage of icons/actions by services defined by process rules --- modules/check_mk.py | 2 +- modules/check_mk_base.py | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/modules/check_mk.py b/modules/check_mk.py index 0aadd50..be1f312 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -1582,7 +1582,7 @@ def icons_and_actions_of(what, hostname, svcdesc = None, checkname = None, param actions = set(service_extra_conf(hostname, svcdesc, service_icons_and_actions)) # Some WATO rules might register icons on their own - checkgroup = checkgroup_of.get(checkname, checkname) + checkgroup = check_info[checkname]["group"] if checkgroup in [ 'ps', 'services' ] and type(params) == dict: icon = params.get('icon') if icon: diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index cd6b67c..2a89ca7 100644 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -1581,6 +1581,8 @@ def pack_crash_dump(crash_dir): def check_unimplemented(checkname, params, info): return (3, 'UNKNOWN - Check not implemented') +# FIXME: Clear / unset all legacy variables to prevent confusions in other code trying to +# use the legacy variables which are not set by newer checks. def convert_check_info(): for check_type, info in check_info.items(): basename = check_type.split(".")[0]

8 years, 10 months

Check_MK Git: check_mk: Fixed exception in ps check when counters are cleared after short rewrite of counter handling

by Lars Michelsen

Module: check_mk Branch: master Commit: f5126dd2e47e0b166804fe428ddb1ee3ed67b821 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f5126dd2e47e0b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Aug 27 10:35:35 2015 +0200 Fixed exception in ps check when counters are cleared after short rewrite of counter handling --- modules/check_mk_base.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index 2e4e8e3..cd6b67c 100644 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -1092,13 +1092,14 @@ def last_counter_wrap(): # Deletes counters from g_item_state matching the given pattern and are older_than x seconds. # This is a neccessary cleanup just used by ps.include. Not nice. -def clear_counters(prefix, older_than): +def clear_counters(check_type_prefix, older_than): global g_item_state counters_to_delete = [] now = time.time() for name, (timestamp, value) in g_item_state.items(): - if name.startswith(prefix): + joined_name = type(name) == tuple and name[0] or name + if joined_name.startswith(check_type_prefix): if now > timestamp + older_than: counters_to_delete.append(name)

8 years, 10 months

Check_MK Git: check_mk: emc_isilon_ifs: Filesystem group check needs to have a check item

by Lars Michelsen

Module: check_mk Branch: master Commit: 921dd05d7ce28a09c212bdcbbafc57901b1fa497 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=921dd05d7ce28a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Aug 27 09:57:34 2015 +0200 emc_isilon_ifs: Filesystem group check needs to have a check item This resulted in exceptions like this one when having at least one rule for filesystem checks defined: Error creating configuration: Invalid entry '({'levels': (91.0, 95.0)}, ['prod'], ['@all'], [u'/usr/sap$'])' in host configuration list: must have 2 or 3 entries --- checks/emc_isilon_ifs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/checks/emc_isilon_ifs b/checks/emc_isilon_ifs index 24ac9fa..0dea37b 100644 --- a/checks/emc_isilon_ifs +++ b/checks/emc_isilon_ifs @@ -31,7 +31,7 @@ factory_settings["emc_isilon_ifs"] = {} def inventory_emc_isilon_ifs(info): # this check handles the cluster file system so there is only one - return [ (None, None) ] + return [ ("Cluster", None) ] def check_emc_isilon_ifs(item, params, info): ONE_MB = 1024 * 1024 @@ -45,7 +45,7 @@ def check_emc_isilon_ifs(item, params, info): check_info["emc_isilon_ifs"] = { "check_function" : check_emc_isilon_ifs, "inventory_function" : inventory_emc_isilon_ifs, - "service_description" : "Filesystem Cluster", + "service_description" : "Filesystem %s", "includes" : [ "df.include" ], "group" : "filesystem", "default_levels_variable" : "emc_isilon_ifs",

8 years, 10 months

Check_MK Git: check_mk: added new metrics

by Simon Betz

Module: check_mk Branch: master Commit: 0324b448173c6c4c567330039fefabb097bf7137 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0324b448173c6c… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Aug 27 08:45:59 2015 +0200 added new metrics --- web/plugins/metrics/check_mk.py | 58 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 58 insertions(+) diff --git a/web/plugins/metrics/check_mk.py b/web/plugins/metrics/check_mk.py index 4931c0f..56ea7f7 100644 --- a/web/plugins/metrics/check_mk.py +++ b/web/plugins/metrics/check_mk.py @@ -182,6 +182,18 @@ unit_info["bar"] = { "render" : lambda v: physical_precision(v, 6, _("bar")), } +unit_info["Pa"] = { + "title" : _("Pascal"), + "symbol" : _("Pa"), + "render" : lambda v: physical_precision(v, 3, _("Pa")), +} + +unit_info["l/s"] = { + "title" : _("Liter per second"), + "symbol" : _("l/s"), + "render" : lambda v: physical_precision(v, 3, _("l/s")), +} + #. # .--Metrics-------------------------------------------------------------. # | __ __ _ _ | @@ -842,6 +854,18 @@ metric_info["smoke_perc"] = { "color" : "#60f088", } +metric_info["airflow"] = { + "title" : _("Air flow"), + "unit" : "l/s", + "color" : "#ff6234", +} + +metric_info["fluidflow"] = { + "title" : _("Fluid flow"), + "unit" : "l/s", + "color" : "#ff6234", +} + metric_info["deviation_calibration_point"] = { "title" : _("Deviation from calibration point"), "unit" : "%", @@ -2014,6 +2038,12 @@ metric_info["pressure"] = { "color" : "#ff6234", } +metric_info["pressure_pa"] = { + "title" : _("Pressure"), + "unit" : "Pa", + "color" : "#ff6234", +} + metric_info["licenses"] = { "title" : _("Used licenses"), "unit" : "count", @@ -3369,6 +3399,13 @@ perfometer_info.append({ perfometer_info.append({ "type" : "logarithmic", + "metric" : "pressure_pa", + "half_value" : 10, + "exponent" : 2, +}) + +perfometer_info.append({ + "type" : "logarithmic", "metric" : "cifs_share_users", "half_value" : 10, "exponent" : 2, @@ -3851,6 +3888,13 @@ perfometer_info.append({ }) perfometer_info.append({ + "type" : "logarithmic", + "metric" : "energy", + "half_value" : 10000, + "exponent" : 3, +}) + +perfometer_info.append({ "type" : "linear", "segments" : [ "voltage_percent" ], "total" : 100.0, @@ -4007,6 +4051,20 @@ perfometer_info.append({ "total" : 10, }) +perfometer_info.append({ + "type" : "logarithmic", + "metric" : "airflow", + "half_value" : 300, + "exponent" : 2, +}) + +perfometer_info.append({ + "type" : "logarithmic", + "metric" : "fluidflow", + "half_value" : 0.2, + "exponent" : 5, +}) + perfometer_info.append(("stacked", [ { "type" : "logarithmic",

8 years, 10 months

Check_MK Git: check_mk: added different uptime formats as comments

by Simon Betz

Module: check_mk Branch: master Commit: 6495b9efdff811c29302971edb5e7c0f8b9f73bc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6495b9efdff811… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Aug 27 08:05:52 2015 +0200 added different uptime formats as comments --- agents/check_mk_agent.aix | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/agents/check_mk_agent.aix b/agents/check_mk_agent.aix index c3927fd..2ebb4f4 100755 --- a/agents/check_mk_agent.aix +++ b/agents/check_mk_agent.aix @@ -216,9 +216,19 @@ then $(which trd) -s fi - +# uptime formats +# 12:55pm up 105 days, 21 hrs, 2 users, load average: 0.26, 0.26, 0.26 +# 1:41pm up 105 days, 21:46, 2 users, load average: 0.28, 0.28, 0.27 +# 05:26PM up 1:16, 1 user, load average: 0.33, 0.21, 0.20 +# 06:13PM up 2:03, 1 user, load average: 1.16, 1.07, 0.91 +# 08:43AM up 29 mins, 1 user, load average: 0.09, 0.18, 0.21 +# 08:47AM up 66 days, 18:34, 1 user, load average: 2.25, 2.43, 2.61 echo '<<<uptime>>>' -uptime | sed -e 's/^.*up//g' -e 's/user.*$//g' -e 's/hrs/0/g' -e 's/:/ /g' -e 's/days,//g' -e 's/mins//g' | sed -r 's/(.*),.*/\1/' | awk '{if (NF == 3) a=86400*int($1)+3600*int($2)+60*int($3); else if (NF ==2) a=3600*int($1)+60*int($2); else a=60*int($1); printf("%d\n",a)}' +uptime | sed -e 's/^.*up//g' -e 's/user.*$//g' -e 's/hrs/0/g' -e 's/:/ /g' -e 's/days,//g' -e 's/mins//g' \ + | sed -r 's/(.*),.*/\1/' \ + | awk '{if (NF == 3) a=86400*int($1)+3600*int($2)+60*int($3); \ + else if (NF ==2) a=3600*int($1)+60*int($2); \ + else a=60*int($1); printf("%d\n",a)}' if cd $PLUGINSDIR 2>/dev/null

8 years, 10 months

Check_MK Git: check_mk: bugfix: commit 5686cf7da2a3f5117fa8a963c4a2e07c3ce15028 broke configuration dialog for assigning icons to services or hosts

by Sebastian Herbord

Module: check_mk Branch: master Commit: 0568a580a73df7092d8850d07d052ea65337163c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0568a580a73df7… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Wed Aug 26 18:17:36 2015 +0200 bugfix: commit 5686cf7da2a3f5117fa8a963c4a2e07c3ce15028 broke configuration dialog for assigning icons to services or hosts --- web/htdocs/wato.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index dd744c0..257b7cb 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -19620,7 +19620,7 @@ class UserIconOrAction(DropdownChoice): if 'title' in action: label += ' - '+action['title'] if 'url' in action: - label += ' ('+action['url']+')' + label += ' ('+action['url'][0]+')' choices.append((key, label)) return sorted(choices, key = lambda x: x[1])

8 years, 10 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits August 2015