Checkmk git commits March 2015

checkmk-commits@lists.checkmk.com

7 participants
320 discussions

Check_MK Git: check_mk: #2155 siemens_plc_counter: added new check for monitoring increasing counter values

by Lars Michelsen

Module: check_mk Branch: master Commit: 655322b1df52c83ecb5bc2332c0badb86e62662e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=655322b1df52c8… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Mar 23 15:30:13 2015 +0100 #2155 siemens_plc_counter: added new check for monitoring increasing counter values --- .werks/2155 | 9 ++++ ChangeLog | 1 + checks/siemens_plc | 71 +++++++++++++++++++++++++------ web/plugins/wato/check_parameters.py | 33 +++++++++++++- web/plugins/wato/datasource_programs.py | 18 +++++--- 5 files changed, 112 insertions(+), 20 deletions(-) diff --git a/.werks/2155 b/.werks/2155 new file mode 100644 index 0000000..a4b29a3 --- /dev/null +++ b/.werks/2155 @@ -0,0 +1,9 @@ +Title: siemens_plc_counter: added new check for monitoring increasing counter values +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i1 +Date: 1427120998 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index f480917..94a7a9c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -138,6 +138,7 @@ * 2153 siemens_plc.duration siemens_plc.flag siemens_plc.info: New Checks for Siemens PLC devices * 2063 winperf_if: now also able to detect the interface port state 'lowerLayerDown'... * 2154 Interface-Checks: Separate traffic thresholds for in and out are now possible... + * 2155 siemens_plc_counter: added new check for monitoring increasing counter values * 1457 FIX: logins: new check renamed from "users" check... NOTE: Please refer to the migration notes! * 1762 FIX: lnx_thermal: Now ignoring trip points with level 0... diff --git a/checks/siemens_plc b/checks/siemens_plc index 0ec362b..913e4ea 100644 --- a/checks/siemens_plc +++ b/checks/siemens_plc @@ -29,19 +29,19 @@ # PFT01 flag Testbit True # PFT01 flag Testbit2 False # RGB01 temp Gesamt 123 -# RGB01 hours Fahren 56 -# RGB01 hours Hub 48 +# RGB01 seconds Fahren 56 +# RGB01 seconds Hub 48 +# RGB01 seconds LAM1 13 # RGB01 temp Extern 18.7000007629 # RGB01 temp RBG_SCH1 0.0 # RGB01 temp RBG_SCH2 0.0 -# RGB01 None Fahren 31450 -# RGB01 None Hub 8100 -# RGB01 None LAM 5002 -# RGB01 hours LAM1 13 -# RGB01 None Lastzyklen 78 -# RGB01 None LAM1_Zyklen 115 -# RGB01 hours Service 109 -# RGB01 hours Serviceintervall 700 +# RGB01 counter Fahren 31450 +# RGB01 counter Hub 8100 +# RGB01 counter LAM 5002 +# RGB01 counter Lastzyklen 78 +# RGB01 counter LAM1_Zyklen 115 +# RGB01 seconds Service 109 +# RGB01 seconds Serviceintervall 700 # RGB01 text Testtext HRL01-0001-0010-02-07 #. @@ -132,14 +132,17 @@ check_info['siemens_plc.flag'] = { # '----------------------------------------------------------------------' def inventory_siemens_plc_duration(info): - return [ (l[0]+" "+l[2], {}) for l in info if l[1].startswith("hours") ] + return [ (l[0]+" "+l[2], {}) for l in info if l[1].startswith("hours") + or l[1].startswith("seconds") ] def check_siemens_plc_duration(item, params, info): for line in info: - if line[1].startswith("hours") and line[0]+" "+line[2] == item: + if (line[1].startswith("hours") or line[1].startswith("seconds")) and line[0]+" "+line[2] == item: if line[1].startswith("hours"): seconds = int(line[-1])*3600 + else: + seconds = int(line[-1]) key = 'siemens_plc.duration.%s' % item if key in g_counters and g_counters[key] < seconds: @@ -166,6 +169,50 @@ check_info['siemens_plc.duration'] = { } #. +# .--Counter-------------------------------------------------------------. +# | ____ _ | +# | / ___|___ _ _ _ __ | |_ ___ _ __ | +# | | | / _ \| | | | '_ \| __/ _ \ '__| | +# | | |__| (_) | |_| | | | | || __/ | | +# | \____\___/ \__,_|_| |_|\__\___|_| | +# | | +# +----------------------------------------------------------------------+ +# | | +# '----------------------------------------------------------------------' + +def inventory_siemens_plc_counter(info): + return [ (l[0]+" "+l[2], {}) for l in info if l[1].startswith("counter") ] + + +def check_siemens_plc_counter(item, params, info): + for line in info: + if line[1].startswith("counter") and line[0]+" "+line[2] == item: + value = int(line[-1]) + + key = 'siemens_plc.counter.%s' % item + if key in g_counters and g_counters[key] < value: + return 2, 'Reduced from %s to %s' % (g_counters[key], value) + g_counters[key] = value + + state = 0 + warn, crit = params.get('levels', (None, None)) + if crit != None and value >= crit: + state = 2 + elif warn != None and value >= warn: + state = 1 + + return state, '%d' % value, [(line[1], value)] + + +check_info['siemens_plc.counter'] = { + "inventory_function" : inventory_siemens_plc_counter, + "check_function" : check_siemens_plc_counter, + "service_description" : "Counter %s", + "has_perfdata" : True, + "group" : "siemens_plc_counter", +} + +#. # .--Info----------------------------------------------------------------. # | ___ __ | # | |_ _|_ __ / _| ___ | diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index ef277ec..1da968f 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -8611,7 +8611,38 @@ register_check_parameters( ], help = _("This rule is used to configure thresholds for duration values read from " "Siemens PLC devices."), - title = _("Expected flag state"), + title = _("Duration levels"), + ), + TextAscii( + title = _("Device Name and Value Ident"), + help = _("You need to concatenate the device name which is configured in the special agent " + "for the PLC device separated by a space with the ident of the value which is also " + "configured in the special agent."), + ), + None +) + +register_check_parameters( + subgroup_environment, + "siemens_plc_counter", + _("Siemens PLC Counter"), + Dictionary( + elements = [ + ('levels', Tuple( + title = _("Counter level"), + elements = [ + Integer( + title = _("Warning at"), + ), + Integer( + title = _("Critical at"), + ), + ] + )), + ], + help = _("This rule is used to configure thresholds for counter values read from " + "Siemens PLC devices."), + title = _("Counter levels"), ), TextAscii( title = _("Device Name and Value Ident"), diff --git a/web/plugins/wato/datasource_programs.py b/web/plugins/wato/datasource_programs.py index 4f30f3a..2bc9236 100644 --- a/web/plugins/wato/datasource_programs.py +++ b/web/plugins/wato/datasource_programs.py @@ -511,13 +511,17 @@ _siemens_plc_value = [ DropdownChoice( title = _("Type of the value"), choices = [ - (None, _("Unclassified")), - ("temp", _("Temperature")), - ("hours_operation", _("Hours of operation")), - ("hours_since_service", _("Hours since service")), - ("hours", _("Hours")), - ("flag", _("State flag (on/off)")), - ("text", _("Text")), + (None, _("Unclassified")), + ("temp", _("Temperature")), + ("hours_operation", _("Hours of operation")), + ("hours_since_service", _("Hours since service")), + ("hours", _("Hours")), + ("seconds_operation", _("Seconds of operation")), + ("seconds_since_service", _("Seconds since service")), + ("seconds", _("Seconds")), + ("counter", _("Increasing counter")), + ("flag", _("State flag (on/off)")), + ("text", _("Text")), ], sorted = True, ),

9 years, 3 months

Check_MK Git: check_mk: db2_counters, db2_sort_overflow:

by Bastian Kuhn

Improved error handling Message-ID: <55101f32.bhIUCpfW+JdsOmDA%bk(a)mathias-kettner.de> User-Agent: Heirloom mailx 12.5 6/20/10 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Module: check_mk Branch: master Commit: 083f848e2bf089b4e1c0878026e198ae7f06902d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=083f848e2bf089… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Mon Mar 23 15:11:52 2015 +0100 db2_counters, db2_sort_overflow: Improved error handling --- checks/db2_counters | 7 ++++++- checks/db2_sort_overflow | 5 ++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/checks/db2_counters b/checks/db2_counters index c90eba5..7eeae53 100644 --- a/checks/db2_counters +++ b/checks/db2_counters @@ -62,7 +62,12 @@ def check_db2_counters(item, params, parsed): wrapped = False for counter, label in db2_counters_map.items(): - value = float(db[counter]) + try: + value = float(db[counter]) + except ValueError: + yield 2, "Invalid value: " + db[counter] + continue + countername = "db2_counters.%s.%s" % (item, counter) try: rate = get_rate("db2_counters.%s.%s" % (item, counter), timestamp, value, onwrap = RAISE) diff --git a/checks/db2_sort_overflow b/checks/db2_sort_overflow index bd647ed..24efefa 100644 --- a/checks/db2_sort_overflow +++ b/checks/db2_sort_overflow @@ -43,7 +43,10 @@ def check_db2_sort_overflow(item, params, parsed): return total, overflows = tuple(map(lambda x: float(x[-1]), db)) - overflow_perc = overflows * 100 / total + if total > 0: + overflow_perc = overflows * 100 / total + else: + overflow_perc = 0.0 warn, crit = params.get("levels_perc") if overflow_perc >= crit: yield 2, "%.1f%% sort overflow (leves at %.1f%%/%.1f%%)" % \

9 years, 3 months

Check_MK Git: check_mk: #2154 Interface-Checks: Separate traffic thresholds for in and out are now possible

by Lars Michelsen

Module: check_mk Branch: master Commit: d69b55b0d35009e0dedaa738a157b48e9b0a514f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d69b55b0d35009… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Mar 23 15:07:48 2015 +0100 #2154 Interface-Checks: Separate traffic thresholds for in and out are now possible It is now possible to configure separate bandwidth thresholds for the interface checks on the traffic directions. Instead of configuring "In/Out" at once, you can choose only a single traffic direction to specify the levels for. --- .werks/2154 | 11 ++ ChangeLog | 1 + checks/if.include | 180 ++++++++++++++-------------- web/htdocs/valuespec.py | 7 +- web/htdocs/wato.py | 4 +- web/plugins/wato/check_mk_configuration.py | 2 +- web/plugins/wato/check_parameters.py | 123 +++++++++++-------- web/plugins/wato/datasource_programs.py | 2 +- 8 files changed, 190 insertions(+), 140 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=d69b55b0d3…

9 years, 3 months

Check_MK Git: check_mk: code cleanup

by Bastian Kuhn

Module: check_mk Branch: master Commit: cf15b65483fea6d4417521f881e94e1d0d5b3989 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cf15b65483fea6… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Mon Mar 23 14:35:12 2015 +0100 code cleanup --- checks/multipath | 1 - 1 file changed, 1 deletion(-) diff --git a/checks/multipath b/checks/multipath index d4ad6aa..eabd80f 100644 --- a/checks/multipath +++ b/checks/multipath @@ -176,7 +176,6 @@ def parse_multipath(info): group = {} numpaths = None for line in info: - # Ignore error messages due to invalid multipath.conf if line[0] == "multipath.conf": continue

9 years, 3 months

Check_MK Git: check_mk: #1240 FIX multipath: improved detection for not installed multipath

by Bastian Kuhn

Module: check_mk Branch: master Commit: 6c11df4316e39bc9bc879bfb7bc12282de1606e7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6c11df4316e39b… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Mon Mar 23 14:34:12 2015 +0100 #1240 FIX multipath: improved detection for not installed multipath --- .werks/1240 | 10 ++++++++++ ChangeLog | 1 + checks/multipath | 3 ++- 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/.werks/1240 b/.werks/1240 new file mode 100644 index 0000000..2f8c485 --- /dev/null +++ b/.werks/1240 @@ -0,0 +1,10 @@ +Title: multipath: improved detection for not installed multipath +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i1 +Date: 1427117606 + + diff --git a/ChangeLog b/ChangeLog index 13a9a65..1950181 100644 --- a/ChangeLog +++ b/ChangeLog @@ -275,6 +275,7 @@ * 2152 FIX: apache_status: Fixed plugin to work on CentOS/RedHat 5.x... * 1896 FIX: ups_socomec_capacity: Now no longer critical when device reports -1 minutes left on battery... * 1238 FIX: check_mk_agent.linux: Do not execute the multipath section if no /etc/multipath.conf exsist. + * 1240 FIX: multipath: improved detection for not installed multipath Multisite: * 1758 Improved exception hander: Shows details without additional debug request, added mailto link for error report... diff --git a/checks/multipath b/checks/multipath index 64dda25..d4ad6aa 100644 --- a/checks/multipath +++ b/checks/multipath @@ -176,6 +176,7 @@ def parse_multipath(info): group = {} numpaths = None for line in info: + # Ignore error messages due to invalid multipath.conf if line[0] == "multipath.conf": continue @@ -191,7 +192,7 @@ def parse_multipath(info): l = " ".join(line) # Skip output when multipath is not present - if l.endswith('DM multipath kernel driver not loaded') \ + if l.endswith('kernel driver not loaded') \ or l.endswith('does not exist, blacklisting all devices.') \ or l.endswith('A sample multipath.conf file is located at') \ or l.endswith('multipath.conf'):

9 years, 3 months

Check_MK Git: check_mk: treasures/downtime: now really fixed

by Bastian Kuhn

Module: check_mk Branch: master Commit: 2efe19140459839a48645e89a5237f6c65dbed1c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2efe1914045983… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Mon Mar 23 14:17:43 2015 +0100 treasures/downtime: now really fixed --- doc/treasures/downtime | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/treasures/downtime b/doc/treasures/downtime index 4f5102f..d04da08 100755 --- a/doc/treasures/downtime +++ b/doc/treasures/downtime @@ -194,9 +194,9 @@ def set_downtime(variables, add_vars): if arg_services: for service in arg_services: if opt_mode == "remove": - set_downtime(variables, [("service_regex", service + "$")]) + set_downtime(variables, [("service", service )]) else: - set_downtime(variables, [("service_regex", service + "$")]) + set_downtime(variables, [("service", service )]) else: set_downtime(variables, []) if opt_all:

9 years, 3 months

Check_MK Git: check_mk: aix_if: some more fixes

by Goetz Golla

Module: check_mk Branch: master Commit: f1b87fb238b7d25ad197f182a50e487754b78d43 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f1b87fb238b7d2… Author: Goetz Golla <gg(a)mathias-kettner.de> Date: Mon Mar 23 14:13:59 2015 +0100 aix_if: some more fixes --- checks/aix_if | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/checks/aix_if b/checks/aix_if index 4f2e9bb..c4f66c7 100644 --- a/checks/aix_if +++ b/checks/aix_if @@ -44,13 +44,11 @@ # Simplex 64BitSupport ChecksumOffload # DataRateSet -check_includes['aix_if'] = [ "if.include" ] def parse_aix_if(info): nic_info = {} current_nic = None index = 0 - flags = () for line in info: # Be careful! On clustered hosts we have more than one perf-counters section # and ethtool section. This needs to be handled. Sadly we have no section @@ -87,10 +85,9 @@ def parse_aix_if(info): nic_info[nic]["ifSpeed"] = int(line[3]) * 1000000 elif " ".join(line[0:2]) == "Driver Flags:": nic_info[nic]["flags"] = line[2:] - elif len(line) and ":" not in " ".join(line) and len(flags): + elif len(line) and ":" not in " ".join(line) and "flags" in nic_info[nic]: nic_info[nic]["flags"] += line - if_table = [] for nic in nic_info: if "Up" in nic_info[nic]["flags"]: @@ -119,9 +116,11 @@ def parse_aix_if(info): if_table.append(map(str, nic_list)) return if_table + def inventory_aix_if(info): return inventory_if_common(info) + def check_aix_if(item, params, info): return check_if_common(item, params, info)

9 years, 3 months

Check_MK Git: check_mk: treasures/dowtime: use service regex again

by Bastian Kuhn

Module: check_mk Branch: master Commit: 1953978674445d9fb620ab6a90a4d785f77b59d5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1953978674445d… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Mon Mar 23 14:05:43 2015 +0100 treasures/dowtime: use service regex again --- doc/treasures/downtime | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/treasures/downtime b/doc/treasures/downtime index 5e50352..4f5102f 100755 --- a/doc/treasures/downtime +++ b/doc/treasures/downtime @@ -194,9 +194,9 @@ def set_downtime(variables, add_vars): if arg_services: for service in arg_services: if opt_mode == "remove": - set_downtime(variables, [("service_regex", service)]) + set_downtime(variables, [("service_regex", service + "$")]) else: - set_downtime(variables, [("service", service)]) + set_downtime(variables, [("service_regex", service + "$")]) else: set_downtime(variables, []) if opt_all:

9 years, 3 months

Check_MK Git: check_mk: Merge conflict

by Bastian Kuhn

Module: check_mk Branch: master Commit: e301514a0c0c865ba99834b1335b0bd9c21c8185 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e301514a0c0c86… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Mon Mar 23 13:58:54 2015 +0100 Merge conflict --- .werks/1239 | 10 ++++++++++ ChangeLog | 1 + doc/treasures/downtime | 2 +- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/1239 b/.werks/1239 new file mode 100644 index 0000000..2c7a869 --- /dev/null +++ b/.werks/1239 @@ -0,0 +1,10 @@ +Title: Fixed /treasures/downtime script to work with the new visuals +Level: 1 +Component: multisite +Class: feature +Compatible: compat +State: unknown +Version: 1.2.7i1 +Date: 1427115417 + + diff --git a/ChangeLog b/ChangeLog index da02b7d..13a9a65 100644 --- a/ChangeLog +++ b/ChangeLog @@ -290,6 +290,7 @@ * 2040 Allow commands for setting downtimes and acknowledging on BI aggregates... * 2042 Services are now sorted in a natural way, this affects services containing numbers... * 2140 Remove PNP Timeranges from range selection, put these ranges directly into the list... + * 1239 Fixed /treasures/downtime script to work with the new visuals * 1781 FIX: Fix broken grouping by host/service group in availability * 1783 FIX: Finish the view "History of Scheduled Downtimes"... * 1206 FIX: Hostname not longer shown as column in host views diff --git a/doc/treasures/downtime b/doc/treasures/downtime index 262994d..5e50352 100755 --- a/doc/treasures/downtime +++ b/doc/treasures/downtime @@ -194,7 +194,7 @@ def set_downtime(variables, add_vars): if arg_services: for service in arg_services: if opt_mode == "remove": - set_downtime(variables, [("service_regex", service + "$")]) + set_downtime(variables, [("service_regex", service)]) else: set_downtime(variables, [("service", service)]) else:

9 years, 3 months

Check_MK Git: check_mk: aix_if: FIX for exception during inventory of multiple interfaces

by Goetz Golla

Module: check_mk Branch: master Commit: 60b71e3a75fdc845adc613492ac905b71dcfdc77 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=60b71e3a75fdc8… Author: Goetz Golla <gg(a)mathias-kettner.de> Date: Mon Mar 23 13:54:38 2015 +0100 aix_if: FIX for exception during inventory of multiple interfaces --- checks/aix_if | 37 +++++++++++++++++++------------------ 1 file changed, 19 insertions(+), 18 deletions(-) diff --git a/checks/aix_if b/checks/aix_if index db6f6ff..4f2e9bb 100644 --- a/checks/aix_if +++ b/checks/aix_if @@ -86,29 +86,30 @@ def parse_aix_if(info): # speed is in Mb/s nic_info[nic]["ifSpeed"] = int(line[3]) * 1000000 elif " ".join(line[0:2]) == "Driver Flags:": - flags = line[2:] + nic_info[nic]["flags"] = line[2:] elif len(line) and ":" not in " ".join(line) and len(flags): - flags += line + nic_info[nic]["flags"] += line - if "Up" in flags: - nic_info[nic]["ifOperStatus"] = 1 - elif "Down" in flags: - nic_info[nic]["ifOperStatus"] = 2 - # No information from entstat. We consider interfaces up - # if they have been used at least some time since the - # system boot. - elif nic_info[nic]["ifInOctets"] > 0: - nic_info[nic]["ifOperStatus"] = 1 - else: - # unknown, or never been up - nic_info[nic]["ifOperStatus"] = 4 - - nic_info[nic]["ifOutQLen"] = 0 - nic_info[nic]["ifInDiscards"] = 0 - nic_info[nic]["ifOutDiscards"] = 0 if_table = [] for nic in nic_info: + if "Up" in nic_info[nic]["flags"]: + nic_info[nic]["ifOperStatus"] = 1 + elif "Down" in nic_info[nic]["flags"]: + nic_info[nic]["ifOperStatus"] = 2 + # No information from entstat. We consider interfaces up + # if they have been used at least some time since the + # system boot. + elif nic_info[nic]["ifInOctets"] > 0: + nic_info[nic]["ifOperStatus"] = 1 + else: + # unknown, or never been up + nic_info[nic]["ifOperStatus"] = 4 + + nic_info[nic]["ifOutQLen"] = 0 + nic_info[nic]["ifInDiscards"] = 0 + nic_info[nic]["ifOutDiscards"] = 0 + nic_list = [] for attr in [ "ifIndex", "ifDescr", "ifType", "ifSpeed", "ifOperStatus", "ifInOctets", "inucast", "inmcast", "inbcast", "ifInDiscards",

9 years, 3 months

← Newer
1
...
6
7
8
9
10
11
12
...
32
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits March 2015