Checkmk git commits May 2016

checkmk-commits@lists.checkmk.com

6 participants
231 discussions

3629 gude_relayport: new check which monitors the ON/ OFF state of a GUDE Power Control device

by Simon Betz

Module: check_mk Branch: master Commit: c7349985ec1b0a75d7b8d0da720453396a3025e5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c7349985ec1b0a… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue May 31 11:37:27 2016 +0200 3629 gude_relayport: new check which monitors the ON/OFF state of a GUDE Power Control device --- .werks/3629 | 9 +++++++ ChangeLog | 1 + checkman/gude_relayport | 14 +++++++++++ checks/gude_relayport | 60 +++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 84 insertions(+) diff --git a/.werks/3629 b/.werks/3629 new file mode 100644 index 0000000..61c02e8 --- /dev/null +++ b/.werks/3629 @@ -0,0 +1,9 @@ +Title: gude_relayport: new check which monitors the ON/OFF state of a GUDE Power Control device +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.9i1 +Date: 1464687418 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index ca62d54..b5ea174 100644 --- a/ChangeLog +++ b/ChangeLog @@ -93,6 +93,7 @@ NOTE: Please refer to the migration notes! * 3138 jolokia_metrics.cache_hits, jolokia_metrics.in_memory, jolokia_metrics.off_heap, jolokia_metrics.on_disk, jolokia_metrics.writer: added checks for monitoring of ehcache metrics through jolokia... * 3628 emcvnx_mirrorview: new check which monitors the mirrorviews of EMC VNX storage system... + * 3629 gude_relayport: new check which monitors the ON/OFF state of a GUDE Power Control device * 3073 FIX: windows agent: relative paths to mrpe scripts are now treated as relative to the agent installation directory... * 3061 FIX: mk_jolokia: Fixed debugging of the agent plugin * 3074 FIX: windows agent: fixed incorrect values for 32-bit performance counters diff --git a/checkman/gude_relayport b/checkman/gude_relayport new file mode 100644 index 0000000..ea41f61 --- /dev/null +++ b/checkman/gude_relayport @@ -0,0 +1,14 @@ +title: GUDE Power Control: Relay port status +agents: snmp +catalog: hw/other +license: GPL +distribution: check_mk +description: + This check monitors the ON/OFF state of a GUDE Power + Control device which supports the GUDEADS-EPC1100-MIB. + +item: + The relay port name. + +inventory: + One service per relay port is created. diff --git a/checks/gude_relayport b/checks/gude_relayport new file mode 100644 index 0000000..9a47499 --- /dev/null +++ b/checks/gude_relayport @@ -0,0 +1,60 @@ +#!/usr/bin/python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2016 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- +# tails. 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. + + +# .1.3.6.1.4.1.28507.19.1.3.1.2.1.2.1 Power Port 1 --> GUDEADS-EPC1100-MIB::epc1100PortName.1 +# .1.3.6.1.4.1.28507.19.1.3.1.2.1.3.1 1 --> GUDEADS-EPC1100-MIB::epc1100PortState.1 + + +def inventory_gude_relayport(info): + for port_name, port_status in info: + if port_status != "0": + yield port_name, None + + +def check_gude_relayport(item, params, info): + map_powerstates = { + "0" : (2, "off"), + "1" : (0, "on"), + } + + for port_name, port_status in info: + if item == port_name: + state, state_readable = map_powerstates[port_status] + infotext = "Status: %s" % state_readable + return state, infotext + + +check_info['gude_relayport'] = { + 'inventory_function' : inventory_gude_relayport, + 'check_function' : check_gude_relayport, + 'service_description' : 'Relay port %s', + 'snmp_info' : (".1.3.6.1.4.1.28507.19.1.3.1.2.1", [ + "2", # GUDEADS-EPC1100-MIB::epc1100PortName + "3", # GUDEADS-EPC1100-MIB::epc1100PortState + ]), + 'snmp_scan_function' : lambda oid: oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.28507.19"), +}

8 years, 4 months

3583 FIX Fixed loosing some services after saving services in WATO

by Lars Michelsen

Module: check_mk Branch: master Commit: a6c0859e9654cdd495923fb853380a7d9207b342 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a6c0859e9654cd… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue May 31 10:59:06 2016 +0200 3583 FIX Fixed loosing some services after saving services in WATO Checks which were creating services with empty strings as check items, where dropped while saving the service configuration via "save manual check configuration". --- .werks/3583 | 11 +++++++++++ ChangeLog | 1 + web/htdocs/wato.py | 3 +-- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/.werks/3583 b/.werks/3583 new file mode 100644 index 0000000..5667ada --- /dev/null +++ b/.werks/3583 @@ -0,0 +1,11 @@ +Title: Fixed loosing some services after saving services in WATO +Level: 1 +Component: wato +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1464684618 + +Checks which were creating services with empty strings as check items, +where dropped while saving the service configuration via "save manual check configuration". diff --git a/ChangeLog b/ChangeLog index a6d8f53..ca62d54 100644 --- a/ChangeLog +++ b/ChangeLog @@ -404,6 +404,7 @@ * 3534 FIX: Fixed exception with upload of interlaced PNG files... * 3242 FIX: Fixed hostname translation for empty optional groups * 3579 FIX: Fixed visibility of SNMP community attribute when SNMP tag is inherited + * 3583 FIX: Fixed loosing some services after saving services in WATO... Notifications: * 3263 Notifications: allow users to restrict by their contact groups... diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index d28a4b6..2fadb23 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -2784,7 +2784,6 @@ def show_service_table(host, firsttime): ]: first = True for st, ct, checkgroup, item, paramstring, params, descr, state, output, perfdata in checktable: - item = html.attrencode(item or 'None') if check_source != st: continue if first: @@ -2808,7 +2807,7 @@ def show_service_table(host, firsttime): manpage_url = folder_preserving_link([("mode", "check_manpage"), ("check_type", ctype)]) table.cell(_("Status"), statename, css=stateclass) table.cell(_("Checkplugin"), '<a href="%s">%s</a>' % (manpage_url, ctype)) - table.cell(_("Item"), item) + table.cell(_("Item"), html.attrencode(item)) table.cell(_("Service Description"), html.attrencode(descr)) table.cell(_("Plugin output"))

8 years, 4 months

3582 FIX check_mail: Fixed issue with processing multipart mails

by Lars Michelsen

Module: check_mk Branch: master Commit: 29888734dbd07c32560c797365ac8a9b46682d9a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=29888734dbd07c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue May 31 10:09:22 2016 +0200 3582 FIX check_mail: Fixed issue with processing multipart mails When the check is configured to forward mails to the event console, it was unable to parse multipart mails. This has been fixed. The events now get the contents of the first text/plain part added until the configured body limit. --- .werks/3582 | 13 +++++++++++++ ChangeLog | 1 + doc/treasures/active_checks/check_mail | 9 +++++++-- 3 files changed, 21 insertions(+), 2 deletions(-) diff --git a/.werks/3582 b/.werks/3582 new file mode 100644 index 0000000..2427dd8 --- /dev/null +++ b/.werks/3582 @@ -0,0 +1,13 @@ +Title: check_mail: Fixed issue with processing multipart mails +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1464681864 + +When the check is configured to forward mails to the event console, +it was unable to parse multipart mails. This has been fixed. The +events now get the contents of the first text/plain part added until +the configured body limit. diff --git a/ChangeLog b/ChangeLog index 1023a0c..a6d8f53 100644 --- a/ChangeLog +++ b/ChangeLog @@ -246,6 +246,7 @@ * 3624 FIX: oracle_asm_diskgroup: fixed dismounted disk handling * 3625 FIX: zfs_arc_cache: fixed data handling if hits and misses are missing * 3626 FIX: dell_eql_storage: fixed scan function if sysDescr is empty + * 3582 FIX: check_mail: Fixed issue with processing multipart mails... Multisite: * 3187 notification view: new filter for log command via regex diff --git a/doc/treasures/active_checks/check_mail b/doc/treasures/active_checks/check_mail index 85b9dad..fecf5cf 100755 --- a/doc/treasures/active_checks/check_mail +++ b/doc/treasures/active_checks/check_mail @@ -300,8 +300,13 @@ def forward_to_ec(mails): log_line = subject # Now add the body to the event if msg.is_multipart(): - for payload in msg.get_payload(): - log_line += '|' + payload.get_payload()[:body_limit] + # only care for the first text/plain element + for part in msg.walk(): + content_type = part.get_content_type() + disposition = str(part.get('Content-Disposition')) + if content_type == 'text/plain' and 'attachment' not in disposition: + log_line += '|' + part.get_payload()[:body_limit] + break else: log_line += '|' + msg.get_payload()[:body_limit] log_line = log_line.replace('\r\n', '\0')

8 years, 4 months

3628 emcvnx_mirrorview: new check which monitors the mirrorviews of EMC VNX storage system

by Simon Betz

Module: check_mk Branch: master Commit: d73a020f8d27a4215b89a24101f9169aad4bbecf URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d73a020f8d27a4… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue May 31 09:33:19 2016 +0200 3628 emcvnx_mirrorview: new check which monitors the mirrorviews of EMC VNX storage system The information is retrieved by the special agent agent_emcvnx which uses EMC's command line tool naviseccli. --- .werks/3628 | 10 +++ ChangeLog | 1 + agents/special/agent_emcvnx | 15 ++-- checkman/emcvnx_mirrorview | 28 ++++++ checks/emcvnx_mirrorview | 148 +++++++++++++++++++++++++++++++ web/plugins/wato/datasource_programs.py | 1 + 6 files changed, 196 insertions(+), 7 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=d73a020f8d…

8 years, 4 months

3581 mssql_versions: Added product name to inventory information

by Lars Michelsen

Module: check_mk Branch: master Commit: 65a6f0cea00a2197d7054115cc05b8d15d9eb7d1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=65a6f0cea00a21… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon May 30 14:10:19 2016 +0200 3581 mssql_versions: Added product name to inventory information --- .werks/3581 | 9 +++++++++ ChangeLog | 1 + inventory/mssql_versions | 21 +++++++++++++++++++++ web/plugins/views/inventory.py | 2 +- 4 files changed, 32 insertions(+), 1 deletion(-) diff --git a/.werks/3581 b/.werks/3581 new file mode 100644 index 0000000..361a894 --- /dev/null +++ b/.werks/3581 @@ -0,0 +1,9 @@ +Title: mssql_versions: Added product name to inventory information +Level: 1 +Component: inv +Compatible: compat +Version: 1.2.9i1 +Date: 1464610188 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index 92c431d..74378f4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -464,6 +464,7 @@ * 3322 esx_vsphere_hostsystem: inventory now adds information about memory, uuid and service tag... * 3028 statgrab_mem, solaris_mem: updated inventory plugins for solaris systems... * 3447 mssql_versions: Added inventory plugin for MSSQL instances + * 3581 mssql_versions: Added product name to inventory information * 3219 FIX: lnx_distro: Now detecting Oracle VM Server correctly * 3229 FIX: lnx_distro: SLES based systems have now an OS name inventorized\ * 3265 FIX: mk_inventory.solaris: fix problem on Solaris 10, do prtdiag and prtpicl only in global zone diff --git a/inventory/mssql_versions b/inventory/mssql_versions index f0e6080..7d5421a 100644 --- a/inventory/mssql_versions +++ b/inventory/mssql_versions @@ -35,6 +35,26 @@ def inv_mssql_versions(info): node = inv_tree_list("software.applications.mssql.instances:") + def product(v): + parts = map(int, v.split(".")) + if parts[0] == 12: + return "SQL Server 2014" + elif parts[0] == 11: + return "SQL Server 2012" + elif parts[0] == 10: + if parts[1] == 50: + return "SQL Server 2005 R2" + else: + return "SQL Server 2005" + elif parts[0] == 9: + return "SQL Server 2005" + elif parts[0] == 8: + return "SQL Server 2000" + elif parts[0] == 7: + return "SQL Server 7.0" + else: + return "Unknown Product" + for line in info: if len(line) not in [2, 4]: continue @@ -48,6 +68,7 @@ def inv_mssql_versions(info): instance = { "name" : instance_id, "version" : version, + "product" : product(version), "edition" : edition, "clustered" : clustered, "cluster_name" : cluster_name, diff --git a/web/plugins/views/inventory.py b/web/plugins/views/inventory.py index 6caaea0..012ee83 100644 --- a/web/plugins/views/inventory.py +++ b/web/plugins/views/inventory.py @@ -695,7 +695,7 @@ inventory_displayhints.update({ ".software.applications.mssql." : { "title" : _("MSSQL") }, ".software.applications.mssql.instances:" : { "title" : _("Instances"), "render" : render_inv_dicttable, - "keyorder" : [ "name", "edition", "version", "clustered", "cluster_name" ], + "keyorder" : [ "name", "product", "edition", "version", "clustered", "cluster_name" ], }, ".software.applications.mssql.instances:*.clustered" : { "title" : _("Clustered"), "paint" : "mssql_is_clustered"},

8 years, 4 months

Fixed the event daemon protocol, its implementation and its usage.

by Sven Panne

Module: check_mk Branch: master Commit: 9674eb0ad458e9f4ce65a5afbd44d34457061b2d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9674eb0ad458e9… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon May 30 13:58:14 2016 +0200 Fixed the event daemon protocol, its implementation and its usage. socket.recv can (and will, see the POSIX spec!) sometimes result in a partial read, so we have to handle this, and basically the same holds for socket.send. As a consequence, our protocol needs a way to determine when a request is complete. One way of doing this is shutting down the writing side, but this would make it impossible to handle multiple requests over the same connection. The solution on the receiving side is simple: Do it like Livestatus and terminate a request with an empty line. A shutdown will of course continue to terminate a request, too. On the sending side, use socket.sendall instead of socket.send. In a nutshell: 99.9% of all uses of recv/send/read/write which are not within a loop are plainly wrong. The evil thing is that bugs caused by this will only surface with a low probability, and even less when the I/O and/or network load is low, i.e. basically never when doing naive testing by hand. :-P As a bonus, we even fix the encoding issue by defining the whole protocol to be UTF-8-based. --- bin/mkeventd | 75 +++++++++++++++++++++++++++++++----------------- web/htdocs/mkeventd.py | 3 +- 2 files changed, 51 insertions(+), 27 deletions(-) diff --git a/bin/mkeventd b/bin/mkeventd index f613009..7ff0b8d 100755 --- a/bin/mkeventd +++ b/bin/mkeventd @@ -374,6 +374,30 @@ class MKClientError(Exception): Exception.__init__(self, t) +class Queries: + def __init__(self, sock): + self._socket = sock + self._buffer = "" + + def __iter__(self): + return self + + def next(self): + while True: + parts = self._buffer.split("\n\n", 1) + if len(parts) > 1: + break + data = self._socket.recv(4096) + if len(data) == 0: + if len(self._buffer) == 0: + raise StopIteration() + parts = [self._buffer, ""] + break + self._buffer += data + request, self._buffer = parts + return request.decode("utf-8").splitlines() + + #. # .--SNMP-Traps----------------------------------------------------------. # | ____ _ _ __ __ ____ _____ | @@ -2649,38 +2673,37 @@ class StatusServer: def handle_client(self, socket, allow_commands, client_ip): - query = decode_from_bytes(socket.recv(8192)).splitlines() - parts = query[0].split(None, 1) - if len(parts) != 2: - raise MKClientError("Invalid query. Need GET/COMMAND plus argument(s)") + for query in Queries(socket): + parts = query[0].split(None, 1) + if len(parts) != 2: + raise MKClientError("Invalid query. Need GET/COMMAND plus argument(s)") - method, table = parts + method, table = parts + output_format = "python" - output_format = "python" - - with lock_eventstatus: - if method == "GET": - response, output_format = self.handle_get_request(table, query[1:]) + with lock_eventstatus: + if method == "GET": + response, output_format = self.handle_get_request(table, query[1:]) - elif method == "REPLICATE": - response = self.handle_replicate(table, client_ip) + elif method == "REPLICATE": + response = self.handle_replicate(table, client_ip) - elif method == "COMMAND": - if not allow_commands: - raise MKClientError("Sorry. Commands are disallowed via TCP") - self.handle_command_request(table) - response = None + elif method == "COMMAND": + if not allow_commands: + raise MKClientError("Sorry. Commands are disallowed via TCP") + self.handle_command_request(table) + response = None - else: - raise MKClientError("Invalid method %s (allowed are GET, COMMAND and REPLICATE)" % method) + else: + raise MKClientError("Invalid method %s (allowed are GET, COMMAND and REPLICATE)" % method) - if output_format == "plain": - for line in response: - socket.send("\t".join([to_utf8(quote_tab(c)) for c in line])) - socket.send("\n") - else: - socket.send(repr(response)) - socket.send("\n") + if output_format == "plain": + for line in response: + socket.send("\t".join([to_utf8(quote_tab(c)) for c in line])) + socket.send("\n") + else: + socket.send(repr(response)) + socket.send("\n") socket.close() diff --git a/web/htdocs/mkeventd.py b/web/htdocs/mkeventd.py index 2a3c3bd..806dfe0 100644 --- a/web/htdocs/mkeventd.py +++ b/web/htdocs/mkeventd.py @@ -186,7 +186,8 @@ def query(query): sock.settimeout(timeout) sock.connect(socket_path) - sock.send(query) + sock.sendall(query) + sock.shutdown(socket.SHUT_WR) response_text = "" while True:

8 years, 4 months

3138 jolokia_metrics.cache_hits, jolokia_metrics.in_memory,

by Sebastian Herbord

jolokia_metrics.off_heap, jolokia_metrics.on_disk, jolokia_metrics.writer : added checks for monitoring of ehcache metrics through jolokia Message-ID: <574c0f02.dWmYSXrja6vGK/nb%sh(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: 439d759b067b0fba8d96363d9d716f25b750fcae URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=439d759b067b0f… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Mon May 30 11:59:16 2016 +0200 3138 jolokia_metrics.cache_hits, jolokia_metrics.in_memory, jolokia_metrics.off_heap, jolokia_metrics.on_disk, jolokia_metrics.writer: added checks for monitoring of ehcache metrics through jolokia To make this work the jolokia plugin was extended to support client-side wildcard resolution. --- .werks/3138 | 9 ++ ChangeLog | 1 + agents/plugins/mk_jolokia | 201 ++++++++++++++++++++++------------- checkman/jolokia_metrics.cache_hits | 14 +++ checkman/jolokia_metrics.in_memory | 15 +++ checkman/jolokia_metrics.off_heap | 15 +++ checkman/jolokia_metrics.on_disk | 15 +++ checkman/jolokia_metrics.writer | 13 +++ checks/jolokia_metrics | 172 +++++++++++++++++++++++------- 9 files changed, 344 insertions(+), 111 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=439d759b06…

8 years, 4 months

3627 FIX fixed double graphs of database size

by Simon Betz

Module: check_mk Branch: master Commit: 5cc24418b4ecdecb82c6368a4d0a668b0000c83b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5cc24418b4ecde… Author: Simon Betz <si(a)mathias-kettner.de> Date: Mon May 30 11:30:49 2016 +0200 3627 FIX fixed double graphs of database size --- .werks/3627 | 10 ++++++++++ ChangeLog | 1 + web/plugins/metrics/check_mk.py | 11 ++++++----- 3 files changed, 17 insertions(+), 5 deletions(-) diff --git a/.werks/3627 b/.werks/3627 new file mode 100644 index 0000000..75d98ef --- /dev/null +++ b/.werks/3627 @@ -0,0 +1,10 @@ +Title: fixed double graphs of database size +Level: 1 +Component: multisite +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1464600580 + + diff --git a/ChangeLog b/ChangeLog index 957c11e..c957aed 100644 --- a/ChangeLog +++ b/ChangeLog @@ -320,6 +320,7 @@ * 3571 FIX: Fixed missing downtime author filter * 3537 FIX: PNP/Graph Templates: fixed incorrect scaling of check-mk-ping, check_mk-active-icmp and check-mk-host-ping... * 3576 FIX: LDAP: Fixed "Internal error" when using the "Filter Group" option in an LDAP connection... + * 3627 FIX: fixed double graphs of database size WATO: * 3244 WATO BI Module: swap order of aggregation function and child node selection... diff --git a/web/plugins/metrics/check_mk.py b/web/plugins/metrics/check_mk.py index cd9f19a..e7104bf 100644 --- a/web/plugins/metrics/check_mk.py +++ b/web/plugins/metrics/check_mk.py @@ -5802,11 +5802,12 @@ graph_info.append({ ( "indexes_size", "stack" ), ( "unused_size", "stack" ), ], -}) - -graph_info.append({ - "metrics" : [ - ( "database_size", "area" ), + "optional_metrics" : [ + "unallocated_size", + "reserved_size", + "data_size", + "indexes_size", + "unused_size", ], "legend_scale" : MB, })

8 years, 4 months

3626 FIX dell_eql_storage: fixed scan function if sysDescr is empty

by Simon Betz

Module: check_mk Branch: master Commit: 7188ce3a7b77fe6ef1c1ac4ad136792cd65457ba URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7188ce3a7b77fe… Author: Simon Betz <si(a)mathias-kettner.de> Date: Mon May 30 11:22:20 2016 +0200 3626 FIX dell_eql_storage: fixed scan function if sysDescr is empty --- .werks/3626 | 10 ++++++++++ ChangeLog | 1 + checks/dell_eql_storage | 6 ++++-- 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/.werks/3626 b/.werks/3626 new file mode 100644 index 0000000..c465e39 --- /dev/null +++ b/.werks/3626 @@ -0,0 +1,10 @@ +Title: dell_eql_storage: fixed scan function if sysDescr is empty +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1464599947 + + diff --git a/ChangeLog b/ChangeLog index a8554b1..957c11e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -243,6 +243,7 @@ * 3578 FIX: df: Fixed exception when monitoring filesystems without inode infos * 3624 FIX: oracle_asm_diskgroup: fixed dismounted disk handling * 3625 FIX: zfs_arc_cache: fixed data handling if hits and misses are missing + * 3626 FIX: dell_eql_storage: fixed scan function if sysDescr is empty Multisite: * 3187 notification view: new filter for log command via regex diff --git a/checks/dell_eql_storage b/checks/dell_eql_storage index 931c8e3..d64cb46 100644 --- a/checks/dell_eql_storage +++ b/checks/dell_eql_storage @@ -24,10 +24,12 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. + def inventory_dell_eql_storage(info): for line in info: yield line[0], {} + def check_dell_eql_storage(item, _no_params, info): for name, desc, health_state, raid_state, total_storage, \ repl_storage, snap_storage, used_storage in info: @@ -90,7 +92,8 @@ check_info["dell_eql_storage"] = { "inventory_function" : inventory_dell_eql_storage, "service_description" : "Storage %s", "has_perfdata" : True, - "snmp_scan_function" : lambda oid: "EQL-SUP" in oid(".1.3.6.1.2.1.1.1.0"), + "snmp_scan_function" : lambda oid: "EQL-SUP" in oid(".1.3.6.1.2.1.1.1.0") or \ + oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.12740.17"), "snmp_info" : (".1.3.6.1.4.1.12740.2.1", [ "1.1.9.1", #eqlMemberName "1.1.7.1", #eqlMemberDescription @@ -102,4 +105,3 @@ check_info["dell_eql_storage"] = { "10.1.2.1", #eqlMemberUsedStorage ]), } -

8 years, 4 months

tinkerforge: some polishing

by Sebastian Herbord

Module: check_mk Branch: master Commit: 62149a607a15ebfb045fec1db392af6cbe353542 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=62149a607a15eb… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Mon May 30 10:56:16 2016 +0200 tinkerforge: some polishing --- checks/tinkerforge | 25 +++++++++++++------------ web/plugins/wato/datasource_programs.py | 3 +++ 2 files changed, 16 insertions(+), 12 deletions(-) diff --git a/checks/tinkerforge b/checks/tinkerforge index 4d3dc70..18fcbcf 100644 --- a/checks/tinkerforge +++ b/checks/tinkerforge @@ -32,10 +32,7 @@ # based on customers investigation -factory_settings['tinkerforge_humidity_default_levels'] = { - 'upper': (50, 55), - 'lower': (40, 35) -} +tinkerforge_humidity_default_levels = (35, 40, 50, 55) def parse_tinkerforge(info): @@ -87,7 +84,11 @@ def parse_tinkerforge(info): def inventory_tinkerforge(brick_type, parsed): for path in parsed.get(brick_type, {}).keys(): - yield path, {} + if brick_type == "humidity": + # stupid wato rule with its stupid tuple-based parameters is stupid + yield path, "tinkerforge_humidity_default_levels" + else: + yield path, None def check_tinkerforge_master(item, params, parsed): @@ -125,18 +126,19 @@ def check_tinkerforge_humidity(item, params, parsed): return max([abs(x[0] - x[1][0]) for x in enumerate(sorted_by_val)]) if 'humidity' in parsed and item in parsed['humidity']: + crit_lower, warn_lower, warn_upper, crit_upper = params + reading = float(parsed['humidity'][item][0]) / 10.0 - status = expect_order(params['lower'][1], params['lower'][0], + status = expect_order(crit_lower, warn_lower, reading, - params['upper'][0], params['upper'][1]) + warn_upper, crit_upper) if status != 0: - level_msg = " (warn/crit below %.1f/%.1f or above %.1f/%.1f)" % \ - (params['lower'][0], params['lower'][1], - params['upper'][0], params['upper'][1]) + level_msg = " (warn/crit at or below %.1f/%.1f or at or above %.1f/%.1f)" % \ + (warn_lower, crit_lower, warn_upper, crit_upper) else: level_msg = "" return (status, "%.1f %%RH%s" % (reading, level_msg), - [('humidity', reading, params['upper'][0], params['upper'][1])]) + [('humidity', reading, warn_upper, crit_upper)]) def check_tinkerforge_motion(item, params, parsed): @@ -199,7 +201,6 @@ check_info['tinkerforge.humidity'] = { 'has_perfdata' : True, 'group' : 'humidity', 'service_description' : "Humidity %s", - 'default_levels_variable' : 'tinkerforge_humidity_default_levels' } diff --git a/web/plugins/wato/datasource_programs.py b/web/plugins/wato/datasource_programs.py index bcaef33..206af65 100644 --- a/web/plugins/wato/datasource_programs.py +++ b/web/plugins/wato/datasource_programs.py @@ -914,6 +914,9 @@ register_rule(group, ( "segment_display_uid", TextAscii( title = _("7-segment display uid"), + help = _("This is the uid of the sensor you want to display in the 7-segment display, " + "not the uid of the display itself. There is currently no support for " + "controling multiple displays.") ) ), ( "segment_display_brightness",

8 years, 4 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits May 2016