Checkmk git commits November 2016

checkmk-commits@lists.checkmk.com

9 participants
299 discussions

by Sven Panne

Module: check_mk Branch: master Commit: 5b52c7ed1051f8c92fb95164b807c9b99896622c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5b52c7ed1051f8… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Nov 24 13:07:08 2016 +0100 Fetched livestatus from downstream. --- ...{EmptyColumn.cc => AttributeListAsIntColumn.cc} | 21 +++-- ...buteListFilter.h => AttributeListAsIntColumn.h} | 35 +++++---- livestatus/src/AttributeListColumn.cc | 51 +++++++------ livestatus/src/AttributeListColumn.h | 15 ++-- livestatus/src/AttributeListFilter.cc | 89 ---------------------- livestatus/src/EmptyColumn.h | 48 ------------ livestatus/src/IntColumn.cc | 6 +- livestatus/src/IntFilter.cc | 12 ++- livestatus/src/Makefile.am | 3 +- livestatus/src/TableContacts.cc | 7 +- livestatus/src/TableHosts.cc | 7 +- livestatus/src/TableServices.cc | 7 +- 12 files changed, 94 insertions(+), 207 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=5b52c7ed10…

7 years, 10 months

4070 Added a painter for the service check period

by Lars Michelsen

Module: check_mk Branch: master Commit: 8281a737550b5c3037220c1612e8f825872ca266 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8281a737550b5c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Nov 24 13:29:05 2016 +0100 4070 Added a painter for the service check period --- .werks/4070 | 9 +++++++++ ChangeLog | 1 + web/plugins/views/painters.py | 7 +++++++ 3 files changed, 17 insertions(+) diff --git a/.werks/4070 b/.werks/4070 new file mode 100644 index 0000000..7ebabbd --- /dev/null +++ b/.werks/4070 @@ -0,0 +1,9 @@ +Title: Added a painter for the service check period +Level: 1 +Component: multisite +Compatible: compat +Version: 1.4.0i3 +Date: 1479990534 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index 7fcd02f..bdf0b95 100644 --- a/ChangeLog +++ b/ChangeLog @@ -25,6 +25,7 @@ * 4092 FIX: if.include: fixed wrong calculated number of interfaces which are up Multisite: + * 4070 Added a painter for the service check period * 3974 FIX: Sorting comments in hover menu of comments icon by time now * 4040 FIX: Fix error in view about "No WATO folder ..." in case of host imported via cmcdump... * 4046 FIX: Repaired html rendering.... diff --git a/web/plugins/views/painters.py b/web/plugins/views/painters.py index 4b7fb58..283c4e3 100644 --- a/web/plugins/views/painters.py +++ b/web/plugins/views/painters.py @@ -918,6 +918,13 @@ multisite_painters["svc_notifper"] = { "paint" : lambda row: (None, row["service_notification_period"]), } +multisite_painters["svc_check_period"] = { + "title" : _("Service check period"), + "short" : _("check."), + "columns" : [ "service_check_period" ], + "paint" : lambda row: (None, row["service_check_period"]), +} + multisite_painters["svc_flapping"] = { "title" : _("Service is flapping"), "short" : _("Flap"),

7 years, 10 months

updated werk text

by Simon Betz

Module: check_mk Branch: master Commit: d6580433e128bc76acd2abda7ca6de6f7e7fa3b7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d6580433e128bc… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Nov 24 12:16:48 2016 +0100 updated werk text --- .werks/4092 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/4092 b/.werks/4092 index a60c7d2..3b9a46b 100644 --- a/.werks/4092 +++ b/.werks/4092 @@ -1,4 +1,4 @@ -Title: if.include: fixed wrong calculated number of interfaces which are up +Title: if.include: fixed wrong calculated number of interfaces which are up in case of interface groups Level: 1 Component: checks Class: fix

7 years, 10 months

4092 FIX if.include: fixed wrong calculated number of interfaces which are up

by Simon Betz

Module: check_mk Branch: master Commit: c0814e9288846475fa19e9d13354fb86239f7c97 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c0814e92888464… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Nov 24 12:15:22 2016 +0100 4092 FIX if.include: fixed wrong calculated number of interfaces which are up --- .werks/4092 | 10 ++++++++++ ChangeLog | 1 + checks/if.include | 2 +- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/4092 b/.werks/4092 new file mode 100644 index 0000000..a60c7d2 --- /dev/null +++ b/.werks/4092 @@ -0,0 +1,10 @@ +Title: if.include: fixed wrong calculated number of interfaces which are up +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.4.0i3 +Date: 1479985997 + + diff --git a/ChangeLog b/ChangeLog index e38b932..7fcd02f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -22,6 +22,7 @@ * 4090 FIX: apc_rackpdu_power, apc_symmetra, apc_symmetra_input, apc_symmetra_output: some fixes... * 4091 FIX: oracle_tablespace: Werk 3907 broke the detection of UNDO- and TEMP-Tablespaces * 4069 FIX: cmciii.phase: Fixed broken check with some devices... + * 4092 FIX: if.include: fixed wrong calculated number of interfaces which are up Multisite: * 3974 FIX: Sorting comments in hover menu of comments icon by time now diff --git a/checks/if.include b/checks/if.include index 4a866df..a5b7cd1 100644 --- a/checks/if.include +++ b/checks/if.include @@ -513,7 +513,7 @@ def check_if_common(item, params, info, has_nodeinfo = False, group_name = "Grou ifOutQLen, ifAlias, ifPhysAddress = line if ifOperStatus == '1' or ( - type(ifOperStatus) == tuple and ifOperStatus == '1'): + type(ifOperStatus) == tuple and ifOperStatus[0] == '1'): num_up += 1 if num_up == len(matching_interfaces):

7 years, 10 months

4069 FIX cmciii.phase: Fixed broken check with some devices

by Lars Michelsen

Module: check_mk Branch: master Commit: 89337fce5980a4a15f55f13fcc3b2f57a170b5a0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=89337fce5980a4… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Nov 24 09:36:49 2016 +0100 4069 FIX cmciii.phase: Fixed broken check with some devices The check failed to discover services on devices not reporting a "device" info in the phase name. The check also failed for devices having spaces in the unit names. --- .werks/4069 | 13 +++++++++++++ ChangeLog | 1 + checks/cmciii | 31 +++++++++++++++++++++++++------ 3 files changed, 39 insertions(+), 6 deletions(-) diff --git a/.werks/4069 b/.werks/4069 new file mode 100644 index 0000000..66269ee --- /dev/null +++ b/.werks/4069 @@ -0,0 +1,13 @@ +Title: cmciii.phase: Fixed broken check with some devices +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.4.0i3 +Date: 1479976504 + +The check failed to discover services on devices not reporting a +"device" info in the phase name. + +The check also failed for devices having spaces in the unit names. diff --git a/ChangeLog b/ChangeLog index a186e1f..e38b932 100644 --- a/ChangeLog +++ b/ChangeLog @@ -21,6 +21,7 @@ * 4088 FIX: ntp: fixed incomplete data handling * 4090 FIX: apc_rackpdu_power, apc_symmetra, apc_symmetra_input, apc_symmetra_output: some fixes... * 4091 FIX: oracle_tablespace: Werk 3907 broke the detection of UNDO- and TEMP-Tablespaces + * 4069 FIX: cmciii.phase: Fixed broken check with some devices... Multisite: * 3974 FIX: Sorting comments in hover menu of comments icon by time now diff --git a/checks/cmciii b/checks/cmciii index 5300a88..5f0cb34 100644 --- a/checks/cmciii +++ b/checks/cmciii @@ -856,8 +856,15 @@ def reparse_cmciii_phase(parsed): for name, value in inputs.items(): if name[1].find("Phase") != -1: parts = name[1].split('.') + + # Prepend an empty device name to handle the special case where + # no device name is given in the alias + if name[1].startswith("Phase "): + parts = [""] + parts + if len(parts) == 3: device, phase, value_name = parts + else: device, phase, value_name, value_name_add = parts value_name = (value_name, value_name_add) @@ -866,23 +873,35 @@ def reparse_cmciii_phase(parsed): unit = units[unit_id-1][1] phase = phase[-1] + # Device may contain spaces. Replace them because spaces will break + # item matching in the check. + device = device.replace(" ", "_") + output.setdefault((unit, device, phase), {}) output[(unit, device, phase)][value_name] = value - - return output def inventory_cmciii_phase(parsed): parsed = reparse_cmciii_phase(parsed) - for device, unit, phase in parsed.keys(): - yield "%s %s Phase %s" % (device, unit, phase), {} + for unit, device, phase in parsed.keys(): + if device: + item = "%s %s Phase %s" % (unit, device, phase) + else: + item = "%s Phase %s" % (unit, phase) + + yield item, {} def check_cmciii_phase(item, params, parsed): - device, unit, word, phase = item.split() - data = reparse_cmciii_phase(parsed)[(device, unit, phase)] + item_parts = item.split() + if len(item_parts) == 3: + unit, device, phase = item_parts[0], "", item_parts[-1] + else: + unit, device, _unused, phase = item_parts + + data = reparse_cmciii_phase(parsed)[(unit, device, phase)] parsed = {} parsed[item] = {}

7 years, 10 months

Cleaned up all_hosts_untagged and all_clusters_untagged to use standard caching mechanism

by Lars Michelsen

Module: check_mk Branch: master Commit: 26e9776588779d568372824885cb70d6fae4ebe4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=26e9776588779d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Nov 23 18:32:15 2016 +0100 Cleaned up all_hosts_untagged and all_clusters_untagged to use standard caching mechanism --- modules/check_mk.py | 38 +++++++++++++++++--------------------- 1 file changed, 17 insertions(+), 21 deletions(-) diff --git a/modules/check_mk.py b/modules/check_mk.py index 38e60e0..633b330 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -619,21 +619,25 @@ def duplicate_hosts(): # Returns a set of all host names to be handled by this site # hosts of other sitest or disabled hosts are excluded -all_hosts_untagged = None def all_active_realhosts(): - global all_hosts_untagged - if all_hosts_untagged == None: - all_hosts_untagged = filter_active_hosts(all_configured_realhosts()) - return all_hosts_untagged + active_realhosts = cmk_base.config_cache.get_set("active_realhosts") + + if active_realhosts.is_empty(): + active_realhosts.update(filter_active_hosts(all_configured_realhosts())) + + return active_realhosts + # Returns a set of all cluster host names to be handled by # this site hosts of other sitest or disabled hosts are excluded -all_clusters_untagged = None def all_active_clusters(): - global all_clusters_untagged - if all_clusters_untagged == None: - all_clusters_untagged = filter_active_hosts(all_configured_clusters()) - return all_clusters_untagged + active_clusters = cmk_base.config_cache.get_set("active_clusters") + + if active_clusters.is_empty(): + active_clusters.update(filter_active_hosts(all_configured_clusters())) + + return active_clusters + # Returns a set of active hosts for this site def filter_active_hosts(hostlist, keep_offline_hosts=False): @@ -653,6 +657,7 @@ def filter_active_hosts(hostlist, keep_offline_hosts=False): if (keep_offline_hosts or in_binary_hostlist(hostname, only_hosts)) and host_is_member_of_site(hostname, distributed_wato_site) ]) + def host_is_member_of_site(hostname, site): for tag in tags_of_host(hostname): if tag.startswith("site:"): @@ -660,6 +665,7 @@ def host_is_member_of_site(hostname, site): # hosts without a site: tag belong to all sites return True + def parse_hostname_list(args, with_clusters = True, with_foreign_hosts = False): if with_foreign_hosts: valid_hosts = all_configured_realhosts() @@ -2415,8 +2421,6 @@ skipped_config_variable_names = [ "contacts", "host_paths", "timeperiods", - "all_hosts_untagged", - "all_clusters_untagged", "extra_service_conf", "extra_host_conf", "extra_nagios_conf", @@ -4139,14 +4143,6 @@ def cleanup_globals(): # | Code for reading the configuration files. | # '----------------------------------------------------------------------' -# These variables shal be ignored when performing checks which global -# variables have been changed during runtime of e.g. the Check_MK -# keepalive mode -ignore_changed_global_variables = [ - 'all_hosts_untagged', - 'all_clusters_untagged', -] - vars_before_config = set([]) # Now - at last - we can read in the user's configuration files @@ -4304,7 +4300,7 @@ def read_config_files(with_conf_d=True, validate_hosts=True): vars_after_config = all_nonfunction_vars() ignored_variables = set(['vars_before_config', 'parts', 'hosttags' ,'seen_hostnames', - 'taggedhost' ,'hostname'] + ignore_changed_global_variables) + 'taggedhost' ,'hostname']) errors = 0 for name in vars_after_config: if name not in ignored_variables and name not in vars_before_config:

7 years, 10 months

Cleaned up derived config var "hosttags" to use generic caching mechanism

by Lars Michelsen

Module: check_mk Branch: master Commit: ddbd764c1aac45289b894563fe97f9670fcd4bc6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ddbd764c1aac45… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Nov 23 18:36:56 2016 +0100 Cleaned up derived config var "hosttags" to use generic caching mechanism --- modules/check_mk.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/modules/check_mk.py b/modules/check_mk.py index 633b330..5af77ff 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -1265,16 +1265,17 @@ def strip_tags(tagged_hostlist): def tags_of_host(hostname): + hosttags = cmk_base.config_cache.get_dict("hosttags") try: return hosttags[hostname] except KeyError: return [] -hosttags = {} def collect_hosttags(): - for taggedhost in all_hosts + clusters.keys(): - parts = taggedhost.split("|") + hosttags = cmk_base.config_cache.get_dict("hosttags") + for tagged_host in all_hosts + clusters.keys(): + parts = tagged_host.split("|") hosttags[parts[0]] = sorted(parts[1:]) @@ -2406,7 +2407,7 @@ def get_piggyback_translation(hostname): # Make service levels available during check execution service_service_levels = None host_service_levels = None -derived_config_variable_names = [ "hosttags", "service_service_levels", "host_service_levels" ] +derived_config_variable_names = [ "service_service_levels", "host_service_levels" ] # These variables are part of the Check_MK configuration, but are not needed # by the Check_MK keepalive mode, so exclude them from the packed config @@ -4299,7 +4300,7 @@ def read_config_files(with_conf_d=True, validate_hosts=True): # Check for invalid configuration variables vars_after_config = all_nonfunction_vars() ignored_variables = set(['vars_before_config', 'parts', - 'hosttags' ,'seen_hostnames', + 'seen_hostnames', 'taggedhost' ,'hostname']) errors = 0 for name in vars_after_config:

7 years, 10 months

added support for newer firmware

by Marcel Arentz

Module: check_mk Branch: master Commit: 8dac1b246d43bd4a73384e69d8f79e062b3d3513 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8dac1b246d43bd… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Wed Nov 23 16:07:25 2016 +0100 added support for newer firmware --- checks/emc_isilon_diskstatus | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/checks/emc_isilon_diskstatus b/checks/emc_isilon_diskstatus index b306375..16a91e9 100644 --- a/checks/emc_isilon_diskstatus +++ b/checks/emc_isilon_diskstatus @@ -51,6 +51,7 @@ check_info["emc_isilon_diskstatus"] = { 5, # diskStatus 7, # diskSerialNumber ]), - "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.12124.1") + "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.12124.1") or \ + oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.12325.1"), }

7 years, 10 months

Unified scan functions in all EMC Isilon checks

by Marcel Arentz

Module: check_mk Branch: master Commit: cec242bded7e8175d56aabba9c1ab92cf2c91146 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cec242bded7e81… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Wed Nov 23 17:46:47 2016 +0100 Unified scan functions in all EMC Isilon checks --- checks/emc_isilon | 2 +- checks/emc_isilon_diskstatus | 3 +-- checks/emc_isilon_iops | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/checks/emc_isilon b/checks/emc_isilon index 6c06717..0013ee4 100644 --- a/checks/emc_isilon +++ b/checks/emc_isilon @@ -33,7 +33,7 @@ emc_isilon_info = [(".1.3.6.1.4.1.12124.1.1", [1, # clusterName ] def emc_isilon_scan(oid): - return oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.12124.1") + return "isilon" in oid(".1.3.6.1.2.1.1.1.0").lower() # .--ClusterHealth------------------------------------------------------. diff --git a/checks/emc_isilon_diskstatus b/checks/emc_isilon_diskstatus index 16a91e9..a4bc5da 100644 --- a/checks/emc_isilon_diskstatus +++ b/checks/emc_isilon_diskstatus @@ -51,7 +51,6 @@ check_info["emc_isilon_diskstatus"] = { 5, # diskStatus 7, # diskSerialNumber ]), - "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.12124.1") or \ - oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.12325.1"), + "snmp_scan_function" : lambda oid: "isilon" in oid(".1.3.6.1.2.1.1.1.0").lower(), } diff --git a/checks/emc_isilon_iops b/checks/emc_isilon_iops index 09d3e8a..b0958f9 100644 --- a/checks/emc_isilon_iops +++ b/checks/emc_isilon_iops @@ -47,6 +47,6 @@ check_info["emc_isilon_iops"] = { [ 2, # diskPerfDeviceName 3, # diskPerfOpsPerSecond ]), - "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.12124.1") + "snmp_scan_function" : lambda oid: "isilon" in oid(".1.3.6.1.2.1.1.1.0").lower(), }

7 years, 10 months

Trying to make free port detection more robust

by Lars Michelsen

Module: check_mk Branch: master Commit: 6650e0de0e7e11bdacf77c01f51583c01970072d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6650e0de0e7e11… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Nov 23 17:10:52 2016 +0100 Trying to make free port detection more robust --- tests/testlib/__init__.py | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/tests/testlib/__init__.py b/tests/testlib/__init__.py index be63e83..d479d74 100644 --- a/tests/testlib/__init__.py +++ b/tests/testlib/__init__.py @@ -381,12 +381,20 @@ class Site(object): def get_free_port_from(self, port): - print "Trying port %d" % port - sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM) - while sock.connect_ex(('127.0.0.1', port)) == 0: - print "Port %d is already used, trying next" % port - port += 1 - sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM) + while True: + try: + print "Trying port %d" % port + sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM) + sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1) + sock.bind(("127.0.0.1", port)) + sock.listen(1) + sock.close() + + break # found a bindable port + except socket.error, e: + print "Failed to bind 127.0.0.1:%d: %s" % (port, e) + port += 1 + print "Using port %d" % port return port

7 years, 10 months

← Newer
1
...
5
6
7
8
9
10
11
...
30
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits November 2016