Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64359 discussions

Check_MK Git: check_mk: Merge branch 'master' of mathias-kettner.de: check_mk

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: d823600092eadac90493ed2056088f7739fc25b9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d823600092eada… Author: Florian Heigl <fh(a)mathias-kettner.de> Date: Fri Jul 27 21:05:28 2012 +0200 Merge branch 'master' of mathias-kettner.de:check_mk Conflicts: ChangeLog ---

12 years, 2 months

Check_MK Git: check_mk: New Check for CBL Airlaser IP1000,

by git＠mathias-kettner.de

monitor the status of the poweron self- User-Agent: Heirloom mailx 12.4 7/29/08 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Module: check_mk Branch: master Commit: dc20cea2456ecc6efda162ed5cef0cdf3b7c4fee URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dc20cea2456ecc… Author: Florian Heigl <fh(a)mathias-kettner.de> Date: Fri Jul 27 20:41:23 2012 +0200 New Check for CBL Airlaser IP1000, monitor the status of the poweron self- tests --- ChangeLog | 3 +- checkman/cbl_airlaser.status | 35 ++++++++++++++++++++++ checks/cbl_airlaser | 65 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 102 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1b953e2..cd9f47e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -20,7 +20,8 @@ * vms_system.ios: new check for total direct/buffered IOs on OpenVMS * vms_system.procs: new check for number of processes on OpenVMS * FIX: mssql agent: Added compatibility code for MSSQL 9 - * New Check for Cisco ASA Firewalls running in a cluster + * cisco_asa_failover: New Check for clustered Cisco ASA Firewalls + * cbl_airlaser.status: New Check for CBL Airlaser IP1000 laser bridge. WATO: * Added permission to control the "clone host" feature in WATO diff --git a/checkman/cbl_airlaser.status b/checkman/cbl_airlaser.status new file mode 100644 index 0000000..f841075 --- /dev/null +++ b/checkman/cbl_airlaser.status @@ -0,0 +1,35 @@ +title: Check of Powerup Status CBL Airlaser +agents: snmp +author: Andreas Boesl <ab(a)mathias-kettner.de> +license: GPL +distribution: check_mk +description: + The check can be used to monitor the CBL AirLaser Powerup status. + + The CBL Airlaser is a device to transparently transport Gigabit Ethernet + over an optical link with optional microwave fallback. + + The status of the AirLaser should usually be normal. + After power up the system performs some self-tests. + This check aquires the results from the sysStatus OID in the + {CBL-AIRLASOR-IP1000-MIB} + + Minor airlaser problems are reported as a warning condition, major failures + as "anything failed" + + snmp-Status to nagios-status: + + (1)normal operation: {OK} + + (2)testing mode: {WARNING} + + (3)warning condition: {WARNING} + + (4)anything failed: {CRIT} + + +inventory: + A service will be generated if the CBL-AIRLASOR-IP1000 MIB is supported by + the remote device. + + diff --git a/checks/cbl_airlaser b/checks/cbl_airlaser new file mode 100644 index 0000000..f1a068b --- /dev/null +++ b/checks/cbl_airlaser @@ -0,0 +1,65 @@ +#!/usr/bin/python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2012 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. + + +# snmp_scan_function +# .1.3.6.1.2.1.1.1.0 = "AirLaser IP1000" < matches airlaser +# .1.3.6.1.4.1.2800.2.1.1.0 3 < Version of management agent ( exists ) +# snmp_info +# .1.3.6.1.4.1.2800.2.1.3 < AirLaser Status + + + +def inventory_cbl_airlaser(info): + # Inventorize if the scan function fired + return [ (None, None) ] + +def check_cbl_airlaser_status(item, _no_params, info): + status = info[0][0] + + if status == "1": + return (0, "OK - Airlaser: normal operation") + elif status == "2": + return (1, "WARNING - (!)Airlaser: testing mode") + elif status == "3": + return (1, "WARNING - (!)Airlaser: warning condition") + elif status == "4": + return (2, "CRITICAL - (!!)Airlaser: a component has failed self-tests") + + return (3, "UNKNOWN - Unknown data from agent") + + +check_info["cbl_airlaser.status"] = { + "check_function" : check_cbl_airlaser_status, + "inventory_function" : inventory_cbl_airlaser, + "service_description" : "CBL Airlaser Status", + "has_perfdata" : False, + "snmp_scan_function" : lambda oid: "airlaser" in oid(".1.3.6.1.2.1.1.1.0").lower() \ + and oid(".1.3.6.1.4.1.2800.2.1.1.0"), + "snmp_info" : (".1.3.6.1.4.1.2800.2.1", [ + "3", # AirLaser Status + ]), +}

12 years, 2 months

Check_MK Git: check_mk: Merge branch 'master' of mathias-kettner.de: check_mk

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 37cc80ce35b5bfb99d92ba826ce2e6a920dd4576 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=37cc80ce35b5bf… Author: Florian Heigl <fh(a)mathias-kettner.de> Date: Sun Jul 22 00:27:54 2012 +0200 Merge branch 'master' of mathias-kettner.de:check_mk ---

12 years, 2 months

Check_MK Git: check_mk: hpux_tunables: Fix drawing of warn/crit

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: cb18578a48bb276bec464b4defa94a609fdb400e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cb18578a48bb27… Author: Florian Heigl <fh(a)mathias-kettner.de> Date: Fri Jul 13 20:08:22 2012 +0200 hpux_tunables: Fix drawing of warn/crit --- pnp-templates/check_mk-hpux_tunables.php | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/pnp-templates/check_mk-hpux_tunables.php b/pnp-templates/check_mk-hpux_tunables.php index 3dd2c66..79f534e 100644 --- a/pnp-templates/check_mk-hpux_tunables.php +++ b/pnp-templates/check_mk-hpux_tunables.php @@ -42,9 +42,8 @@ $def[1] = "DEF:var1=$RRDFILE[1]:$DS[1]:MAX ". # Add in warning / crit if they're passed to us. if (isset($WARN[1]) and $WARN[1] != "") { - $def[1] .= ""; - "HRULE:$WARN[1]#FFFF00:\"Warning at $WARN[1]\" ". - "HRULE:$CRIT[1]#FF0000:\"Critical at $CRIT[1]\" "; + $def[1] .= "HRULE:$WARN[1]#FFFF00:\"Warning at $WARN[1]\" ". + "HRULE:$CRIT[1]#FF0000:\"Critical at $CRIT[1]\" "; } ?>

12 years, 2 months

Check_MK Git: check_mk: agents/FreeBSD: Fix line wrap, thanks to Max Matslofva

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 92cad1fefa11610fc323753a75ae017dee6b5eea URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=92cad1fefa1161… Author: Florian Heigl <fh(a)mathias-kettner.de> Date: Sun Jul 22 15:30:51 2012 +0200 agents/FreeBSD: Fix line wrap, thanks to Max Matslofva --- agents/check_mk_agent.freebsd | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/agents/check_mk_agent.freebsd b/agents/check_mk_agent.freebsd index 14a3e61..aabc993 100755 --- a/agents/check_mk_agent.freebsd +++ b/agents/check_mk_agent.freebsd @@ -184,8 +184,7 @@ if [ "$(echo $osver | cut -f1 -d\. )" -gt "8" ]; then netstat -inb | egrep -v '(^Name|lo|plip)' | grep Link | awk '{print $1" "$8" "$5" "$6" "$7" 0 0 0 0 "$11" "$9" "$10" 0 0 0 0 0"}' else # pad output for freebsd 7 and before - netstat -inb | egrep -v '(^Name|lo|plip)' | grep Link | awk '{print $1" "$7" -"$5" "$6" 0 0 0 0 0 "$10" "$8" "$9" 0 0 "$11" 0 0"}' + netstat -inb | egrep -v '(^Name|lo|plip)' | grep Link | awk '{print $1" "$7" "$5" "$6" 0 0 0 0 0 "$10" "$8" "$9" 0 0 "$11" 0 0"}' fi

12 years, 2 months

Check_MK Git: check_mk: search for rules in "Host & Service Configuration"

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: bd6468fb460ce822b037bc1188fdd460f289ce03 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bd6468fb460ce8… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Jul 27 15:01:55 2012 +0200 search for rules in "Host & Service Configuration" --- ChangeLog | 1 + web/htdocs/wato.py | 42 +++++++++++++++++++++++++++++++++++++++--- 2 files changed, 40 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index f84d053..3055a7e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -41,6 +41,7 @@ * Implemented new option in WATO attributes: editable When set to False the attribute can only be changed during creation of a new object. When editing an object this attribute is only displayed. + * new: search for rules in "Host & Service Configuration" BI: * Great speed up of rule compilation in large environments diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 1050e3f..ed69bc3 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -9356,15 +9356,39 @@ def mode_ruleeditor(phase): help = help.split('\n')[0] # Take only first line as button text menu.append((url, title, icon, "rulesets", help)) render_main_menu(menu) + + html.write("<BR>") + rule_search_form() +def rule_search_form(): + html.begin_form("search") + html.write(_("Search for rules: ")) + html.text_input("search", size=32) + html.hidden_fields() + html.hidden_field("mode", "rulesets") + html.set_focus("search") + html.write(" ") + html.button("_do_seach", _("Search")) + html.end_form() + html.write("<br>") + + def mode_rulesets(phase): group = html.var("group") # obligatory + search = html.var("search") + if search != None: + search = search.strip().lower() + if group == "used": title = _("Used Rulesets") help = _("Non-empty rulesets") only_used = True + elif search != None: + title = _("Rules matching ") + search + help = _("All rules that contain '%s' in their name of help") % search + only_used = False else: title, help = g_rulegroups.get(group, (group, None)) only_used = False @@ -9397,6 +9421,9 @@ def mode_rulesets(phase): if not only_host: render_folder_path(keepvarnames = ["mode", "local", "group"]) + if search != None: + rule_search_form() + if help != None: help = "".join(help.split("\n", 1)[1:]).strip() if help: @@ -9415,8 +9442,7 @@ def mode_rulesets(phase): # Select matching rule groups while keeping their configured order groupnames = [ gn for gn, rulesets in g_rulespec_groups - if only_used or gn == group or gn.startswith(group + "/") ] - do_folding = len(groupnames) > 1 + if only_used or search != None or gn == group or gn.startswith(group + "/") ] something_shown = False html.write('<div class=rulesets>') @@ -9431,11 +9457,21 @@ def mode_rulesets(phase): varname = rulespec["varname"] valuespec = rulespec["valuespec"] + + # handle only_used rules = all_rulesets.get(varname, []) num_rules = len(rules) if num_rules == 0 and (only_used or only_local): continue + # handle search + if search != None \ + and not (rulespec["help"] and search in rulespec["help"].lower()) \ + and search not in rulespec["title"].lower() \ + and search not in varname: + continue + + # Handle case where a host is specified rulespec = g_rulespecs[varname] this_host = False @@ -9451,7 +9487,7 @@ def mode_rulesets(phase): if only_local and num_local_rules == 0: continue - if only_used: + if only_used or search != None: titlename = g_rulegroups[groupname.split("/")[0]][0] else: if '/' in groupname:

12 years, 2 months

Check_MK Git: check_mk: Merge branch 'master' of ssh://mathias-kettner.de/ check_mk

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 7ad74236740b78b5d5cdc40c411c7dd27da411e0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7ad74236740b78… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Jul 27 15:01:57 2012 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

12 years, 2 months

Check_MK Git: check_mk: Merge branch 'master' of mathias-kettner.de: check_mk

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 8e30147ed6d4241910e5f05c912862972ac226ff URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8e30147ed6d424… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jul 27 14:56:08 2012 +0200 Merge branch 'master' of mathias-kettner.de:check_mk ---

12 years, 2 months

Check_MK Git: check_mk: Fixed problems with new "editable"

by git＠mathias-kettner.de

option for WATO attributes User-Agent: Heirloom mailx 12.4 7/29/08 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Module: check_mk Branch: master Commit: af01810580ecb9d279974bcf6601c7e4e967e7ef URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=af01810580ecb9… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jul 27 14:48:37 2012 +0200 Fixed problems with new "editable" option for WATO attributes --- web/htdocs/wato.py | 74 ++++++++++++++++++++++++++++------------------------ 1 files changed, 40 insertions(+), 34 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 1050e3f..d8a9519 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -4742,6 +4742,7 @@ def configure_attributes(new, hosts, for_what, parent, myself=None, without_attr checkbox_name = "_change_%s" % attrname cb = html.get_checkbox(checkbox_name) force_entry = False + disabled = False # first handle mandatory cases if for_what == "folder" and attr.is_mandatory() \ @@ -4750,11 +4751,9 @@ def configure_attributes(new, hosts, for_what, parent, myself=None, without_attr and not has_inherited: force_entry = True active = True - elif not new and not attr.editable(): - force_entry = True elif for_what == "host" and attr.is_mandatory() and not has_inherited: - force_entry = True - active = True + force_entry = True + active = True elif cb != None: active = cb # get previous state of checkbox elif for_what == "search": @@ -4766,13 +4765,19 @@ def configure_attributes(new, hosts, for_what, parent, myself=None, without_attr else: # "host" active = attrname in host + if not new and not attr.editable(): + if active: + force_entry = True + else: + disabled = True + if force_entry: checkbox_code = '<input type=checkbox name="ignored_%s" CHECKED DISABLED>' % checkbox_name checkbox_code += '<input type=hidden name="%s" value="on">' % checkbox_name else: onclick = "wato_fix_visibility(); wato_toggle_attribute(this, '%s');" % attrname - checkbox_code = '<input type=checkbox name="%s" %s onclick="%s">' % ( - checkbox_name, active and "CHECKED" or "", onclick) + checkbox_code = '<input type=checkbox name="%s" %s %s onclick="%s">' % ( + checkbox_name, active and "CHECKED" or "", disabled and "DISABLED" or "", onclick) forms.section(attr.title(), checkbox=checkbox_code, id="attr_" + attrname) html.help(attr.help()) @@ -4784,18 +4789,13 @@ def configure_attributes(new, hosts, for_what, parent, myself=None, without_attr if not new and not attr.editable(): # In edit mode only display non editable values, don't show the # input fields - html.write('<div id="attr_hidden_%s" style="display:none">') + html.write('<div id="attr_hidden_%s" style="display:none">' % attrname) attr.render_input(defvalue) html.write('</div>') - tdclass, content = attr.paint(defvalue, "") - if not content: - content = _("empty") - html.write(content) + html.write('<div class="inherited" id="attr_visible_%s">' % (attrname)) else: - # Regular rendering - # Now comes the input fields and the inherited / default values # as two DIV elements, one of which is visible at one time. @@ -4806,33 +4806,39 @@ def configure_attributes(new, hosts, for_what, parent, myself=None, without_attr attr.render_input(defvalue) html.write("</div>") - # DIV with actual / inherited / default value html.write('<div class="inherited" id="attr_default_%s" style="%s">' - % (attrname, active and "display: none" or "")) - - # in bulk mode we show inheritance only if *all* hosts inherit - explanation = "" - if for_what == "bulk": - if num_haveit == 0: - explanation = " (" + inherited_from + ")" - value = inherited_value - elif not unique: - explanation = _("This value differs between the selected hosts.") - else: - value = values[0] + % (attrname, active and "display: none" or "")) - elif for_what in [ "host", "folder" ]: + # + # DIV with actual / inherited / default value + # + + # in bulk mode we show inheritance only if *all* hosts inherit + explanation = "" + if for_what == "bulk": + if num_haveit == 0: + explanation = " (" + inherited_from + ")" + value = inherited_value + elif not unique: + explanation = _("This value differs between the selected hosts.") + else: + value = values[0] + + elif for_what in [ "host", "folder" ]: + if not new and not attr.editable() and active: + value = values[0] + else: explanation = " (" + inherited_from + ")" value = inherited_value - if for_what != "search" and not (for_what == "bulk" and not unique): - tdclass, content = attr.paint(value, "") - if not content: - content = _("empty") - html.write("<b>" + content + "</b>") + if for_what != "search" and not (for_what == "bulk" and not unique): + tdclass, content = attr.paint(value, "") + if not content: + content = _("empty") + html.write("<b>" + content + "</b>") - html.write(explanation) - html.write("</div>") + html.write(explanation) + html.write("</div>") if len(topics) > 1:

12 years, 2 months

Check_MK Git: check_mk: cmctc.temp: added parameters for warn/crit

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: dba4dd191c16981b60065172afbe70bbd6c056a4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dba4dd191c1698… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Jul 27 14:24:01 2012 +0200 cmctc.temp: added parameters for warn/crit --- ChangeLog | 2 + checkman/cmctc.temp | 14 +++++++-- checks/cmctc | 81 ++++++++++++++++++++++++++++---------------------- checks/cmctc_lcp | 2 +- 4 files changed, 59 insertions(+), 40 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6668ccd..f84d053 100644 --- a/ChangeLog +++ b/ChangeLog @@ -24,6 +24,8 @@ * added perf-o-meters for a lot of temperature checks * cmctc_lcp.*: added new checks for Rittal CMC-TC LCP * FIX: diskstat (linux): Don't inventorize check when data empty + * cmctc.temp: added parameters for warn/crit, use now WATO rule + "Room temperature (external thermal sensors)" WATO: * Added permission to control the "clone host" feature in WATO diff --git a/checkman/cmctc.temp b/checkman/cmctc.temp index 79eb551..27d9974 100644 --- a/checkman/cmctc.temp +++ b/checkman/cmctc.temp @@ -6,9 +6,11 @@ distribution: check_mk description: This check polls the state of temperature sensors attached to a ComputerMultiControl-TopConcept unit. - Warning and critical levels are read via SNMP and - need to be configured in Nagios. Configure them - in your CMC unit. + Per default warning and critical levels are read via SNMP and + need to be configured in Check_Mk. Configure them + in your CMC unit. It is also possible to configure + levels. That way the state and levels from the SNMP + output are being ignored. item: Combination of IO unit number (3-6) and sensors index (1-4). @@ -19,3 +21,9 @@ perfdata: inventory: All available temperature sensors are automatically inventorized. + +[parameters] +warn(int): Optional warning level for the temperature. If you use no + parameters, then the builtin state will be used (this is the default). +crit(int): Critical level for the temperature. + diff --git a/checks/cmctc b/checks/cmctc index 7c1655d..e46896f 100644 --- a/checks/cmctc +++ b/checks/cmctc @@ -37,7 +37,7 @@ def inventory_cmctc_temp(info): return [ (line[0], None) for line in info if saveint(line[1]) == 10 ] -def check_cmctc_temp(item, _no_params, info): +def check_cmctc_temp(item, params, info): for line in info: # , value1, value2 in info: if line[0] != item: continue @@ -53,50 +53,59 @@ def check_cmctc_temp(item, _no_params, info): "8" : "tooLow", "9" : "tooHigh", } - status, current, crit, low, warn, descr = line[2:8] - - info_text = " - %s at %sC" % (descr, current) + status, current, crit, low, warn = map(int, line[2:7]) + descr = line[7] + info_text = " - %s at %d°C" % (descr, current) + if params: + warn, crit = params + if current >= crit: + status = 2 + elif current >= warn: + status = 7 levels_text = " (warn/crit at %sC/%sC)" % (warn, crit) status_is = ", status is %s" % status_text.get(status, "UNKNOWN") perfdata = [ ("temp", current, warn, crit, 0 ) ] - if status == "7": + if status == 7: return (1, "WARNING" + info_text + levels_text, perfdata) - elif status == "8": + elif status == 8: return (1, "WARNING" + info_text + ": too low (below %sC)" % low, perfdata) - elif status == "4": + elif status == 4: return (0, "OK" + info_text, perfdata) else: return (2, "CRIT" + info_text + levels_text + status_is, perfdata) return (3, "UNKNOWN - Sensor %s not found in SNMP data" % item) -check_info['cmctc.temp'] = (check_cmctc_temp, "Temperature %s", 1, inventory_cmctc_temp) -snmp_info['cmctc'] = ( - # Base to all IO units - ".1.3.6.1.4.1.2606.4.2", - # Each of the up to 4 units has its own subtree - ["3", "4", "5", "6"], - [ - # sensors index (1-4) - "5.2.1.1", - # sensor type (10 = temperature) - "5.2.1.2", - # unit status: notAvail(1), lost(2), changed(3), ok(4), off(5), on(6), warning(7), tooLow(8), tooHigh(9) - "5.2.1.4", - # current value - "5.2.1.5", - # high value (used for critical state) - "5.2.1.6", - # low value (used for warning, if temp falls below this value) - "5.2.1.7", - # warn value (used for warning state) - "5.2.1.8", - # description (configured by user via admin interface) - "7.2.1.2" - ] - ) - -snmp_scan_functions["cmctc.temp"] = \ - lambda oid: "CMC-TC" in oid(".1.3.6.1.2.1.1.1.0") +check_info['cmctc.temp'] = { + "check_function" : check_cmctc_temp, + "inventory_function" : inventory_cmctc_temp, + "has_perfdata" : True, + "service_description" : "Temperature %s", + "group" : "room_temperature", + "snmp_scan_function" : lambda oid: "CMC-TC" in oid(".1.3.6.1.2.1.1.1.0"), + "snmp_info" : ( + # Base to all IO units + ".1.3.6.1.4.1.2606.4.2", + # Each of the up to 4 units has its own subtree + ["3", "4", "5", "6"], + [ + # sensors index (1-4) + "5.2.1.1", + # sensor type (10 = temperature) + "5.2.1.2", + # unit status: notAvail(1), lost(2), changed(3), ok(4), off(5), on(6), warning(7), tooLow(8), tooHigh(9) + "5.2.1.4", + # current value + "5.2.1.5", + # high value (used for critical state) + "5.2.1.6", + # low value (used for warning, if temp falls below this value) + "5.2.1.7", + # warn value (used for warning state) + "5.2.1.8", + # description (configured by user via admin interface) + "7.2.1.2", + ] + ), +} -checkgroup_of["cmctc.temp"] = "temperature_auto" diff --git a/checks/cmctc_lcp b/checks/cmctc_lcp index 83a3323..f8e2dde 100644 --- a/checks/cmctc_lcp +++ b/checks/cmctc_lcp @@ -166,7 +166,7 @@ cmctc_lcp_sensortypes = { def inventory_cmctc_lcp(info, sensortype): inventory = [] for index, typeid, status, value, description in info: - typeid = int(typeid) + typeid = saveint(typeid) if typeid in cmctc_lcp_sensors: item, st = cmctc_lcp_sensors[typeid] if st == sensortype:

12 years, 2 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits