Checkmk git commits January 2015

checkmk-commits@lists.checkmk.com

8 participants
297 discussions

Check_MK Git: check_mk: Fixed some english texts

by Mathias Kettner

Module: check_mk Branch: master Commit: 64e266aba90c1f76f1a41e1fc3d82d83412b0a06 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=64e266aba90c1f… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Jan 29 10:42:39 2015 +0100 Fixed some english texts --- web/htdocs/dashboard.py | 2 +- web/htdocs/wato.py | 10 ++++++---- web/plugins/wato/active_checks.py | 2 +- web/plugins/wato/check_mk_configuration.py | 4 ++-- web/plugins/wato/check_parameters.py | 28 ++++++++++++++-------------- 5 files changed, 24 insertions(+), 22 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=64e266aba9…

9 years, 7 months

Check_MK Git: check_mk: removed redundant load_checks() call

by Lutz Helwing

Module: check_mk Branch: master Commit: feebdc33695c8d1ffd2c785eb5ee2631fa6f3f7e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=feebdc33695c8d… Author: Lutz Helwing <lh(a)mathias-kettner.de> Date: Thu Jan 29 10:00:08 2015 +0100 removed redundant load_checks() call --- modules/check_mk.py | 1 - 1 file changed, 1 deletion(-) diff --git a/modules/check_mk.py b/modules/check_mk.py index 069e820..08a4295 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -353,7 +353,6 @@ def load_checks(): # Now convert check_info to new format. convert_check_info() -load_checks() #. # .--Checks--------------------------------------------------------------.

9 years, 7 months

Check_MK Git: check_mk: 1948 Livedump: Host names can now be prefixed with an individual string...

by Sven Rueß

Module: check_mk Branch: master Commit: 9462bdda32ccbcb31ae4a83f93b757bb9bcfeb71 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9462bdda32ccbc… Author: Sven Rueß <sr(a)mathias-kettner.de> Date: Wed Jan 28 16:49:11 2015 +0100 1948 Livedump: Host names can now be prefixed with an individual string... --- .werks/1948 | 19 +++++ ChangeLog | 7 +- doc/treasures/livedump/livedump | 162 +++++++++++++++++++++++---------------- 3 files changed, 117 insertions(+), 71 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=9462bdda32…

9 years, 7 months

Check_MK Git: check_mk: #1218 Inital Agent Version for zOS (IBM Mainframes )

by Bastian Kuhn

Module: check_mk Branch: master Commit: 3dc15d62dbc3c8ebfcaa9799956e58d848333900 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3dc15d62dbc3c8… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Wed Jan 28 16:30:32 2015 +0100 #1218 Inital Agent Version for zOS (IBM Mainframes) This is only the first Version of the Agent. It has to be extended in the future. --- .werks/1218 | 10 +++++ ChangeLog | 1 + agents/z_os/README.convert | 2 + agents/z_os/check_mk_agent | 1 + agents/z_os/uptime | 1 + checks/df_zos | 91 ++++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 106 insertions(+) diff --git a/.werks/1218 b/.werks/1218 new file mode 100644 index 0000000..0f989ac --- /dev/null +++ b/.werks/1218 @@ -0,0 +1,10 @@ +Title: Inital Agent Version for zOS (IBM Mainframes) +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i1 +Date: 1422458934 +Class: feature + +This is only the first Version of the Agent. It has to be extended in the future. + diff --git a/ChangeLog b/ChangeLog index afa4d95..86cc635 100644 --- a/ChangeLog +++ b/ChangeLog @@ -62,6 +62,7 @@ * 1217 dell_om_sensors: Check now uses generic temperature template... NOTE: Please refer to the migration notes! * 1929 netapp_api_if: improved inventory and check output of virtual interfaces... + * 1218 Inital Agent Version for zOS (IBM Mainframes)... * 1457 FIX: logins: new check renamed from "users" check... NOTE: Please refer to the migration notes! * 1762 FIX: lnx_thermal: Now ignoring trip points with level 0... diff --git a/agents/z_os/README.convert b/agents/z_os/README.convert new file mode 100644 index 0000000..c9cc254 --- /dev/null +++ b/agents/z_os/README.convert @@ -0,0 +1,2 @@ +iconv -f ibm-1047 -t utf-8 FILE_NAME |tr "\205" "\12"|tr -d "\302" + diff --git a/agents/z_os/check_mk_agent b/agents/z_os/check_mk_agent new file mode 100644 index 0000000..29443f8 --- /dev/null +++ b/agents/z_os/check_mk_agent @@ -0,0 +1 @@ +{§@ònP`¢£@N§¥§£@mÅÄÃmÁÄÄmÅÙÙÕÖò~ñ§£@×ÁãÈ~a§£@ÔÒmÓÉÂÄÉÙ~a€¢aamm£§£@ÔÒmÃÖÕÆÄÉÙ~a£am{@Ô@¢€k@š@¢£@¢@@€×ÁãÈ~[×ÁãÈza€¢a@@@@@@{@Á@§€£¢@@×ÓäÇÉÕâÄÉÙ@Š@¢š@@§€£@@£{@€€£@@£@£@€£€£@@£@£K@×€¢@@£@Š{@¢£¢@@€¢£@€£€£@¢@Š£@}LLL}@@}nnn}×ÓäÇÉÕâÄÉÙ~[ÔÒmÓÉÂÄÉÙa€¢{@Á@§€£¢@@ÓÖÃÁÓÄÉÙ@Š@š@§€£@@£{@€£€£@¢£@£@£@¢£@LLLnnnK@×¢{@@£@@€££@@£¢@€£@@¢KÓÖÃÁÓÄÉÙ~[ÔÒmÓÉÂÄÉÙa{@Á@¢@@â×ÖÖÓÄÉÙ@Š@¢š@@£@£@£{@€£€£@@£š@@£@€££@M¢@Š]â×ÖÖÓÄÉÙ~[ÔÒmÃÖÕÆÄÉÙa¢@LLLmnnn@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@å¢z@ñKòKô@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@Á£Öâz@©aÖâ@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@×€¢Ä£šz@[×ÓäÇÉÕâÄÉÙ@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ÓÄ£šz@[ÓÖÃÁÓÄÉÙ@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@âÄ£šz@[â×ÖÖÓÄÉÙ@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@Á£Ä£šz@[ÔÒmÃÖÕÆÄÉÙ@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@~[MŠ]@@@@@@@@@@LLL¢nnn@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@¢@`@`@€¢k¥¢©k¥¢©öôk€k@O@¢€@O@¢@`@ñ@`@}¢a@\àM_@œ\à]@\àM_@œ\à]@\àM_@œ\à]@\àM_@œ\à]@\aMàñkàòkàókàô]@a}@@@@@@@@@@@@@@@@@@@{@ä£@}LLL€£nnn}@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@a€¢aa€£@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@LLLm©¢nnn@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@`¥×@O@¢@ñ{@`@O@¢@ñ@O@@`¥@¢@`¥@@{@×€¢@@[×ÓäÇÉÕâÄÉÙ@òna¥a€£@@@@@¢£@@[M¢]@@@@@@@@@@@@@@`§@[¢£@œ@^@£@@@@@@@@@@@@Ka[¢£@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@{@Ó@¢@}LLLnnn}@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@[ÓÖÃÁÓÄÉÙ@^@£@@@@@¢£@@[M¢]@^@@@@@@@@@@@`@[¢£@`@`§@[¢£@œ@^@£@@@@@@@@@@@@Ka[¢£@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ \ No newline at end of file diff --git a/agents/z_os/uptime b/agents/z_os/uptime new file mode 100644 index 0000000..5c956a3 --- /dev/null +++ b/agents/z_os/uptime @@ -0,0 +1 @@ +a\@ÙÅçç@\aÃåã@@@@@@~@ÃòÄMâãÖÙÁÇÅMñðkô]]@@@@@@@@@@@@@@@@a\@£@£@Ãåã@@@@@@@@@\aâÔÃÁ@@@@@~@âãÖÙÁÇÅMÄòçMÃåã@N@ñùö]kô]@@@@@@@@@a\@£@£@âÔÃÁ@@@@@@@@\aâÔÃÁ@@@@@~@ÂÉãÁÕÄMâÔÃÁk}÷ÆÆÆÆÆÆÆ}ç]@@@@@@@@@@a\@©@@@£@@\aâÔÃÁ@@@@@~@ÃòÄMâÔÃÁ]@@@@@@@@@@@@@@@@@@@@@@@@@a\@¥£@£@@@@\aa\@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@\aa\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\aa\@@ã@É×Ó@£@¢@¢£@@@@£@`@¢@£@@@@@@\aa\@@£@£@£k@£@¢@£@@¥£@@£@§@@@@@@\aa\@@£@@¢@¢@£@@¥K@@@@@@@@@@@@@@@@@@@@@@@@@@@@@\aa\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\aÉ×ÓãÉÔÅ@@~@ÃòÄMâãÖÙÁÇÅMÄòçMâÔÃÁ@N@óóö]kô]]@@@a\@É×Ó@ã@`@š@@@@\aÉ×ÓÄÁãÅ@@~@ÃòÄMâãÖÙÁÇÅMÄòçMâÔÃÁ@N@óôð]kô]]@@@a\@É×Ó@Ä£@`@ðÃèèÄÄÄÆ@@\aÉ×ÓÄÁãÅ@@~@ÄòçMÉ×ÓÄÁãÅ]@@@@@@@@@@@@@@@@@@@@@@a\@¥£@@£@§@@\aÉ×ÓÄÁãÅ@@~@âäÂâãÙMÉ×ÓÄÁãÅkòkõ]@@@@@@@@@@@@@@@a\@@èèÄÄÄ@@@@@@@@@@@\aÉ×ÓãÉÔÅ@@~@É×ÓãÉÔÅ@a@ñðð@@@@@@@@@@@@@@@@@@@@@a\@¥@€£¢@@@@@\a@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@a\@òô@\@öð@\@öð@~@øöôðð@\aâÁè@MÄÁãÅMÂ]`ÄÁãÅMÂkÉ×ÓÄÁãÅkÑ]]\øöôððNMãÉÔÅMâ]`É×ÓãÉÔÅ]@ð@@ \ No newline at end of file diff --git a/checks/df_zos b/checks/df_zos new file mode 100644 index 0000000..e66a6ed --- /dev/null +++ b/checks/df_zos @@ -0,0 +1,91 @@ +#!/usr/bin/python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2013 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- +# ails. 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. + +# <<<df_zos>>> +# SYS5.OMVS.ALF0.HFS 720 92 504 16% /ALF0 +# HFS, Read/Write, Device:2, ACLS=Y +# Filetag : T=off codeset=0 +# +# SYS5.OMVS.SYSPLEX.ROOT 720 224 372 38% / +# HFS, Read Only, Device:1, ACLS=Y +# Filetag : T=off codeset=0 + +# FS Types: +# AUTOMNT +# TFS +# ZFS +# NFS +# HFS + +def df_zos_convert(data): + entries = [] + found = False + for line in data: + if len(line) == 6: + entry = list(line) + found = True + continue + elif found: + entry.append(line[0][:-1]) #Filesystem Type + # Read/Write + if len(line) == 4: + entry.append('rw') + # Read Only + else: + entry.append('ro') + entries.append(entry) + found = False + return entries + +df_zos_exclude_list = ['AUTOMNT', 'TFS', 'NFS'] + +def inventory_df_zos(info): + info = df_zos_convert(info) + mplist = [] + for line in info: + if line[-1] == "rw" and line[-2] not in df_zos_exclude_list: + mplist.append(line[5]) + return df_inventory(mplist) + + +def check_df_zos(item, params, info): + info_convert = df_zos_convert(info) + fslist = [] + for fs, size, used, avail, used_perc, mount_point, fs_type, fs_state in info_convert: + size_mb = float(size) / 1024 + avail_mb = float(avail) / 1024 + fslist.append((mount_point, size_mb, avail_mb)) + return df_check_filesystem_list(item, params, fslist) + +check_info['df_zos'] = { + "check_function" : check_df_zos, + "inventory_function" : inventory_df_zos, + "service_description" : "Filesystem %s", + "has_perfdata" : True, + "group" : "filesystem", + "default_levels_variable" : "filesystem_default_levels", + "includes" : [ "df.include" ], +}

9 years, 7 months

Check_MK Git: check_mk: updated kemp_loadmaster_realserver manpage

by Lutz Helwing

Module: check_mk Branch: master Commit: 790e56e3007cbbc1e81002db9e0c169d85fa8a14 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=790e56e3007cbb… Author: Lutz Helwing <lh(a)mathias-kettner.de> Date: Wed Jan 28 15:04:37 2015 +0100 updated kemp_loadmaster_realserver manpage --- checkman/kemp_loadmaster_realserver | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/checkman/kemp_loadmaster_realserver b/checkman/kemp_loadmaster_realserver index 4c55cde..4bbf58f 100644 --- a/checkman/kemp_loadmaster_realserver +++ b/checkman/kemp_loadmaster_realserver @@ -4,10 +4,9 @@ catalog: hw/network/kemp license: GPL distribution: check_mk description: - This check monitors the state of the backend servers connected to a Kemp - Loadmaster. - It will return {OK} if the server is reachable, - {WARn} if the server state is unkown, Other states will result in {UKN}. + This check monitors the state of all enabled backend servers which are connected to a Kemp + Loadmaster. The check result is OK if the server's state is 'in service'. When the detected server state + is 'out of service' or 'failed' the check's result will be CRIT. inventory: - One service will be created for each serveradress + All backend servers which are not disabled are automatically detected. Each one is defined by its ID.

9 years, 7 months

Check_MK Git: check_mk: #1929 netapp_api_if: improved inventory and check output of virtual interfaces

by Andreas Boesl

Module: check_mk Branch: master Commit: 18c52e6b7f27036bcb7ca97fdb24c3607c8b1ccb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=18c52e6b7f2703… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Jan 28 15:01:58 2015 +0100 #1929 netapp_api_if: improved inventory and check output of virtual interfaces The netapp_api_if check now uses the common inventory function, which is used by most of the other inventory checks. This allows you to choose which port states to monitor and set whether the interface should use the interface description as service name --- .werks/1929 | 12 ++++++++++++ ChangeLog | 7 ++++--- checkman/netapp_api_if | 4 ++++ checks/netapp_api_if | 15 ++++++++++----- 4 files changed, 30 insertions(+), 8 deletions(-) diff --git a/.werks/1929 b/.werks/1929 new file mode 100644 index 0000000..41689d2 --- /dev/null +++ b/.werks/1929 @@ -0,0 +1,12 @@ +Title: netapp_api_if: improved inventory and check output of virtual interfaces +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i1 +Date: 1422453295 +Class: feature + +The netapp_api_if check now uses the common inventory function, which is used +by most of the other inventory checks. This allows you to choose which port states +to monitor and set whether the interface should use the interface description as service name + diff --git a/ChangeLog b/ChangeLog index 381556e..afa4d95 100644 --- a/ChangeLog +++ b/ChangeLog @@ -57,10 +57,11 @@ * 1920 df: Linux filesystem check now supports displaying data reserved for root... * 1675 esx_vsphere_hostsystem.cpu_util_cluster: Averaged CPU utilization of all cluster nodes... * 1216 hp_procurve_cpu: Can now be configured with Wato - * 1217 dell_om_sensors: Check now uses generic temperature template... - NOTE: Please refer to the migration notes! * 1676 if.include: now able to detect grouped interfaces... * 1928 netapp_api_if: Improved handling and check output of virtual interfaces... + * 1217 dell_om_sensors: Check now uses generic temperature template... + NOTE: Please refer to the migration notes! + * 1929 netapp_api_if: improved inventory and check output of virtual interfaces... * 1457 FIX: logins: new check renamed from "users" check... NOTE: Please refer to the migration notes! * 1762 FIX: lnx_thermal: Now ignoring trip points with level 0... @@ -114,8 +115,8 @@ * 1858 FIX: docsis_channels_downstream: allow for negative values of power in dBm * 1847 FIX: oracle_logswitches: Fixed description of WATO rule for levels... * 1877 FIX: printer_input/printer_output: Check can now handle non reported capacity unit - * 1859 FIX: cups_queues: linux agent now runs section cups_queues in cached mode... * 1921 FIX: kemp_loadmaster_realserver: reimplementation, now use vendor specific information + * 1859 FIX: cups_queues: linux agent now runs section cups_queues in cached mode... Multisite: * 1758 Improved exception hander: Shows details without additional debug request, added mailto link for error report... diff --git a/checkman/netapp_api_if b/checkman/netapp_api_if index d1d29e4..46e7ff3 100644 --- a/checkman/netapp_api_if +++ b/checkman/netapp_api_if @@ -27,6 +27,10 @@ description: in bytes. If you have configured traffic levels, then those levels are applied to the averaged values. + It might be a good idea to use the option "Use description as service name + for network interface checks", since there is no real interface index available + and can change over time. + item: There are three allowed ways to specify a port: {1}: the index of the interface (depends on the order of the data reported by the agent), the {ifDescr} of diff --git a/checks/netapp_api_if b/checks/netapp_api_if index c89582c..e6de141 100644 --- a/checks/netapp_api_if +++ b/checks/netapp_api_if @@ -60,7 +60,8 @@ def netapp_convert_to_if64(info): interfaces = parsed_data.get("net-ifconfig-get") # Calculate speed, state and create mac-address list - if_mac_list = {} + if_mac_list = {} # Dictionary with lists of common mac addresses + vif_list = [] # List of virtual interfaces for name, values in interfaces.items(): mediatype = values.get("mediatype") if mediatype: @@ -74,8 +75,13 @@ def netapp_convert_to_if64(info): speed = 10000000000 elif "10" in mediatype: speed = 10000000 + else: + speed = 0 values["speed"] = speed values["state"] = tokens[-1].lower() == "up" and "1" or "2" + elif values.get("port-role") != "storage-acp": + # If an interface has no media type and is not a storage-acp it is considered as virtual interface + vif_list.append(name) if "mac-address" in values: if_mac_list.setdefault(values["mac-address"], []) if_mac_list[values["mac-address"]].append(name) @@ -101,7 +107,7 @@ def netapp_convert_to_if64(info): mac_list = if_mac_list[values["mac-address"]] if len(mac_list) > 1: # check if this interface is grouped extra_info.setdefault(nic_name, {}) - extra_info[nic_name]["grouped_if"] = mac_list + extra_info[nic_name]["grouped_if"] = [ x for x in mac_list if x not in vif_list ] for tmp_if in mac_list: if tmp_if == nic_name: @@ -129,7 +135,7 @@ def netapp_convert_to_if64(info): mac = '' nic = ['0'] * 20 - nic[0] = idx + 1 # Index + nic[0] = str(idx + 1) # Index nic[1] = nic_name # Description nic[2] = "6" # Fake ethernet # Type nic[3] = speed # Speed @@ -158,8 +164,7 @@ def netapp_convert_to_if64(info): def inventory_netapp_api_if(parsed): nics, extra_info = parsed - for entry in nics: - yield entry[1], None + return inventory_if_common(nics) def check_netapp_api_if(item, params, parsed): nics, extra_info = parsed

9 years, 7 months

Check_MK Git: check_mk: Reserved 10 Werk IDS

by Sven Rueß

Module: check_mk Branch: master Commit: e049bdd10bbd7504ed96dad56e678b1de7f73499 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e049bdd10bbd75… Author: Sven Rueß <sr(a)mathias-kettner.de> Date: Wed Jan 28 14:53:17 2015 +0100 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 1473f3a..bba5da1 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -1948 +1958

9 years, 7 months

Check_MK Git: check_mk: Implement new option --cap

by Mathias Kettner

Module: check_mk Branch: master Commit: 973bc99d6412a7c2c43fbd4548a89c1b9297e124 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=973bc99d6412a7… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Jan 28 14:40:24 2015 +0100 Implement new option --cap --- modules/check_mk.py | 17 ++++++++++++----- modules/check_mk_base.py | 7 +++++-- 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/modules/check_mk.py b/modules/check_mk.py index 2a8d31c..069e820 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -253,7 +253,7 @@ config_variable_names = set.difference(set(vars().keys()) - known_vars) # at check time (and many of what is also needed at administration time). try: - modules = [ 'check_mk_base', 'discovery', 'snmp', 'notify', 'prediction', 'cmc', 'inline_snmp', 'agent_bakery' ] + modules = [ 'check_mk_base', 'discovery', 'snmp', 'notify', 'prediction', 'cmc', 'inline_snmp', 'agent_bakery', 'cap' ] for module in modules: filename = modules_dir + "/" + module + ".py" if os.path.exists(filename): @@ -4212,6 +4212,7 @@ def usage(): cmk -i, --inventory [HOST1 HOST2...] Do a HW/SW-Inventory of some ar all hosts cmk --inventory-as-check HOST Do HW/SW-Inventory, behave like check plugin cmk -A, --bake-agents [-f] [H1 H2..] Bake agents for hosts (not in all versions) + cmk --cap pack|unpack|list FILE.cap Pack/unpack agent packages (not in all versions) cmk --show-snmp-stats Analyzes recorded Inline SNMP statistics cmk -V, --version print version cmk -h, --help print this help @@ -5447,11 +5448,11 @@ long_options = [ "help", "version", "verbose", "compile", "debug", "interactive" "man", "nowiki", "config-check", "backup=", "restore=", "check-inventory=", "check-discovery=", "paths", "checks=", "inventory", "inventory-as-check=", "hw-changes=", "sw-changes=", - "cmc-file=", "browse-man", "list-man", "update-dns-cache" ] + "cmc-file=", "browse-man", "list-man", "update-dns-cache", "cap" ] non_config_options = ['-L', '--list-checks', '-P', '--package', '-M', '--notify', '--man', '-V', '--version' ,'-h', '--help', '--automation', - '--create-rrd', '--convert-rrds', '--keepalive' ] + '--create-rrd', '--convert-rrds', '--keepalive', '--cap' ] try: opts, args = getopt.getopt(sys.argv[1:], short_options, long_options) @@ -5669,14 +5670,20 @@ try: done = True elif o in [ '-A', '--bake-agents' ]: if 'do_bake_agents' not in globals(): - sys.stderr.write("Agent baking is not implemented in your version of Check_MK. Sorry.\n") - sys.exit(1) + bail_out("Agent baking is not implemented in your version of Check_MK. Sorry.") if args: hostnames = parse_hostname_list(args, with_clusters = False) else: hostnames = None do_bake_agents(hostnames) done = True + + elif o == '--cap': + if 'do_cap' not in globals(): + bail_out("Agent packages are not supported by your version of Check_MK.") + do_cap(args) + done = True + elif o in [ '--show-snmp-stats' ]: if 'do_show_snmp_stats' not in globals(): sys.stderr.write("Handling of SNMP statistics is not implemented in your version of Check_MK. Sorry.\n") diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index 9071f29..0ea9407 100644 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -139,8 +139,11 @@ else: # Output text if opt_verbose is set (-v). Adds no linefeed def verbose(text): if opt_verbose: - sys.stdout.write(text) - sys.stdout.flush() + try: + sys.stdout.write(text) + sys.stdout.flush() + except: + pass # avoid exception on broken pipe (e.g. due to | head) # Output text if, opt_verbose >= 2 (-vv). def vverbose(text):

9 years, 7 months

Check_MK Git: check_mk: merge conflict

by Bastian Kuhn

Module: check_mk Branch: master Commit: c5b9b2f6ae3556f4ccfa02369226c3dac140b7e9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c5b9b2f6ae3556… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Wed Jan 28 14:26:08 2015 +0100 merge conflict ---

9 years, 7 months

Check_MK Git: check_mk: #1217 dell_om_sensors: Check now uses generic temperature template

by Bastian Kuhn

Module: check_mk Branch: master Commit: 35f2ab69da042e645be53505b498056a09d6516e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=35f2ab69da042e… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Wed Jan 28 14:25:37 2015 +0100 #1217 dell_om_sensors: Check now uses generic temperature template The Check now uses the Wato Temperature Rule who provides more configuration options. If you used the Wato Room Temeperature Rule before you have to migrate the levels. --- .werks/1217 | 11 +++++++++++ ChangeLog | 2 ++ checks/dell_om_sensors | 37 +++++++++++++++++++++++-------------- 3 files changed, 36 insertions(+), 14 deletions(-) diff --git a/.werks/1217 b/.werks/1217 new file mode 100644 index 0000000..81d4b3f --- /dev/null +++ b/.werks/1217 @@ -0,0 +1,11 @@ +Title: dell_om_sensors: Check now uses generic temperature template +Level: 1 +Component: checks +Compatible: incomp +Version: 1.2.7i1 +Date: 1422451362 +Class: feature + +The Check now uses the Wato Temperature Rule who provides more configuration options. +If you used the Wato Room Temeperature Rule before you have to migrate the levels. + diff --git a/ChangeLog b/ChangeLog index c295753..023fc07 100644 --- a/ChangeLog +++ b/ChangeLog @@ -57,6 +57,8 @@ * 1920 df: Linux filesystem check now supports displaying data reserved for root... * 1675 esx_vsphere_hostsystem.cpu_util_cluster: Averaged CPU utilization of all cluster nodes... * 1216 hp_procurve_cpu: Can now be configured with Wato + * 1217 dell_om_sensors: Check now uses generic temperature template... + NOTE: Please refer to the migration notes! * 1457 FIX: logins: new check renamed from "users" check... NOTE: Please refer to the migration notes! * 1762 FIX: lnx_thermal: Now ignoring trip points with level 0... diff --git a/checks/dell_om_sensors b/checks/dell_om_sensors index 5b9f94c..0720ae2 100644 --- a/checks/dell_om_sensors +++ b/checks/dell_om_sensors @@ -32,7 +32,9 @@ def dell_om_sensors_item(name): def inventory_dell_om_sensors(info): - return [ (dell_om_sensors_item(line[4]), "dell_om_sensors_default_levels") for line in info ] + for line in info: + if line[3]: + yield dell_om_sensors_item(line[3]), "dell_om_sensors_default_levels" def check_dell_om_sensors(item, params, info): @@ -43,19 +45,26 @@ def check_dell_om_sensors(item, params, info): 3 : 'AmbientESM', # type is Ambient Embedded Systems Management temperature probe 16 : 'Discrete', # type is temperature probe with discrete reading } - for idx, sensor_state, reading, sensor_type, location_name in info: + sensor_states = { + 1 : "other", + 2 : "unknown", + 10 : "failed", + } + for idx, sensor_state, reading, location_name, dev_crit, dev_warn, dev_warn_lower, dev_crit_lower in info: if item == idx or dell_om_sensors_item(location_name) == item: if params == None: params = dell_om_sensors_default_levels # compatibility with old autochecks - temp = int(reading) / 10.0 - yield check_temperature(temp, params) + sensor_state = int(sensor_state) + if sensor_state in [ 1, 2, 10 ]: + return 2, "Sensor is: " + sensor_states[sensor_state] + + temp = int(reading) / 10.0 - if item == idx: # old style item: output location name - yield 0, "%s, Type: %s" % (location_name, probe_types[int(sensor_type)]) + dev_warn, dev_crit, dev_warn_lower, dev_crit_lower = \ + map(lambda v: float(v)/10 if v else None, [ dev_warn, dev_crit, dev_warn_lower, dev_crit_lower ]) - if int(sensor_state) != 3: - yield 2, "in critical state" + return check_temperature(temp, params, dev_levels = (dev_warn, dev_crit), dev_levels_lower = (dev_warn_lower, dev_crit_lower)) check_info["dell_om_sensors"] = { @@ -63,19 +72,19 @@ check_info["dell_om_sensors"] = { "inventory_function" : inventory_dell_om_sensors, "service_description" : "Temperature %s", "has_perfdata" : True, - "group" : "room_temperature", + "group" : "temperature", # There is no other way to find out that openmanage is present. "snmp_scan_function" : scan_dell_om, "snmp_info" : ( ".1.3.6.1.4.1.674.10892.1.700.20.1", [ '2', # ProbeIndex '5', # ProbeStatus '6', # ProbeReading - '7', # ProbeType + #'7', # ProbeType '8', # ProbeLocationName - #'10.1', # ProbeUpperCriticalThreshold', - #'11.1', # ProbeUpperNonCriticalThreshold', - #'12.1', # ProbeLowerNonCriticalThreshold', - #'13.1', # ProbeLowerCriticalThreshold', + '10', # ProbeUpperCriticalThreshold', + '11', # ProbeUpperNonCriticalThreshold', + '12', # ProbeLowerNonCriticalThreshold', + '13', # ProbeLowerCriticalThreshold', #'16.1', # ProbeDiscreteReading', ]), "includes" : [ "dell_om.include", "temperature.include" ],

9 years, 7 months

← Newer
1
...
4
5
6
7
8
9
10
...
30
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits January 2015