Checkmk git commits June 2017

checkmk-commits@lists.checkmk.com

13 participants
266 discussions

by Sven Panne

Module: check_mk Branch: master Commit: fabcaddb8d076f5b1aed94cc71cf4a0ae4b1367e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fabcaddb8d076f… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed Jun 21 12:35:14 2017 +0200 Fixed RRDtool version. Change-Id: Id012f402878e996e1741c7db48429c0a9456e23c --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index ed82d8a..90957c6 100644 --- a/Makefile +++ b/Makefile @@ -482,8 +482,8 @@ config.status: ar-lib compile config.guess config.sub install-sh missing depcomp else \ BOOST_OPT="DUMMY1=" ; \ fi ; \ - if test -d "../rrdtool/rrdtool-1.5.4/src/.libs"; then \ - RRD_OPT="LDFLAGS=-L$(realpath ../rrdtool/rrdtool-1.5.4/src/.libs)" ; \ + if test -d "../rrdtool/rrdtool-1.7.0/src/.libs"; then \ + RRD_OPT="LDFLAGS=-L$(realpath ../rrdtool/rrdtool-1.7.0/src/.libs)" ; \ else \ RRD_OPT="DUMMY2=" ; \ fi ; \

7 years

4890 FIX Fixed broken management board monitoring when using the Microcore

by Lars Michelsen

Module: check_mk Branch: master Commit: 9de0a5d7ca3634fd88664c608fb75fbe0b6d399b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9de0a5d7ca3634… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jun 20 16:58:58 2017 +0200 4890 FIX Fixed broken management board monitoring when using the Microcore Instead of the configured management board address the host address was contacted via SNMP which often lead to SNMP timeout messages. Change-Id: Ic69f89c4e454fe8392ebbdb73c2f966be3c4622e --- .werks/4890 | 12 ++++++++++++ modules/check_mk_base.py | 10 +++++----- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/.werks/4890 b/.werks/4890 new file mode 100644 index 0000000..ba81380 --- /dev/null +++ b/.werks/4890 @@ -0,0 +1,12 @@ +Title: Fixed broken management board monitoring when using the Microcore +Level: 1 +Component: core +Class: fix +Compatible: compat +Edition: cee +State: unknown +Version: 1.5.0i1 +Date: 1497970657 + +Instead of the configured management board address the host address was +contacted via SNMP which often lead to SNMP timeout messages. diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index 90c0427..4698b0f 100644 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -1599,10 +1599,10 @@ def is_manual_check(hostname, check_type, item): def initialize_check_type_caches(): - snmp_cache = cmk_base.config_cache.get_set("check_type_snmp") + snmp_cache = cmk_base.runtime_cache.get_set("check_type_snmp") snmp_cache.update(snmp_info.keys()) - tcp_cache = cmk_base.config_cache.get_set("check_type_tcp") + tcp_cache = cmk_base.runtime_cache.get_set("check_type_tcp") tcp_cache.update(check_info.keys()) @@ -1612,7 +1612,7 @@ def is_snmp_check(check_name): try: return cache[check_name] except KeyError: - snmp_checks = cmk_base.config_cache.get_set("check_type_snmp") + snmp_checks = cmk_base.runtime_cache.get_set("check_type_snmp") result = check_name.split(".")[0] in snmp_checks cache[check_name] = result @@ -1625,8 +1625,8 @@ def is_tcp_check(check_name): try: return cache[check_name] except KeyError: - tcp_checks = cmk_base.config_cache.get_set("check_type_tcp") - snmp_checks = cmk_base.config_cache.get_set("check_type_snmp") + tcp_checks = cmk_base.runtime_cache.get_set("check_type_tcp") + snmp_checks = cmk_base.runtime_cache.get_set("check_type_snmp") result = check_name in tcp_checks \ and check_name.split(".")[0] not in snmp_checks # snmp check basename

7 years

4889 FIX LDAP connections: Fixed exception when using "nested groups" with groups to roles plugin

by Lars Michelsen

Module: check_mk Branch: master Commit: a90090ea4851cd003a464c3e2ae2d43c86620bc8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a90090ea4851cd… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jun 20 16:11:45 2017 +0200 4889 FIX LDAP connections: Fixed exception when using "nested groups" with groups to roles plugin Change-Id: Id706ecb10cf2e5cc67a3a49e8c9bafb249cded71 --- .werks/4889 | 11 +++++++++++ web/htdocs/wato.py | 3 +++ 2 files changed, 14 insertions(+) diff --git a/.werks/4889 b/.werks/4889 new file mode 100644 index 0000000..fd01d77 --- /dev/null +++ b/.werks/4889 @@ -0,0 +1,11 @@ +Title: LDAP connections: Fixed exception when using "nested groups" with groups to roles plugin +Level: 1 +Component: wato +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i1 +Date: 1497967829 + + diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 1a28d0b..a29e0be 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -6473,6 +6473,9 @@ def vs_ldap_connection(new, connection_id): def validate_ldap_connection(value, varprefix): for role_id, group_specs in value["active_plugins"].get("groups_to_roles", {}).items(): + if role_id == "nested": + continue # This is the option to enabled/disable nested group handling, not a role to DN entry + for index, group_spec in enumerate(group_specs): dn, connection_id = group_spec

7 years

4693 FIX Catch communication errors with the event console when the Nagios core is used.

by Sven Panne

Module: check_mk Branch: master Commit: 18aa4a14a5d8053b15b9af9978fc50b9d8803b39 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=18aa4a14a5d805… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Jun 20 15:38:25 2017 +0200 4693 FIX Catch communication errors with the event console when the Nagios core is used. When issuing commands to the event console via Livestatus, communication errors could result in termination of Nagios. This has been fixed, the error is logged now. Change-Id: I818b32ef12d3369a5489245f9e205d10150107ce --- .werks/4693 | 12 ++++++++++++ livestatus/src/Store.cc | 11 ++++++++--- 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/.werks/4693 b/.werks/4693 new file mode 100644 index 0000000..bef8a96 --- /dev/null +++ b/.werks/4693 @@ -0,0 +1,12 @@ +Title: Catch communication errors with the event console when the Nagios core is used. +Level: 1 +Component: livestatus +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1497965745 +Class: fix + +When issuing commands to the event console via Livestatus, communication +errors could result in termination of Nagios. This has been fixed, the +error is logged now. diff --git a/livestatus/src/Store.cc b/livestatus/src/Store.cc index 7b65c24..b6bafc7 100644 --- a/livestatus/src/Store.cc +++ b/livestatus/src/Store.cc @@ -28,6 +28,7 @@ #include <cstring> #include <ctime> #include <ostream> +#include <stdexcept> #include <utility> #include <vector> #include "DowntimeOrComment.h" // IWYU pragma: keep @@ -251,9 +252,13 @@ bool Store::handleCommand(const string &command) { Notice(logger()) << "event console disabled, ignoring command '" << command << "'"; } else { - ECTableConnection(logger(), _mc->mkeventdSocketPath(), - "COMMAND " + command.substr(3)) - .run(); + try { + ECTableConnection(logger(), _mc->mkeventdSocketPath(), + "COMMAND " + command.substr(3)) + .run(); + } catch (const std::runtime_error &err) { + Alert(logger()) << err.what(); + } } return true; }

7 years

4835 windows_updates.vbs: this plugin automatically configured to asynchron execution and 4 hours cached

by Andreas Boesl

Module: check_mk Branch: master Commit: b19a537f718d1956e1d1273acdf0f67219d43905 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b19a537f718d19… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Jun 20 15:06:54 2017 +0200 4835 windows_updates.vbs: this plugin automatically configured to asynchron execution and 4 hours cached You can still overwrite these hardcoded values with the WATO rules Set cache age for plugins and local checks and Set execution mode for plugins and local checks. Change-Id: I3a3888eb9e59261d28b37ab326964c7f334c9e89 --- .werks/4835 | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/.werks/4835 b/.werks/4835 new file mode 100644 index 0000000..e360cf3 --- /dev/null +++ b/.werks/4835 @@ -0,0 +1,12 @@ +Title: windows_updates.vbs: this plugin automatically configured to asynchron execution and 4 hours cached +Level: 1 +Component: wato +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1497963919 +Class: feature + +You can still overwrite these hardcoded values with the WATO rules Set cache age for plugins and local +checks and Set execution mode for plugins and local checks. +

7 years

Extension to #4761: Suppress MKLivestatusTableNotFoundError() by default

by Lars Michelsen

Module: check_mk Branch: master Commit: 203d93c582d01294a3fa445a7542401f2e095d1a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=203d93c582d012… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jun 20 14:55:07 2017 +0200 Extension to #4761: Suppress MKLivestatusTableNotFoundError() by default Change-Id: If3e5ff659e39dd77e08c4794e2640c34c9b08080 --- livestatus/api/python/livestatus.py | 10 ++++++++-- web/plugins/sidebar/shipped.py | 13 +------------ 2 files changed, 9 insertions(+), 14 deletions(-) diff --git a/livestatus/api/python/livestatus.py b/livestatus/api/python/livestatus.py index 7352ca4..ddb1d09 100644 --- a/livestatus/api/python/livestatus.py +++ b/livestatus/api/python/livestatus.py @@ -182,11 +182,17 @@ class Query(object): query. The object can be used to hand over the handling code some flags, for example to influence the error handling during query processing.""" + default_suppressed_exceptions = [MKLivestatusTableNotFoundError] + def __init__(self, query, suppress_exceptions=None): super(Query, self).__init__() self._query = self._ensure_unicode(query) - self.suppress_exceptions = suppress_exceptions or [] + + if suppress_exceptions == None: + self.suppress_exceptions = self.default_suppressed_exceptions + else: + self.suppress_exceptions = suppress_exceptions def _ensure_unicode(self, thing): @@ -743,7 +749,7 @@ class MultiSiteConnection(Helpers): if isinstance(query, Query): suppress_exceptions = tuple(query.suppress_exceptions) else: - suppress_exceptions = tuple() + suppress_exceptions = tuple(Query.default_suppressed_exceptions) # Then retrieve all answers. We will be as slow as the slowest of all # connections. diff --git a/web/plugins/sidebar/shipped.py b/web/plugins/sidebar/shipped.py index c93ddd2..4bf3e13 100644 --- a/web/plugins/sidebar/shipped.py +++ b/web/plugins/sidebar/shipped.py @@ -637,20 +637,9 @@ def get_tactical_overview_data(extra_filter_headers): stat_only=True, extra_headers=extra_filter_headers) - # Livestatus < 1.4.0 does not know this table. The API will raise a - # MKLivestatusTableNotFoundError exception in this case which will mark - # the site as dead by default. Adding the exception to the list of - # suppressed exception makes livestatus silently ignore this kind of - # error. This makes it possible to make livestatus connections with - # older Check_MK versions. - query = livestatus.Query( - event_query, - suppress_exceptions=[livestatus.MKLivestatusTableNotFoundError], - ) - try: sites.live().set_auth_domain("ec") - event_data = sites.live().query_summed_stats(query) + event_data = sites.live().query_summed_stats(event_query) except livestatus.MKLivestatusNotFoundError: event_data = [0, 0, 0] finally:

7 years

4888 FIX Fixed missing link to "events of host" view for hosts the user may see

by Lars Michelsen

Module: check_mk Branch: master Commit: 5c14bd9e3d7def5495d837b5f60d07cd804c50b5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5c14bd9e3d7def… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jun 20 13:46:09 2017 +0200 4888 FIX Fixed missing link to "events of host" view for hosts the user may see In the "all events" view, there are links on the host names to a view which shows all events related to that host. In previous 1.4 versions these links were broken when the user was not a contact of these hosts but permitted to see the events of all hosts. Change-Id: I8ffd3cba68413d87d92c2b62a85cfd0f617ff8a8 --- .werks/4888 | 14 ++++++++++++++ web/plugins/views/mkeventd.py | 4 ++-- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/.werks/4888 b/.werks/4888 new file mode 100644 index 0000000..4024d5b --- /dev/null +++ b/.werks/4888 @@ -0,0 +1,14 @@ +Title: Fixed missing link to "events of host" view for hosts the user may see +Level: 1 +Component: ec +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i1 +Date: 1497959040 + +In the "all events" view, there are links on the host names to a view which +shows all events related to that host. In previous 1.4 versions these links +were broken when the user was not a contact of these hosts but permitted +to see the events of all hosts. diff --git a/web/plugins/views/mkeventd.py b/web/plugins/views/mkeventd.py index 0977063..fa769b6 100644 --- a/web/plugins/views/mkeventd.py +++ b/web/plugins/views/mkeventd.py @@ -75,8 +75,8 @@ def query_ec_table(datasource, columns, add_columns, query, only_sites, limit, t # the "mkeventd.seeall" permissions. So it is simply not possible to do this on # core level at the moment. def _ec_filter_host_information_of_not_permitted_hosts(rows): - if not config.user.may("mkeventd.seeall"): - return + if config.user.may("mkeventd.seeall"): + return # Don't remove anything. The user may see everything user_groups = set(config.user.contact_groups())

7 years

Fix links from EC list views to "EC events of host" for unrelated hosts

by Lars Michelsen

Module: check_mk Branch: master Commit: cd43af2f8a0fcb71dae72eace4ae73dd6f6a01f3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cd43af2f8a0fcb… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jun 20 14:01:08 2017 +0200 Fix links from EC list views to "EC events of host" for unrelated hosts Change-Id: Ia230e1917e3068f7a43d684f7eea49c6a5ae63b6 --- web/plugins/views/mkeventd.py | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/web/plugins/views/mkeventd.py b/web/plugins/views/mkeventd.py index fa769b6..7e598e3 100644 --- a/web/plugins/views/mkeventd.py +++ b/web/plugins/views/mkeventd.py @@ -58,10 +58,19 @@ def query_ec_table(datasource, columns, add_columns, query, only_sites, limit, t _ec_filter_host_information_of_not_permitted_hosts(rows) - if config.user.may("mkeventd.seeunrelated"): - return rows # user is allowed to see all events returned by the core + if not config.user.may("mkeventd.seeunrelated"): + # user is not allowed to see all events returned by the core + rows = [ r for r in rows if r["event_contact_groups"] != [] or r["host_name"] != "" ] + + # Now we don't need to distinguish anymore between unrelated and related events. We + # need the host_name field for rendering the views. Try our best and use the + # event_host value as host_name. + for row in rows: + if not row.get("host_name"): + row["host_name"] = row["event_host"] + + return rows - return [ r for r in rows if r["event_contact_groups"] != [] or r["host_name"] != "" ] # Handle the case where a user is allowed to see all events (-> events for hosts he

7 years

4834 FIX Quicksearch: fixed quoting problem with \ in service description

by Andreas Boesl

Module: check_mk Branch: master Commit: d0aaec09ab280faa569c356e886392bbefb84107 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d0aaec09ab280f… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Jun 20 14:06:09 2017 +0200 4834 FIX Quicksearch: fixed quoting problem with \ in service description Change-Id: I67ff6177c241f9ce8b18044c6230d82731f305d3 --- .werks/4834 | 10 ++++++++++ web/htdocs/sidebar.py | 49 ++++++++++++++++++++++++++++++------------------- 2 files changed, 40 insertions(+), 19 deletions(-) diff --git a/.werks/4834 b/.werks/4834 new file mode 100644 index 0000000..3be150e --- /dev/null +++ b/.werks/4834 @@ -0,0 +1,10 @@ +Title: Quicksearch: fixed quoting problem with \ in service description +Level: 1 +Component: multisite +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1497960330 +Class: fix + + diff --git a/web/htdocs/sidebar.py b/web/htdocs/sidebar.py index d5351a9..bce5777 100644 --- a/web/htdocs/sidebar.py +++ b/web/htdocs/sidebar.py @@ -745,8 +745,20 @@ def search_open(): html.http_redirect(url) + +class LivestatusSearchBase(object): + def _build_url(self, url_params, restore_regex = False): + new_params = [] + if restore_regex: + for key, value in url_params: + new_params.append((key, value.replace("\\", "\\\\"))) + else: + new_params.extend(url_params) + return html.makeuri(new_params, delvars = "q", filename = "view.py") + + # Handles exactly one livestatus query -class LivestatusSearchConductor(object): +class LivestatusSearchConductor(LivestatusSearchBase): def __init__(self, used_filters, filter_behaviour): # used_filters: {u'h': [u'heute'], u's': [u'Check_MK']} # filter_behaviour: "continue" @@ -896,11 +908,11 @@ class LivestatusSearchConductor(object): } [self._livestatus_table] - def get_search_url(self): + def get_search_url_params(self): exact_match = self.num_rows() == 1 target_view = self._get_target_view(exact_match = exact_match) - url_params = [] + url_params = [("view_name", target_view), ("filled_in", "filter")] for plugin in self._used_search_plugins: match_info = plugin.get_matches(target_view, exact_match and self._rows[0] or None, @@ -912,10 +924,7 @@ class LivestatusSearchConductor(object): text, url_filters = match_info url_params.extend(url_filters) - return html.makeuri([("view_name", target_view), - ("filled_in", "filter")] + url_params, - delvars = "q", - filename = "view.py") + return url_params def create_result_elements(self): @@ -939,10 +948,9 @@ class LivestatusSearchConductor(object): url_params.extend(url_filters) entry["text_tokens"].append((plugin.get_filter_shortname(), text)) - entry["url"] = html.makeuri([("view_name", target_view), - ("site", row.get("site"))] + url_params, - delvars = "q", - filename = "view.py") + entry["url"] = self._build_url([("view_name", target_view), + ("site", row.get("site"))] + url_params, restore_regex = True) + entry["raw_data"] = row self._elements.append(entry) @@ -1020,7 +1028,7 @@ class LivestatusSearchConductor(object): -class LivestatusQuicksearch(object): +class LivestatusQuicksearch(LivestatusSearchBase): def __init__(self, query): self._query = query self._search_objects = [] # Each of these objects do exactly one ls query @@ -1037,18 +1045,21 @@ class LivestatusQuicksearch(object): self._query_data() # Generate a search page for the topmost search_object with results - search_object = None + url_params = [] + + restore_regex = False for search_object in self._search_objects: if search_object.num_rows() > 0: - use_search_object = search_object + url_params.extend(search_object.get_search_url_params()) + if search_object.num_rows() == 1: + restore_regex = True break else: - return html.makeuri([("view_name", "allservices"), - ("filled_in", "filter"), ("service_regex", self._query)], - delvars = "q", - filename = "view.py") + url_params.extend([("view_name", "allservices"), + ("filled_in", "filter"), + ("service_regex", self._query)]) - return search_object.get_search_url() + return self._build_url(url_params, restore_regex = restore_regex) def _query_data(self):

7 years

4662 win_ip_r: inventorizes routes table of Windows hosts

by Simon Betz

Module: check_mk Branch: master Commit: d68111c0ca7d413d18c3c575cbdbff0b898cd74d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d68111c0ca7d41… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue May 23 17:07:37 2017 +0200 4662 win_ip_r: inventorizes routes table of Windows hosts Change-Id: I98ccca999403d189b48ce7d036a341782864f4fa --- .werks/4662 | 11 ++++++ agents/windows/plugins/mk_inventory.vbs | 35 +++++++++++++++++ inventory/win_ip_r | 68 +++++++++++++++++++++++++++++++++ 3 files changed, 114 insertions(+) diff --git a/.werks/4662 b/.werks/4662 new file mode 100644 index 0000000..d7f3c31 --- /dev/null +++ b/.werks/4662 @@ -0,0 +1,11 @@ +Title: win_ip_r: inventorizes routes table of Windows hosts +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1495552000 +Class: feature + +In order to make this inventory plugin run ypu have +to install the related agent plugin {{mk_inventory.vbs}}. diff --git a/agents/windows/plugins/mk_inventory.vbs b/agents/windows/plugins/mk_inventory.vbs index df3990a..19f74fe 100644 --- a/agents/windows/plugins/mk_inventory.vbs +++ b/agents/windows/plugins/mk_inventory.vbs @@ -156,6 +156,37 @@ Sub getNetworkAdapter(arrVars) Next End Sub +Sub getRouteTable() + Set objClass = GetObject("winmgmts:{impersonationLevel=impersonate}!\\.\root\cimv2") + Set Adapters = objClass.ExecQuery("Select * from Win32_NetworkAdapter") + Set Routes = objClass.ExecQuery("Select * from Win32_IP4RouteTable") + + Dim indexNames : Set indexNames = CreateObject("Scripting.Dictionary") + For Each adapter in Adapters + indexNames.Add adapter.InterfaceIndex, adapter.Name + Next + + Dim routeTypes : Set routeTypes = CreateObject("Scripting.Dictionary") + routeTypes.Add 1, "other" + routeTypes.Add 2, "invalid" + routeTypes.Add 3, "direct" + routeTypes.Add 4, "indirect" + + For Each route in Routes + Dim rtType, rtGateway, rtTarget, rtMask, rtDevice + + rtType = routeTypes(route.Type) + rtGateway = route.NextHop + rtTarget = route.Destination + rtMask = route.Mask + rtDevice = indexNames(route.InterfaceIndex) + + If rtDevice <> "" Then + outPut(rtType & "|" & rtTarget & "|" & rtMask & "|" & rtGateway & "|" & rtDevice) + End If + Next +End Sub + Sub RecurseForExecs(strFolderPath) Dim objFolder : Set objFolder = fso.GetFolder(strFolderPath) Dim objFile @@ -269,6 +300,10 @@ Call startSection("win_networkadapter",58,timeUntil) adapterVars = Array("ServiceName", "MACAddress", "AdapterType", "DeviceID", "NetworkAddresses", "Speed") Call getNetworkAdapter(adapterVars) +' Route Table +Call startSection("win_ip_r",124,timeUntil) +Call getRouteTable() + ' Installed Software Call startSection("win_wmi_software",124,timeUntil) swVars = Array( "ProductName", "Publisher", "VersionString", "InstallDate", "Language") diff --git a/inventory/win_ip_r b/inventory/win_ip_r new file mode 100644 index 0000000..3e06b11 --- /dev/null +++ b/inventory/win_ip_r @@ -0,0 +1,68 @@ +#!/usr/bin/python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2017 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. + + +# -- (type|target|mask|gateway|device) +# <<<win_ip_r:sep(124):persist(1495544240)>>> +# indirect|0.0.0.0|0.0.0.0|11.112.81.1|vmxnet3 Ethernet Adapter #2 +# direct|11.112.81.0|255.255.255.0|0.0.0.0|vmxnet3 Ethernet Adapter #2 +# direct|11.112.81.34|255.255.255.255|0.0.0.0|vmxnet3 Ethernet Adapter #2 +# direct|11.112.81.36|255.255.255.255|0.0.0.0|vmxnet3 Ethernet Adapter #2 +# direct|11.112.81.39|255.255.255.255|0.0.0.0|vmxnet3 Ethernet Adapter #2 +# direct|11.112.81.41|255.255.255.255|0.0.0.0|vmxnet3 Ethernet Adapter #2 +# direct|11.112.81.43|255.255.255.255|0.0.0.0|vmxnet3 Ethernet Adapter #2 +# direct|11.112.81.44|255.255.255.255|0.0.0.0|vmxnet3 Ethernet Adapter #2 +# direct|11.112.81.45|255.255.255.255|0.0.0.0|vmxnet3 Ethernet Adapter #2 +# direct|11.112.81.46|255.255.255.255|0.0.0.0|vmxnet3 Ethernet Adapter #2 +# direct|11.112.81.255|255.255.255.255|0.0.0.0|vmxnet3 Ethernet Adapter #2 +# direct|11.112.136.0|255.255.252.0|0.0.0.0|vmxnet3 Ethernet Adapter +# direct|11.112.136.112|255.255.255.255|0.0.0.0|vmxnet3 Ethernet Adapter +# direct|11.112.139.255|255.255.255.255|0.0.0.0|vmxnet3 Ethernet Adapter +# direct|169.254.0.0|255.255.0.0|0.0.0.0|Microsoft Failover Cluster Virtual Adapter +# direct|169.254.2.184|255.255.255.255|0.0.0.0|Microsoft Failover Cluster Virtual Adapter +# direct|169.254.255.255|255.255.255.255|0.0.0.0|Microsoft Failover Cluster Virtual Adapter +# direct|224.0.0.0|240.0.0.0|0.0.0.0|vmxnet3 Ethernet Adapter #2 +# direct|224.0.0.0|240.0.0.0|0.0.0.0|vmxnet3 Ethernet Adapter +# direct|224.0.0.0|240.0.0.0|0.0.0.0|Microsoft Failover Cluster Virtual Adapter +# direct|255.255.255.255|255.255.255.255|0.0.0.0|vmxnet3 Ethernet Adapter #2 +# direct|255.255.255.255|255.255.255.255|0.0.0.0|vmxnet3 Ethernet Adapter +# direct|255.255.255.255|255.255.255.255|0.0.0.0|Microsoft Failover Cluster Virtual Adapter + + +def inv_win_ip_r(info): + routes = inv_tree_list("networking.routes:") + for _type, target, mask, gateway, device in info: + routes.append({ + "target" : target, + "device" : device, + "gateway" : gateway, + "type" : _type, + }) + + +inv_info['win_ip_r'] = { + 'inv_function' : inv_win_ip_r, +}

7 years

← Newer
1
...
9
10
11
12
13
14
15
...
27
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits June 2017