Checkmk git commits June 2018

checkmk-commits@lists.checkmk.com

10 participants
179 discussions

by Tom Baerwinkel

Module: check_mk Branch: master Commit: 5ceddcbfd573f10ead4ee47c180c8453618a16b6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5ceddcbfd573f1… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Fri Jun 29 18:35:14 2018 +0200 Update werk #6116 Change-Id: I31f2c67ccc2e127d2e2c11f891659371b97141ca --- .werks/6116 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.werks/6116 b/.werks/6116 index 1155601..8213177 100644 --- a/.werks/6116 +++ b/.werks/6116 @@ -13,6 +13,8 @@ The refactoring solves the following known issues: 2. Fix the calculation of the number of database connections. 3. Use a more accurate method to calculate the latency for a database connection. 4. The structure of the plugin was improved for better maintainability. +5. The plugin now ignores inactive databases, i.e. it will only collect data for + databases which are in the "LIST ACTIVE DATABASES" command. To use the new version of the plugin it has to be deployed to to the affected hosts. Futhermore, the script is now required to be accessible and executable by the

6 years

webapi.py: moved some helper functions from plugins to htdocs/webapi.py

by Andreas

Module: check_mk Branch: master Commit: 97641f1ea74f9b82350da13af2ae53e55e63f7c0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=97641f1ea74f9b… Author: Andreas <ab(a)mathias-kettner.de> Date: Fri Jun 29 11:03:41 2018 +0200 webapi.py: moved some helper functions from plugins to htdocs/webapi.py Change-Id: I0f101ee98e1d48bf2bbf57839c58809cda254b74 --- .werks/6240 | 148 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 148 insertions(+) diff --git a/.werks/6240 b/.werks/6240 new file mode 100644 index 0000000..6f5dd95 --- /dev/null +++ b/.werks/6240 @@ -0,0 +1,148 @@ +Title: WATO Web-API: Implemented SLA API interface +Level: 1 +Component: wato +Class: feature +Compatible: compat +Edition: cee +State: unknown +Version: 1.6.0i1 +Date: 1530272014 + + +SLA data for services can now be fetched via the Web API. +The new action is named <tt>get_sla</tt>. + +The request object is structured like this: + +F+: +{ + "query": [ [[{sla_configuration}], [{timerange_spec_1}], [{host/service pair}]] ] +} +F-: + +A query entry always consists of 3 fields. +<ul> +<li>The list of sla_definitions</li> +<li>The list of timerange specificiations</li> +<li>The list of host/service pairs</li> +</ul> + +The sla_definition is simply the id of the configured SLA definition. + +The timerange specification has some special syntax +Some examples: +F+: +# # Field to send in query +# "Today" # "d0" +# "Yesterday" # "d1" +# +# "This week" # "w0" +# "Last week" # "w1" +# +# "This month" # "m0" +# "Last month" # "m1" +# +# "This year" # "y0" +# "Last year" # "y1" +# +# "The last..." # "last:86400" +# "Time range" # "range:1530271236:1530281236" +# +# SLA configurations have no distinct timestamp. The timestamp depends on the SLA period +# The following example says +# - Start at the penultimate sla period (Note: 0 is current period) +# - Look back additional 4 sla periods +# There will be 5 period results +# "Sla period range" # "sla:2:4" +F-: + +The of host/service pairs identifies the required services. + +A valid request may look like +F+: +{ + "query": [ [["sla_configuration_1"], ["w1"], [["HostA", "ServiceB"]]] ] +} +F-: +This queries the sla_configuration_1 with the timerange "Last week" for the service HostA/ServiceB. +This returns 1 result. + + +As you might have noticed, each field in the query is enclosed by a list. +That's because each query entry may have multiple values specified. +F+: +{ + "query": [ [["sla_configuration_1", "sla_configuration_2"], ["w1"], [["HostA", "ServiceB"]]] ] +} +F-: +This queries the sla_configuration_1 and sla_configuration_2 with the timerange "Last week" for the service HostA/ServiceB. +This returns 2 results. + + +Now add an additional timerange specification +F+: +{ + "query": [ [["sla_configuration_1", "sla_configuration_2"], ["w1", "w0"], [["HostA", "ServiceB"]]] ] +} +F-: +This queries the sla_configuration_1 and sla_configuration_2 with the timerange "Last week" and "This week" for the service HostA/ServiceB. +This returns 4 results. + + + +Finally, you can also add additional triples to the query. +F+: +{ + "query": [ [["sla_configuration_1"], ["w1"], [["HostA", "ServiceB"]]], + [["sla_configuration_2"], ["w0"], [["HostX", "ServiceY"]]] ] +} +F-: +This queries sla_configuration_1 with the timerange "Last week" for HostA/ServiceB and +sla_configuration_2 with the timerange "This week" for HostX/ServiceY. + + + +The returned result for these queries is a python dictionary with lots of infos +F+: +{'mysite': {'myhost': {'CPU load': + {(('myhost', 'CPU load'), 'sla_configuration_1', ('sla_period_range', (0, 1)), 'weekly'): + {'plugin_results': [{'period_results': [{'duration': 604800.0, + 'sla_broken': False, + 'statistics': {'duration': {-1: 604800.0}, + 'percentage': {-1: 100.0}}, + 'subresults': [{'deviation_info': {'deviation': 0.0, + 'deviation_state': 2, + 'levels': (0, + 0), + 'limit': 0.0}, + 'error_instances': [], + 'requirement': (0, + 'min', + 0.0), + 'sla_broken': False}], + 'timerange': (1529272800.0, + 1529877600.0)}, + {'duration': 396134.0, + 'sla_broken': False, + 'statistics': {'duration': {-1: 385358.0, + 0: 10776}, + 'percentage': {-1: 97.27970838150726, + 0: 2.7202916184927326}}, + 'subresults': [{'deviation_info': {'deviation': 2.7202916184927326, + 'deviation_state': 0, + 'levels': (0, + 0), + 'limit': 0.0}, + 'error_instances': [], + 'requirement': (0, + 'min', + 0.0), + 'sla_broken': False}], + 'timerange': (1529877600.0, + 1530273734)}], + 'plugin_id': 'service_state_percentage', + 'timerange_sla_duration': 1000934.0}], + 'sla_id': 'sla_configuration_1', + 'sla_period': 'weekly'}}}}} +F-: +Keep in mind that this API implementation is an initial version, so there might be interface changes within the next months.

6 years

webapi.py: moved some helper functions from plugins to htdocs/webapi.py

by Andreas

Module: check_mk Branch: master Commit: c444ddc3c03372c12a91addaf0da1d7bcfbb303a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c444ddc3c03372… Author: Andreas <ab(a)mathias-kettner.de> Date: Fri Jun 29 11:03:41 2018 +0200 webapi.py: moved some helper functions from plugins to htdocs/webapi.py Change-Id: I0f101ee98e1d48bf2bbf57839c58809cda254b74 --- web/htdocs/webapi.py | 106 +++++++++++++++++++++++++++++++++++++++++++ web/plugins/webapi/webapi.py | 104 ------------------------------------------ 2 files changed, 106 insertions(+), 104 deletions(-) diff --git a/web/htdocs/webapi.py b/web/htdocs/webapi.py index a920fc4..a31e6d9 100644 --- a/web/htdocs/webapi.py +++ b/web/htdocs/webapi.py @@ -47,6 +47,111 @@ api_actions = {} loaded_with_language = False +#. +# .--API Helpers-------------------------------------------------------------. +# | _ _ _ | +# | | | | | ___| |_ __ ___ _ __ ___ | +# | | |_| |/ _ \ | '_ \ / _ \ '__/ __| | +# | | _ | __/ | |_) | __/ | \__ \ | +# | |_| |_|\___|_| .__/ \___|_| |___/ | +# | |_| | +# +----------------------------------------------------------------------+ +# TODO: encapsulate in module/class + +def validate_request_keys(request, required_keys = None, optional_keys = None): + if required_keys: + missing = set(required_keys) - set(request.keys()) + if missing: + raise MKUserError(None, _("Missing required key(s): %s") % ", ".join(missing)) + + + all_keys = (required_keys or []) + (optional_keys or []) + for key in request.keys(): + if key not in all_keys: + raise MKUserError(None, _("Invalid key: %s") % key) + + +def check_hostname(hostname, should_exist = True): + # Validate hostname with valuespec + Hostname().validate_value(hostname, "hostname") + + if should_exist: + host = watolib.Host.host(hostname) + if not host: + raise MKUserError(None, _("No such host")) + else: + if watolib.Host.host_exists(hostname): + raise MKUserError(None, _("Host %s already exists in the folder %s") % (hostname, watolib.Host.host(hostname).folder().path())) + + +# Check if the given attribute name exists, no type check +def validate_general_host_attributes(host_attributes): + # inventory_failed and site are no "real" host_attributes (TODO: Clean this up!) + all_host_attribute_names = map(lambda (x, y): x.name(), watolib.all_host_attributes()) + ["inventory_failed", "site"] + for name, value in host_attributes.items(): + if name not in all_host_attribute_names: + raise MKUserError(None, _("Unknown attribute: %s") % html.attrencode(name)) + + # For real host attributes validate the values + try: + attr = watolib.host_attribute(name) + except KeyError: + attr = None + + if attr != None: + if attr.needs_validation("host"): + attr.validate_input(value, "") + + # The site attribute gets an extra check + if name == "site" and value not in config.allsites().keys(): + raise MKUserError(None, _("Unknown site %s") % html.attrencode(value)) + + +# Check if the tag group exists and the tag value is valid +def validate_host_tags(host_tags): + for key, value in host_tags.items(): + for group_entry in config.host_tag_groups(): + if group_entry[0] == key: + for value_entry in group_entry[2]: + if value_entry[0] == value: + break + else: + raise MKUserError(None, _("Unknown host tag %s") % html.attrencode(value)) + break + else: + raise MKUserError(None, _("Unknown host tag group %s") % html.attrencode(key)) + + +def validate_host_attributes(attributes): + validate_general_host_attributes(dict((key, value) for key, value in attributes.items() if not key.startswith("tag_"))) + validate_host_tags(dict((key[4:], value) for key, value in attributes.items() if key.startswith("tag_"))) + + +def compute_config_hash(entity): + import json, md5 + try: + entity_encoded = json.dumps(entity, sort_keys=True) + entity_hash = md5.md5(entity_encoded).hexdigest() + except Exception, e: + logger.error("Error %s" % e) + entity_hash = "0" + + return entity_hash + + +def validate_config_hash(hash_value, entity): + entity_hash = compute_config_hash(entity) + if hash_value != entity_hash: + raise MKUserError(None, _("The configuration has changed in the meantime. "\ + "You need to load the configuration and start another update. " + "If the existing configuration should not be checked, you can " + "remove the configuration_hash value from the request object.")) + + +def add_configuration_hash(response, configuration_object): + response["configuration_hash"] = compute_config_hash(configuration_object) + + class APICallCollection(object): @classmethod def all_classes(cls): @@ -61,6 +166,7 @@ class APICallCollection(object): raise NotImplementedError("This API collection does not register any API call") + def load_plugins(force): global loaded_with_language if loaded_with_language == current_language and not force: diff --git a/web/plugins/webapi/webapi.py b/web/plugins/webapi/webapi.py index 6df2128..7990fb1 100644 --- a/web/plugins/webapi/webapi.py +++ b/web/plugins/webapi/webapi.py @@ -26,110 +26,6 @@ # TODO CLEANUP: Replace MKUserError by MKAPIError or something like that -#. -# .--Helpers-------------------------------------------------------------. -# | _ _ _ | -# | | | | | ___| |_ __ ___ _ __ ___ | -# | | |_| |/ _ \ | '_ \ / _ \ '__/ __| | -# | | _ | __/ | |_) | __/ | \__ \ | -# | |_| |_|\___|_| .__/ \___|_| |___/ | -# | |_| | -# +----------------------------------------------------------------------+ - -def validate_request_keys(request, required_keys = None, optional_keys = None): - if required_keys: - missing = set(required_keys) - set(request.keys()) - if missing: - raise MKUserError(None, _("Missing required key(s): %s") % ", ".join(missing)) - - - all_keys = (required_keys or []) + (optional_keys or []) - for key in request.keys(): - if key not in all_keys: - raise MKUserError(None, _("Invalid key: %s") % key) - - -def check_hostname(hostname, should_exist = True): - # Validate hostname with valuespec - Hostname().validate_value(hostname, "hostname") - - if should_exist: - host = watolib.Host.host(hostname) - if not host: - raise MKUserError(None, _("No such host")) - else: - if watolib.Host.host_exists(hostname): - raise MKUserError(None, _("Host %s already exists in the folder %s") % (hostname, watolib.Host.host(hostname).folder().path())) - - -# Check if the given attribute name exists, no type check -def validate_general_host_attributes(host_attributes): - # inventory_failed and site are no "real" host_attributes (TODO: Clean this up!) - all_host_attribute_names = map(lambda (x, y): x.name(), watolib.all_host_attributes()) + ["inventory_failed", "site"] - for name, value in host_attributes.items(): - if name not in all_host_attribute_names: - raise MKUserError(None, _("Unknown attribute: %s") % html.attrencode(name)) - - # For real host attributes validate the values - try: - attr = watolib.host_attribute(name) - except KeyError: - attr = None - - if attr != None: - if attr.needs_validation("host"): - attr.validate_input(value, "") - - # The site attribute gets an extra check - if name == "site" and value not in config.allsites().keys(): - raise MKUserError(None, _("Unknown site %s") % html.attrencode(value)) - - -# Check if the tag group exists and the tag value is valid -def validate_host_tags(host_tags): - for key, value in host_tags.items(): - for group_entry in config.host_tag_groups(): - if group_entry[0] == key: - for value_entry in group_entry[2]: - if value_entry[0] == value: - break - else: - raise MKUserError(None, _("Unknown host tag %s") % html.attrencode(value)) - break - else: - raise MKUserError(None, _("Unknown host tag group %s") % html.attrencode(key)) - - -def validate_host_attributes(attributes): - validate_general_host_attributes(dict((key, value) for key, value in attributes.items() if not key.startswith("tag_"))) - validate_host_tags(dict((key[4:], value) for key, value in attributes.items() if key.startswith("tag_"))) - - -def compute_config_hash(entity): - import json, md5 - try: - entity_encoded = json.dumps(entity, sort_keys=True) - entity_hash = md5.md5(entity_encoded).hexdigest() - except Exception, e: - logger.error("Error %s" % e) - entity_hash = "0" - - return entity_hash - - -def validate_config_hash(hash_value, entity): - entity_hash = compute_config_hash(entity) - if hash_value != entity_hash: - raise MKUserError(None, _("The configuration has changed in the meantime. "\ - "You need to load the configuration and start another update. " - "If the existing configuration should not be checked, you can " - "remove the configuration_hash value from the request object.")) - - -def add_configuration_hash(response, configuration_object): - response["configuration_hash"] = compute_config_hash(configuration_object) - - #.

6 years

moved APICallCollection base class to correct file

by Andreas

Module: check_mk Branch: master Commit: 4035524b24e86338bfcff9c7a01737d996281e39 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4035524b24e863… Author: Andreas <ab(a)mathias-kettner.de> Date: Fri Jun 29 10:46:05 2018 +0200 moved APICallCollection base class to correct file Change-Id: Ie35f52731e3fc7673726a479266b31a3884d7120 --- web/htdocs/webapi.py | 15 +++++++++++++++ web/plugins/webapi/webapi.py | 13 ------------- 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/web/htdocs/webapi.py b/web/htdocs/webapi.py index 8e57854..a920fc4 100644 --- a/web/htdocs/webapi.py +++ b/web/htdocs/webapi.py @@ -46,6 +46,21 @@ else: api_actions = {} loaded_with_language = False + +class APICallCollection(object): + @classmethod + def all_classes(cls): + classes = {} + for subclass in cls.__subclasses__(): # pylint: disable=no-member + classes[subclass.__name__] = subclass + + return classes.values() + + + def get_api_calls(self): + raise NotImplementedError("This API collection does not register any API call") + + def load_plugins(force): global loaded_with_language if loaded_with_language == current_language and not force: diff --git a/web/plugins/webapi/webapi.py b/web/plugins/webapi/webapi.py index 02291c7..6df2128 100644 --- a/web/plugins/webapi/webapi.py +++ b/web/plugins/webapi/webapi.py @@ -131,19 +131,6 @@ def add_configuration_hash(response, configuration_object): -class APICallCollection(object): - @classmethod - def all_classes(cls): - classes = {} - for subclass in cls.__subclasses__(): # pylint: disable=no-member - classes[subclass.__name__] = subclass - - return classes.values() - - - def get_api_calls(self): - raise NotImplementedError("This API collection does not register any API call") - #. # .--Folders-------------------------------------------------------------.

6 years

Revert " Remove finally statement causing PID file to be removed after bail_out call "

by Andreas

Module: check_mk Branch: master Commit: f471a16fb8cdabb3263bf42ebe6da07d09a00a4b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f471a16fb8cdab… Author: Andreas <ab(a)mathias-kettner.de> Date: Fri Jun 29 10:13:45 2018 +0200 Revert "Remove finally statement causing PID file to be removed after bail_out call" This reverts commit a788c0f978058ec03fb6fefa0a58a588dde1e4bb. --- cmk/ec/main.py | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/cmk/ec/main.py b/cmk/ec/main.py index 69fdd10..fcf02ea 100644 --- a/cmk/ec/main.py +++ b/cmk/ec/main.py @@ -4029,16 +4029,12 @@ def main(): raise bail_out(logger, traceback.format_exc()) - # BEWARE: This cleanup shoud *only* run, if bail_out - # in the previous except block was *not* executed. - # If we use a finally statement here, it *will* execute, - # because bail_out's sys.exit(1) statement raises a SystemExit - # exception, and Python *would* run this finally-Block. - if cmk.store.have_lock(str(pid_path)): - try: - pid_path.unlink() - except OSError: - pass + finally: + if cmk.store.have_lock(str(pid_path)): + try: + pid_path.unlink() + except OSError: + pass if __name__ == "__main__":

6 years

5991 win_computersystem: Inventorizes model, manufacturer and client hostname

by Simon Betz

Module: check_mk Branch: master Commit: 26adc507587cd8e7b6514190a6ff981fc5398c6a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=26adc507587cd8… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed Apr 18 14:51:13 2018 +0200 5991 win_computersystem: Inventorizes model, manufacturer and client hostname Change-Id: I03a96cf36b97514767d4707e54694e9a2a1008c5 --- .werks/5991 | 10 +++++++ agents/windows/plugins/mk_inventory.vbs | 5 ++++ inventory/win_computersystem | 53 +++++++++++++++++++++++++++++++++ inventory/win_system | 3 +- web/plugins/views/inventory.py | 50 +++++++++++++++---------------- 5 files changed, 94 insertions(+), 27 deletions(-) diff --git a/.werks/5991 b/.werks/5991 new file mode 100644 index 0000000..2f4201d --- /dev/null +++ b/.werks/5991 @@ -0,0 +1,10 @@ +Title: win_computersystem: Inventorizes model, manufacturer and client hostname +Level: 1 +Component: inv +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1524055833 +Class: feature + + diff --git a/agents/windows/plugins/mk_inventory.vbs b/agents/windows/plugins/mk_inventory.vbs index 21788f9..d4f2bdf 100644 --- a/agents/windows/plugins/mk_inventory.vbs +++ b/agents/windows/plugins/mk_inventory.vbs @@ -285,6 +285,11 @@ Call startSection("win_system",58,timeUntil) systemVars = Array( "Manufacturer","Name","Model","HotSwappable","InstallDate","PartNumber","SerialNumber" ) Call getWMIObject("Win32_SystemEnclosure",systemVars) +' ComputerSystem +Call startSection("win_computersystem",58,timeUntil) +systemVars = Array( "Manufacturer","Name","Model","InstallDate" ) +Call getWMIObject("Win32_ComputerSystem",systemVars) + ' Hard-Disk Call startSection("win_disks",58,timeUntil) diskVars = Array( "Manufacturer","InterfaceType","Model","Name","SerialNumber","Size","MediaType","Signature" ) diff --git a/inventory/win_computersystem b/inventory/win_computersystem new file mode 100644 index 0000000..03afe68 --- /dev/null +++ b/inventory/win_computersystem @@ -0,0 +1,53 @@ +#!/usr/bin/python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2013 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. + +# win_computersystem is executed after win_system +# and we overwrite some data. +# Assumption: it's more precise + +# Example output: +# <<<win_computersystem:sep(58)>>> +# Manufacturer: FUJITSU +# Model: PRIMERGY RX100 S7 +# Name: <WINDOWSHOST> + + +def inv_win_computersystem(info): + node = inv_tree("hardware.system.") + for line in info: + key = line[0] + value = " ".join(line[1:]) + if key == "Manufacturer": + node["manufacturer"] = value + elif key == "Model": + node["model"] = value + elif key == "Name": + node["family"] = value + + +inv_info['win_computersystem'] = { + "inv_function": inv_win_computersystem, +} diff --git a/inventory/win_system b/inventory/win_system index d634d9d..c566727 100644 --- a/inventory/win_system +++ b/inventory/win_system @@ -52,6 +52,7 @@ def inv_win_system(info): elif varname == "Model": node["family"] = value + inv_info['win_system'] = { - "inv_function" : inv_win_system, + "inv_function": inv_win_system, } diff --git a/web/plugins/views/inventory.py b/web/plugins/views/inventory.py index bc11e02..0f7d9ed 100644 --- a/web/plugins/views/inventory.py +++ b/web/plugins/views/inventory.py @@ -565,38 +565,36 @@ inventory_displayhints.update({ ".hardware.system.serial" : { "title" : _("Serial Number") }, ".hardware.system.expresscode" : { "title" : _("Express Servicecode") }, ".hardware.system.model" : { "title" : _("Model Name") }, + ".hardware.system.manufacturer" : { "title" : _("Manufacturer") }, # Legacy ones. Kept to not break existing views - DON'T use these values for new plugins ".hardware.system.serial_number" : { "title" : _("Serial Number - LEGACY, don't use") }, ".hardware.system.model_name" : { "title" : _("Model Name - LEGACY, don't use") }, - ".hardware.system.manufacturer" : { "title" : _("Manufacturer") }, - ".hardware.components." : { "title" : _("Physical Components") }, - - ".hardware.components.others:" : { "title" : _("Other entities"), - "keyorder" : [ "index", "name", "description", "software", "serial", "manufacturer", "model", "location" ], - "view" : "invother_of_host" }, - ".hardware.components.others:*.index" : { "title" : _("Index") }, - ".hardware.components.others:*.name" : { "title" : _("Name") }, - ".hardware.components.others:*.description" : { "title" : _("Description") }, - ".hardware.components.others:*.software" : { "title" : _("Software") }, - ".hardware.components.others:*.serial" : { "title" : _("Serial Number") }, - ".hardware.components.others:*.manufacturer" : { "title" : _("Manufacturer") }, - ".hardware.components.others:*.model" : { "title" : _("Model Name") }, - ".hardware.components.others:*.location" : { "title" : _("Location") }, - - ".hardware.components.unknowns:" : { "title" : _("Unknown entities"), - "keyorder" : [ "index", "name", "description", "software", "serial", "manufacturer", "model", "location" ], - "view" : "invunknown_of_host" }, - ".hardware.components.unknowns:*.index" : { "title" : _("Index") }, - ".hardware.components.unknowns:*.name" : { "title" : _("Name") }, - ".hardware.components.unknowns:*.description" : { "title" : _("Description") }, - ".hardware.components.unknowns:*.software" : { "title" : _("Software") }, - ".hardware.components.unknowns:*.serial" : { "title" : _("Serial Number") }, - ".hardware.components.unknowns:*.manufacturer" : { "title" : _("Manufacturer") }, - ".hardware.components.unknowns:*.model" : { "title" : _("Model Name") }, - ".hardware.components.unknowns:*.location" : { "title" : _("Location") }, + ".hardware.components.others:" : { "title" : _("Other entities"), + "keyorder" : [ "index", "name", "description", "software", "serial", "manufacturer", "model", "location" ], + "view" : "invother_of_host" }, + ".hardware.components.others:*.index" : { "title" : _("Index") }, + ".hardware.components.others:*.name" : { "title" : _("Name") }, + ".hardware.components.others:*.description" : { "title" : _("Description") }, + ".hardware.components.others:*.software" : { "title" : _("Software") }, + ".hardware.components.others:*.serial" : { "title" : _("Serial Number") }, + ".hardware.components.others:*.manufacturer" : { "title" : _("Manufacturer") }, + ".hardware.components.others:*.model" : { "title" : _("Model Name") }, + ".hardware.components.others:*.location" : { "title" : _("Location") }, + + ".hardware.components.unknowns:" : { "title" : _("Unknown entities"), + "keyorder" : [ "index", "name", "description", "software", "serial", "manufacturer", "model", "location" ], + "view" : "invunknown_of_host" }, + ".hardware.components.unknowns:*.index" : { "title" : _("Index") }, + ".hardware.components.unknowns:*.name" : { "title" : _("Name") }, + ".hardware.components.unknowns:*.description" : { "title" : _("Description") }, + ".hardware.components.unknowns:*.software" : { "title" : _("Software") }, + ".hardware.components.unknowns:*.serial" : { "title" : _("Serial Number") }, + ".hardware.components.unknowns:*.manufacturer" : { "title" : _("Manufacturer") }, + ".hardware.components.unknowns:*.model" : { "title" : _("Model Name") }, + ".hardware.components.unknowns:*.location" : { "title" : _("Location") }, ".hardware.components.chassis:" : { "title" : _("Chassis"), "keyorder" : [ "index", "name", "description", "software", "serial", "manufacturer", "model", "location" ],

6 years

6116 FIX mk_db2.linux: major refactoring of the plugin to solve different issues

by Tom Baerwinkel

Module: check_mk Branch: master Commit: de6d8dea81383f1c847092ad64217d66356f31d9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=de6d8dea81383f… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Wed Dec 13 16:20:23 2017 +0100 6116 FIX mk_db2.linux: major refactoring of the plugin to solve different issues The refactoring solves the following known issues: 1. Here documents are avoided which should resolve wrong output due to quoting problems. 2. Fix the calculation of the number of database connections. 3. Use a more accurate method to calculate the latency for a database connection. 4. The structure of the plugin was improved for better maintainability. To use the new version of the plugin it has to be deployed to to the affected hosts. Futhermore, the script is now required to be accessible and executable by the instance users to work properly. Change-Id: If0027ac6044d49d9da23c45d797b424436b1b7dd --- .werks/6116 | 19 +++ agents/plugins/mk_db2.linux | 321 ++++++++++++++++++-------------------------- checks/db2_connections | 11 +- checks/db2_counters | 6 +- 4 files changed, 160 insertions(+), 197 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=de6d8dea81…

6 years

Remove finally statement causing PID file to be removed after bail_out call

by Konstantin Büttner

Module: check_mk Branch: master Commit: a788c0f978058ec03fb6fefa0a58a588dde1e4bb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a788c0f978058e… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Thu Jun 28 16:35:31 2018 +0200 Remove finally statement causing PID file to be removed after bail_out call Change-Id: I9172d90af02c96a11cc6a8bc56298db8535b4e9d --- cmk/ec/main.py | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/cmk/ec/main.py b/cmk/ec/main.py index fcf02ea..69fdd10 100644 --- a/cmk/ec/main.py +++ b/cmk/ec/main.py @@ -4029,12 +4029,16 @@ def main(): raise bail_out(logger, traceback.format_exc()) - finally: - if cmk.store.have_lock(str(pid_path)): - try: - pid_path.unlink() - except OSError: - pass + # BEWARE: This cleanup shoud *only* run, if bail_out + # in the previous except block was *not* executed. + # If we use a finally statement here, it *will* execute, + # because bail_out's sys.exit(1) statement raises a SystemExit + # exception, and Python *would* run this finally-Block. + if cmk.store.have_lock(str(pid_path)): + try: + pid_path.unlink() + except OSError: + pass if __name__ == "__main__":

6 years

Updated werk

by Simon Betz

Module: check_mk Branch: master Commit: cb75ebc01785656ba1591b7913cc263789b94fe2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cb75ebc0178565… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Jun 28 16:27:49 2018 +0200 Updated werk Change-Id: I78489a6240c87d06e424033cc7c0a6e335acebde --- .werks/5966 | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/.werks/5966 b/.werks/5966 index f517f19..1448ea4 100644 --- a/.werks/5966 +++ b/.werks/5966 @@ -7,4 +7,15 @@ Version: 1.6.0i1 Date: 1523524818 Class: feature +The agent plugin {{mk_oracle.aix}} does not exist anymore. +Instead the {{mk_oracle}} plugin was refactored and now +supports AIX, too. +In order to use the new plugin please install it to the +well-known agent plugin path or use the agent bakery if +you have a enterprise edition. + +The new option '--log' logs some steps to the related log file +which can be found in {{$MK_VARDIR/log/mk_oracle.log}} and +helps to find any errors. Please note that the shell command +'flock' has to be installed.

6 years

mk_oracle: Unified Linux/Solaris and AIX plugin

by Simon Betz

Module: check_mk Branch: master Commit: e8e6a6870afca961208ba81e216e4914de67331e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e8e6a6870afca9… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue Apr 24 16:41:40 2018 +0200 mk_oracle: Unified Linux/Solaris and AIX plugin Change-Id: I0cf775d0a0ac08579d6f3578c2262287d9b10729 --- .werks/5966 | 10 + .werks/6146 | 10 + agents/plugins/mk_oracle | 1222 +++++++++++++++++++++++++----------------- agents/plugins/mk_oracle.aix | 1152 --------------------------------------- 4 files changed, 762 insertions(+), 1632 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=e8e6a6870a…

6 years

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits June 2018