Checkmk git commits August 2014

checkmk-commits@lists.checkmk.com

5 participants
225 discussions

Check_MK Git: check_mk: docsis_downstream_channels: disable frequency check per default

by Mathias Kettner

Module: check_mk Branch: master Commit: cb23e82a0915c748a9042e50c9e53d74652954fa URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cb23e82a0915c7… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Aug 29 16:33:40 2014 +0200 docsis_downstream_channels: disable frequency check per default --- checks/docsis_channels_downstream | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/checks/docsis_channels_downstream b/checks/docsis_channels_downstream index 96df170..10d0d6a 100644 --- a/checks/docsis_channels_downstream +++ b/checks/docsis_channels_downstream @@ -25,7 +25,6 @@ # Boston, MA 02110-1301 USA. factory_settings["docsis_channels_downstream"] = { - "frequency" : ( 155, 163 ), "power" : ( 5.0, 1.0 ), } @@ -54,16 +53,17 @@ def check_docsis_channels_downstream(item, params, info): # Check Frequency frequency_mhz = float(frequency) / 1000000 infotext = "Frequency is %.1f MHz" % frequency_mhz - warn, crit = params["frequency"] perfdata = [("frequency" , 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 + if "frequency" in params: + warn, crit = params["frequency"] + levels = " (warn/crit at %d MHz/ %d MHz)" % ( warn, crit ) + 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 yield state, infotext, perfdata return

9 years, 9 months

Check_MK Git: check_mk: fixed indent

by Andreas Boesl

Module: check_mk Branch: master Commit: 98e64416c83baf06bfc6a588e186489cd6e787d7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=98e64416c83baf… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Aug 29 16:04:25 2014 +0200 fixed indent --- livestatus/src/CustomVarsFilter.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/livestatus/src/CustomVarsFilter.cc b/livestatus/src/CustomVarsFilter.cc index ab453b7..06d972c 100644 --- a/livestatus/src/CustomVarsFilter.cc +++ b/livestatus/src/CustomVarsFilter.cc @@ -30,12 +30,12 @@ #include "logger.h" #include "OutputBuffer.h" - CustomVarsFilter::CustomVarsFilter(CustomVarsColumn *column, int opid, char *value) +CustomVarsFilter::CustomVarsFilter(CustomVarsColumn *column, int opid, char *value) : _column(column) , _opid(abs(opid)) , _negate(opid < 0) , _ref_text(value) - , _regex(0) + , _regex(0) { // Prepare part in case of DICT filter if (_column->type() == COLTYPE_DICT) {

9 years, 9 months

Check_MK Git: check_mk: #1150 netstat: new check for monitoring TCP/ UDP connections and Linux and AIX

by Mathias Kettner

Module: check_mk Branch: master Commit: 088c2b0cfbfb6a4fc0980e6fbd89384d40285e7e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=088c2b0cfbfb6a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Aug 29 15:53:47 2014 +0200 #1150 netstat: new check for monitoring TCP/UDP connections and Linux and AIX The check does the same as <tt>win_netstat</tt> and also uses the same WATO rule. You need to deploy the agent plugin <tt>netstat.linux</tt> or <tt>netstat.aix</tt>. --- .werks/1150 | 10 ++++++ ChangeLog | 1 + agents/plugins/netstat.aix | 31 ++++++++++++++++ agents/plugins/netstat.linux | 31 ++++++++++++++++ checkman/netstat | 77 ++++++++++++++++++++++++++++++++++++++++ checks/netstat | 73 ++++++++++++++++++++++++++++++++++++++ checks/netstat.include | 80 ++++++++++++++++++++++++++++++++++++++++++ checks/win_netstat | 54 ++-------------------------- 8 files changed, 305 insertions(+), 52 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=088c2b0cfb…

9 years, 9 months

Check_MK Git: check_mk: Trying to fix too small input fields for date/ time in view actions

by Lars Michelsen

Module: check_mk Branch: master Commit: ecee85ec77eaa7a8f9acb20d4a9aa0957e946f04 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ecee85ec77eaa7… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Aug 29 14:35:58 2014 +0200 Trying to fix too small input fields for date/time in view actions --- web/htdocs/htmllib.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index 5e9448b..48215ac 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -420,7 +420,7 @@ class html: add_style = "width: 100%; " else: addprops += " size=\"%d\"" % (args["size"] + 1) - if "width:" not in args.get("style", "") and not self.mobile: + if not args.get('omit_css_width', False) and "width:" not in args.get("style", "") and not self.mobile: add_style = "width: %d.8ex; " % args["size"] if "type" in args: @@ -634,11 +634,11 @@ class html: def time_input(self, varname, hours, mins, submit=None): self.text_input(varname, "%02d:%02d" % (hours, mins), cssclass="time", size=5, - submit=submit) + submit=submit, omit_css_width = True) def date_input(self, varname, year, month, day, submit=None): self.text_input(varname, "%04d-%02d-%02d" % (year, month, day), - cssclass="date", size=11, submit=submit) + cssclass="date", size=10, submit=submit, omit_css_width = True) def get_datetime_input(self, varname): t = self.var(varname + "_time")

9 years, 9 months

Check_MK Git: check_mk: docsis: remove print statement

by Mathias Kettner

Module: check_mk Branch: master Commit: 9f8e36b28cbc37fde7b51868ccc8ebc5f04e1dd5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9f8e36b28cbc37… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Aug 29 12:16:42 2014 +0200 docsis: remove print statement --- checks/docsis_channels_downstream | 1 - 1 file changed, 1 deletion(-) diff --git a/checks/docsis_channels_downstream b/checks/docsis_channels_downstream index 8d83ca9..96df170 100644 --- a/checks/docsis_channels_downstream +++ b/checks/docsis_channels_downstream @@ -39,7 +39,6 @@ def check_docsis_channels_downstream(item, params, info): if channel_id == item: # Power warn, crit = params["power"] - print power power_dbmv = abs(float(int(power))) / 10 infotext = "Power is %.1f dBmV" % power_dbmv levels = " (Levels Warn/Crit at %d dBmV/ %d dBmV)" % ( warn, crit )

9 years, 9 months

Check_MK Git: check_mk: docsis-checks: converted WATO rules to floats for dBmV

by Mathias Kettner

Module: check_mk Branch: master Commit: 26b9452fd4019b899d86f65b2603550c6221da1e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=26b9452fd4019b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Aug 29 12:16:10 2014 +0200 docsis-checks: converted WATO rules to floats for dBmV --- checks/docsis_signal_quality | 2 +- web/plugins/wato/check_parameters.py | 26 +++++++++++++------------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/checks/docsis_signal_quality b/checks/docsis_signal_quality index cafbd52..0d4d4df 100644 --- a/checks/docsis_signal_quality +++ b/checks/docsis_signal_quality @@ -49,7 +49,7 @@ def check_docsis_signal_quality( item, params, info): if entry == item: # Signal Noise noise_db = float(signal_noise) / 10 - infotext = "Signal/Noise-rate: %.2f dB" % noise_db + infotext = "Signal/Noise ratio: %.2f dB" % noise_db warn, crit = params['signal_noise'] levels = " (warn/crit at %.1f/%.1f dB)" % ( warn, crit ) state = 0 diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index ac0e385..7c87f42 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -1383,28 +1383,28 @@ register_check_parameters( register_check_parameters( subgroup_networking, 'docsis_signal_quality', - _("Docsis Singal Quality"), + _("Docsis Signal Quality"), Dictionary( elements = [ ( 'signal_noise', Tuple( - title = _("Levels for Signal Noise"), + title = _("Levels for signal/noise ratio"), elements = [ - Integer( title = _("Warning at"), unit = "dB", default_value = 50), - Integer( title = _("Critical at"), unit = "dB", default_value = 60 ), + Float(title = _("Warning at or below"), unit = "dB", default_value = 50.0), + Float(title = _("Critical at"), unit = "dB", default_value = 60.0 ), ] )), ( 'corrected', Tuple( title = _("Levels for corrected Packages"), elements = [ Percentage( title = _("Warning at"), default_value = 25.0), - Percentage( title = _("Critical at"), default_value = 30.0 ), + Percentage( title = _("Critical at"), default_value = 30.0), ] )), ( 'uncorrected', Tuple( title = _("Levels for uncorrected Packages"), elements = [ - Percentage( title = _("Warning at"), default_value = 25.0 ), - Percentage( title = _("Critical at"), default_value = 30.0 ), + Percentage( title = _("Warning at"), default_value = 25.0), + Percentage( title = _("Critical at"), default_value = 30.0), ] )), ] @@ -1423,15 +1423,15 @@ register_check_parameters( 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 ), + Float(title = _("warning at or below"), unit = "dBmV", default_value = 5.0 ), + Float(title = _("critical at or below"), unit = "dBmV", default_value = 1.0 ), ])), ( "frequency", Tuple( title = _("Frequency"), help = _("The current tuner frequency"), elements = [ - Integer(title = _("warning at"), unit = "Mhz", default_value = 155 ), - Integer(title = _("critical at"), unit = "Mhz", default_value = 163 ), + Integer(title = _("warning at"), unit = "MHz", default_value = 155 ), + Integer(title = _("critical at"), unit = "MHz", default_value = 163 ), ])), ] ), @@ -1469,8 +1469,8 @@ register_check_parameters( 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 ), + Float(title = _("warning at"), unit = "dBmV", default_value = 20.0 ), + Float(title = _("critical at"), unit = "dBmV", default_value = 10.0 ), ])), ] ),

9 years, 9 months

Check_MK Git: check_mk: docsis-checks: fix some computations

by Mathias Kettner

Module: check_mk Branch: master Commit: 79ffb040953db8106831feca770411bce938c2e3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=79ffb040953db8… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Aug 29 12:11:42 2014 +0200 docsis-checks: fix some computations --- checks/docsis_channels_downstream | 34 ++++++++++++------------ checks/docsis_cm_status | 52 ++++++++++++++++++------------------- checks/docsis_signal_quality | 16 ++++++------ 3 files changed, 52 insertions(+), 50 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=79ffb04095…

9 years, 9 months

Check_MK Git: check_mk: tcp_conn_stats: fix missing performance values

by Mathias Kettner

Module: check_mk Branch: master Commit: 283af3df70742579d4b75fc10822b9107ec89a16 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=283af3df707425… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Aug 29 11:25:08 2014 +0200 tcp_conn_stats: fix missing performance values --- checks/tcp_conn_stats | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/checks/tcp_conn_stats b/checks/tcp_conn_stats index cb0b49a..a3c2b92 100644 --- a/checks/tcp_conn_stats +++ b/checks/tcp_conn_stats @@ -51,10 +51,10 @@ def check_tcp_conn_stats(item, params, info): for stat_state, hex in tcp_conn_stats_states: num = int(stats.get(stat_state, stats.get(hex, 0))) state = 0 + perf = [stat_state, num] if num > 0: # Only check positive counts hit = True infotext = "%s: %d" % (stat_state, num) - perf = [stat_state, num] levels = params.get(stat_state) if levels: warn, crit = levels @@ -66,9 +66,12 @@ def check_tcp_conn_stats(item, params, info): elif num >= warn: state = 1 infotext += " (warning at %d)" % warn - yield state, infotext, [perf] + yield state, infotext, [ tuple(perf) ] + else: + yield 0, None, [ tuple(perf) ] + if not hit: - yield 0, "Currently no tcp connection stats" + yield 0, "Currently no TCP connections" check_info["tcp_conn_stats"] = {

9 years, 9 months

Check_MK Git: check_mk: #0651 FIX f5_bigip_interfaces:

by Goetz Golla

indentation error and oid to determine the interface state fixed Message-ID: <53ff46f0.7+QXvjep19y393Q6%gg(a)mathias-kettner.de> 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: bd3d2e635c5ca57f9039771666e3d547f92b2804 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bd3d2e635c5ca5… Author: Goetz Golla <gg(a)mathias-kettner.de> Date: Thu Aug 28 17:12:39 2014 +0200 #0651 FIX f5_bigip_interfaces: indentation error and oid to determine the interface state fixed A major indentation errors has lead to interface throuputs identical for all ifs. The oid for the determination of the if state was wrong Both errors have been fixed. Also the scan function was extended to detect more and newer f5 devices --- .werks/651 | 15 +++++++++++++++ ChangeLog | 1 + checks/f5_bigip_interfaces | 40 +++++++++++++++++++++------------------- 3 files changed, 37 insertions(+), 19 deletions(-) diff --git a/.werks/651 b/.werks/651 new file mode 100644 index 0000000..7325efb --- /dev/null +++ b/.werks/651 @@ -0,0 +1,15 @@ +Title: f5_bigip_interfaces: indentation error and oid to determine the interface state fixed +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.5i6 +Date: 1409238534 +Class: fix + +A major indentation errors has lead to interface throuputs identical for all ifs. +The oid for the determination of the if state was wrong + +Both errors have been fixed. + +Also the scan function was extended to detect more and newer f5 devices + diff --git a/ChangeLog b/ChangeLog index 5843001..88e2313 100644 --- a/ChangeLog +++ b/ChangeLog @@ -65,6 +65,7 @@ NOTE: Please refer to the migration notes! * 1102 FIX: esx_vsphere_counters: no longer raise false alarms because of invalid data from ESX Host... * 1149 FIX: check_mk-ibm_svc_systemstats.diskio, check_mk-ibm_svc_systemstats.iops: fix exception in Perf-O-Meter + * 0651 FIX: f5_bigip_interfaces: indentation error and oid to determine the interface state fixed... Multisite: * 1066 Implemented Dashboard Designer... diff --git a/checks/f5_bigip_interfaces b/checks/f5_bigip_interfaces index 1cbec71..13025d5 100644 --- a/checks/f5_bigip_interfaces +++ b/checks/f5_bigip_interfaces @@ -25,7 +25,7 @@ # Boston, MA 02110-1301 USA. # .1.3.6.1.4.1.3375.2.1.2.4.4.3.1.1. index for ifname -# .1.3.6.1.4.1.3375.2.1.2.4.4.3.1.13. index for ifstate +# .1.3.6.1.4.1.3375.2.1.2.4.1.2.1.17. index for ifstate # .1.3.6.1.4.1.3375.2.1.2.4.4.3.1.3. index for OUT bytes # .1.3.6.1.4.1.3375.2.1.2.4.4.3.1.5. index for IN bytes @@ -34,25 +34,26 @@ def check_f5_bigip_interfaces(item, params, info): if item == port: if int(ifstate) != 0: states = { - 2 : "down (has no link and is initialized)", - 3 : "disabled has been forced down)", - 4 : "uninitialized (has not been initialized)", - 5 : "loopback (in loopback mode)", - 6 : "unpopulated (interface not physically populated)", + 1 : "down (has no link and is initialized)", + 2 : "disabled has been forced down)", + 3 : "uninitialized (has not been initialized)", + 4 : "loopback (in loopback mode)", + 5 : "unpopulated (interface not physically populated)", } - return(2, "State of %s is %s" % (states[ifstate], port)) - this_time = int(time.time()) - in_timedif, in_per_sec = get_counter("f5.interface.in.%s" % item, this_time, saveint(inbytes)) - out_timedif, out_per_sec = get_counter("f5_interface.out.%s" % item, this_time, saveint(outbytes)) + return(2, "State of %s is %s" % (states.get(ifstate,"unkown"), port)) + this_time = int(time.time()) + in_timedif, in_per_sec = get_counter("f5.interface.in.%s" % item, this_time, saveint(inbytes)) + out_timedif, out_per_sec = get_counter("f5_interface.out.%s" % item, this_time, saveint(outbytes)) - inbytes_h = get_bytes_human_readable(in_per_sec) - outbytes_h = get_bytes_human_readable(out_per_sec) - perf = [ - ("bytes_in", in_per_sec), - ("bytes_out", out_per_sec), - ] - return (0, "in bytes: %s/s, out bytes: %s/s" % (inbytes_h, outbytes_h), perf) + inbytes_h = get_bytes_human_readable(in_per_sec) + outbytes_h = get_bytes_human_readable(out_per_sec) + perf = [ + ("bytes_in", in_per_sec), + ("bytes_out", out_per_sec), + ] + return (0, "in bytes: %s/s, out bytes: %s/s" % (inbytes_h, outbytes_h), perf) + return 3, "no such interface found in snmp data" check_info["f5_bigip_interfaces"] = { @@ -60,6 +61,7 @@ check_info["f5_bigip_interfaces"] = { "inventory_function" : lambda info: [ (x[0], {'state': 0 } ) for x in info if int(x[1]) == 0], "service_description" : "f5 Interface %s", "has_perfdata" : True, - "snmp_scan_function" : lambda oid: ".1.3.6.1.4.1.3375.2.1.3.4.20" in oid(".1.3.6.1.2.1.1.2.0"), - "snmp_info" : ( ".1.3.6.1.4.1.3375.2.1.2.4.4.3.1", [1, 13, 3, 5]), + "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0") in \ + [ ".1.3.6.1.4.1.3375.2.1.3.4.10", ".1.3.6.1.4.1.3375.2.1.3.4.20" ], + "snmp_info" : ( ".1.3.6.1.4.1.3375.2.1.2.4", ["4.3.1.1", "1.2.1.17", "4.3.1.3", "4.3.1.5"]), }

9 years, 9 months

Check_MK Git: check_mk: Fixed internal code comments

by Mathias Kettner

Module: check_mk Branch: master Commit: 935de15a0f9bb3caa292d124020a3e2f65494e02 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=935de15a0f9bb3… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Aug 28 15:50:35 2014 +0200 Fixed internal code comments --- notifications/asciimail | 2 +- notifications/mail | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/notifications/asciimail b/notifications/asciimail index c8cb112..5d6b203 100755 --- a/notifications/asciimail +++ b/notifications/asciimail @@ -105,7 +105,7 @@ def construct_content(context): # NOTIFICATIONTYPE is "FLAPPINGSTART" or "FLAPPINGSTOP" # - Downtimes Started, Ended, Cancelled - # NOTIFICATIONTYPE is "DOWNTIMESTART", "DOWNTIMECANCELLED", or "DOWNTIMESTOPPED" + # NOTIFICATIONTYPE is "DOWNTIMESTART", "DOWNTIMECANCELLED", or "DOWNTIMEEND" # - Acknowledgements # NOTIFICATIONTYPE is "ACKNOWLEDGEMENT" diff --git a/notifications/mail b/notifications/mail index 8921317..39603ed 100755 --- a/notifications/mail +++ b/notifications/mail @@ -402,7 +402,7 @@ def construct_content(context): # NOTIFICATIONTYPE is "FLAPPINGSTART" or "FLAPPINGSTOP" # - Downtimes Started, Ended, Cancelled - # NOTIFICATIONTYPE is "DOWNTIMESTART", "DOWNTIMECANCELLED", or "DOWNTIMESTOPPED" + # NOTIFICATIONTYPE is "DOWNTIMESTART", "DOWNTIMECANCELLED", or "DOWNTIMEEND" # - Acknowledgements # NOTIFICATIONTYPE is "ACKNOWLEDGEMENT"

9 years, 9 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits August 2014