Checkmk git commits December 2013

checkmk-commits@lists.checkmk.com

6 participants
316 discussions

Check_MK Git: check_mk: hitachi_hnas_fan: New check for fans in Hitachi HNAS systems

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: cafc9e9c864a4b0116ee5d621d38433e5632af12 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cafc9e9c864a4b… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Wed Dec 18 16:39:59 2013 +0100 hitachi_hnas_fan: New check for fans in Hitachi HNAS systems --- .werks/318 | 8 +++ ChangeLog | 1 + checkman/hitachi_hnas_fan | 25 +++++++ checks/hitachi_hnas_fan | 101 +++++++++++++++++++++++++++ pnp-templates/check_mk-hitachi_hnas_fan.php | 34 +++++++++ web/plugins/perfometer/check_mk.py | 6 ++ 6 files changed, 175 insertions(+) diff --git a/.werks/318 b/.werks/318 new file mode 100644 index 0000000..e138891 --- /dev/null +++ b/.werks/318 @@ -0,0 +1,8 @@ +Title: hitachi_hnas_fan: New check for fans in Hitachi HNAS systems +Level: 2 +Component: checks +Version: 1.2.5i1 +Date: 1387381163 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index 567a1aa..9860334 100644 --- a/ChangeLog +++ b/ChangeLog @@ -24,6 +24,7 @@ * 0395 cmctc.temp: also detect older CMC devices * 0396 cmciii_access cmciii_io cmciii_psm_current cmciii_psm_plugs: Support other firmeware versions as well... * 0111 kemp_loadmaster_ha, kemp_loadmaster_realserver, kemp_loadmaster_services: New Checks for Kemp Loadbalancer + * 0318 hitachi_hnas_fan: New check for fans in Hitachi HNAS systems * 0103 FIX: services: Fixed bug with service inventory defined in main.mk... * 0299 FIX: borcade_mlx_fan: Prettified output, handling "other" state now * 0300 FIX: cisco_fru_power: Trying not to inventorize not plugged in FRUs... diff --git a/checkman/hitachi_hnas_fan b/checkman/hitachi_hnas_fan new file mode 100644 index 0000000..3434c5e --- /dev/null +++ b/checkman/hitachi_hnas_fan @@ -0,0 +1,25 @@ +title: Hitachi HNAS: Status and Speed of Fans +agents: snmp +catalog: hw/network/brocade +license: GPL +distribution: check_mk +description: + Checks the fitted status and speed status of a fan in an Hitachi HNAS storage + system. Displays speed of the fan. + + Returns {OK} if the fitted status is reported to be ok, {WARN} on status + okIdWrong, {CRIT} on status notFitted and {UNKN} on every other. + + Returns {OK} if the speed status is reported to be ok, {WARN} on status + warning, {CRIT} on status severe and {UNKN} on every other. + + The worst of both is the status returned by this Check. + +item: + The ID of the PNode plus the ID of the Fan, separated by a dot. E. g. 1.2 + +perfdata: + One value: The speed of the fan (rpm). + +inventory: + Finds one item per fan diff --git a/checks/hitachi_hnas_fan b/checks/hitachi_hnas_fan new file mode 100644 index 0000000..dfe785d --- /dev/null +++ b/checks/hitachi_hnas_fan @@ -0,0 +1,101 @@ +#!/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. + +def inventory_hitachi_hnas_fan(info): + inventory = [] + for clusternode, id, fitted_status, speed_status, speed in info: + inventory.append( (clusternode + "." + id, None) ) + return inventory + +def check_hitachi_hnas_fan(item, _no_params, info): + rc = 0 + + fan_fitted_status_map = ( ("", 3), # 0 + ("ok", 0), # 1 + ("okIdWrong", 1), # 2 + ("notFitted", 2), # 3 + ("unknown", 3), # 4 + ) + + fan_speed_status_map = ( ("", 3), # 0 + ("ok", 0), # 1 + ("warning", 1), # 2 + ("severe", 2), # 3 + ("unknown", 3), # 4 + ) + errorstring = ( "", " (!)", " (!!)", "") + + for clusternode, id, fitted_status, speed_status, speed in info: + if clusternode + "." + id == item: + fitted_status=int(fitted_status) + speed_status=int(speed_status) + speed=int(speed) + message = "PNode %s Fan %s" % (clusternode, id) + + # check fitted status + if fitted_status == 0 or fitted_status >= len(fan_fitted_status_map): + message += " fitted status unidentified %s" % fitted_status + rc = 3 + else: + message += " fitted status is %s%s" % ( fan_fitted_status_map[fitted_status][0], errorstring[fan_fitted_status_map[fitted_status][1]] ) + rc = fan_fitted_status_map[fitted_status][1] + + # check speed status + if speed_status == 0 or speed_status >= len(fan_speed_status_map): + message += ", speed status unidentified %s" % speed_status + if rc == 0: + rc = 3 + # if rc is already warning or critical, keep it + else: + message += ", speed status is %s%s" % ( fan_speed_status_map[speed_status][0], errorstring[fan_speed_status_map[speed_status][1]] ) + if fan_speed_status_map[speed_status][1] == 1: + if rc == 2: + rc = 2 + else: + rc = 1 + elif fan_speed_status_map[speed_status][1] == 2: + rc = 2 + elif fan_speed_status_map[speed_status][1] == 3: + if rc == 0: + rc = 3 + + # report speed + message += ", speed is %s rpm" % speed + perfdata = [ ('fanspeed', str(speed) + 'rpm', '', '', 0, '') ] + + return rc, message, perfdata + + return 3, "No fan %s found" % item + +check_info["hitachi_hnas_fan"] = { + "check_function" : check_hitachi_hnas_fan, + "inventory_function" : inventory_hitachi_hnas_fan, + "service_description" : "Fan %s", + "has_perfdata" : True, + "snmp_info" : (".1.3.6.1.4.1.11096.6.1.1.1.2.1.11.1", [1, 2, 3, 4, 5]), + # fanClusterNode, fanIndex, fanFittedStatus, fanSpeedStatus, fanSpeed + "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.11096.6"), +} diff --git a/pnp-templates/check_mk-hitachi_hnas_fan.php b/pnp-templates/check_mk-hitachi_hnas_fan.php new file mode 100644 index 0000000..6feda78 --- /dev/null +++ b/pnp-templates/check_mk-hitachi_hnas_fan.php @@ -0,0 +1,34 @@ +<?php +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | 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. + +$opt[1] = "--vertical-label \"rpm\" --title \"$hostname / $servicedesc\" "; + +$def[1] = "DEF:var1=$RRDFILE[1]:$DS[1]:MAX "; +$def[1] .= "AREA:var1#2080ff:\"Speed\:\" "; +$def[1] .= "GPRINT:var1:LAST:\"%2.0lf rpm\" "; +$def[1] .= "LINE1:var1#000080:\"\" "; +$def[1] .= "GPRINT:var1:MAX:\"(Max\: %2.0lf rpm,\" "; +$def[1] .= "GPRINT:var1:AVERAGE:\"Avg\: %2.0lf rpm)\" "; +?> diff --git a/web/plugins/perfometer/check_mk.py b/web/plugins/perfometer/check_mk.py index dca0387..baa43c4 100644 --- a/web/plugins/perfometer/check_mk.py +++ b/web/plugins/perfometer/check_mk.py @@ -760,3 +760,9 @@ def perfometer_fanspeed(row, check_command, perf_data): return "%.2f%%" % value, perfometer_linear(value, "silver") perfometers["check_mk-apc_inrow_fanspeed"] = perfometer_fanspeed + +def perfometer_fanspeed_logarithmic(row, check_command, perf_data): + value = float(perf_data[0][1]) + return "%d rpm" % value, perfometer_logarithmic(value, 5000, 2, "silver") + +perfometers["check_mk-hitachi_hnas_fan"] = perfometer_fanspeed_logarithmic

10 years, 6 months

Check_MK Git: check_mk: check-spaces / healspaces now handles windows newlins correctly

by Lars Michelsen

Module: check_mk Branch: master Commit: 3ca0536afe587cc71b113d7beaa489aca7b1dad1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3ca0536afe587c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Dec 18 16:25:58 2013 +0100 check-spaces / healspaces now handles windows newlins correctly --- Makefile | 4 +- checks/moxa_iologik_register | 144 +++++++++++++++++++++--------------------- 2 files changed, 74 insertions(+), 74 deletions(-) diff --git a/Makefile b/Makefile index 7a810ae..4ac633a 100644 --- a/Makefile +++ b/Makefile @@ -59,7 +59,7 @@ check-spaces: @if grep -q '[[:space:]]$$' $(SOURCE_FILES) ; then echo $$? ; figlet "Space error" \ ; echo "Aborting due to trailing spaces. Please use 'make healspaces' to repair." \ ; echo "Affected files: " \ - ; grep -l '[ ]$$' $(SOURCE_FILES) \ + ; grep -l '[[:space:]]$$' $(SOURCE_FILES) \ ; exit 1 ; fi @echo OK @@ -234,7 +234,7 @@ SOURCE_FILES = checkman/* modules/* checks/* notifications/* $$(find -name Makef healspaces: @echo "Removing trailing spaces from code lines..." - @sed -ri 's/[ ]+$$//g' $(SOURCE_FILES) + @sed -ri 's/[[:space:]]+$$//g' $(SOURCE_FILES) setup: diff --git a/checks/moxa_iologik_register b/checks/moxa_iologik_register index 067cd30..7fa4d35 100644 --- a/checks/moxa_iologik_register +++ b/checks/moxa_iologik_register @@ -1,72 +1,72 @@ -#!/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. - -# "0=Off, 1=On in DI/DO mode or N=Count in DO counter mode" - -def inventory_iologik_register(info): - inventory = [] - for line in info: - if line[2]: - inventory.append((line[0], None )) - return inventory - - -def check_iologik_register(item, params, info): - for line in info: - if line[0] == item: - if int(line[2]) in range(0, 2): - return (int(line[2]), line[1]) - else: - return (3, "Invalid value %s for register" % line[2]) - - return (3, "Register not found") - - -check_info['moxa_iologik_register'] = { - "check_function" : check_iologik_register, - "inventory_function" : inventory_iologik_register, - "service_description" : "Moxa Register", - "has_perfdata" : False, - "group" : "iologik_register", - "snmp_scan_function" : lambda oid: oid(".1.3.6.1.4.1.8691.10.2242.2.0").startswith("E2242-T"), - "snmp_info" : (".1.3.6.1.4.1.8691.10.2242.10.4.1.1", - [ "1", # index - "2", # Name - "3", # Value - ]) -} - -# DIOEntry -# dioIndex Integer32 (0..11) "The channel dio index." -# dioType Integer32 (0..1) "The channel dio type. 0=DI, DO=1, AI=2" -# dioMode Integer32 (0..1) "The channel dio mode. 0=DI, 1=Event Counter" -# dioStatus Unsigned32 (0..4294967295) "The channel dio(di/do) status. 0=Off, 1=On in DI/DO mode or N=Count in DO counter mode -# dioFilter Integer32 (1..65535) "The channel dio(di) counter filter. unit=0.5ms" -# dioTrigger Integer32 (0..1) "The channel dio(di) counter trigger level. 0=L2H, 1=H2L" -# dioCntStart Integer32 (0..1) "The channel dio(do) counter start/stop. 0=stop, 1=start" -# dioPulseStart Integer32 (0..1) "The channel dio(do) pulse start/stop. 0=stop, 1=start" -# dioPulseONWidth Unsigned32 (1..4294967295) "The channel dio(do) signal ON width. unit=0.5ms" -# dioPulseOFFWidth Unsigned32 (1..4294967295) "The channel dio(do) signal OFF width. unit=0.5ms" +#!/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. + +# "0=Off, 1=On in DI/DO mode or N=Count in DO counter mode" + +def inventory_iologik_register(info): + inventory = [] + for line in info: + if line[2]: + inventory.append((line[0], None )) + return inventory + + +def check_iologik_register(item, params, info): + for line in info: + if line[0] == item: + if int(line[2]) in range(0, 2): + return (int(line[2]), line[1]) + else: + return (3, "Invalid value %s for register" % line[2]) + + return (3, "Register not found") + + +check_info['moxa_iologik_register'] = { + "check_function" : check_iologik_register, + "inventory_function" : inventory_iologik_register, + "service_description" : "Moxa Register", + "has_perfdata" : False, + "group" : "iologik_register", + "snmp_scan_function" : lambda oid: oid(".1.3.6.1.4.1.8691.10.2242.2.0").startswith("E2242-T"), + "snmp_info" : (".1.3.6.1.4.1.8691.10.2242.10.4.1.1", + [ "1", # index + "2", # Name + "3", # Value + ]) +} + +# DIOEntry +# dioIndex Integer32 (0..11) "The channel dio index." +# dioType Integer32 (0..1) "The channel dio type. 0=DI, DO=1, AI=2" +# dioMode Integer32 (0..1) "The channel dio mode. 0=DI, 1=Event Counter" +# dioStatus Unsigned32 (0..4294967295) "The channel dio(di/do) status. 0=Off, 1=On in DI/DO mode or N=Count in DO counter mode +# dioFilter Integer32 (1..65535) "The channel dio(di) counter filter. unit=0.5ms" +# dioTrigger Integer32 (0..1) "The channel dio(di) counter trigger level. 0=L2H, 1=H2L" +# dioCntStart Integer32 (0..1) "The channel dio(do) counter start/stop. 0=stop, 1=start" +# dioPulseStart Integer32 (0..1) "The channel dio(do) pulse start/stop. 0=stop, 1=start" +# dioPulseONWidth Unsigned32 (1..4294967295) "The channel dio(do) signal ON width. unit=0.5ms" +# dioPulseOFFWidth Unsigned32 (1..4294967295) "The channel dio(do) signal OFF width. unit=0.5ms"

10 years, 6 months

Check_MK Git: check_mk: check_ftp: use IP address instead of host name

by Mathias Kettner

Module: check_mk Branch: master Commit: 89ef1c2b33f69cce6145a22f198370ea1d799d84 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=89ef1c2b33f69c… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Dec 18 15:22:40 2013 +0100 check_ftp: use IP address instead of host name --- checks/check_ftp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checks/check_ftp b/checks/check_ftp index 99cb288..9d6f72c 100644 --- a/checks/check_ftp +++ b/checks/check_ftp @@ -28,7 +28,7 @@ def check_ftp_arguments(params): if type(params) == tuple: host, settings = params else: - host = "$HOSTNAME$" + host = "$HOSTADDRESS$" settings = params args = ' -H %s' % quote_shell_string(host)

10 years, 6 months

Check_MK Git: check_mk: FIX WATO BI editor now supports percentages for count_ok

by Mathias Kettner

Module: check_mk Branch: master Commit: 7d3e0726d1fb43aa916dd1a15d24d897a4148519 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7d3e0726d1fb43… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Dec 18 15:19:28 2013 +0100 FIX WATO BI editor now supports percentages for count_ok The WATO module for BI aggregates now can correctly show and edit aggregation functions of the type <tt>count_ok</tt> that are using percentages instead of explicit numbers, e.g. <tt>count_ok!60%!30%</tt>. --- .werks/400 | 12 ++++++++++++ ChangeLog | 1 + web/htdocs/bi.py | 2 -- web/htdocs/lib.py | 6 ++++++ web/htdocs/wato.py | 2 +- web/plugins/wato/bi.py | 34 ++++++++++++++++++++++++++-------- 6 files changed, 46 insertions(+), 11 deletions(-) diff --git a/.werks/400 b/.werks/400 new file mode 100644 index 0000000..76da29c --- /dev/null +++ b/.werks/400 @@ -0,0 +1,12 @@ +Title: WATO BI editor now supports percentages for count_ok +Level: 2 +Component: wato +Class: fix +State: unknown +Version: 1.2.5i1 +Date: 1387376299 +Targetversion: future + +The WATO module for BI aggregates now can correctly show and edit aggregation +functions of the type <tt>count_ok</tt> that are using percentages instead +of explicit numbers, e.g. <tt>count_ok!60%!30%</tt>. diff --git a/ChangeLog b/ChangeLog index f56a379..567a1aa 100644 --- a/ChangeLog +++ b/ChangeLog @@ -106,6 +106,7 @@ * 0346 FIX: Fix folder visibility in WATO for unpriviledged users... * 0385 FIX: Better error handling for invalid service regex in rule conditions... * 0389 FIX: Showing LDAP settings on site specific global settings page now... + * 0400 FIX: WATO BI editor now supports percentages for count_ok... Notifications: * 0362 sms: now searching PATH for sendsms and smssend commands... diff --git a/web/htdocs/bi.py b/web/htdocs/bi.py index 85a841c..a463750 100644 --- a/web/htdocs/bi.py +++ b/web/htdocs/bi.py @@ -1245,8 +1245,6 @@ def aggr_countok(nodes, needed_for_ok=2, needed_for_warn=1): # counts can be specified as integer (e.g. '2') or # as percentages (e.g. '70%'). - - if num_ok >= aggr_countok_convert(needed_for_ok, len(states)): return { "state" : 0, "output" : "" } elif num_ok >= aggr_countok_convert(needed_for_warn, len(states)): diff --git a/web/htdocs/lib.py b/web/htdocs/lib.py index 7b8d205..7b53b2a 100644 --- a/web/htdocs/lib.py +++ b/web/htdocs/lib.py @@ -289,6 +289,12 @@ def saveint(x): except: return 0 +def tryint(x): + try: + return int(x) + except: + return x + def set_is_disjoint(a, b): for elem in a: if elem in b: diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index b4fc2e2..bb10448 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -13347,7 +13347,7 @@ def convert_rule_from_bi(rule, ruleid): crule.update(rule) crule["nodes"] = map(convert_node_from_bi, rule["nodes"]) parts = rule["aggregation"].split("!") - crule["aggregation"] = (parts[0], tuple(map(saveint, parts[1:]))) + crule["aggregation"] = (parts[0], tuple(map(tryint, parts[1:]))) crule["id"] = ruleid return crule diff --git a/web/plugins/wato/bi.py b/web/plugins/wato/bi.py index c8662a1..1b45ff5 100644 --- a/web/plugins/wato/bi.py +++ b/web/plugins/wato/bi.py @@ -68,18 +68,36 @@ bi_aggregation_functions["best"] = { ]), } +def vs_count_ok_count(title, defval, defvalperc): + return Alternative( + title = title, + style = "dropdown", + match = lambda x: str(x).endswith("%") and 1 or 0, + elements = [ + Integer( + title = _("Explicit number"), + label=_("Number of OK-nodes"), + min_value = 0, + default_value = defval + ), + Transform( + Percentage( + label=_("Percent of OK-nodes"), + display_format = "%.0f", + default_value = defvalperc), + title = _("Percentage"), + forth = lambda x: float(x[:-1]), + back = lambda x: "%d%%" % x, + ), + ] + ) + bi_aggregation_functions["count_ok"] = { "title" : _("Count the number of nodes in state OK"), "valuespec" : Tuple( elements = [ - Integer( - label = _("Required number of OK-nodes for a total state of OK:"), - default_value = 2, - min_value = 0), - Integer( - label = _("Required number of OK-nodes for a total state of WARN:"), - default_value = 1, - min_value = 0), + vs_count_ok_count(_("Required number of OK-nodes for a total state of OK:"), 2, 50), + vs_count_ok_count(_("Required number of OK-nodes for a total state of WARN:"), 1, 25), ]), }

10 years, 6 months

Check_MK Git: check_mk: FIX check_ftp: cleanup configuration via WATO, remove Hostname field

by Mathias Kettner

Module: check_mk Branch: master Commit: 99d6fb648b8d5ea759cbaf14537a1105dfcf52ce URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=99d6fb648b8d5e… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Dec 18 14:47:54 2013 +0100 FIX check_ftp: cleanup configuration via WATO, remove Hostname field The <tt>check_ftp</tt> active check does not longer need nor allow to specify a host name. The host name is always present: the host the check is mapped onto. Also the specification of an alternative host name would not be consistent with any of the other networking checks. If you need an FTP check on a specific host then please add that host to the monitoring. Exceptions can alsway be done via <tt>custom_checks</tt>. --- .werks/399 | 16 ++++++++++++++++ ChangeLog | 1 + checks/check_ftp | 9 +++++++-- web/plugins/wato/active_checks.py | 15 +++++---------- 4 files changed, 29 insertions(+), 12 deletions(-) diff --git a/.werks/399 b/.werks/399 new file mode 100644 index 0000000..f2c11d9 --- /dev/null +++ b/.werks/399 @@ -0,0 +1,16 @@ +Title: check_ftp: cleanup configuration via WATO, remove Hostname field +Level: 2 +Component: checks +Class: fix +State: unknown +Version: 1.2.5i1 +Date: 1387374334 +Targetversion: future + +The <tt>check_ftp</tt> active check does not longer need nor allow to +specify a host name. The host name is always present: the host the check is +mapped onto. Also the specification of an alternative host name would not +be consistent with any of the other networking checks. + +If you need an FTP check on a specific host then please add that host to +the monitoring. Exceptions can alsway be done via <tt>custom_checks</tt>. diff --git a/ChangeLog b/ChangeLog index 9758651..f56a379 100644 --- a/ChangeLog +++ b/ChangeLog @@ -66,6 +66,7 @@ * 0387 FIX: df*: Negative filesystem space levels get a more clear text in check output... * 0351 FIX: local: Catch invalid state codes and map to 3 (UNKNOWN)... * 0397 FIX: mrpe: tolerate performance variable names with spaces... + * 0399 FIX: check_ftp: cleanup configuration via WATO, remove Hostname field... Multisite: * 0371 Added log class filter to hostsvcevents view diff --git a/checks/check_ftp b/checks/check_ftp index 7200786..99cb288 100644 --- a/checks/check_ftp +++ b/checks/check_ftp @@ -25,7 +25,12 @@ # Boston, MA 02110-1301 USA. def check_ftp_arguments(params): - host, settings = params + if type(params) == tuple: + host, settings = params + else: + host = "$HOSTNAME$" + settings = params + args = ' -H %s' % quote_shell_string(host) if "response_time" in settings: @@ -60,7 +65,7 @@ def check_ftp_arguments(params): active_check_info['ftp'] = { "command_line" : '$USER1$/check_ftp $ARG1$', "argument_function" : check_ftp_arguments, - "service_description" : lambda args: "FTP %s" % args[0], + "service_description" : lambda args: type(args) == tuple and ("FTP %s" % args[0]) or "FTP", "has_perfdata" : True, } diff --git a/web/plugins/wato/active_checks.py b/web/plugins/wato/active_checks.py index 7285211..4372fbd 100644 --- a/web/plugins/wato/active_checks.py +++ b/web/plugins/wato/active_checks.py @@ -94,14 +94,8 @@ register_rule(group, register_rule(group, "active_checks:ftp", - Tuple( - title = _("Check FTP Services"), - elements = [ - TextAscii ( title = _("Hostname"), allow_empty = False, - help = _("The hostname of the FTP server you want to check. " - "It is possible to use $HOSTNAME$.") - ), - Dictionary( + Transform( + Dictionary( elements = [ ( "response_time", Tuple( @@ -161,8 +155,9 @@ register_rule(group, default_value = 30) ), ]), - ] - ) + forth = lambda x: type(x) == tuple and x[1] or x, + title = _("Check FTP Service"), + ) )

10 years, 6 months

Check_MK Git: check_mk: Updated bug entries #0894

by Lars Michelsen

Module: check_mk Branch: master Commit: b3052b14b585705902fb15997e05394e8f33ba93 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b3052b14b58570… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Dec 18 14:47:25 2013 +0100 Updated bug entries #0894 --- .bugs/894 | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.bugs/894 b/.bugs/894 index ec9bede..6ea4a5a 100644 --- a/.bugs/894 +++ b/.bugs/894 @@ -1,9 +1,13 @@ Title: never read automation_secret.mk from Multisite Component: multisite -State: open +Class: nastiness +State: wontfix Date: 2013-06-20 16:12:17 Targetversion: future -Class: nastiness That file should be "write only" from the point of view of Multisite and only be read by external skripts. + +2013-12-18 14:47:04: changed state open -> wontfix +We need to use the single files to prevent loading the whole user-db during regular +page processing. This saves a lot of time.

10 years, 6 months

Check_MK Git: check_mk: Cleanup a few texts in WATO rules

by Mathias Kettner

Module: check_mk Branch: master Commit: 931a4ee501146ef8ff55eb98934532f8fe7f2e59 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=931a4ee501146e… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Dec 18 14:44:04 2013 +0100 Cleanup a few texts in WATO rules --- web/plugins/wato/check_parameters.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 6f6bee9..af20c22 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -1577,11 +1577,14 @@ filesystem_elements = [ ] ) ), + # Beware: this is a nasty hack that helps us to detect new-style paramters. + # Something hat has todo with float/int conversion and has not been documented + # by the one who implemented this. ( "flex_levels", FixedValue( None, totext = "", - title = _("Hidden identifier key for flexible level usage") + title = "", )), ( "magic", Float( @@ -2054,7 +2057,7 @@ register_check_parameters( ( "heartbeat_ok", MonitoringState( title = _("Heartbeat OK"), - help = _(" Guest operating system is responding normally."), + help = _("Guest operating system is responding normally."), default_value = 0, ) ),

10 years, 6 months

Check_MK Git: check_mk: Added sorter / filter for host/ service service levels

by Lars Michelsen

Module: check_mk Branch: master Commit: 04413ddc938ca19b31fd0d9261e110bdbab13829 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=04413ddc938ca1… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Dec 18 14:41:36 2013 +0100 Added sorter / filter for host/service service levels The service level attribute of hosts and services can now be shown in multisite views. It has been added to the detail page of hosts and services. --- .bugs/2122 | 9 ++++++++ .bugs/837 | 6 +++++ .bugs/921 | 2 +- .werks/391 | 13 +++++++++++ ChangeLog | 1 + mkeventd/web/plugins/wato/mkeventd.py | 34 --------------------------- web/htdocs/views.py | 10 ++++++++ web/plugins/views/builtin.py | 2 ++ web/plugins/views/painters.py | 31 +++++++++++++++++++------ web/plugins/views/sorters.py | 8 +++++++ web/plugins/wato/globals_notification.py | 37 ++++++++++++++++++++++++++++++ 11 files changed, 111 insertions(+), 42 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=04413ddc93…

10 years, 6 months

Check_MK Git: check_mk: Added some exchange checks to treasures

by Bastian Kuhn

Module: check_mk Branch: master Commit: c2871e0ac46eca957b76accf77fa85e442533974 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c2871e0ac46eca… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Wed Dec 18 14:35:51 2013 +0100 Added some exchange checks to treasures --- doc/treasures/msexchange/README | 26 ++++++ doc/treasures/msexchange/winperf_msx_activesync | 50 ++++++++++ .../msexchange/winperf_msx_db_reads_avg_latency | 83 +++++++++++++++++ doc/treasures/msexchange/winperf_msx_dc_access | 96 ++++++++++++++++++++ doc/treasures/msexchange/winperf_msx_dumpster | 78 ++++++++++++++++ .../msexchange/winperf_msx_queued_mailbox | 63 +++++++++++++ .../msexchange/winperf_msx_rpc_clientaccess | 77 ++++++++++++++++ 7 files changed, 473 insertions(+) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=c2871e0ac4…

10 years, 6 months

Check_MK Git: check_mk: kemp_loadmaster_ha, kemp_loadmaster_realserver, kemp_loadmaster_services: New Checks for Kemp Loadbalancer

by Bastian Kuhn

Module: check_mk Branch: master Commit: c28caa271ae1d4d0369c5c45aa2977e3200b1f51 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c28caa271ae1d4… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Wed Dec 18 14:31:33 2013 +0100 kemp_loadmaster_ha, kemp_loadmaster_realserver, kemp_loadmaster_services: New Checks for Kemp Loadbalancer --- .werks/111 | 10 ++++++ ChangeLog | 1 + checkman/kemp_loadmaster_ha | 8 +++++ checkman/kemp_loadmaster_realserver | 13 ++++++++ checkman/kemp_loadmaster_services | 12 +++++++ checks/kemp_loadmaster_ha | 46 +++++++++++++++++++++++++ checks/kemp_loadmaster_realserver | 61 +++++++++++++++++++++++++++++++++ checks/kemp_loadmaster_services | 63 +++++++++++++++++++++++++++++++++++ 8 files changed, 214 insertions(+) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=c28caa271a…

10 years, 6 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits December 2013