Checkmk git commits December 2018

checkmk-commits@lists.checkmk.com

15 participants
342 discussions

by Moritz Kiemer

Module: check_mk Branch: master Commit: 30c6788cda7335b20f60251dd7904b3cb371a496 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=30c6788cda7335… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Tue Dec 4 15:11:46 2018 +0100 FEED-3144: reorganize plugin catalog Change-Id: I10cfb0a5d80d690ca77aa255c0525f9a6e682d37 --- checkman/azure_agent_info | 6 +++--- checkman/azure_databases | 4 ++-- checkman/azure_databases.connections | 4 ++-- checkman/azure_databases.cpu | 4 ++-- checkman/azure_databases.deadlock | 4 ++-- checkman/azure_databases.dtu | 4 ++-- checkman/azure_databases.storage | 4 ++-- checkman/azure_sites | 4 ++-- checkman/azure_virtualmachines | 4 ++-- checkman/azure_virtualmachines.summary | 4 ++-- cmk/gui/wato/pages/check_catalog.py | 2 ++ cmk/man_pages.py | 6 ++++-- web/htdocs/images/icon_plugins_cloud.png | Bin 0 -> 4733 bytes web/htdocs/themes/facelift/images/icon_plugins_cloud.png | Bin 0 -> 921 bytes 14 files changed, 27 insertions(+), 23 deletions(-) diff --git a/checkman/azure_agent_info b/checkman/azure_agent_info index 27a1cdc..26178df 100644 --- a/checkman/azure_agent_info +++ b/checkman/azure_agent_info @@ -1,6 +1,6 @@ -title: Azure Agent Info +title: Microsoft Azure Agent Info agents: linux -catalog: app/Azure +catalog: cloud/azure license: GPL distribution: check_mk description: @@ -13,5 +13,5 @@ item: inventory: One service is created per monitored resource group and one for the - host that runs the agent. + host that the agent is assigned to. diff --git a/checkman/azure_databases b/checkman/azure_databases index 0a90031..dcc9a78 100644 --- a/checkman/azure_databases +++ b/checkman/azure_databases @@ -1,6 +1,6 @@ -title: Azure Monitoring: Databases +title: Microsoft Azure SQL Databases agents: linux -catalog: app/databases +catalog: cloud/azure license: GPL distribution: check_mk description: diff --git a/checkman/azure_databases.connections b/checkman/azure_databases.connections index 4fe7ce9..594e3d2 100644 --- a/checkman/azure_databases.connections +++ b/checkman/azure_databases.connections @@ -1,6 +1,6 @@ -title: Azure Monitoring: Database connections +title: Microsoft Azure SQL Databases: connections agents: linux -catalog: app/databases +catalog: cloud/azure license: GPL distribution: check_mk description: diff --git a/checkman/azure_databases.cpu b/checkman/azure_databases.cpu index 941bd7c..b85d31a 100644 --- a/checkman/azure_databases.cpu +++ b/checkman/azure_databases.cpu @@ -1,6 +1,6 @@ -title: Azure Monitoring: Database CPU utilization +title: Microsoft Azure SQL Databases: CPU utilization agents: linux -catalog: app/databases +catalog: cloud/azure license: GPL distribution: check_mk description: diff --git a/checkman/azure_databases.deadlock b/checkman/azure_databases.deadlock index a90e4c7..b73f3d7 100644 --- a/checkman/azure_databases.deadlock +++ b/checkman/azure_databases.deadlock @@ -1,6 +1,6 @@ -title: Azure Monitoring: Database deadlocks +title: Microsoft Azure SQL Databases: deadlocks agents: linux -catalog: app/databases +catalog: cloud/azure license: GPL distribution: check_mk description: diff --git a/checkman/azure_databases.dtu b/checkman/azure_databases.dtu index b7ecef2..6b2b5f5 100644 --- a/checkman/azure_databases.dtu +++ b/checkman/azure_databases.dtu @@ -1,6 +1,6 @@ -title: Azure Monitoring: Database throughput units +title: Microsoft Azure SQL Databases: throughput units agents: linux -catalog: app/databases +catalog: cloud/azure license: GPL distribution: check_mk description: diff --git a/checkman/azure_databases.storage b/checkman/azure_databases.storage index 5188262..ec3f7a7 100644 --- a/checkman/azure_databases.storage +++ b/checkman/azure_databases.storage @@ -1,6 +1,6 @@ -title: Azure Monitoring: Database storage +title: Microsoft Azure SQL Databases: storage agents: linux -catalog: app/databases +catalog: cloud/azure license: GPL distribution: check_mk description: diff --git a/checkman/azure_sites b/checkman/azure_sites index e58bedc..fe9b4ff 100644 --- a/checkman/azure_sites +++ b/checkman/azure_sites @@ -1,6 +1,6 @@ -title: Azure Monitoring: Webserver +title: Microsoft Azure Webserver agents: linux -catalog: app/webserver +catalog: cloud/azure license: GPL distribution: check_mk description: diff --git a/checkman/azure_virtualmachines b/checkman/azure_virtualmachines index 7e2c4d1..539e3d3 100644 --- a/checkman/azure_virtualmachines +++ b/checkman/azure_virtualmachines @@ -1,6 +1,6 @@ -title: Virtual Machine under Azure +title: Microsoft Azure Virtual Machines agents: azure -catalog: os/misc +catalog: cloud/azure license: GPL distribution: check_mk description: diff --git a/checkman/azure_virtualmachines.summary b/checkman/azure_virtualmachines.summary index 712065f..5521d39 100644 --- a/checkman/azure_virtualmachines.summary +++ b/checkman/azure_virtualmachines.summary @@ -1,6 +1,6 @@ -title: Summary Virtual Machine under Azure +title: Microsoft Azure Virtual Machines: Summary agents: azure -catalog: os/misc +catalog: cloud/azure license: GPL distribution: check_mk description: diff --git a/cmk/gui/wato/pages/check_catalog.py b/cmk/gui/wato/pages/check_catalog.py index b20e337..6018413 100644 --- a/cmk/gui/wato/pages/check_catalog.py +++ b/cmk/gui/wato/pages/check_catalog.py @@ -317,6 +317,8 @@ class ModeCheckPlugins(WatoMode): ("app", False, _("Applications"), _("Monitoring of applications such as " "processes, services or databases")), + ("cloud", False, _("Cloud Based Environments"), + _("Monitoring of cloud environments like Microsoft Azure")), ("agentless", False, _("Networking checks without agent"), _("Plugins that directly check networking " "protocols like HTTP or IMAP")), diff --git a/cmk/man_pages.py b/cmk/man_pages.py index 408f278..7b24c8f 100644 --- a/cmk/man_pages.py +++ b/cmk/man_pages.py @@ -203,8 +203,10 @@ catalog_titles = { "networking" : "Networking", "misc" : "Miscellaneous", "storage" : "Filesystems, Disks and RAID", - - "agentless" : "Networking checks without agent", + "cloud" : "Cloud Based Environments", + "azure" : "Microsoft Azure", + "aws" : "Amazon Web Services", + "agentless": "Networking checks without agent", "generic" : "Generic check plugins", "unsorted" : "Uncategorized", } # yapf: disable diff --git a/web/htdocs/images/icon_plugins_cloud.png b/web/htdocs/images/icon_plugins_cloud.png new file mode 100644 index 0000000..5bac406 Binary files /dev/null and b/web/htdocs/images/icon_plugins_cloud.png differ diff --git a/web/htdocs/themes/facelift/images/icon_plugins_cloud.png b/web/htdocs/themes/facelift/images/icon_plugins_cloud.png new file mode 100644 index 0000000..1997d90 Binary files /dev/null and b/web/htdocs/themes/facelift/images/icon_plugins_cloud.png differ

5 years, 6 months

6943 FIX juniper_bgp_state: Fix item generation for IPv6 addresses

by Moritz Kiemer

Module: check_mk Branch: master Commit: 1cd7274e1e532a9834ecb5897ceaedda0e643714 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1cd7274e1e532a… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Tue Dec 4 14:23:36 2018 +0100 6943 FIX juniper_bgp_state: Fix item generation for IPv6 addresses The check now extracts the proper remote IP address in case of IPv6 addresses as item, instead of a part of the OID end. This change requires a rediscovery. CMK-1334 Change-Id: Ib3275f88dcca9ed1bb23bff92c6551c91796b3b7 --- .werks/6943 | 12 +++++++ checks/juniper_bgp_state | 42 ++++++++++++++++++---- .../datasets/juniper_bgp_state_1_regression.py | 14 ++++---- .../datasets/juniper_bgp_state_ip_addresses.py | 37 +++++++++++++++++++ 4 files changed, 92 insertions(+), 13 deletions(-) diff --git a/.werks/6943 b/.werks/6943 new file mode 100644 index 0000000..cb160b9 --- /dev/null +++ b/.werks/6943 @@ -0,0 +1,12 @@ +Title: juniper_bgp_state: Fix item generation for IPv6 addresses +Level: 1 +Component: checks +Compatible: incomp +Edition: cre +Version: 1.6.0i1 +Date: 1543929566 +Class: fix + +The check now extracts the proper remote IP address in case of +IPv6 addresses as item, instead of a part of the OID end. +This change requires a rediscovery. diff --git a/checks/juniper_bgp_state b/checks/juniper_bgp_state index 4bbcb60..04e26dc 100644 --- a/checks/juniper_bgp_state +++ b/checks/juniper_bgp_state @@ -25,8 +25,39 @@ # Boston, MA 02110-1301 USA. -def juniper_bgp_state_create_item(oid_end): - return re.sub(r"[0-9]+\.1\.[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+\.1\.", "", oid_end) +def _clean_v4_address(chunks): + return "%d.%d.%d.%d" % tuple(int(c, 16) for c in chunks) + + +def _clean_v6_address(chunks): + ichunks = iter(chunks) + blocks = ("%s%s" % pair for pair in zip(ichunks, ichunks)) + stripped_blocks = ('0' if b == '0000' else b.lstrip('0') for b in blocks) + v6_string = ':'.join(b.lower() for b in stripped_blocks) + + # replace longest series of zeros + for length in range(8, 0, -1): + subs = ':'.join('0' * length) + if subs in v6_string: + shortened = v6_string.replace(subs, '', 1) + if not shortened or shortened.startswith(':'): + shortened = ':' + shortened + if shortened.endswith(':'): + shortened += ':' + return '[%s]' % shortened + return v6_string + + +def juniper_bgp_state_create_item(peering_entry): + chunks = peering_entry.split() + try: + if len(chunks) == 4: + return _clean_v4_address(chunks) + elif len(chunks) == 16: + return _clean_v6_address(chunks) + except (ValueError, IndexError): + pass + return "'%s'" % peering_entry.strip() def parse_juniper_bgp_state(info): @@ -45,8 +76,8 @@ def parse_juniper_bgp_state(info): "2": "running" # 2 } parsed = {} - for oid_end, state, operational_state in info: - item = juniper_bgp_state_create_item(oid_end) + for state, operational_state, peering_entry in info: + item = juniper_bgp_state_create_item(peering_entry) state_txt = bgp_state_map.get(state.strip(), "undefined") operational_txt = bgp_operational_state_map.get(operational_state.strip(), "undefined") @@ -59,7 +90,6 @@ def parse_juniper_bgp_state(info): @get_parsed_item_data def check_juniper_bgp_state(item, _no_params, data): - state = data.get('state', "undefined") operational_state = data.get('operational_state', "undefined") @@ -86,9 +116,9 @@ check_info["juniper_bgp_state"] = { "snmp_info": ( '.1.3.6.1.4.1.2636.5.1.1.2.1.1.1', [ - OID_END, # take peering partner IP from this 2, # jnxBgpM2PeerState 3, # jnxBgpM2PeerStatus (like operational status) + 11, # jnxBgpM2PeerRemoteAddr ]), "snmp_scan_function": lambda oid: oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.2636.1.1.1"), diff --git a/tests/unit/checks/generictests/datasets/juniper_bgp_state_1_regression.py b/tests/unit/checks/generictests/datasets/juniper_bgp_state_1_regression.py index 90ff830..83064b9 100644 --- a/tests/unit/checks/generictests/datasets/juniper_bgp_state_1_regression.py +++ b/tests/unit/checks/generictests/datasets/juniper_bgp_state_1_regression.py @@ -1,22 +1,22 @@ checkname = 'juniper_bgp_state' info = [ - [u'6.1.80.81.193.134.1.80.81.192.3', u'6', u'2'], - [u'6.1.80.81.193.134.1.80.81.192.24', u'3', u'2'], + [u'6', u'2', '64 60 01 22'], + [u'3', u'2', '64 60 01 26'], ] discovery = { - '': [(u'80.81.192.24', {}), (u'80.81.192.3', {}), + '': [(u'100.96.1.34', {}), (u'100.96.1.38', {}), ] } checks = { '': [ - (u'80.81.192.24', 'default', - [(2, u'Status with peer 80.81.192.24 is active', []), + (u'100.96.1.34', 'default', + [(0, u'Status with peer 100.96.1.34 is established', []), (0, 'operational status: running', [])]), - (u'80.81.192.3', 'default', - [(0, u'Status with peer 80.81.192.3 is established', []), + (u'100.96.1.38', 'default', + [(2, u'Status with peer 100.96.1.38 is active', []), (0, 'operational status: running', [])]), ] } diff --git a/tests/unit/checks/generictests/datasets/juniper_bgp_state_ip_addresses.py b/tests/unit/checks/generictests/datasets/juniper_bgp_state_ip_addresses.py new file mode 100644 index 0000000..1d8c10c --- /dev/null +++ b/tests/unit/checks/generictests/datasets/juniper_bgp_state_ip_addresses.py @@ -0,0 +1,37 @@ +checkname = 'juniper_bgp_state' + +info = [ + [u'4', u'1', 'DE AD BE EF 00 40 01 11 00 00 00 00 00 00 00 01'], + [u'4', u'2', '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'], + [u'4', u'2', 'DE AD BE EF 00 40 01 11 00 00 00 00 00 00 00 00'], + [u'4', u'1', '00 00 00 00 00 40 01 11 00 00 10 0A 00 00 00 00'], + [u'5', u'2', 'this is not a valid IP'], +] + +discovery = { + '': [ + (u'[dead:beef:40:111::1]', {}), (u'[::]', {}), + (u'[dead:beef:40:111::]', {}), (u'[::40:111:0:100a:0:0]', {}), + (u"'this is not a valid IP'", {}), + ] +} + +checks = { + '': [ + (u'[dead:beef:40:111::1]', 'default', + [(0, u'Status with peer [dead:beef:40:111::1] is opensent', []), + (1, 'operational status: halted', [])]), + (u'[::]', 'default', + [(2, u'Status with peer [::] is opensent', []), + (0, 'operational status: running', [])]), + (u'[dead:beef:40:111::]', 'default', + [(2, u'Status with peer [dead:beef:40:111::] is opensent', []), + (0, 'operational status: running', [])]), + (u'[::40:111:0:100a:0:0]', 'default', + [(0, u'Status with peer [::40:111:0:100a:0:0] is opensent', []), + (1, 'operational status: halted', [])]), + (u"'this is not a valid IP'", 'default', + [(2, u"Status with peer 'this is not a valid IP' is openconfirm", []), + (0, 'operational status: running', [])]), + ] +}

5 years, 6 months

[CMK-1382] - prevent agent crash when the error occurs during reading eventlog

by Sergey Kipnis

Module: check_mk Branch: master Commit: db66714eeef0e51f45f25715df56a0f95185e1c3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=db66714eeef0e5… Author: Sergey Kipnis <sk(a)mathias-kettner.de> Date: Tue Dec 4 15:01:27 2018 +0100 [CMK-1382] - prevent agent crash when the error occurs during reading eventlog 6864 FIX Windows Agent crash during access to Event Log Sometimes Windows Agent may crash when accessing Windows Event Log because the size of the Log is too big or the Log itself is broken. Now Windows Agent should skip such logs. Change-Id: Ie513d5bb409b93bf2155a3d77481de0ec4cb02f1 --- .werks/6864 | 12 ++++++++++++ agents/windows/EventLog.cc | 23 +++++++++++++++++++---- 2 files changed, 31 insertions(+), 4 deletions(-) diff --git a/.werks/6864 b/.werks/6864 new file mode 100644 index 0000000..08ce3ef --- /dev/null +++ b/.werks/6864 @@ -0,0 +1,12 @@ +Title: Windows Agent crash during access to Event Log +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1543932376 +Class: fix + +Sometimes Windows Agent may crash when accessing Windows Event Log +because the size of the Log is too big or the Log itself is broken. +Now Windows Agent should skip such logs. diff --git a/agents/windows/EventLog.cc b/agents/windows/EventLog.cc index 4726833..23d7ce8 100644 --- a/agents/windows/EventLog.cc +++ b/agents/windows/EventLog.cc @@ -175,8 +175,9 @@ wstring MessageResolver::resolve(DWORD eventID, LPCWSTR source, result += parameters[i]; } } - std::replace_if(result.begin(), result.end(), - [](wchar_t ch) { return ch == '\n' || ch == '\r'; }, ' '); + std::replace_if( + result.begin(), result.end(), + [](wchar_t ch) { return ch == '\n' || ch == '\r'; }, ' '); return result; } @@ -307,8 +308,22 @@ std::unique_ptr<EventLogRecordBase> EventLog::read() { if (result == nullptr) { // no fitting record in our buffer, get the next couple of // records - if (!fillBuffer()) { - // no more events to read, break out of the loop + try { + if (!fillBuffer()) { + // no more events to read, break out of the loop + break; + } + } catch (const std::exception &e) { + // win_exception is coming here + // generated exception in fillBuffer must be processed in any + // case usually we have something like FILE_TOO_LARGE(223) + // during reading Event Log and fpor some reason we thorw + // exception. Bad? Bad. In Fact, we have SERIOUS problem with + // monitored host. Our Log was informed. Probably we need some + // additional checks pointing that logs are either bad or + // overflown + Debug(_logger) + << "Error reading event log. Exception is " << e.what(); break; } }

5 years, 7 months

Add dedicated log level option for GUI automation calls

by Lars Michelsen

Module: check_mk Branch: master Commit: 53daa71e13f0132002ace7572a9b02b4943a340a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=53daa71e13f013… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Dec 4 14:20:37 2018 +0100 Add dedicated log level option for GUI automation calls Change-Id: I9b7f652ac453bc88a73c61526f3a6ed5f3fd7896 --- cmk/gui/plugins/config/base.py | 1 + cmk/gui/plugins/wato/check_mk_configuration.py | 3 +++ cmk/gui/watolib.py | 2 +- 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/cmk/gui/plugins/config/base.py b/cmk/gui/plugins/config/base.py index 46a160b..ce2826c 100644 --- a/cmk/gui/plugins/config/base.py +++ b/cmk/gui/plugins/config/base.py @@ -53,6 +53,7 @@ log_levels = { "cmk.web.ldap": 30, "cmk.web.auth": 30, "cmk.web.bi.compilation": 30, + "cmk.web.automations": 30, } # New style, used by WATO diff --git a/cmk/gui/plugins/wato/check_mk_configuration.py b/cmk/gui/plugins/wato/check_mk_configuration.py index 7f3b9f4..b5da70f 100644 --- a/cmk/gui/plugins/wato/check_mk_configuration.py +++ b/cmk/gui/plugins/wato/check_mk_configuration.py @@ -182,6 +182,9 @@ class ConfigVariableLogLevels(ConfigVariable): _("If this option is enabled, Check_MK BI will create a log with details " "about compiling BI aggregations. This includes statistics and " "details for each executed compilation.")), + ("cmk.web.automations", _("Automation calls"), + _("Communication between different components of Check_MK (e.g. GUI and check engine) " + "will be logged in this log level.")) ]: elements.append((level_id, LogLevelChoice( diff --git a/cmk/gui/watolib.py b/cmk/gui/watolib.py index ebcb36d..0cfb9a3 100644 --- a/cmk/gui/watolib.py +++ b/cmk/gui/watolib.py @@ -7189,7 +7189,7 @@ def check_mk_local_automation(command, args=None, indata="", stdin_data=None, ti if args is None: args = [] - auto_logger = logger.getChild("config.automations") + auto_logger = logger.getChild("automations") if timeout: args = ["--timeout", "%d" % timeout] + args

5 years, 7 months

Improve GUI logging

by Lars Michelsen

Module: check_mk Branch: master Commit: 71910d09e3e0706c2dba84bb98adac320599aa1c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=71910d09e3e070… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Dec 4 14:12:20 2018 +0100 Improve GUI logging * The GUI log (var/log/web.log) can now contain log entries from all python modules that are used during GUI python code processing. * Initialize logging to web.log not only for "cmk.gui" logger but also for the top level root logger. * Initialize top level logger levels with the configured overall GUI log level. Change-Id: I2086f7603819134afebb0a44c059f5ff674c613d --- cmk/gui/log.py | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/cmk/gui/log.py b/cmk/gui/log.py index b5d32b7..17dc101 100644 --- a/cmk/gui/log.py +++ b/cmk/gui/log.py @@ -64,14 +64,22 @@ def init_logging(): def _setup_web_log_logging(): - del logger.handlers[:] # First remove all handlers + del logger.root.handlers[:] # First remove all handlers handler = _logging.FileHandler("%s/web.log" % cmk.paths.log_dir, encoding="UTF-8") handler.setFormatter(cmk.log.get_formatter()) - logger.addHandler(handler) + + # Setup logging for the root logger to be able to get library log entries in the + # log of the web application + logger.root.addHandler(handler) def set_log_levels(log_levels): + # Setup logging for the root logger to be able to get library log entries in the + # log of the web application + logger.root.setLevel(log_levels["cmk.web"]) + cmk.log.logger.setLevel(log_levels["cmk.web"]) + for logger_name, level in log_levels.items(): _logging.getLogger(logger_name).setLevel(level)

5 years, 7 months

Add debug log entries for file locking logic

by Lars Michelsen

Module: check_mk Branch: master Commit: 9c19e2473d44961f6279562063a4a87b605f01da URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9c19e2473d4496… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Dec 4 14:03:43 2018 +0100 Add debug log entries for file locking logic Change-Id: I5cf8fc5da1eca139edfa2b158aa1fcc58b8ffd3b --- cmk/store.py | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/cmk/store.py b/cmk/store.py index 9634c12..3b53c23 100644 --- a/cmk/store.py +++ b/cmk/store.py @@ -36,9 +36,12 @@ import time import pathlib2 as pathlib +import cmk.log from cmk.exceptions import MKGeneralException, MKTimeout from cmk.i18n import _ +logger = cmk.log.get_logger("store") + # TODO: Make all methods handle paths the same way. e.g. mkdir() and makedirs() # care about encoding a path to UTF-8. The others don't to that. @@ -274,6 +277,8 @@ def aquire_lock(path, blocking=True): if path in g_locked_paths: return True # No recursive locking + logger.debug("Try aquire lock on %s", path) + # Create file (and base dir) for locking if not existant yet if not os.path.exists(os.path.dirname(path)): os.makedirs(os.path.dirname(path), mode=0770) @@ -295,6 +300,8 @@ def aquire_lock(path, blocking=True): os.close(fd) fd = fd_new + logger.debug("Got lock on %s", path) + g_aquired_locks.append((path, fd)) g_locked_paths.append(path) @@ -314,6 +321,8 @@ def release_lock(path): if path not in g_locked_paths: return # no unlocking needed + logger.debug("Releasing lock on %s", path) + for lock_path, fd in g_aquired_locks: if lock_path != path: continue @@ -330,6 +339,7 @@ def release_lock(path): break g_locked_paths.remove(path) + logger.debug("Released lock on %s", path) def have_lock(path): @@ -338,6 +348,9 @@ def have_lock(path): def release_all_locks(): global g_aquired_locks, g_locked_paths + logger.debug("Releasing all locks") + logger.debug("g_aquired_locks: %r", g_aquired_locks) + logger.debug("g_locked_paths: %r", g_locked_paths) for path, _unused_fd in g_aquired_locks: release_lock(path)

5 years, 7 months

6654 FIX Bug fixing in predictive levels and refactoring

by Óscar Nájera

Module: check_mk Branch: master Commit: 6aa4a181a94e4fa95623b5b5552e7474bdcb0421 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6aa4a181a94e4f… Author: Óscar Nájera <on(a)mathias-kettner.de> Date: Wed Nov 21 14:15:22 2018 +0100 6654 FIX Bug fixing in predictive levels and refactoring Predictive levels calculations suffered from some buggy behaviors under certain configuration conditions like: no predictions after 22:30, inhability to fetch data despite months of available perf data, prediction pointer offset by an hour in timezones with dayligth savings time. - Document current behavior of get_rrd_data, add test for it, in case it is ever modified. - Since livestatus always replies, elevate exception of no data available to data consolidation function. Should fix symptoms of [FEED-369] - [CMK-1368] Fix integer division when estimating scale resolution. Now all time resolutions are correctly mapped to the desired/available time range - [FEED-3133] Fix predictive monitoring timezone issue - Use JSON format to store and read prediction data aggregate & info. JSON is 7x faster that ast.literal_eval and it is safer. Tuple data type is lost, thus when comparing to parameters config a conversion needs to take place. - Functions in cmk_base/prediction are split in smaller more testable units - Unit test for data processing functions in predictive levels - Integration test for data retrieval & aggregation for predictive levels - Include a sample rrd datafile to query historic data and expected aggregation - Remove repeated code between cmk_base/prediction & cmk/gui/prediction Change-Id: I11b134f3d57e7867bba33fb1b926550eb0b489a8 --- .werks/6654 | 13 + active_checks/check_cpu_peaks | 2 +- cmk/gui/prediction.py | 119 ++------ cmk/prediction.py | 165 +++++++++++ cmk_base/prediction.py | 321 +++++++++------------ tests/integration/cmk_base/test-files/26 | 1 + tests/integration/cmk_base/test-files/26.info | 1 + .../integration/cmk_base/test-files/CPU_load.info | 3 + tests/integration/cmk_base/test-files/CPU_load.rrd | Bin 0 -> 1151496 bytes tests/integration/cmk_base/test-files/everyday | 1 + .../integration/cmk_base/test-files/everyday.info | 1 + tests/integration/cmk_base/test-files/thursday | 1 + .../integration/cmk_base/test-files/thursday.info | 1 + .../cmk_base/test_services_prediction.py | 121 ++++++++ tests/unit/cmk/test_prediction_commons.py | 61 ++++ tests/unit/cmk_base/test_prediction.py | 99 +++---- 16 files changed, 566 insertions(+), 344 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=6aa4a181a9…

5 years, 7 months

Fixed and enabled singleton-comparison warning.

by Sven Panne

Module: check_mk Branch: master Commit: 2519b6515ce2dff5d3974240eab4760d2ddbab69 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2519b6515ce2df… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Dec 4 09:23:55 2018 +0100 Fixed and enabled singleton-comparison warning. Note: This is a quite conservative change, we seem to distinguish between None, False, "", etc. at a few places. :-P This is highly dangerous, and should probably be fixed later. Change-Id: I1c7847741fe2e263df6fcc9f2f0e5123fec22baa --- .pylintrc | 4 ---- agents/plugins/mtr | 8 ++++---- agents/special/agent_emcvnx | 2 +- agents/special/agent_ibmsvc | 2 +- agents/special/agent_storeonce | 2 +- bin/mkbackup | 6 ++---- checks/oracle_rman | 2 +- cmk/ec/main.py | 3 +-- cmk/ec/snmp.py | 2 +- cmk/gui/availability.py | 2 +- cmk/gui/background_job.py | 2 +- cmk/gui/backup.py | 8 ++++---- cmk/gui/bi.py | 4 ++-- cmk/gui/dashboard.py | 4 ++-- cmk/gui/htmllib.py | 2 +- cmk/gui/key_mgmt.py | 2 +- cmk/gui/mkeventd.py | 12 ++++++------ cmk/gui/mobile.py | 2 +- cmk/gui/multitar.py | 4 ++-- cmk/gui/pagetypes.py | 8 ++++---- cmk/gui/plugins/sidebar/wiki.py | 6 +++--- cmk/gui/plugins/userdb/ldap_connector.py | 2 +- cmk/gui/plugins/views/availability.py | 4 ++-- cmk/gui/plugins/views/perfometers/check_mk.py | 2 +- cmk/gui/plugins/visuals/filters.py | 10 +++++----- cmk/gui/plugins/wato/active_checks.py | 2 +- cmk/gui/plugins/wato/bi.py | 14 +++++++------- cmk/gui/plugins/wato/check_parameters/unsorted.py | 2 +- cmk/gui/plugins/wato/utils/__init__.py | 2 +- cmk/gui/plugins/wato/utils/simple_modes.py | 2 +- cmk/gui/table.py | 10 +++++----- cmk/gui/userdb.py | 2 +- cmk/gui/valuespec.py | 12 ++++++------ cmk/gui/visuals.py | 2 +- cmk/gui/wato/__init__.py | 2 +- cmk/gui/wato/mkeventd.py | 18 +++++++++--------- cmk/gui/wato/pages/analyze_configuration.py | 2 +- cmk/gui/wato/pages/audit_log.py | 2 +- cmk/gui/wato/pages/bulk_edit.py | 2 +- cmk/gui/wato/pages/custom_attributes.py | 2 +- cmk/gui/wato/pages/folders.py | 8 ++++---- cmk/gui/wato/pages/global_settings.py | 4 ++-- cmk/gui/wato/pages/groups.py | 2 +- cmk/gui/wato/pages/host_rename.py | 4 ++-- cmk/gui/wato/pages/host_tags.py | 12 ++++++------ cmk/gui/wato/pages/hosts.py | 2 +- cmk/gui/wato/pages/icons.py | 2 +- cmk/gui/wato/pages/ldap.py | 2 +- cmk/gui/wato/pages/notifications.py | 2 +- cmk/gui/wato/pages/pattern_editor.py | 2 +- cmk/gui/wato/pages/roles.py | 2 +- cmk/gui/wato/pages/rulesets.py | 2 +- cmk/gui/wato/pages/services.py | 2 +- cmk/gui/wato/pages/sites.py | 8 ++++---- cmk/gui/wato/pages/timeperiods.py | 2 +- cmk/gui/wato/pages/users.py | 4 ++-- cmk/gui/watolib.py | 12 ++++++------ cmk/man_pages.py | 4 ++-- cmk_base/core.py | 2 +- cmk_base/core_nagios.py | 2 +- omd/packages/omd/omdlib/main.py | 2 +- web/app/index.wsgi | 2 +- 62 files changed, 129 insertions(+), 136 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=2519b6515c…

5 years, 7 months

Small steps towards enabling wrong-import-position.

by Sven Panne

Module: check_mk Branch: master Commit: 583f402a470e472626a69b0bb9d9b907cf2e13ca URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=583f402a470e47… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon Dec 3 16:00:06 2018 +0100 Small steps towards enabling wrong-import-position. Change-Id: I47b324ef4bdd01a82b83618f018c2071dca1daca --- agents/plugins/mk_tinkerforge | 6 +++--- agents/special/agent_tinkerforge | 6 +++--- bin/check_mk | 4 +++- bin/mkbackup | 4 ++-- cmk/gui/key_mgmt.py | 4 +++- cmk/gui/plugins/views/utils.py | 3 +-- cmk_base/packaging.py | 3 +-- tests/pylint/test_pylint.py | 4 ++-- 8 files changed, 18 insertions(+), 16 deletions(-) diff --git a/agents/plugins/mk_tinkerforge b/agents/plugins/mk_tinkerforge index 865df75..3ee5d8e 100755 --- a/agents/plugins/mk_tinkerforge +++ b/agents/plugins/mk_tinkerforge @@ -63,6 +63,9 @@ import sys import os +from optparse import OptionParser +import time + def install(): dest = os.path.dirname(os.path.realpath(__file__)) @@ -96,9 +99,6 @@ DEFAULT_SETTINGS = { 'segment_display_brightness': 2 } -from optparse import OptionParser -import time - # globals segment_display_value = None segment_display_unit = "" diff --git a/agents/special/agent_tinkerforge b/agents/special/agent_tinkerforge index 7b6744c..b42b810 100755 --- a/agents/special/agent_tinkerforge +++ b/agents/special/agent_tinkerforge @@ -59,6 +59,9 @@ import os +from optparse import OptionParser +import time + DEFAULT_SETTINGS = { 'host': "localhost", 'port': 4223, @@ -66,9 +69,6 @@ DEFAULT_SETTINGS = { 'segment_display_brightness': 2 } -from optparse import OptionParser -import time - # globals segment_display_value = None segment_display_unit = "" diff --git a/bin/check_mk b/bin/check_mk index f087e30..5dc93b9 100755 --- a/bin/check_mk +++ b/bin/check_mk @@ -36,7 +36,9 @@ import sys import getopt # Needs to be placed before cmk modules, because they are not available -# when executed as non site user. +# when executed as non site user. Alas, this screws up our import ordering +# a bit, so we have to tell pylint about that. +# pylint: disable=wrong-import-position if not os.environ.get("OMD_SITE"): sys.stderr.write("Check_MK can be used only as site user.\n") sys.exit(1) diff --git a/bin/mkbackup b/bin/mkbackup index 213173c..5c59f81 100755 --- a/bin/mkbackup +++ b/bin/mkbackup @@ -24,8 +24,6 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. -VERSION = "1.4.0i1" - import ast import errno import fcntl @@ -61,6 +59,8 @@ import cmk.schedule as schedule import cmk.store as store from cmk.exceptions import MKTerminate, MKGeneralException +VERSION = "1.4.0i1" + # Is used to duplicate output from stdout/stderr to a the job log. This # is e.g. used during "mkbackup backup" to store the output. diff --git a/cmk/gui/key_mgmt.py b/cmk/gui/key_mgmt.py index 561fbd5..4f052e0 100644 --- a/cmk/gui/key_mgmt.py +++ b/cmk/gui/key_mgmt.py @@ -30,8 +30,10 @@ import time # This is needed for at least CentOS 5.5 # TODO: Drop this until all supported platforms have newer versions available. +# It it not 100% sure if we need this before the OpenSSL import, but we play +# safe here and tell pylint about that. +# pylint: disable=wrong-import-position os.environ["CRYPTOGRAPHY_ALLOW_OPENSSL_098"] = "1" - from OpenSSL import crypto import cmk.render diff --git a/cmk/gui/plugins/views/utils.py b/cmk/gui/plugins/views/utils.py index 385acdb..f4c3b63 100644 --- a/cmk/gui/plugins/views/utils.py +++ b/cmk/gui/plugins/views/utils.py @@ -51,6 +51,7 @@ from cmk.gui.htmllib import HTML from cmk.gui.i18n import _ from cmk.gui.globals import html from cmk.gui.exceptions import MKGeneralException +from cmk.gui.display_options import display_options # TODO: Better name it PainterOptions or DisplayOptions? There are options which only affect @@ -293,8 +294,6 @@ def view_title(view): return visuals.visual_title('view', view) -from cmk.gui.display_options import display_options - # TODO: Move this to view processing code. This must not be module global as # it contains request specific information painter_options = PainterOptions() diff --git a/cmk_base/packaging.py b/cmk_base/packaging.py index 4cbd9a6..ae55be4 100644 --- a/cmk_base/packaging.py +++ b/cmk_base/packaging.py @@ -39,10 +39,9 @@ import cmk.paths import cmk.ec.export import cmk.log -logger = cmk.log.get_logger(__name__) - import cmk_base.utils +logger = cmk.log.get_logger(__name__) pac_ext = ".mkp" diff --git a/tests/pylint/test_pylint.py b/tests/pylint/test_pylint.py index 8312049..1a8d795 100755 --- a/tests/pylint/test_pylint.py +++ b/tests/pylint/test_pylint.py @@ -127,7 +127,7 @@ def inv_tree(path, default_value=None): # add the modules # These pylint warnings are incompatible with our "concatenation technology". - f.write("# pylint: disable=reimported,ungrouped-imports,wrong-import-order\n") + f.write("# pylint: disable=reimported,ungrouped-imports,wrong-import-order,wrong-import-position\n") pylint_cmk.add_file(f, repo_path() + "/cmk_base/check_api.py") pylint_cmk.add_file(f, repo_path() + "/cmk_base/inventory_plugins.py") @@ -146,7 +146,7 @@ def _compile_bakery_plugins(pylint_test_dir): pylint_cmk.add_file( f, os.path.realpath(os.path.join(cmc_path(), "cmk_base/cee/agent_bakery_plugins.py"))) # This pylint warning is incompatible with our "concatenation technology". - f.write("# pylint: disable=reimported,wrong-import-order\n") + f.write("# pylint: disable=reimported,wrong-import-order,wrong-import-position\n") # Also add bakery plugins for path in pylint_cmk.check_files(os.path.join(cmc_path(), "agents/bakery")):

5 years, 7 months

6982 FIX apc_inrow_airflow: Fix scaling of airflow value

by Konstantin Büttner

Module: check_mk Branch: master Commit: ff9ce1fa9befa262faab79bcb433166628eb74e3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ff9ce1fa9befa2… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Tue Dec 4 13:39:21 2018 +0100 6982 FIX apc_inrow_airflow: Fix scaling of airflow value Change-Id: I32dcb897c4edc84451e64a48ea3f9a471ea98791 --- .werks/6982 | 11 +++++++++++ checks/apc_inrow_airflow | 15 +++++++++++---- 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/.werks/6982 b/.werks/6982 new file mode 100644 index 0000000..96f9196 --- /dev/null +++ b/.werks/6982 @@ -0,0 +1,11 @@ +Title: apc_inrow_airflow: Fix scaling of airflow value +Level: 1 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1543913545 + + diff --git a/checks/apc_inrow_airflow b/checks/apc_inrow_airflow index b94bd80..de7fb76 100644 --- a/checks/apc_inrow_airflow +++ b/checks/apc_inrow_airflow @@ -25,8 +25,8 @@ # Boston, MA 02110-1301 USA. apc_inrow_airflow_default_levels = { - "level_low": (5.0, 2.0), - "level_high": (10.0, 11.0), + "level_low": (500.0, 200.0), + "level_high": (1000.0, 1100.0), } @@ -36,7 +36,14 @@ def inventory_apc_inrow_airflow(info): def check_apc_inrow_airflow(_no_item, params, info): - flow = saveint(info[0][0]) / 100.0 + # The MIB states that this value is given in hundredths of liters per second. + # However, it appears that the device actually returns l/s, as the oom should + # be closer to 1000 l/s. (cf. https://www.apc.com/salestools/DRON-AAAR53/DRON-AAAR53_R1_EN.pdf) + try: + flow = float(info[0][0]) + except: + return + state = 0 message = "" @@ -57,7 +64,7 @@ def check_apc_inrow_airflow(_no_item, params, info): message = "too high" perf = [("flow", flow, warn, crit)] - return state, "Current: %.2fl/s %s" % (flow, message), perf + return state, "Current: %.0f l/s %s" % (flow, message), perf check_info["apc_inrow_airflow"] = {

5 years, 7 months

← Newer
1
...
28
29
30
31
32
33
34
35
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits December 2018