Checkmk git commits August 2014

checkmk-commits@lists.checkmk.com

5 participants
225 discussions

Check_MK Git: check_mk: Fixed various problems when loading builtin dashboards of old format

by Lars Michelsen

Module: check_mk Branch: master Commit: 6316b43d11597bc1c60960b861d3a2a19ab1c813 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6316b43d11597b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Aug 4 09:50:15 2014 +0200 Fixed various problems when loading builtin dashboards of old format --- web/htdocs/dashboard.py | 31 ++++++++++++++++++++++++++++--- web/plugins/sidebar/wato.py | 3 ++- 2 files changed, 30 insertions(+), 4 deletions(-) diff --git a/web/htdocs/dashboard.py b/web/htdocs/dashboard.py index c95cb0e..cc13b0d 100644 --- a/web/htdocs/dashboard.py +++ b/web/htdocs/dashboard.py @@ -60,13 +60,14 @@ dashlet_min_size = 10, 10 # Minimum width and height of dashlets # thus must be reinitialized everytime a language-change has # been detected. def load_plugins(): - global loaded_with_language, dashboards + global loaded_with_language, dashboards, builtin_dashboards_transformed if loaded_with_language == current_language: return # Load plugins for dashboards. Currently these files # just may add custom dashboards by adding to builtin_dashboards. load_web_plugins("dashboard", globals()) + builtin_dashboards_transformed = False # This must be set after plugin loading to make broken plugins raise # exceptions all the time and not only the first time (when the plugins @@ -82,7 +83,7 @@ def load_plugins(): for name, board in builtin_dashboards.items(): config.declare_permission("dashboard.%s" % name, board["title"], - board["description"], + board.get("description", ""), config.builtin_role_ids) # Make sure that custom views also have permissions @@ -98,14 +99,27 @@ def load_dashboards(): # referenced by url, e.g. dashboard['url'] = 'hoststats.py' # FIXME: can be removed one day. Mark as incompatible change or similar. def transform_builtin_dashboards(): + global builtin_dashboards_transformed + if builtin_dashboards_transformed: + return # Only do this once for name, dashboard in builtin_dashboards.items(): + # Do not transform dashboards which are already in the new format + if 'context' in dashboard: + continue + + # Transform the dashlets for nr, dashlet in enumerate(dashboard['dashlets']): if dashlet.get('url', '').startswith('dashlet_') and dashlet['url'].endswith('.py'): + # hoststats and servicestats dashlet['type'] = dashlet['url'][8:-3] del dashlet['url'] - elif dashlet.get('url', '') != '': + + elif dashlet.get('url', '') != '' or dashlet.get('urlfunc'): + # Normal URL based dashlet dashlet['type'] = 'url' + elif dashlet.get('view', '') != '': + # Transform views # There might be more than the name in the view definition view_name = dashlet['view'].split('&')[0] @@ -113,6 +127,11 @@ def transform_builtin_dashboards(): load_view_into_dashlet(dashlet, nr, view_name) del dashlet['view'] + else: + raise MKGeneralException(_('Unable to transform dashlet %d of dashboard %s. ' + 'You will need to migrate it on your own. Definition: %r' % + (nr, name, html.attrencode(dashlet)))) + # the modification time of builtin dashboards can not be checked as on user specific # dashboards. Set it to 0 to disable the modification chech. dashboard.setdefault('mtime', 0) @@ -122,6 +141,12 @@ def transform_builtin_dashboards(): dashboard['title'] = _('No title') dashboard['show_title'] = False + dashboard.setdefault('context_type', 'global') + dashboard.setdefault('context', {}) + dashboard.setdefault('topic', _('Overview')) + dashboard.setdefault('description', dashboard.get('title', '')) + builtin_dashboards_transformed = True + def load_view_into_dashlet(dashlet, nr, view_name): import views views.load_views() diff --git a/web/plugins/sidebar/wato.py b/web/plugins/sidebar/wato.py index 0583eb4..d584332 100644 --- a/web/plugins/sidebar/wato.py +++ b/web/plugins/sidebar/wato.py @@ -24,7 +24,7 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. -import config, wato, views +import config, wato, views, dashboard # +----------------------------------------------------------------------+ # | __ ___ _____ ___ | @@ -215,6 +215,7 @@ def render_wato_foldertree(): selected_topic, selected_target = config.load_user_file("foldertree", (_('Hosts'), 'allhosts')) views.load_views() + dashboard.load_dashboards() 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)')

9 years, 10 months

Check_MK Git: check_mk: #0194 FIX raritan_pdu_inlet: Check now outputs the correct values

by Bastian Kuhn

Module: check_mk Branch: master Commit: 1a070043e2ce66ba31176af8054c923222229e71 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1a070043e2ce66… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Fri Aug 1 15:38:28 2014 +0200 #0194 FIX raritan_pdu_inlet: Check now outputs the correct values The complete checks has been rewritten cause of a few problems with the old version. A re-inventory of all raritan pdu devices is needed after update. --- .werks/194 | 11 +++++++++++ ChangeLog | 2 ++ checks/raritan_pdu_inlet | 6 +++--- checks/raritan_pdu_inlet.include | 4 +++- 4 files changed, 19 insertions(+), 4 deletions(-) diff --git a/.werks/194 b/.werks/194 new file mode 100644 index 0000000..07eb1a2 --- /dev/null +++ b/.werks/194 @@ -0,0 +1,11 @@ +Title: raritan_pdu_inlet: Check now outputs the correct values +Level: 1 +Component: checks +Compatible: incomp +Version: 1.2.5i6 +Date: 1406900223 +Class: fix + +The complete checks has been rewritten cause of a few problems with the old version. +A re-inventory of all raritan pdu devices is needed after update. + diff --git a/ChangeLog b/ChangeLog index 7aca901..31c01d9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -12,6 +12,8 @@ * 1090 FIX: zfsget: fixed exception which happened on incomplete zfs entries * 0187 FIX: hp_proliant_power: Fixed Wato configuration * 0192 FIX: oracle_rman_backups: Not longer try to make a inventory for broken plugin outputs + * 0194 FIX: raritan_pdu_inlet: Check now outputs the correct values... + NOTE: Please refer to the migration notes! Multisite: * 1066 Implemented Dashboard Designer... diff --git a/checks/raritan_pdu_inlet b/checks/raritan_pdu_inlet index a81c3c8..000d861 100644 --- a/checks/raritan_pdu_inlet +++ b/checks/raritan_pdu_inlet @@ -28,8 +28,8 @@ def raritan_pdu_inlet_convert(info): # List of tuples, sorting like the snmp output, # each tuple contains: capabilities, Unit, digits translation = ( + ( '2', 1 ), ( '1', 0 ), - ( '2', 0 ), ( '3', 0 ), ( '4', 0 ), ( '-1', 2 ), @@ -40,10 +40,10 @@ def raritan_pdu_inlet_convert(info): for line in info: y = 0 state = line[1] - for value in line[2:]: + for value in line[1:]: item = phases[i] + '-' + capabilities[translation[y][0]] unit = translation[y][0] - digits = translation[y][2] + digits = translation[y][1] yield item, unit, digits, '1', state, value y += 1 i += 1 diff --git a/checks/raritan_pdu_inlet.include b/checks/raritan_pdu_inlet.include index b7bc570..8fab020 100644 --- a/checks/raritan_pdu_inlet.include +++ b/checks/raritan_pdu_inlet.include @@ -79,7 +79,9 @@ sensor_states = { def inventory_raritan_pdu_inlet_generic(info): for line in info: - yield line[0], None + # Ignore closed sensor state + if line[4] != '1': + yield line[0], None def check_raritan_pdu_inlet_generic(item, _no_params, info): for line in info:

9 years, 10 months

Check_MK Git: check_mk: #1070 printer_input/printer_output: New checks to monitor input/output sub-units of printers

by Lars Michelsen

Module: check_mk Branch: master Commit: 7d8c5f6b5341a739ec105ad8759e96af0428bedc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7d8c5f6b5341a7… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Aug 1 15:21:07 2014 +0200 #1070 printer_input/printer_output: New checks to monitor input/output sub-units of printers These checks are meant to check whether or not there is enough paper in the input slots and/or enough space in the output slots. --- .werks/1070 | 10 ++ ChangeLog | 1 + checkman/printer_input | 27 ++++++ checkman/printer_output | 27 ++++++ checks/printer_io | 168 ++++++++++++++++++++++++++++++++++ web/plugins/wato/check_parameters.py | 48 +++++++++- 6 files changed, 280 insertions(+), 1 deletion(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=7d8c5f6b53…

9 years, 10 months

Check_MK Git: check_mk: raritan_pdu_inlet: First unit correction

by Bastian Kuhn

Module: check_mk Branch: master Commit: 292c988487b776f70b0984abc51a3662d58a14e4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=292c988487b776… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Fri Aug 1 14:54:01 2014 +0200 raritan_pdu_inlet: First unit correction --- checks/raritan_pdu_inlet | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/checks/raritan_pdu_inlet b/checks/raritan_pdu_inlet index a543408..a81c3c8 100644 --- a/checks/raritan_pdu_inlet +++ b/checks/raritan_pdu_inlet @@ -28,11 +28,12 @@ def raritan_pdu_inlet_convert(info): # List of tuples, sorting like the snmp output, # each tuple contains: capabilities, Unit, digits translation = ( - ( '1', '1', 0 ), - ( '2', '2', 1 ), - ( '-1', '0', 2 ), - ( '0', '0', 0 ), - ( '5', '5', 0), + ( '1', 0 ), + ( '2', 0 ), + ( '3', 0 ), + ( '4', 0 ), + ( '-1', 2 ), + ( '5', 0 ), ) phases = [ 'L1', 'L2', 'L3' ] i = 0 @@ -41,7 +42,7 @@ def raritan_pdu_inlet_convert(info): state = line[1] for value in line[2:]: item = phases[i] + '-' + capabilities[translation[y][0]] - unit = translation[y][1] + unit = translation[y][0] digits = translation[y][2] yield item, unit, digits, '1', state, value y += 1

9 years, 10 months

Check_MK Git: check_mk: #0193 docsis_cm_status: New Check Status Check for Cable Modems with Docsis MIB.

by Bastian Kuhn

Module: check_mk Branch: master Commit: 1ceb035a496566beafdfe0b7f0540aae29c5bbda URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1ceb035a496566… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Fri Aug 1 14:45:52 2014 +0200 #0193 docsis_cm_status: New Check Status Check for Cable Modems with Docsis MIB. --- .werks/193 | 9 +++ ChangeLog | 1 + checkman/docsis_cm_status | 16 +++++ checks/docsis.include | 7 +++ checks/docsis_channels_downstream | 4 +- checks/docsis_cm_status | 111 ++++++++++++++++++++++++++++++++++ web/plugins/wato/check_parameters.py | 39 ++++++++++++ 7 files changed, 185 insertions(+), 2 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=1ceb035a49…

9 years, 10 months

Check_MK Git: check_mk: Added missing has_perfdata flag to some checks

by Bastian Kuhn

Module: check_mk Branch: master Commit: 24928fa6e8cc8ef4ab9d489837e7104f449146b1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=24928fa6e8cc8e… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Fri Aug 1 14:12:42 2014 +0200 Added missing has_perfdata flag to some checks --- checks/docsis_channels_downstream | 1 + checks/docsis_signal_quality | 3 ++- checks/knuerr_rms_humidity | 1 + checks/knuerr_rms_temp | 1 + 4 files changed, 5 insertions(+), 1 deletion(-) diff --git a/checks/docsis_channels_downstream b/checks/docsis_channels_downstream index 71ecba0..66c19f9 100644 --- a/checks/docsis_channels_downstream +++ b/checks/docsis_channels_downstream @@ -75,6 +75,7 @@ check_info["docsis_channels_downstream"] = { "check_function" : check_docsis_channels_downstream, "inventory_function" : inventory_docsis_channels_downstream, "service_description" : "Channel Downstream %s", + "has_perfdata" : True, "snmp_scan_function" : docsis_scan_function, "snmp_info" : ( ".1.3.6.1.2.1.10.127.1.1.1.1", [ 1, # Channel ID 2, # Frequency diff --git a/checks/docsis_signal_quality b/checks/docsis_signal_quality index 6937c4e..7a9dfac 100644 --- a/checks/docsis_signal_quality +++ b/checks/docsis_signal_quality @@ -82,8 +82,9 @@ def check_docsis_signal_quality( item, params, info): check_info["docsis_signal_quality"] = { "check_function" : check_docsis_signal_quality, "inventory_function" : inventory_docsis_signal_quality, - "service_description" : "FEC", + "service_description" : "Signal Quality %s", "snmp_scan_function" : docsis_scan_function, + "has_perfdata" : True, "snmp_info" : ( ".1.3.6.1.2.1.10.127.1.1.4.1", [ OID_END, 2, #docsIfSigQUnerroreds diff --git a/checks/knuerr_rms_humidity b/checks/knuerr_rms_humidity index 0a8b7f0..c0a8af4 100644 --- a/checks/knuerr_rms_humidity +++ b/checks/knuerr_rms_humidity @@ -48,6 +48,7 @@ check_info["knuerr_rms_humidity"] = { "check_function" : check_knuerr_rms_humidity, "inventory_function" : inventory_knuerr_rms_humidity, "service_description" : "Humidity", + "has_perfdata" : True, "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0") == ".1.3.6.1.4.1.3711.15.1", "snmp_info" : ( ".1.3.6.1.4.1.3711.15.1.1.1.2" , [ 2 , 4 ]), "group" : "single_humidity" diff --git a/checks/knuerr_rms_temp b/checks/knuerr_rms_temp index 13c773d..19d3d67 100644 --- a/checks/knuerr_rms_temp +++ b/checks/knuerr_rms_temp @@ -48,6 +48,7 @@ check_info["knuerr_rms_temp"] = { "check_function" : check_knuerr_rms_temp, "inventory_function" : inventory_knuerr_rms_temp, "service_description" : "Temperature", + "has_perfdata" : True, "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0") == ".1.3.6.1.4.1.3711.15.1", "snmp_info" : ( ".1.3.6.1.4.1.3711.15.1.1.1.1" , [ 2 , 4 ]), "group" : "hw_single_temperature"

9 years, 10 months

Check_MK Git: check_mk: #0192 FIX oracle_rman_backups: Not longer try to make a inventory for broken plugin outputs

by Bastian Kuhn

Module: check_mk Branch: master Commit: 38dc4f45766e89449ca604f79659eefa6ba9685b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=38dc4f45766e89… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Fri Aug 1 13:56:56 2014 +0200 #0192 FIX oracle_rman_backups: Not longer try to make a inventory for broken plugin outputs --- .werks/192 | 10 ++++++++++ ChangeLog | 1 + checks/oracle_rman_backups | 3 ++- 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/.werks/192 b/.werks/192 new file mode 100644 index 0000000..e57a96c --- /dev/null +++ b/.werks/192 @@ -0,0 +1,10 @@ +Title: oracle_rman_backups: Not longer try to make a inventory for broken plugin outputs +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.5i6 +Date: 1406894132 + + diff --git a/ChangeLog b/ChangeLog index c2198e6..f20fdb9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -10,6 +10,7 @@ * 1142 FIX: winperf_ts_sessions: fix computation, check has never really worked * 1090 FIX: zfsget: fixed exception which happened on incomplete zfs entries * 0187 FIX: hp_proliant_power: Fixed Wato configuration + * 0192 FIX: oracle_rman_backups: Not longer try to make a inventory for broken plugin outputs Multisite: * 1066 Implemented Dashboard Designer... diff --git a/checks/oracle_rman_backups b/checks/oracle_rman_backups index e9f2fa5..17e5f5e 100644 --- a/checks/oracle_rman_backups +++ b/checks/oracle_rman_backups @@ -31,7 +31,8 @@ def inventory_oracle_rman_backups(info): inventory = [] for line in info: - inventory.append(("%s.%s" % (line[0], " ".join(line[5:])), {})) + if line[1] != "FAILURE": + inventory.append(("%s.%s" % (line[0], " ".join(line[5:])), {})) return inventory def check_oracle_rman_backups(item, params, info):

9 years, 10 months

Check_MK Git: check_mk: docsis_channels_downstream: Added transmit power as output

by Bastian Kuhn

Module: check_mk Branch: master Commit: 765173b27beaf82a7e6f0506e3027caab08b7b8d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=765173b27beaf8… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Fri Aug 1 11:47:16 2014 +0200 docsis_channels_downstream: Added transmit power as output --- checkman/docsis_channels_downstream | 3 ++- checks/docsis_channels_downstream | 29 ++++++++++++++++++++++++----- web/plugins/wato/check_parameters.py | 13 ++++++++++--- 3 files changed, 36 insertions(+), 9 deletions(-) diff --git a/checkman/docsis_channels_downstream b/checkman/docsis_channels_downstream index dd4a83e..95fed91 100644 --- a/checkman/docsis_channels_downstream +++ b/checkman/docsis_channels_downstream @@ -4,7 +4,8 @@ catalog: hw/network/arris license: GPL distribution: description: - This check monitors currently only montiors the frequency for each channel in Mhz. Additional information are available but not yet implemented. + This check monitors the frequency for each channel in Mhz and the the current operational transmit power. Levels for each value can be set. + Additional information are available but not implemented yet. item: Channel ID diff --git a/checks/docsis_channels_downstream b/checks/docsis_channels_downstream index 4669f3a..71ecba0 100644 --- a/checks/docsis_channels_downstream +++ b/checks/docsis_channels_downstream @@ -25,7 +25,8 @@ # Boston, MA 02110-1301 USA. factory_settings["docsis_channels_downstream"] = { - "frequency": ( 155 , 163 ), + "frequency" : ( 155 , 163 ), + "power" : ( 250 , 260 ), } def inventory_docsis_channels_downstream(info): @@ -34,11 +35,25 @@ def inventory_docsis_channels_downstream(info): yield line[0], {} def check_docsis_channels_downstream( item, params, info): - for channel_id, frequency in info: + for channel_id, frequency, power in info: if channel_id == item: - frequency_mhz = int(frequency) / 1000000 + # Power + warn, crit = params["power"] + power_dbmv = int(power) + infotext = "Power is %d dBmV" % power_dbmv + levels = " (Levels Warn/Crit at %d dBmV/ %d dBmV)" % ( warn, crit ) + state = 0 + if power_dbmv >= crit: + state = 2 + infotext += power + elif power_dbmv >= warn: + state = 1 + infotext += power + yield state, infotext, [ ('power', power_dbmv, warn, crit ) ] + # Check Frequency - infotext = "Current Frequence is %d Mhz" % frequency_mhz + frequency_mhz = int(frequency) / 1000000 + infotext = "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 ) @@ -50,7 +65,10 @@ def check_docsis_channels_downstream( item, params, info): state = 1 infotext += levels # Change this to yield in case of future extension of the check - return state, infotext, perfdata + yield state, infotext, perfdata + return + yield 3, "Channel information not found in output" + # This Check is a subcheck because there is also a upstream version possible check_info["docsis_channels_downstream"] = { @@ -60,6 +78,7 @@ check_info["docsis_channels_downstream"] = { "snmp_scan_function" : docsis_scan_function, "snmp_info" : ( ".1.3.6.1.2.1.10.127.1.1.1.1", [ 1, # Channel ID 2, # Frequency + 5, # Power ]), "group" : "docsis_channels_downstream", "default_levels_variable" : "docsis_channels_downstream", diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index ba2a544..79ace8f 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -1354,12 +1354,19 @@ register_check_parameters( _("Docsis Downstream Channels"), Dictionary( elements = [ + ( "power", Tuple( + title = _("Power"), + help = _(" The operational transmit power"), + elements = [ + Integer(title = _("warning at"), unit = "dBmV", default_value = 250 ), + Integer(title = _("critical at"), unit = "dBmV", default_value = 260 ), + ])), ( "frequency", Tuple( title = _("Frequency"), - help = _("Levels for the frequencies of Downstram Channels of Docsis Devices" ), + help = _("The current tuner frequency"), elements = [ - Integer(title = _("warning if at"), unit = "Mhz", default_value = 155 ), - Integer(title = _("critical if at"), unit = "Mhz", default_value = 163 ), + Integer(title = _("warning at"), unit = "Mhz", default_value = 155 ), + Integer(title = _("critical at"), unit = "Mhz", default_value = 163 ), ])), ] ),

9 years, 10 months

Check_MK Git: check_mk: docsis_signal_quality: Added Signal Noise

by Bastian Kuhn

Module: check_mk Branch: master Commit: 67af7971b11dfe877b2afe5880a74d6296161c20 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=67af7971b11dfe… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Fri Aug 1 11:14:44 2014 +0200 docsis_signal_quality: Added Signal Noise --- checkman/docsis_channels_downstream | 4 ++-- checkman/docsis_signal_quality | 10 ++++++---- checks/docsis_signal_quality | 19 ++++++++++++++++++- web/plugins/wato/check_parameters.py | 9 ++++++++- 4 files changed, 34 insertions(+), 8 deletions(-) diff --git a/checkman/docsis_channels_downstream b/checkman/docsis_channels_downstream index 407e686..dd4a83e 100644 --- a/checkman/docsis_channels_downstream +++ b/checkman/docsis_channels_downstream @@ -7,8 +7,8 @@ description: This check monitors currently only montiors the frequency for each channel in Mhz. Additional information are available but not yet implemented. item: - None + Channel ID inventory: - One service will be created + One service will be created for each channel diff --git a/checkman/docsis_signal_quality b/checkman/docsis_signal_quality index 2a6f2aa..2c5eedd 100644 --- a/checkman/docsis_signal_quality +++ b/checkman/docsis_signal_quality @@ -4,12 +4,14 @@ catalog: hw/network/docsis license: GPL distribution: description: - This check monitors the Forward Error correction rate on the docsis MIB. - It is possible to set levels in percent for uncorrected and corrected packages. + This check monitors the Singal Quality. This includes + the Forward Error correction, and the Signal Noise. + It is possible to set levels in percent for uncorrected and corrected packages (FEC) and + levels for the Signal Quality in dB. item: - None + Channel ID like reported in SNMP Output inventory: - One service will be created + One service will be created for each Channel diff --git a/checks/docsis_signal_quality b/checks/docsis_signal_quality index 8f57ef4..6937c4e 100644 --- a/checks/docsis_signal_quality +++ b/checks/docsis_signal_quality @@ -36,6 +36,7 @@ factory_settings["docsis_signal_quality_default_levels"] = { "corrected" : ( 25.0 , 30.0 ), "uncorrected" : ( 25.0 , 30.0 ), + "signal_noise" : ( 50, 60 ), #dB } def inventory_docsis_signal_quality(info): @@ -44,8 +45,23 @@ def inventory_docsis_signal_quality(info): yield line[0], {} def check_docsis_signal_quality( item, params, info): - for entry, good, corrected, uncorrected in info: + for entry, good, corrected, uncorrected, signal_noise in info: if entry == item: + # Signal Noise + noise_db = float(signal_noise) / 10 + infotext = "Noise: %.2f dB" % noise_db + warn, crit = params['signal_noise'] + levels = " (Warn/Crit at %s dB/ %s dB)" % ( warn, crit ) + state = 0 + if noise_db >= crit: + state = 2 + infotext += levels + elif noise_db >= warn: + state = 2 + infotext += levels + yield state, infotext, [ ('signal_noise', noise_db, warn, crit ) ] + + # FEC fec = {} good, fec['corrected'], fec['uncorrected'] = map(float, [ good, corrected, uncorrected ]) fec['corrected_perc'] = ( fec['corrected'] / good ) * 100 @@ -73,6 +89,7 @@ check_info["docsis_signal_quality"] = { 2, #docsIfSigQUnerroreds 3, #docsIfSigQCorrecteds 4, #docsIfSigQUnerroreds + 5, #docsIfSigQSignalNoise ]), "default_levels_variable" : "docsis_signal_quality_default_levels", "group" : "docsis_signal_quality", diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index c5082a0..ba2a544 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -1318,9 +1318,16 @@ register_check_parameters( register_check_parameters( subgroup_networking, 'docsis_signal_quality', - _("Docsis Forward error correction"), + _("Docsis Singal Quality"), Dictionary( elements = [ + ( 'signal_noise', Tuple( + title = _("Levels for Signal Noise"), + elements = [ + Integer( title = _("Warning at"), unit = "dB", default_value = 50), + Integer( title = _("Critical at"), unit = "dB", default_value = 60 ), + ] + )), ( 'corrected', Tuple( title = _("Levels for corrected Packages"), elements = [

9 years, 10 months

Check_MK Git: check_mk: Removed test entry from changelog

by Lars Michelsen

Module: check_mk Branch: master Commit: 8cec1ca92ca552a6b662e240ec029ce1b3e016c4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8cec1ca92ca552… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Aug 1 11:09:25 2014 +0200 Removed test entry from changelog --- ChangeLog | 3 --- 1 file changed, 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index a10b3f1..c2198e6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +1,4 @@ 1.2.5i6: - Core & Setup: - * 1070 asd - Checks & Agents: * 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...

9 years, 10 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits August 2014