Checkmk git commits July 2014

checkmk-commits@lists.checkmk.com

7 participants
221 discussions

Check_MK Git: check_mk: raritan_pdu_inlet: finished the rewriting. Warning: Values may wrong yet, will be fixed soon

by Bastian Kuhn

Module: check_mk Branch: master Commit: ced7e8d654e39cd1f4d1d3374d5b53cb1ced0acf URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ced7e8d654e39c… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Thu Jul 31 17:39:32 2014 +0200 raritan_pdu_inlet: finished the rewriting. Warning: Values may wrong yet, will be fixed soon --- checks/raritan_pdu_inlet | 118 +++++++++++--------------------------- checks/raritan_pdu_inlet.include | 104 +++++++++++++++++++++++++++++++++ checks/raritan_pdu_inlet_summary | 52 +++++++++++++++++ 3 files changed, 190 insertions(+), 84 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=ced7e8d654…

9 years, 12 months

Check_MK Git: check_mk: docsis_channels: Changed check style

by Bastian Kuhn

Module: check_mk Branch: master Commit: 1e465c0c16919e0d05a6c27c4e959f9b381b4fa7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1e465c0c16919e… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Thu Jul 31 16:31:55 2014 +0200 docsis_channels: Changed check style --- checkman/{docsis_channels.downstream => docsis_channels_downstream} | 0 checks/{docsis_channels => docsis_channels_downstream} | 2 +- web/plugins/perfometer/check_mk.py | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/checkman/docsis_channels.downstream b/checkman/docsis_channels_downstream similarity index 100% rename from checkman/docsis_channels.downstream rename to checkman/docsis_channels_downstream diff --git a/checks/docsis_channels b/checks/docsis_channels_downstream similarity index 98% rename from checks/docsis_channels rename to checks/docsis_channels_downstream index 4872255..4669f3a 100644 --- a/checks/docsis_channels +++ b/checks/docsis_channels_downstream @@ -53,7 +53,7 @@ def check_docsis_channels_downstream( item, params, info): return state, infotext, perfdata # This Check is a subcheck because there is also a upstream version possible -check_info["docsis_channels.downstream"] = { +check_info["docsis_channels_downstream"] = { "check_function" : check_docsis_channels_downstream, "inventory_function" : inventory_docsis_channels_downstream, "service_description" : "Channel Downstream %s", diff --git a/web/plugins/perfometer/check_mk.py b/web/plugins/perfometer/check_mk.py index d3bec82..c715433 100644 --- a/web/plugins/perfometer/check_mk.py +++ b/web/plugins/perfometer/check_mk.py @@ -1139,6 +1139,6 @@ def perfometer_mhz( row, check_command, perf_data ): mhz_current = int(perf_data[0][1]) return str(mhz_current) + " Mhz", perfometer_logarithmic(mhz_current, 50, 2, "#da6") -perfometers["check_mk-docsis_channels.downstream"] = perfometer_mhz +perfometers["check_mk-docsis_channels_downstream"] = perfometer_mhz

9 years, 12 months

Check_MK Git: check_mk: raritan_pdu_inlet: Changed name of perfdata

by Bastian Kuhn

Module: check_mk Branch: master Commit: 83956972a508654066f80c9c63e91f4e58adc065 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=83956972a50865… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Thu Jul 31 15:47:11 2014 +0200 raritan_pdu_inlet: Changed name of perfdata --- checks/raritan_pdu_inlet | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/checks/raritan_pdu_inlet b/checks/raritan_pdu_inlet index 2aafa1c..01e645e 100644 --- a/checks/raritan_pdu_inlet +++ b/checks/raritan_pdu_inlet @@ -36,7 +36,7 @@ capabilities = { } units = { - '-1' : "kVA", + '-1' : "", '0' : "", '1' : "V", '2' : "A", @@ -89,7 +89,7 @@ def check_raritan_pdu_inlet_summary(item, _no_params, info): digits = int(digits) sensor_value = float(sensor_value) / 10**digits - yield 0, "Value: %.2f %s" % ( sensor_value, units[unit] ), [ (units[unit], sensor_value ) ] + yield 0, "Value: %.2f %s" % ( sensor_value, units[unit] ), [ (item, sensor_value ) ] sensor_state = int(sensor_state) sensor_text = "Sensor State: " + sensor_states[sensor_state]

9 years, 12 months

Check_MK Git: check_mk: First fix for raritan_pdu_inlet, not finished yet

by Bastian Kuhn

Module: check_mk Branch: master Commit: 64aa2d0308f5c2954622f56bd768ac608d56fb34 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=64aa2d0308f5c2… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Thu Jul 31 15:40:01 2014 +0200 First fix for raritan_pdu_inlet, not finished yet --- checks/raritan_pdu_inlet | 174 +++++++++++++++++----------------------------- 1 file changed, 62 insertions(+), 112 deletions(-) diff --git a/checks/raritan_pdu_inlet b/checks/raritan_pdu_inlet index 2afedd8..266e380 100644 --- a/checks/raritan_pdu_inlet +++ b/checks/raritan_pdu_inlet @@ -25,41 +25,42 @@ # Boston, MA 02110-1301 USA. capabilities = { - 0: "rmsCurrent", - 2: "unbalancedCurrent", - 3: "rmsVoltage", - 4: "activePower", - 5: "apparentPower", - 6: "powerFactor", - 7: "activeEnergy", - 8: "apparentEnergy" + '1' : "rmsVoltage", + '2' : "rmsCurrent", + '3' : "activePower", + '4' : "apparentPower", + '5' : "activeEnergy", + '9' : "unbalancedCurrent", + '-1' : "powerFactor", + #'' : "apparentEnergy" } units = { - -1: "", - 0: "", - 1: "V", - 2: "A", - 3: "W", - 4: "VA", - 5: "Wh", - 6: "VAh", - 7: "C", - 8: "Hz", - 9: "%", - 10: "m/s", - 11: "Pascal", - 12: "psi", - 13: "g", - 14: "F", - 15: "ft", - 16: "in", - 17: "cm", - 18: "m", - 19: "rpm", + '-1' : "", + '0' : "", + '1' : "V", + '2' : "A", + '3' : "W", + '4' : "VA", + '5' : "Wh", + '6' : "VAh", + '7' : "C", + '8' : "Hz", + '9' : "%", + '10' : "m/s", + '11' : "Pascal", + '12' : "psi", + '13' : "g", + '14' : "F", + '15' : "ft", + '16' : "in", + '17' : "cm", + '18' : "m", + '19' : "rpm", } -states = { + +sensor_states = { -1 : "unavailable", 0 : "open", 1 : "closed", @@ -75,92 +76,41 @@ states = { 11: "alarmed", } -def get_capability(cap_entry, id): - id = id - 1 - bit = bin(ord(cap_entry))[2:][id] - if bit == "1": - return capabilities[id] +def inventory_raritan_pdu_inlet_summary(info): + for line in info: + yield capabilities[line[0]], None -def inventory_raritan_pdu_inlet(info): - inventory = [] - i = 0 - for line in info[1]: - i += 1 - cap = get_capability(info[0][0][2][0],i) - if line[2] == "1" and cap: - item = info[0][0][0] + "-" + cap - inventory.append((item, None)) - item = info[0][0][0] + "-" + cap + "_L1" - inventory.append((item, None)) - item = info[0][0][0] + "-" + cap + "_L2" - inventory.append((item, None)) - item = info[0][0][0] + "-" + cap + "_L3" - inventory.append((item, None)) - return inventory +def check_raritan_pdu_inlet_summary(item, _no_params, info): + for unit, digits, availability, sensor_state, sensor_value in info: + if capabilities[unit] == item: + if availability != '1': + yield 2, "Sensor not available" + return -def check_raritan_pdu_inlet(item, _no_params, info): - kinds = { "": 4, "_L1": 5, "_L2": 6, "_L3": 7 } - label = info[0][0][0] - name = info[0][0][1] - i = 0 - for line in info[1]: - i += 1 - cap = get_capability(info[0][0][2][0],i) - for mark, index in kinds.iteritems(): - if cap and label + "-" + cap + mark == item: - unit = units[int(line[0])] - digits = int(line[1]) - avail = line[2] - status = int(line[3]) - status_txt = states[status] - value = float(line[index]) / 10.0**digits - message = "sensor " + name - message += "status \"%s\", value %.2f %s" % (status_txt,value,unit) - perfdata = [ (cap+mark, str(value)+unit) ] - if avail != "1" or status in ( 2, 6 ): - state = 2 - elif status == 4: - state = 0 - else: - state = 1 - return (state, message, perfdata) + digits = int(digits) + sensor_value = float(sensor_value) / 10**digits + yield 0, "Value: %.2f %s" % ( sensor_value, units[unit] ) - return 3, "no such inlet data" + sensor_state = int(sensor_state) + sensor_text = "Sensor State: " + sensor_states[sensor_state] + if sensor_state in [ 2, 6 ]: + yield 2, sensor_text + elif sensor_state != 4: + yield 1, sensor_text -check_info['raritan_pdu_inlet'] = { - "inventory_function" : inventory_raritan_pdu_inlet, - "check_function" : check_raritan_pdu_inlet, - "service_description" : "Inlet Sensor %s", +check_info['raritan_pdu_inlet.summary'] = { + "inventory_function" : inventory_raritan_pdu_inlet_summary, + "check_function" : check_raritan_pdu_inlet_summary, + "service_description" : "Inlets %s", "has_perfdata" : True, - "snmp_info" : [ - (".1.3.6.1.4.1.13742.6", # General properties of the inlet - [ - "3.3.3.1.2", # label - "3.3.3.1.3", # name - "3.3.3.1.10", # capabilites - ] - ), - ( ".1.3.6.1.4.1.13742.6", # Properties of the sensors - [ - "3.3.4.1.6.1.1", # inletSensorUnits - "3.3.4.1.7.1.1", # inletDecimalDigits - "5.2.3.1.2.1.1", # inlet sensor availability - "5.2.3.1.3.1.1", # inlet sensor state - "5.2.3.1.4.1.1", # inlet sensor value - "5.2.4.1.4.1.1.1", # inlet sensor L1 value - "5.2.4.1.4.1.1.2", # inlet sensor L2 value - "5.2.4.1.4.1.1.3", # inlet sensor L3 value - ] - ), - #( ".1.3.6.1.4.1.13742.6.5.2.4.1.4.1.1", # Properties of the sensors - # [ - # "1", # inlet sensor values - # "2", # inlet sensor values - # "3", # inlet sensor values - # ] - #), - ], - "snmp_scan_function" : lambda oid: \ - oid(".1.3.6.1.4.1.13742.6.3.2.1.1.3.1").startswith("PX2-2") + "snmp_info" : ( ".1.3.6.1.4.1.13742.6", [ + "3.3.4.1.6.1.1", # inletSensorUnits + "3.3.4.1.7.1.1", # inletDecimalDigits value + "5.2.3.1.2.1.1", # inlet sensor availability + "5.2.3.1.3.1.1", # inlet sensor state + "5.2.3.1.4.1.1", # inlet sensor value + ]), + "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0") == ".1.3.6.1.4.1.13742.6" + }

9 years, 12 months

Check_MK Git: check_mk: Added missing perfdata

by Bastian Kuhn

Module: check_mk Branch: master Commit: 33d617e5fcd32f8b0788771503b2b24073b0f79d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=33d617e5fcd32f… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Thu Jul 31 15:43:05 2014 +0200 Added missing perfdata --- checks/raritan_pdu_inlet | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/checks/raritan_pdu_inlet b/checks/raritan_pdu_inlet index 266e380..2aafa1c 100644 --- a/checks/raritan_pdu_inlet +++ b/checks/raritan_pdu_inlet @@ -36,7 +36,7 @@ capabilities = { } units = { - '-1' : "", + '-1' : "kVA", '0' : "", '1' : "V", '2' : "A", @@ -89,7 +89,7 @@ def check_raritan_pdu_inlet_summary(item, _no_params, info): digits = int(digits) sensor_value = float(sensor_value) / 10**digits - yield 0, "Value: %.2f %s" % ( sensor_value, units[unit] ) + yield 0, "Value: %.2f %s" % ( sensor_value, units[unit] ), [ (units[unit], sensor_value ) ] sensor_state = int(sensor_state) sensor_text = "Sensor State: " + sensor_states[sensor_state]

9 years, 12 months

Check_MK Git: check_mk: #1094 FIX sidebar snaping 'Tree of folders': fixed exception

by Andreas Boesl

Module: check_mk Branch: master Commit: a85978ded78e5a3b7d8aa6b49fbd65114f85ed97 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a85978ded78e5a… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Jul 31 11:51:39 2014 +0200 #1094 FIX sidebar snaping 'Tree of folders': fixed exception --- .werks/1094 | 8 ++++++++ ChangeLog | 3 ++- web/plugins/sidebar/wato.py | 6 +++--- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/.werks/1094 b/.werks/1094 new file mode 100644 index 0000000..89fc260 --- /dev/null +++ b/.werks/1094 @@ -0,0 +1,8 @@ +Title: sidebar snaping 'Tree of folders': fixed exception +Level: 2 +Component: multisite +Version: 1.2.5i6 +Date: 1406800287 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index fdc2ed6..ae70717 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,8 +3,8 @@ * 0185 knuerr_rms_humidity, knuerr_rms_temp: Two new Checks to Monitor the Temperature and the Humidity on Knürr RMS Devices * 1065 heartbeat_crm / heartbeat_crm.resources: Rewrote checks / formalized parameters... * 1068 livedump: Added optional check interval (detect staleness) / option to encrypt mails... - * 0189 docsis_channels: Support for Frequency of Downstream Channels for Devices with DOCSIS MIB * 1093 windows agent: performance counter can now be specified by name... + * 0189 docsis_channels: Support for Frequency of Downstream Channels for Devices with DOCSIS MIB * 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 @@ -13,6 +13,7 @@ Multisite: * 1066 Implemented Dashboard Designer... * 1067 FIX: Fixed login problem in LDAP connector when no user filter specified... + * 1094 FIX: sidebar snaping 'Tree of folders': fixed exception WATO: * 1064 FIX: Fixed rare issue with WATO communication in distributed setups (different OS versions)... diff --git a/web/plugins/sidebar/wato.py b/web/plugins/sidebar/wato.py index 81cd6f3..0583eb4 100644 --- a/web/plugins/sidebar/wato.py +++ b/web/plugins/sidebar/wato.py @@ -215,20 +215,20 @@ def render_wato_foldertree(): selected_topic, selected_target = config.load_user_file("foldertree", (_('Hosts'), 'allhosts')) views.load_views() - topic_views = visuals_by_topic(views.permitted_views()) + topic_views = visuals_by_topic(views.permitted_views().items() + dashboard.permitted_dashboards().items()) topics = [ (t, t) for t, s in topic_views ] html.select("topic", topics, selected_topic, onchange = 'wato_tree_topic_changed(this)') html.write('<span class=left>%s</span>' % _('Topic:')) for topic, view_list in topic_views: targets = [] - for t, title, name in view_list: + for t, title, name, is_view in view_list: if config.visible_views and name not in config.visible_views: continue if config.hidden_views and name in config.hidden_views: continue if t == topic: - if topic == _('Dashboards'): + if not is_view: name = 'dashboard|' + name targets.append((name, title))

9 years, 12 months

Check_MK Git: check_mk: #0191 FIX Added swp files to the ignore list for the WATO git feature

by Bastian Kuhn

Module: check_mk Branch: master Commit: b4d28110126ca7387d3d37995080e35b41a2c50d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b4d28110126ca7… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Thu Jul 31 11:47:36 2014 +0200 #0191 FIX Added swp files to the ignore list for the WATO git feature Wato does not longer try to add swap files created by vim when editing the config manual and activate changes in the same time. --- .werks/191 | 10 ++++++++++ ChangeLog | 1 + web/htdocs/wato.py | 2 +- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/191 b/.werks/191 new file mode 100644 index 0000000..d753a3b --- /dev/null +++ b/.werks/191 @@ -0,0 +1,10 @@ +Title: Added swp files to the ignore list for the WATO git feature +Level: 1 +Component: wato +Class: fix +State: unknown +Version: 1.2.5i6 +Date: 1406799966 + +Wato does not longer try to add swap files created by vim when editing the config manual and activate +changes in the same time. diff --git a/ChangeLog b/ChangeLog index fa57ac7..2e47ca7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -20,6 +20,7 @@ * 1089 FIX: Snapshot restore: fixed exception during exception handling...... * 1091 FIX: logwatch patterns: allow unicode text in pattern comment * 1092 FIX: logwatch: now able to enter unicode text into the "Pattern (Regex)" field + * 0191 FIX: Added swp files to the ignore list for the WATO git feature... 1.2.5i5: diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 451cc8d..e5d086c 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -380,7 +380,7 @@ def do_git_commit(): git_command(["init"]) # Make sure that .gitignore-files are present and uptodate - file(defaults.default_config_dir + "/.gitignore", "w").write("*\n!*.d\n!.gitignore\n") + file(defaults.default_config_dir + "/.gitignore", "w").write("*\n!*.d\n!.gitignore\n*swp\n") for subdir in os.listdir(defaults.default_config_dir): if subdir.endswith(".d"): file(defaults.default_config_dir + "/" + subdir + "/.gitignore", "w").write("*\n!wato\n!wato/*\n")

9 years, 12 months

Check_MK Git: check_mk: #0190 docsis_signal_quality: New Check to monitor Signal Qualtiy on Devices with DOCSIS MIB

by Bastian Kuhn

Module: check_mk Branch: master Commit: 6868d11f607f59f4213efef096242bf4c65c6e30 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6868d11f607f59… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Thu Jul 31 11:20:43 2014 +0200 #0190 docsis_signal_quality: New Check to monitor Signal Qualtiy on Devices with DOCSIS MIB --- .werks/190 | 8 ++ ChangeLog | 3 +- checkman/{docsis_signal => docsis_signal_quality} | 4 +- checks/{docsis_signal => docsis.include} | 37 ++-------- checks/docsis_channels | 4 +- checks/docsis_signal_quality | 81 +++++++++++++++++++++ web/plugins/perfometer/check_mk.py | 9 ++- web/plugins/wato/check_parameters.py | 8 +- 8 files changed, 112 insertions(+), 42 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=6868d11f60…

9 years, 12 months

Check_MK Git: check_mk: Merge conflict

by Bastian Kuhn

Module: check_mk Branch: master Commit: f743c952188c6d1ef641ebc36ae38300a35c238e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f743c952188c6d… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Thu Jul 31 10:34:49 2014 +0200 Merge conflict ---

9 years, 12 months

Check_MK Git: check_mk: #0189 docsis_channels: Support for Frequency of Downstream Channels for Devices with DOCSIS MIB

by Bastian Kuhn

Module: check_mk Branch: master Commit: 0330957b1c1c4ac434060e9a5d864ad711a2ed9e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0330957b1c1c4a… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Thu Jul 31 10:32:49 2014 +0200 #0189 docsis_channels: Support for Frequency of Downstream Channels for Devices with DOCSIS MIB --- .werks/189 | 8 ++++ ChangeLog | 1 + checkman/docsis_channels | 14 ------- checks/docsis_channels | 69 ++++++++++++++++++++++------------ modules/check_mk.py | 2 + web/plugins/wato/check_parameters.py | 22 +++++++---- 6 files changed, 70 insertions(+), 46 deletions(-) diff --git a/.werks/189 b/.werks/189 new file mode 100644 index 0000000..0530618 --- /dev/null +++ b/.werks/189 @@ -0,0 +1,8 @@ +Title: docsis_channels: Support for Frequency of Downstream Channels for Devices with DOCSIS MIB +Level: 1 +Component: checks +Version: 1.2.5i6 +Date: 1406795521 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index 5de59cb..2ab8d2c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,7 @@ * 0186 touchstone_cable_modem_fec: New Check to monitor the Forward error correction on touchstone cable modems * 1068 livedump: Added optional check interval (detect staleness) / option to encrypt mails... * 0188 touchstone_cable_modem_frequency: New check for line frequency in Mhz + * 0189 docsis_channels: Support for Frequency of Downstream Channels for Devices with DOCSIS MIB * 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/docsis_channels b/checkman/docsis_channels deleted file mode 100644 index 6686176..0000000 --- a/checkman/docsis_channels +++ /dev/null @@ -1,14 +0,0 @@ -title: DOCSIS: Frequency -agents: snmp -catalog: hw/network/arris -license: GPL -distribution: -description: - This check monitors the frequency on the modem line in Mhz. Levels for {WARN} and {CRIT} can be set. - -item: - None - -inventory: - One service will be created - diff --git a/checks/docsis_channels b/checks/docsis_channels index 030fa65..7fb84f9 100644 --- a/checks/docsis_channels +++ b/checks/docsis_channels @@ -24,32 +24,53 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. -docsis_channels_default_levels = ( 155, 163 ) +factory_settings["docsis_channels_downstream"] = { + "frequency": ( 155 , 163 ), +} -def inventory_docsis_channels(info): - return [ (None, "docsis_channels_default_levels") ] +def inventory_docsis_channels_downstream(info): + for line in info: + if line[1] != '0': + yield line[0], {} -def check_docsis_channels(_no_item, params, info): - mhz = int(info[0][0]) / 1000000 - infotext = "Current Frequence is %d Mhz" % mhz - warn, crit = params - perfdata = [("frequence" , mhz, warn, crit )] - levels = " (Levels Warn/Crit at %d Mhz/ %d Mhz)" % ( warn, crit ) - state = 0 - if mhz >= crit: - state = 2 - infotext += levels - elif mhz >= warn: - state = 1 - infotext += levels - return state, infotext, perfdata +def check_docsis_channels_downstream( item, params, info): + for channel_id, frequency in info: + if channel_id == item: + frequency_mhz = int(frequency) / 1000000 + # Check Frequency + infotext = "Current Frequence is %d Mhz" % frequency_mhz + warn, crit = params["frequency"] + perfdata = [("frequence" , frequency_mhz, warn, crit )] + levels = " (Levels Warn/Crit at %d Mhz/ %d Mhz)" % ( warn, crit ) + state = 0 + if frequency_mhz >= crit: + state = 2 + infotext += levels + elif frequency_mhz >= warn: + state = 1 + infotext += levels + # Change this to yield in case of future extension of the check + return state, infotext, perfdata -check_info["docsis_channels"] = { - "check_function" : check_docsis_channels, - "inventory_function" : inventory_docsis_channels, - "service_description" : "Frequency", - "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0") == ".1.3.6.1.4.1.4115.820.1.0.0.0.0.0", - "snmp_info" : ( ".1.3.6.1.2.1.10.127.1.1.1.1.2", [ 3 ]), - "group" : "docsis_channels", +# This Check is a subcheck because there is also a upstream version possible +check_info["docsis_channels.downstream"] = { + "check_function" : check_docsis_channels_downstream, + "inventory_function" : inventory_docsis_channels_downstream, + "service_description" : "Channel Downstream %s", + "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0") in [ ".1.3.6.1.4.1.4115.820.1.0.0.0.0.0", + ".1.3.6.1.4.1.9.1.827" ], + "snmp_info" : ( ".1.3.6.1.2.1.10.127.1.1.1.1", [ 1, # Channel ID + 2, # Frequency + ]), + "group" : "docsis_channels_downstream", + "default_levels_variable" : "docsis_channels_downstream", } +# Information for future extensions of the check: +# docsIfDownChannelId 1.3.6.1.2.1.10.127.1.1.1.1.1 +# docsIfDownChannelFrequency 1.3.6.1.2.1.10.127.1.1.1.1.2 +# docsIfDownChannelWidth 1.3.6.1.2.1.10.127.1.1.1.1.3 +# docsIfDownChannelModulation 1.3.6.1.2.1.10.127.1.1.1.1.4 +# docsIfDownChannelInterleave 1.3.6.1.2.1.10.127.1.1.1.1.5 +# docsIfDownChannelPower 1.3.6.1.2.1.10.127.1.1.1.1.6 +# docsIfDownChannelAnnex 1.3.6.1.2.1.10.127.1.1.1.1.7 diff --git a/modules/check_mk.py b/modules/check_mk.py index 8c03880..95a433c 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -6162,9 +6162,11 @@ 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 diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 65c9ba9..3b3b9ba 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -1343,17 +1343,23 @@ register_check_parameters( register_check_parameters( subgroup_networking, - "docsis_channels", - _("Modem Frequencies for Docsis"), # Name can be changed if the rule is used for another check - Tuple( - help = _("Levels for the frequencies of network devices like modems." ), + "docsis_channels_downstream", + _("Docsis Downstream Channels"), + Dictionary( elements = [ - Integer(title = _("warning if at"), unit = "Mhz", default_value = 155 ), - Integer(title = _("critical if at"), unit = "Mhz", default_value = 163 ), - ]), - None, + ( "frequency", Tuple( + title = _("Frequency"), + help = _("Levels for the frequencies of Downstram Channels of Docsis Devices" ), + elements = [ + Integer(title = _("warning if at"), unit = "Mhz", default_value = 155 ), + Integer(title = _("critical if at"), unit = "Mhz", default_value = 163 ), + ])), + ] + ), + TextAscii( title = _("ID of the Channel")), "first" ) + register_check_parameters( subgroup_networking, "vpn_tunnel",

9 years, 12 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits July 2014