Checkmk git commits March 2017

checkmk-commits@lists.checkmk.com

11 participants
379 discussions

by Marcel Schulte

Module: check_mk Branch: master Commit: dfb3622f52de02de0b81c91db362a78744e931b0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dfb3622f52de02… Author: Marcel Schulte <ms(a)mathias-kettner.de> Date: Mon Mar 6 12:10:13 2017 +0100 corrected snmp_scan_function in ucd_mem Change-Id: I35db9e0467828c1e24a9eda1a73f068fc5279f8f --- checks/ucd_mem | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checks/ucd_mem b/checks/ucd_mem index df445b5..73e34f3 100644 --- a/checks/ucd_mem +++ b/checks/ucd_mem @@ -60,7 +60,7 @@ check_info['ucd_mem'] = { ]), 'snmp_scan_function' : (lambda oid: \ "pfsense" in oid(".1.3.6.1.2.1.1.1.0").lower()) or - prefer_hr_scan_function(oid), + prefer_hr_scan_function, 'default_levels_variable' : 'ucd_mem_default_levels', 'group' : 'memory_simple', 'includes' : [ "ucd.include", "memory.include" ],

7 years, 6 months

Added a clean example for talking to the mkeventd.

by Sven Panne

Module: check_mk Branch: master Commit: d0b1a5fce9a4786959eb873c722cd3997718c127 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d0b1a5fce9a478… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon Mar 6 12:13:55 2017 +0100 Added a clean example for talking to the mkeventd. Change-Id: I0f5b9ab535193a298f7d1da3945dfa4be10e4acf --- doc/treasures/read_from_mkeventd.py | 83 +++++++++++++++++++++++++++++++++++++ 1 file changed, 83 insertions(+) diff --git a/doc/treasures/read_from_mkeventd.py b/doc/treasures/read_from_mkeventd.py new file mode 100755 index 0000000..95a9e18 --- /dev/null +++ b/doc/treasures/read_from_mkeventd.py @@ -0,0 +1,83 @@ +#!/usr/bin/python +# "How to talk to the mkeventd", Python edition :-) + +import json +import os +import socket + +class EventConsoleConnection: + def __init__(self, path, timeout=3): + self._socket = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM) + self._socket.settimeout(timeout) + self._socket.connect(path) + self._buffer = "" + + def send_request(self, request): + self._socket.sendall(request); + self._socket.shutdown(socket.SHUT_WR) + + def read_response(self): + """Return the whole response as a byte string""" + buffer = "" + while True: + data = self._socket.recv(4096) + if len(data) == 0: + return buffer + buffer += data + + def lines(self): + return ResponseLines(self._socket) + + def close(self): + self._socket.close() + + def __iter__(self): + """Return an iterator for reading the response as Unicode lines""" + return self + + def next(self): + while True: + parts = self._buffer.split("\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 + line, self._buffer = parts + return line.decode("utf-8").splitlines() + + def __enter__(self): + return self + + def __exit__(self, ty, value, traceback): + self.close() + +def request(what, path): + """Submit a request to the event console, returning the reply as a python object""" + with EventConsoleConnection(path) as c: + c.send_request(what + "\nOutputFormat: json") + return json.loads(c.read_response()) + +################################################################################ + +path = os.getenv("OMD_ROOT") + "/tmp/run/mkeventd/status" + +# read the response line by line +with EventConsoleConnection(path) as c: + c.send_request("GET status\nOutputFormat: plain") + for line in c: + print line + +# read the whole response in one go +with EventConsoleConnection(path) as c: + c.send_request("GET status\nOutputFormat: python") + print(c.read_response()) + +# use the convenience function +print(request("GET status", path)) +print(request("COMMAND SYNC", path)) +print(request("REPLICATE 1488791495", path))

7 years, 6 months

Handle OutputFormat header for COMMAND and REPLICATE, too.

by Sven Panne

Module: check_mk Branch: master Commit: b34b090281f599465eaf6c75e40d46f1c52849b9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b34b090281f599… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon Mar 6 12:02:19 2017 +0100 Handle OutputFormat header for COMMAND and REPLICATE, too. Change-Id: Iad5836cb1bcdb1b9e62f0387f1fb9448cb337106 --- bin/mkeventd | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/bin/mkeventd b/bin/mkeventd index 48eb434..f1568d3 100755 --- a/bin/mkeventd +++ b/bin/mkeventd @@ -3010,10 +3010,19 @@ class StatusServer: method, table = parts output_format = "python" + # TODO(sp) Handle all header lines centrally in a separate method + header_lines = [] + for line in query[1:]: + header, argument = line.rstrip().split(":", 1) + argument = argument.strip() + if header == "OutputFormat": + output_format = argument + else: + header_lines += line with lock_eventstatus: if method == "GET": - response, output_format = self.handle_get_request(table, query[1:]) + response = self.handle_get_request(table, header_lines) elif method == "REPLICATE": response = self.handle_replicate(table, client_ip) @@ -3228,7 +3237,6 @@ class StatusServer: filters = [] only_host = None limit = None - output_format = "python" for line in headerlines: try: header, argument = line.rstrip().split(":", 1) @@ -3239,8 +3247,6 @@ class StatusServer: if name == "event_host" and opfunc == filter_operators['=']: only_host = argument filters.append((name, opfunc, argument)) - elif header == "OutputFormat": - output_format = argument elif header == "Limit": limit = int(argument) elif header == "Columns": @@ -3273,7 +3279,7 @@ class StatusServer: else: rows += list_rows - return rows, output_format + return rows def filter_row(self, headers, filters, list_row): row = dict(zip(headers, list_row))

7 years, 6 months

8666 FIX added more detected APs to aironet_clients

by Marcel Schulte

Module: check_mk Branch: master Commit: c4070493456b85af5b90e1aeac8ef54fb34bd349 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c4070493456b85… Author: Marcel Schulte <ms(a)mathias-kettner.de> Date: Mon Mar 6 10:39:29 2017 +0100 8666 FIX added more detected APs to aironet_clients Change-Id: Ib34447f6e21bb04e5033cf3f5948b8da018615b1 --- .werks/8666 | 11 +++++++++++ checks/aironet_clients | 3 +++ 2 files changed, 14 insertions(+) diff --git a/.werks/8666 b/.werks/8666 new file mode 100644 index 0000000..2269a21 --- /dev/null +++ b/.werks/8666 @@ -0,0 +1,11 @@ +Title: added more detected APs to aironet_clients +Level: 1 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i1 +Date: 1488793069 + + diff --git a/checks/aironet_clients b/checks/aironet_clients index 30e572c..2a85d67 100644 --- a/checks/aironet_clients +++ b/checks/aironet_clients @@ -97,5 +97,8 @@ check_info["aironet_clients"] = { ".1.3.6.1.4.1.9.1.758", ".1.3.6.1.4.1.9.1.1034", ".1.3.6.1.4.1.9.1.1247", + ".1.3.6.1.4.1.9.1.1873", + ".1.3.6.1.4.1.9.1.1661", + ".1.3.6.1.4.1.9.1.2240", ], }

7 years, 6 months

Updated bug entries #2462

by Lars Michelsen

Module: check_mk Branch: master Commit: a6434dbab9b4643daa66044641572a27c76d1dc0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a6434dbab9b464… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Mar 3 13:58:18 2017 +0100 Updated bug entries #2462 Change-Id: I0736166b83de8e24ed154572074c0b2a79d205ce --- .bugs/2462 | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/.bugs/2462 b/.bugs/2462 index 54dd441..1372250 100644 --- a/.bugs/2462 +++ b/.bugs/2462 @@ -9,3 +9,15 @@ When viewing an event of a host which the user is not permitted to see while the user has "see all events permission", the user sees the service states in the last column. The user can also add more columns to the view to see all information about the host. + +---- + +The EC tables are already capable of returning "empty" data for unrelated +events. This needs to be handled equal in case a user has set "see all events" +and is not permitted on a host. + +This should make the user see the event and prevent the user from seeing +the monitoring data of that host. + +This needs to be filtered either in the core (then we need the AuthUser header and +the info that the user has "see all" permission) or in web/plugins/views/mkeventd.py query_ec_table().

7 years, 6 months

Removed debugging code.

by Sven Panne

Module: check_mk Branch: master Commit: a1186965eabb9db947cf8baddc00507dcb668619 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a1186965eabb9d… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon Mar 6 09:45:14 2017 +0100 Removed debugging code. Change-Id: I85ae71396a6940db6481634883aa154adb724bae --- livestatus/src/TableEventConsole.cc | 4 ---- 1 file changed, 4 deletions(-) diff --git a/livestatus/src/TableEventConsole.cc b/livestatus/src/TableEventConsole.cc index 2f76661..8200e23 100644 --- a/livestatus/src/TableEventConsole.cc +++ b/livestatus/src/TableEventConsole.cc @@ -124,11 +124,9 @@ bool TableEventConsole::isAuthorizedForEvent(contact *ctc, void *data) { if (precedence == "rule") { isAuthorizedForEventViaContactGroups(c, r, result) || isAuthorizedForEventViaHost(c, r, result); - Error(_core->loggerLivestatus()) << "RULE " << result << " " << ctc; } else if (precedence == "host") { isAuthorizedForEventViaHost(c, r, result) || isAuthorizedForEventViaContactGroups(c, r, result); - Error(_core->loggerLivestatus()) << "HOST " << result << " " << ctc; } else { Error(_core->loggerLivestatus()) << "unknown precedence '" << precedence << "' in table " << name(); @@ -150,8 +148,6 @@ bool TableEventConsole::isAuthorizedForEventViaContactGroups( return (result = true, true); } } - Error(_core->loggerLivestatus()) - << "isAuthorizedForEventViaContactGroups 3"; return (result = false, true); }

7 years, 6 months

8665 FIX fixed aborted snmp scan because of werk #8664

by Marcel Schulte

Module: check_mk Branch: master Commit: 232eadd9dc5fe0bf3d0361d493e93c4e7e76b41a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=232eadd9dc5fe0… Author: Marcel Schulte <ms(a)mathias-kettner.de> Date: Mon Mar 6 09:28:30 2017 +0100 8665 FIX fixed aborted snmp scan because of werk #8664 werk #8664 caused an aborted snmp scan for devices other than pfSense. This has been fixed now. Change-Id: I9aecc454a18a3526f37509b175392dbc43e61646 --- .werks/8665 | 12 ++++++++++++ checks/ucd_mem | 4 ++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/.werks/8665 b/.werks/8665 new file mode 100644 index 0000000..d394f0b --- /dev/null +++ b/.werks/8665 @@ -0,0 +1,12 @@ +Title: fixed aborted snmp scan because of werk #8664 +Level: 2 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i1 +Date: 1488788498 + +werk #8664 caused an aborted snmp scan for devices other than pfSense. This has been fixed now. + diff --git a/checks/ucd_mem b/checks/ucd_mem index 75bd758..df445b5 100644 --- a/checks/ucd_mem +++ b/checks/ucd_mem @@ -58,8 +58,8 @@ check_info['ucd_mem'] = { "5", # memTotal -> kB "6", # memAvailable -> kB ]), - 'snmp_scan_function' : lambda oid: \ - "pfsense" in oid(".1.3.6.1.2.1.1.1.0").lower() or + 'snmp_scan_function' : (lambda oid: \ + "pfsense" in oid(".1.3.6.1.2.1.1.1.0").lower()) or prefer_hr_scan_function(oid), 'default_levels_variable' : 'ucd_mem_default_levels', 'group' : 'memory_simple',

7 years, 6 months

Fixed assertion in test code.

by Sven Panne

Module: check_mk Branch: master Commit: f593cf5d3fa817bc79b2023cbfba6d51dfd796e6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f593cf5d3fa817… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon Mar 6 08:52:33 2017 +0100 Fixed assertion in test code. Change-Id: If90c235903207be37e9e48c07e07b576ec900cb1 --- tests/testlib/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/testlib/__init__.py b/tests/testlib/__init__.py index fdfd74a..d587049 100644 --- a/tests/testlib/__init__.py +++ b/tests/testlib/__init__.py @@ -663,7 +663,7 @@ class WebSession(requests.Session): if allow_errors and matches: print "Found error message, but it's allowed: %s" % matches.groups() else: - assert not matches, "Found error message: %s" % matches.groups() + assert not matches, "Found error message(s): %s" % "\n".join(matches.groups()) def _check_html_page_resources(self, response):

7 years, 6 months

remove useless return statement

by Simon Betz

Module: check_mk Branch: master Commit: 29543d79413b705fe8d5e2764fcb9566e1acb149 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=29543d79413b70… Author: Simon Betz <si(a)mathias-kettner.de> Date: Mon Mar 6 08:22:21 2017 +0100 remove useless return statement Change-Id: I5c0a6152c516a908c0d0a46e0d4cd1e6cd2c2643 --- inventory/cisco_vlans | 2 -- 1 file changed, 2 deletions(-) diff --git a/inventory/cisco_vlans b/inventory/cisco_vlans index d3e7641..3402b1e 100644 --- a/inventory/cisco_vlans +++ b/inventory/cisco_vlans @@ -109,8 +109,6 @@ def inv_cisco_vlans(info, params): if_info["vlantype"] = vlan_readable break - return node - inv_info['inv_cisco_vlans'] = { "inv_function" : inv_cisco_vlans,

7 years, 6 months

4483 cisco_vlans: New inventory plugin which collects vlan information of Cisco devices supporting CISCO-VLAN-MEMBERSHIP mib

by Simon Betz

Module: check_mk Branch: master Commit: 3bedb9f0a5f9e883851f8f83706b289884eb8472 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3bedb9f0a5f9e8… Author: Simon Betz <si(a)mathias-kettner.de> Date: Mon Mar 6 08:19:59 2017 +0100 4483 cisco_vlans: New inventory plugin which collects vlan information of Cisco devices supporting CISCO-VLAN-MEMBERSHIP mib Change-Id: I39886067f23eca5cfa540ca1ab0604b3adcd4e7e --- .werks/4483 | 10 ++++ inventory/cisco_vlans | 124 +++++++++++++++++++++++++++++++++++++++++ web/plugins/views/inventory.py | 2 + 3 files changed, 136 insertions(+) diff --git a/.werks/4483 b/.werks/4483 new file mode 100644 index 0000000..1bfb91a --- /dev/null +++ b/.werks/4483 @@ -0,0 +1,10 @@ +Title: cisco_vlans: New inventory plugin which collects vlan information of Cisco devices supporting CISCO-VLAN-MEMBERSHIP mib +Level: 1 +Component: inv +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1488784681 +Class: feature + + diff --git a/inventory/cisco_vlans b/inventory/cisco_vlans new file mode 100644 index 0000000..d3e7641 --- /dev/null +++ b/inventory/cisco_vlans @@ -0,0 +1,124 @@ +#!/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.9.9.68.1.2.2.1.1 --> vmVlanType: static(1), dynamic(2), multiVlan(3) +# 1.3.6.1.4.1.9.9.68.1.2.2.1.2 --> vmVlan: id of the vlan the port is asssigned to +# if type = 1 or 2. +# it's 0 if the port is not assigned to a vlan +# 1.3.6.1.4.1.9.9.68.1.2.2.1.4 --> vmVlans: the vlans the port is assigned to +# if the type = 3 + +# "The VLAN(s) the port is assigned to when the +# port's vmVlanType is set to multiVlan. +# This object is not instantiated if not applicable. + +# The port is always assigned to one or more VLANs +# and the object may not be set so that there are +# no vlans assigned. + +# Each octet within the value of this object specifies a +# set of eight VLANs, with the first octet specifying +# VLAN id 1 through 8, the second octet specifying VLAN +# ids 9 through 16, etc. Within each octet, the most +# significant bit represents the lowest numbered +# VLAN id, and the least significant bit represents the +# highest numbered VLAN id. Thus, each VLAN of the +# port is represented by a single bit within the +# value of this object. If that bit has a value of +# '1' then that VLAN is included in the set of +# VLANs; the VLAN is not included if its bit has a +# value of '0'." + + +# This function compresses a list of vlans, eg [1,3,4,7,8,9,...,1024], +# into a readable format: "1, 3-4, 7-1024" in case of multi-vlans +def parse_multi_vlan(vlan_multi): + + def concatenate_vlans(vlan, subinfo): + if vlan not in subinfo: + subinfo.append(vlan) + return "-".join(map(str, subinfo)) + + vlans = [] + for k, hex in enumerate(vlan_multi): + for l, bit in enumerate(bin(ord(hex))[2:]): + if bit == '1': + vlans.append(k*8 + l+1) + + infotexts = [] + subinfo = vlans[:1] + last_vlan = vlans[0] + + for vlan in vlans[1:]: + if vlan - last_vlan > 1: + infotexts.append(concatenate_vlans(last_vlan, subinfo)) + subinfo = [vlan] + + if vlan == vlans[-1]: + infotexts.append(concatenate_vlans(vlan, subinfo)) + + last_vlan = vlan + + return ", ".join(infotexts) + + +def inv_cisco_vlans(info, params): + node = inv_tree("networking.interfaces:") + map_vlans = { + '1' : 'static', + '2' : 'dynamic', + '3' : 'multi-VLAN', + } + + for if_id, vlan_type, vlan_single, vlan_multi in info: + vlan_readable = map_vlans.get(vlan_type, "") + vlans = None + if vlan_single != '0' and vlan_type in ['1', '2']: + vlans = vlan_single + elif vlan_type == '3': + vlans = parse_multi_vlan(vlan_multi) + + if vlans: + for if_info in node: + if if_info["index"] == int(if_id): + if_info["vlans"] = vlans + if_info["vlantype"] = vlan_readable + break + + return node + + +inv_info['inv_cisco_vlans'] = { + "inv_function" : inv_cisco_vlans, + 'snmp_info' : (".1.3.6.1.4.1.9.9.68.1.2.2.1", [ + OID_END, + "1", # vmVlanType + "2", # vmVlan + "4", # vmVlans + ]), + 'snmp_scan_function': lambda oid: "cisco" in oid(".1.3.6.1.2.1.1.1.0").lower(), +} diff --git a/web/plugins/views/inventory.py b/web/plugins/views/inventory.py index 850122c..70e5583 100644 --- a/web/plugins/views/inventory.py +++ b/web/plugins/views/inventory.py @@ -846,6 +846,8 @@ inventory_displayhints.update({ ".networking.interfaces:*.speed" : { "title" : _("Speed"), "paint" : "nic_speed", }, ".networking.interfaces:*.port_type" : { "title" : _("Type"), "paint" : "if_port_type", "filter" : visuals.FilterInvtableInterfaceType }, ".networking.interfaces:*.last_change" : { "title" : _("Last Change"), "paint" : "timestamp_as_age_days", "filter" : visuals.FilterInvtableTimestampAsAge }, + ".networking.interfaces:*.vlans" : { "title" : _("VLANs") }, + ".networking.interfaces:*.vlantype" : { "title" : _("VLAN type") }, ".networking.wlan" : { "title" : _("WLAN") }, ".networking.wlan.controller" : { "title" : _("Controller") },

7 years, 6 months

← Newer
1
...
26
27
28
29
30
31
32
...
38
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits March 2017