Checkmk git commits August 2014

checkmk-commits@lists.checkmk.com

5 participants
225 discussions

Check_MK Git: check_mk: Added missing PNP templates

by Mathias Kettner

Module: check_mk Branch: master Commit: eb1afcc4d851f47cbdee269f8cc274ef5bc705f1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=eb1afcc4d851f4… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Aug 14 16:49:52 2014 +0200 Added missing PNP templates --- pnp-templates/check_mk-canon_pages.php | 1 + pnp-templates/check_mk-printer_pages.php | 32 ++++++++++++++++++++++++++++++ 2 files changed, 33 insertions(+) diff --git a/pnp-templates/check_mk-canon_pages.php b/pnp-templates/check_mk-canon_pages.php new file mode 120000 index 0000000..81ff691 --- /dev/null +++ b/pnp-templates/check_mk-canon_pages.php @@ -0,0 +1 @@ +check_mk-printer_pages.php \ No newline at end of file diff --git a/pnp-templates/check_mk-printer_pages.php b/pnp-templates/check_mk-printer_pages.php new file mode 100644 index 0000000..c9c519d --- /dev/null +++ b/pnp-templates/check_mk-printer_pages.php @@ -0,0 +1,32 @@ +<?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 'Pages printed' -X0 -l0 --title \"$servicedesc\" "; +$def[1] = "DEF:pages=$RRDFILE[1]:$DS[1]:MAX "; +$def[1] .= "AREA:pages#808080:\"Pages printed\" "; +$def[1] .= "LINE:pages#404040 "; +$def[1] .= "GPRINT:pages:MIN:\"%7.3lf %s first\" "; +$def[1] .= "GPRINT:pages:LAST:\"%7.3lf %s last\" "; +?>

9 years, 10 months

Check_MK Git: check_mk: removed a print statement from check

by Goetz Golla

Module: check_mk Branch: master Commit: 5ab02239be602dced0791c2681185539d3af1391 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5ab02239be602d… Author: Goetz Golla <gg(a)mathias-kettner.de> Date: Thu Aug 14 11:55:37 2014 +0200 removed a print statement from check --- checks/adva_fsp_if | 1 - 1 file changed, 1 deletion(-) diff --git a/checks/adva_fsp_if b/checks/adva_fsp_if index d436634..aec2847 100644 --- a/checks/adva_fsp_if +++ b/checks/adva_fsp_if @@ -87,7 +87,6 @@ def check_adva_fsp_if(item, params, info): infotext = "Admin/Operational State: %s/%s %s" % ( admintxt, opertxt, statesym ) perfdata = [] - print line[6], line[7] for power, name in [ (line[6], "output"), (line[7], "input" ) ]:

9 years, 10 months

Check_MK Git: check_mk: #0644 adva_fsp_if: instead of lower warning and critical levels check now supports lower and upper levels

by Goetz Golla

Module: check_mk Branch: master Commit: 27a754eb6a247f9b43b71309bcefb3a0b7831563 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=27a754eb6a247f… Author: Goetz Golla <gg(a)mathias-kettner.de> Date: Thu Aug 14 11:54:30 2014 +0200 #0644 adva_fsp_if: instead of lower warning and critical levels check now supports lower and upper levels --- .werks/644 | 9 +++++ ChangeLog | 2 ++ checkman/adva_fsp_if | 8 ++--- checks/adva_fsp_if | 66 ++++++++++++---------------------- web/plugins/wato/check_parameters.py | 12 +++---- 5 files changed, 42 insertions(+), 55 deletions(-) diff --git a/.werks/644 b/.werks/644 new file mode 100644 index 0000000..ee1b0f0 --- /dev/null +++ b/.werks/644 @@ -0,0 +1,9 @@ +Title: adva_fsp_if: instead of lower warning and critical levels check now supports lower and upper levels +Level: 1 +Component: checks +Compatible: incomp +Version: 1.2.5i6 +Date: 1408009839 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index 3075ccb..2cf9c9e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -18,6 +18,8 @@ NOTE: Please refer to the migration notes! * 1174 rms200_temp: New Temperature check for RMS200 Devices * 1175 dell_idrac_disks: New Check for Harddisks using Dell iDrac + * 0644 adva_fsp_if: instead of lower warning and critical levels check now supports lower and upper levels + NOTE: Please refer to the migration notes! * 1051 FIX: tcp_conn_stats: fix missing performance data... * 1142 FIX: winperf_ts_sessions: fix computation, check has never really worked * 1090 FIX: zfsget: fixed exception which happened on incomplete zfs entries diff --git a/checkman/adva_fsp_if b/checkman/adva_fsp_if index e0c2eca..4f0f5c4 100644 --- a/checkman/adva_fsp_if +++ b/checkman/adva_fsp_if @@ -11,7 +11,7 @@ description: {ifOperStatus}. Laser information is collected from the FspR7-MIB parameters {currentPmSnapshotOutputPower} and {currentPmSnapshotInputPower}. - Lower warning and critical limits can be configured for the input (received) + Lower and upper critical limits can be configured for the input (received) and output (transmit) power of the laser. Per default, not limits are imposed, since meaningful values depend on the type of interface. @@ -39,10 +39,8 @@ inventory: [parameters] parameters (dict): - {"min_input_power"}: a tuple of warning and critical values in dBm, - default is (None, None) - {"min_output_power"}: a tuple of warning and critical values in dBm, - default is (None, None) + {"limits_input_power"}: a tuple of lower and upper critical values in dBm, + {"limits_output_power"}: a tuple of lower and upper critical values in dBm [configuration] adva_fsp_if_inventory_porttypes (list of strings): List of interface types the inventory should create checks for. diff --git a/checks/adva_fsp_if b/checks/adva_fsp_if index a5cdb4c..d436634 100644 --- a/checks/adva_fsp_if +++ b/checks/adva_fsp_if @@ -29,11 +29,6 @@ adva_fsp_if_inventory_portstates = [ '1' ] adva_fsp_if_inventory_uses_description = True adva_fsp_if_inventory_uses_alias = False -factory_settings["adva_fsp_if_default_levels"] = { - "min_output_power" : (None, None), - "min_input_power" : (None, None), -} - adva_fsp_if_operstates = { "1": ("up", 0 ), "2": ("down", 2 ), @@ -60,7 +55,7 @@ def inventory_adva_fsp_if(info): item = line[5] else: item = line[0] - inventory.append( (item, "adva_fsp_if_default_levels") ) + inventory.append( (item, {}) ) return inventory def adva_fsp_if_getindex(item,info): @@ -91,44 +86,28 @@ def check_adva_fsp_if(item, params, info): statesym = "" infotext = "Admin/Operational State: %s/%s %s" % ( admintxt, opertxt, statesym ) - perfdata = [] - - try: - output_power = float(line[6])/10.0 - owarn, ocrit = params.get("min_output_power") - if ocrit and output_power < ocrit: - state = 2 - osym = "(!!)" - elif owarn and output_power < owarn: - state = max(1, state) - osym = "(!)" - else: - osym = "" - infotext += ", Output Power: %.1f%s" % ( output_power, osym ) - perfdata.append( ("output_power", str(output_power)+"dBm", str(owarn)+":", str(ocrit)+":") ) - except: - if not re.match("S", item): # service interface does not have power parameter - infotext += ", Output Power: n.a. (!)" - state = max(1,state) - + perfdata = [] + print line[6], line[7] + for power, name in [ (line[6], "output"), + (line[7], "input" ) + ]: + try: + sym = "" + climits = "" + fpower = float(power)/10.0 + if params.get("limits_%s_power" % name): + lower, upper = params.get("limits_%s_power" % name) + climits = "%s:%s" % params.get("limits_%s_power" % name) + if fpower < lower or fpower > upper: + state = 2 + sym = "(!!)" + infotext += ", %s Power: %.1f%s" % (name.title(), fpower, sym ) + perfdata.append( ("%s_power" % name, "%.1fdBm" % fpower, "", climits ) ) - try: - input_power = float(line[7])/10.0 - iwarn, icrit = params.get("min_input_power") - if icrit and input_power < icrit: - state = 2 - isym = "(!!)" - elif iwarn and input_power < iwarn: - state = max(1, state) - isym = "(!)" - else: - isym = "" - infotext += ", Input Power: %.1f%s" % ( input_power, isym ) - perfdata.append( ("input_power", str(input_power)+"dBm", str(iwarn)+":", str(icrit)+":") ) - except: - if not re.match("S", item): # service interface does not have power parameter - infotext += ", Input Power: n.a. (!)" - state = max(1,state) + except: + if not re.match("S", item): # if no service interface and no power parameter + infotext += ", %s Power: n.a. (!)" % name.title() + state = max(1,state) return(state, infotext, perfdata) @@ -141,7 +120,6 @@ check_info['adva_fsp_if'] = { "service_description" : "Interface %s", "has_perfdata" : True, "group" : "adva_ifs", - "default_levels_variable" : "adva_fsp_if_default_levels", "snmp_info" : ( ".1.3.6.1", [ "2.1.2.2.1.1", # ifIndex "2.1.2.2.1.2", # ifDescr diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 6f2363c..4a69f77 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -5747,20 +5747,20 @@ register_check_parameters( _("Adva Optical Transport Laser Power"), Dictionary( elements = [ - ( "min_output_power", + ( "limits_output_power", Tuple( title = _("Sending Power"), elements = [ - Float(title = _("warning if below"), unit = "dBm", default_value = None), - Float(title = _("critical if below"), unit = "dBm", default_value = None), + Float(title = _("lower limit"), unit = "dBm"), + Float(title = _("upper limit"), unit = "dBm"), ]) ), - ( "min_input_power", + ( "limits_input_power", Tuple( title = _("Received Power"), elements = [ - Float(title = _("warning if below"), unit = "dBm", default_value = None), - Float(title = _("critical if below"), unit = "dBm", default_value = None), + Float(title = _("lower limit"), unit = "dBm"), + Float(title = _("upper limit"), unit = "dBm"), ]) ), ]

9 years, 10 months

Check_MK Git: check_mk: #0643 windows inventory: OS now contains the install date, reg_uninstall now contains the path

by Goetz Golla

Module: check_mk Branch: master Commit: dd30e8b2678eacdae33e264e95d927374e6a9710 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dd30e8b2678eac… Author: Goetz Golla <gg(a)mathias-kettner.de> Date: Thu Aug 14 11:46:12 2014 +0200 #0643 windows inventory: OS now contains the install date, reg_uninstall now contains the path You have to replace the inventory plugin for windows as well as the checks --- .werks/643 | 9 +++++++++ ChangeLog | 4 ++++ inventory/win_os | 6 +++++- inventory/win_reg_uninstall | 3 ++- web/plugins/views/inventory.py | 8 ++++++++ 5 files changed, 28 insertions(+), 2 deletions(-) diff --git a/.werks/643 b/.werks/643 new file mode 100644 index 0000000..a8a30f8 --- /dev/null +++ b/.werks/643 @@ -0,0 +1,9 @@ +Title: windows inventory: OS now contains the install date, reg_uninstall now contains the path +Level: 1 +Component: inv +Compatible: incomp +Version: 1.2.5i6 +Date: 1408009410 +Class: feature + +You have to replace the inventory plugin for windows as well as the checks diff --git a/ChangeLog b/ChangeLog index 1a8592e..3075ccb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -47,6 +47,10 @@ * 1153 FIX: Changed custom user attributes can now be used immediately... * 0201 FIX: Fixed error message in Rulelist of RBN... + HW/SW-Inventory: + * 0643 windows inventory: OS now contains the install date, reg_uninstall now contains the path... + NOTE: Please refer to the migration notes! + 1.2.5i5: Core & Setup: diff --git a/inventory/win_os b/inventory/win_os index 37c4439..e653609 100644 --- a/inventory/win_os +++ b/inventory/win_os @@ -31,7 +31,7 @@ def inv_win_os(info): node = inv_tree("software.os.") line = info[0] - if len(line) == 6: + if len(line) == 7: node["name"] = line[1] node["kernel_version"] = line[2] if line[3] == "64-Bit": @@ -39,6 +39,10 @@ def inv_win_os(info): else: node["arch"] = "i386" node["service_pack"] = line[4]+"."+line[5] + dat = re.sub("\+\d+","",line[6]) + tz = int(re.sub("\d{14}.\d{6}","",line[6])) + node["install_date"] = int(time.mktime(time.strptime(dat, "%Y%m%d%H%M%S.%f"))) - tz*60 + inv_info['win_os'] = { "inv_function" : inv_win_os, diff --git a/inventory/win_reg_uninstall b/inventory/win_reg_uninstall index 022d85d..ecf87f4 100644 --- a/inventory/win_reg_uninstall +++ b/inventory/win_reg_uninstall @@ -31,7 +31,7 @@ def inv_win_reg_uninstall(info): paclist = inv_tree("software.packages:") for line in info: - display_name, publisher, path, pacname, version, estimated_size, date = line + display_name, publisher, path, pacname, version, estimated_size, date = line install_date = "" if len(date) == 8 and re.match("^20", date): install_date = int(time.mktime(time.strptime(date, "%Y%m%d"))) @@ -43,6 +43,7 @@ def inv_win_reg_uninstall(info): "summary" : display_name, "install_date" : install_date, "size" : estimated_size, + "path" : path, "package_type" : "reg_uninstall", } paclist.append(entry) diff --git a/web/plugins/views/inventory.py b/web/plugins/views/inventory.py index 9288213..aee64e6 100644 --- a/web/plugins/views/inventory.py +++ b/web/plugins/views/inventory.py @@ -244,6 +244,7 @@ inv_filter_info = { "bytes_rounded" : { "unit" : _("MB"), "scale" : 1024*1024 }, "hz" : { "unit" : _("MHz"), "scale" : 1000000 }, "volt" : { "unit" : _("Volt") }, + "timestamp" : { "unit" : _("secs") }, } @@ -540,6 +541,12 @@ def inv_paint_volt(volt): else: return "", "" +def inv_paint_timestamp(stamp): + if stamp: + return "Unix time", "%i" % stamp + else: + return "", "" + inventory_displayhints.update({ "." : { "title" : _("Inventory") }, ".hardware." : { "title" : _("Hardware"), "icon" : "hardware", }, @@ -598,6 +605,7 @@ inventory_displayhints.update({ ".software.os.version" : { "title" : _("Version"), }, ".software.os.vendor" : { "title" : _("Vendor"), }, ".software.os.type" : { "title" : _("Type"), }, # e.g. "linux" + ".software.os,install_date" : { "title" : _("Install Date"), "paint" : "timestamp" }, ".software.os.kernel_version" : { "title" : _("Kernel Version"), "short" : _("Kernel") }, ".software.os.arch" : { "title" : _("Kernel Architecture"), "short" : _("Architecture") }, ".software.os.service_pack" : { "title" : _("Service Pack"), "short" : _("Service Pack") },

9 years, 10 months

Check_MK Git: check_mk: Remove lots of trailing spaces

by Mathias Kettner

Module: check_mk Branch: master Commit: 70cf44882db03ffe91bc5eb82772575d88582799 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=70cf44882db03f… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Aug 14 10:37:15 2014 +0200 Remove lots of trailing spaces --- checkman/arris_cmts_temp | 2 +- checkman/cisco_secure | 2 +- checkman/dell_idrac_disks | 2 +- checkman/docsis_signal_quality | 2 +- checkman/esx_vsphere_hostsystem.maintenance | 2 +- checkman/knuerr_rms_temp | 2 +- checkman/oracle_dataguard_stats | 2 +- checkman/printer_input | 2 +- checkman/printer_output | 2 +- checkman/sap.value_groups | 8 ++++---- checks/akcp_sensor_temp | 2 +- checks/check_uniserv | 4 ++-- checks/dell_idrac_disks | 4 ++-- checks/docsis_channels_downstream | 22 +++++++++++----------- checks/docsis_cm_status | 24 ++++++++++++------------ checks/docsis_signal_quality | 6 +++--- checks/knuerr_rms_humidity | 2 +- checks/knuerr_rms_temp | 2 +- checks/oracle_crs_voting | 2 +- checks/raritan_pdu_inlet | 4 ++-- checks/raritan_pdu_inlet.include | 2 +- checks/raritan_pdu_inlet_summary | 2 +- checks/veeam_client | 2 +- web/htdocs/js/dashboard.js | 14 +++++++------- web/plugins/wato/active_checks.py | 6 +++--- 25 files changed, 62 insertions(+), 62 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=70cf44882d…

9 years, 10 months

Check_MK Git: check_mk: tcp_conn_stats: Next try to fix the bugs since the last changes of the check

by Bastian Kuhn

Module: check_mk Branch: master Commit: 17ef25804eaf7f9153efbda8ab523140962786d5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=17ef25804eaf7f… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Thu Aug 14 10:00:52 2014 +0200 tcp_conn_stats: Next try to fix the bugs since the last changes of the check --- checks/tcp_conn_stats | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/checks/tcp_conn_stats b/checks/tcp_conn_stats index 55fc841..70c86f5 100644 --- a/checks/tcp_conn_stats +++ b/checks/tcp_conn_stats @@ -47,10 +47,12 @@ def inventory_tcp_conn_stats(info): def check_tcp_conn_stats(item, params, info): stats = dict(info) + hit = False for stat_state, hex in tcp_conn_stats_states: num = int(stats.get(stat_state, stats.get(hex, 0))) state = 0 if num > 0: # Only check positive counts + hit = True infotext = "%s: %d" % (stat_state, num) perf = [stat_state, num] levels = params.get(stat_state) @@ -64,9 +66,9 @@ def check_tcp_conn_stats(item, params, info): elif num >= warn: state = 1 infotext += " (warning at %d)" % warn - else: - infotext = None - yield state, infotext, [perf] + yield state, infotext, [perf] + if not hit: + yield 0, "Currently no tcp connection stats" check_info["tcp_conn_stats"] = {

9 years, 10 months

Check_MK Git: check_mk: mem.win: fix computation of predictive levels

by Mathias Kettner

Module: check_mk Branch: master Commit: 9d66f5d7ef09ea62c324cb7e0d37a2e6ec7b77b9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9d66f5d7ef09ea… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Aug 13 17:57:19 2014 +0200 mem.win: fix computation of predictive levels --- checks/diskstat.include | 2 +- checks/mem | 2 +- modules/check_mk_base.py | 27 ++++++++++++++++----------- 3 files changed, 18 insertions(+), 13 deletions(-) diff --git a/checks/diskstat.include b/checks/diskstat.include index a4cd35a..b607f61 100644 --- a/checks/diskstat.include +++ b/checks/diskstat.include @@ -125,7 +125,7 @@ def check_diskstat_line(this_time, item, params, line, mode='sectors'): # check levels state, text, extraperf = check_levels(bytes_per_sec, dsname, levels, - unit = "MB/s", factor = 1048576, statemarkers=True) + unit = "MB/s", scale = 1048576, statemarkers=True) if text: infos.append(text) status = max(state, status) diff --git a/checks/mem b/checks/mem index b9368ac..0845b31 100644 --- a/checks/mem +++ b/checks/mem @@ -155,7 +155,7 @@ def check_mem_windows(item, params, info): "average" in params and paramname + "_avg" or paramname, # Name of RRD variable params[paramname], unit = "GB", # Levels are specified in GB... - factor = 1024 * 1024 * 1024.0, # ... in WATO ValueSpec + scale = 1024 * 1024, # ... in WATO ValueSpec ) if infoadd: infotext += ", " + infoadd diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index 61984e2..68a1385 100644 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -1592,10 +1592,15 @@ def pnp_cleanup(s): # dsname: name of the datasource in the RRD that corresponds to this value # unit: unit to be displayed in the plugin output, e.g. "MB/s" # factor: the levels are multiplied with this factor before applying -# them to the value. For example the disk-IO check uses B/s -# as the unit for the value. But the levels are in MB/s. In that -# case the factor is 1.0 / 1048576. -def check_levels(value, dsname, params, unit = "", factor = 1.0, statemarkers=False): +# them to the value. This is being used for the CPU load check +# currently. The levels here are "per CPU", so the number of +# CPUs is used as factor. +# scale: Scale of the levels in relation to "value" and the value in the RRDs. +# For example if the levels are specified in GB and the RRD store KB, then +# the scale is 1024*1024. +def check_levels(value, dsname, params, unit="", factor=1.0, scale=1.0, statemarkers=False): + if unit: + unit = " " + unit # Insert space before MB, GB, etc. perfdata = [] infotext = "" @@ -1606,7 +1611,7 @@ def check_levels(value, dsname, params, unit = "", factor = 1.0, statemarkers=Fa # Pair of numbers -> static levels elif type(params) == tuple: - warn_upper, crit_upper = params[0] * factor, params[1] * factor, + warn_upper, crit_upper = params[0] * factor * scale, params[1] * factor * scale, warn_lower, crit_lower = None, None ref_value = None @@ -1614,9 +1619,9 @@ def check_levels(value, dsname, params, unit = "", factor = 1.0, statemarkers=Fa else: try: ref_value, ((warn_upper, crit_upper), (warn_lower, crit_lower)) = \ - get_predictive_levels(dsname, params, "MAX", levels_factor=factor) + get_predictive_levels(dsname, params, "MAX", levels_factor=factor * scale) if ref_value: - infotext += "predicted reference: %.2f%s" % (ref_value * factor, unit) + infotext += "predicted reference: %.2f%s" % (ref_value * factor / scale, unit) else: infotext += "no reference for prediction yet" except Exception, e: @@ -1630,18 +1635,18 @@ def check_levels(value, dsname, params, unit = "", factor = 1.0, statemarkers=Fa # Critical cases if crit_upper != None and value >= crit_upper: state = 2 - infotext += " (critical level at %.2f%s)" % (crit_upper / factor, unit) + infotext += " (critical level at %.2f%s)" % (crit_upper / factor / scale, unit) elif crit_lower != None and value <= crit_lower: state = 2 - infotext += " (too low: critical level at %.2f%s)" % (crit_lower / factor, unit) + infotext += " (too low: critical level at %.2f%s)" % (crit_lower / factor / scale, unit) # Warning cases elif warn_upper != None and value >= warn_upper: state = 1 - infotext += " (warning level at %.2f%s)" % (warn_upper / factor, unit) + infotext += " (warning level at %.2f%s)" % (warn_upper / factor / scale, unit) elif warn_lower != None and value <= warn_lower: state = 1 - infotext += " (too low: warning level at %.2f%s)" % (warn_lower / factor, unit) + infotext += " (too low: warning level at %.2f%s)" % (warn_lower / factor / scale, unit) # OK else:

9 years, 10 months

Check_MK Git: check_mk: fixed some wording and tabs

by Andreas Boesl

Module: check_mk Branch: master Commit: 8ac44d091401c6f0c04f95dd0736d25a4040aa4a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8ac44d091401c6… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Aug 13 17:17:47 2014 +0200 fixed some wording and tabs --- checks/cisco_temp_sensor | 35 ++++++++++++++++++----------------- 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/checks/cisco_temp_sensor b/checks/cisco_temp_sensor index 2a1d8f1..66cdff4 100644 --- a/checks/cisco_temp_sensor +++ b/checks/cisco_temp_sensor @@ -130,11 +130,10 @@ def parse_cisco_temp_sensor(info): # Create main dictionary (only of temperature sensors) sensors = [] for id, sensortype, value, sensorstate in state_info: - # poor try to find temperature values - # who are given in tens of degress. - # Seems that some new firmware show this behavier. - # A normal Temperature Sensor has only a range up to - # 60 degree, so i choiced 70. + # Poor try to find temperature values, which are given in tenths of degrees. + # Seems that some new firmware shows this behaviour. + # A normal temperature sensor has only a range up to + # 60 degree, so we've chosen 70. value = saveint(value) if value > 70: value = value / 10 @@ -165,18 +164,20 @@ def check_cisco_temp_sensor(item, params, info): levels = " (warn/crit at %.1f/%.1f °C)" % (warn, crit) perfdata = [ ( "temperature", temp, warn, crit ) ] state = 0 - if sensorstate == "2": - return (3, "data from sensor currently not available") - elif sensorstate == "3": - return (3, "sensor is broken") - if temp >= crit: - state = 2 - infotext += levels - elif temp >= warn: - state = 1 - infotext += levels - return state, infotext, perfdata - return (3, "sensor not found in SNMP data") + + if sensorstate == "2": + return (3, "Data from sensor currently not available") + elif sensorstate == "3": + return (3, "Sensor is broken") + + if temp >= crit: + state = 2 + infotext += levels + elif temp >= warn: + state = 1 + infotext += levels + return state, infotext, perfdata + return (3, "Sensor not found in SNMP data") check_info['cisco_temp_sensor'] = {

9 years, 10 months

Check_MK Git: check_mk: fixed exception in cisco_temp_sensor

by Andreas Boesl

Module: check_mk Branch: master Commit: 70fea83a663d3a7b20166991cac19b4477f7c9d3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=70fea83a663d3a… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Aug 13 17:12:55 2014 +0200 fixed exception in cisco_temp_sensor --- checks/cisco_temp_sensor | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/checks/cisco_temp_sensor b/checks/cisco_temp_sensor index 06cc9cd..2a1d8f1 100644 --- a/checks/cisco_temp_sensor +++ b/checks/cisco_temp_sensor @@ -119,13 +119,13 @@ def parse_cisco_temp_sensor(info): for id, sensortype, value, sensorstate in state_info: thresholds.setdefault(id, []) - for endoid, level in levels_info: + for endoid, levels in levels_info: # endoid is e.g. 21549.9 or 21459.10 level = saveint(levels) if level > 70: level = level / 10 id, subid = endoid.split('.') - thresholds.setdefault(id, []).append(level) + thresholds.setdefault(id, []).append(levels) # Create main dictionary (only of temperature sensors) sensors = [] @@ -134,7 +134,7 @@ def parse_cisco_temp_sensor(info): # who are given in tens of degress. # Seems that some new firmware show this behavier. # A normal Temperature Sensor has only a range up to - # 60 degree, so i choiced 70. + # 60 degree, so i choiced 70. value = saveint(value) if value > 70: value = value / 10

9 years, 10 months

Check_MK Git: check_mk: removed some nonsense print statements

by Andreas Boesl

Module: check_mk Branch: master Commit: c2e0ef7751169a9f2e371358f3d01c29be0c6ed6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c2e0ef7751169a… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Aug 13 16:27:22 2014 +0200 removed some nonsense print statements --- modules/check_mk.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/modules/check_mk.py b/modules/check_mk.py index 95a433c..8c03880 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -6162,11 +6162,9 @@ if __name__ == "__main__": except MKGeneralException, e: - print "hioer:" sys.stderr.write("%s\n" % e) if opt_debug: raise - print "nein" sys.exit(3) # handle -I / -II

9 years, 10 months

← Newer
1
...
13
14
15
16
17
18
19
...
23
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits August 2014