Checkmk git commits July 2017

checkmk-commits@lists.checkmk.com

11 participants
286 discussions

by Lars Michelsen

Module: check_mk Branch: master Commit: 36c835ac2f76eae3ec9c667ee7effe6cd4a1eea6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=36c835ac2f76ea… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jul 24 15:52:43 2017 +0200 Fixed editing bookmark lists Change-Id: I4dc734295fd9c24e647a2792fb4e79d18021eb1c --- web/plugins/sidebar/shipped.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/web/plugins/sidebar/shipped.py b/web/plugins/sidebar/shipped.py index 731bc51..5bf42a1 100644 --- a/web/plugins/sidebar/shipped.py +++ b/web/plugins/sidebar/shipped.py @@ -1453,7 +1453,9 @@ class BookmarkList(pagetypes.Overridable): "topic" : v[3], } - return [(_("Bookmarks"), [ + parameters = super(BookmarkList, cls).parameters() + + parameters += [(_("Bookmarks"), [ # sort-index, key, valuespec (2.5, "default_topic", TextUnicode( title = _("Default Topic") + "<sup>*</sup>", @@ -1506,6 +1508,8 @@ class BookmarkList(pagetypes.Overridable): )), ])] + return parameters + @classmethod def _load(cls):

6 years, 11 months

cmk: Prepare to support modes that do not load the checks

by Lars Michelsen

Module: check_mk Branch: master Commit: 74aeebe21362bc8f32c8549edbe7228a9d5edd15 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=74aeebe21362bc… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jul 24 11:50:49 2017 +0200 cmk: Prepare to support modes that do not load the checks Change-Id: I1f3720a1ea146223c8fdb8af0e884938bfe64790 --- bin/check_mk | 7 ++++--- cmk_base/modes/__init__.py | 11 ++++++++++- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/bin/check_mk b/bin/check_mk index dfc73e7..9af3b38 100755 --- a/bin/check_mk +++ b/bin/check_mk @@ -75,10 +75,11 @@ except getopt.GetoptError, err: # First load the general modifying options modes.process_general_options(opts) -# TODO: Why are we loading the checks in all modes? This is useless in some modes! -# But at least in case the config is needed, the checks are needed too, because +# At least in case the config is needed, the checks are needed too, because # the configuration may refer to check config variable names. -checks.load() +if len(set.intersection(set(modes.non_config_options()), + [o[0] for o in opts])) == 0: + checks.load() # Read the configuration files (main.mk, autochecks, etc.), but not for # certain operation modes that does not need them and should not be harmed diff --git a/cmk_base/modes/__init__.py b/cmk_base/modes/__init__.py index ba1cdae..727f6af 100644 --- a/cmk_base/modes/__init__.py +++ b/cmk_base/modes/__init__.py @@ -141,6 +141,14 @@ class Modes(object): return options + def non_checks_options(self): + options = [] + for mode in self._modes: + if not mode.needs_checks: + options += mode.options() + return options + + def parse_hostname_list(self, args, with_clusters=True, with_foreign_hosts=False): if with_foreign_hosts: valid_hosts = config.all_configured_realhosts() @@ -293,13 +301,14 @@ class Option(object): class Mode(Option): def __init__(self, long_option, handler_function, short_help, short_option=None, argument=False, argument_descr=None, argument_conv=None, argument_optional=False, - long_help=None, needs_config=True, sub_options=None): + long_help=None, needs_config=True, needs_checks=True, sub_options=None): # pylint: disable=bad-super-call super(Mode, self).__init__(long_option, short_help, short_option, argument, argument_descr, argument_conv, argument_optional, handler_function=handler_function) self.long_help = long_help self.needs_config = needs_config + self.needs_checks = needs_checks self.sub_options = sub_options or []

6 years, 11 months

Added missing link

by Lars Michelsen

Module: check_mk Branch: master Commit: 9deddb5755de7daea371f7137afe06c9723dbd04 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9deddb5755de7d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jul 24 14:31:21 2017 +0200 Added missing link Change-Id: Icf7071ef81e7ebd7909e8e8da8cf964e6e05e405 --- cmk_base/modes/cee.py | 1 + 1 file changed, 1 insertion(+) diff --git a/cmk_base/modes/cee.py b/cmk_base/modes/cee.py new file mode 120000 index 0000000..13d85bb --- /dev/null +++ b/cmk_base/modes/cee.py @@ -0,0 +1 @@ +../../enterprise/cmk_base/modes/cee.py \ No newline at end of file

6 years, 11 months

Introduce module hierarchy for automations

by Lars Michelsen

Module: check_mk Branch: master Commit: a474881b16955c0bfe709f51c4bd9e927b09d57b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a474881b16955c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jul 24 15:10:17 2017 +0200 Introduce module hierarchy for automations - Moved CEE specific automations to CEE code - Some automations don't load the checks anymore Example goal: Uploading MKPs with broken checks does not break whole MKP manager anymore. The MKP can then be deleted via the MKP manager to fix the issue. Change-Id: Id6c07093ff3a882e7cf56c011ecefc384c997b12 --- bin/.f12 | 1 + bin/check_mk | 2 +- cmk_base/automation.py | 1275 -------------------------------------- cmk_base/automations/__init__.py | 141 +++++ cmk_base/automations/cee.py | 1 + cmk_base/automations/check_mk.py | 1265 +++++++++++++++++++++++++++++++++++++ cmk_base/modes/__init__.py | 5 + cmk_base/modes/check_mk.py | 7 +- tests/pylint/test_pylint_misc.py | 5 + 9 files changed, 1423 insertions(+), 1279 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=a474881b16…

6 years, 11 months

Updated bug entries #2902

by Andreas Boesl

Module: check_mk Branch: master Commit: 91c9dd4447ec2cd72553ad1c72942ecc4075599a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=91c9dd4447ec2c… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Jul 24 14:59:13 2017 +0200 Updated bug entries #2902 Change-Id: I9fb371e603efa2e0da0feba38819889b554bb1e8 --- .bugs/2902 | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/.bugs/2902 b/.bugs/2902 index b10317f..cb04bcd 100644 --- a/.bugs/2902 +++ b/.bugs/2902 @@ -1,15 +1,8 @@ -Title: Agent bakery does not use local check plugins -Component: core +Title: Contact group inheritance in WATO +Component: wato State: open -Date: 2017-05-11 11:55:19 -Targetversion: 1.5.0 -Class: feature +Date: 2017-07-24 14:57:59 +Targetversion: future +Class: nastiness -To make this possible we need to abstract the source path for such files from the agent -bakery plugins. We could wrap the paths in a function which detects the real path. Something -like this: - -overridable_file_path("check_mk/agents/plugins/...") - -In case a local file is available it is used. Otherwise the regular file -below share is used. +See ticket #38 Uni-Leipzig

6 years, 11 months

Minor code cleanup

by Konstantin Büttner

Module: check_mk Branch: master Commit: 18d2b31e45d1efa1747f324c0e2899121ee6eff1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=18d2b31e45d1ef… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Mon Jul 24 14:30:58 2017 +0200 Minor code cleanup Change-Id: I7af9e93bfa1d8302520366f051b2fea791a72d2d --- checks/multipath | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/checks/multipath b/checks/multipath index fe40d85..0f472c4 100644 --- a/checks/multipath +++ b/checks/multipath @@ -246,22 +246,21 @@ def parse_multipath(info): # Proceed with next line after init continue - else: - if uuid != None: - # Handle special syntax | |- 2:0:0:1 sda ... - if line[0] == '|': - line = line[1:] - if reg_prio.search(l): - group['state'] = "".join(line[3:]) - elif len(line) >= 4 and reg_lun.match(line[1]): - luninfo = "%s(%s)" % (line[1], line[2]) - lun_info.append(luninfo) - state = line[4] - if not "active" in state: - broken_paths.append(luninfo) - numpaths += 1 - group['numpaths'] = numpaths - paths_info.append(line[2]) + elif uuid != None: + # Handle special syntax | |- 2:0:0:1 sda ... + if line[0] == '|': + line = line[1:] + if reg_prio.search(l): + group['state'] = "".join(line[3:]) + elif len(line) >= 4 and reg_lun.match(line[1]): + luninfo = "%s(%s)" % (line[1], line[2]) + lun_info.append(luninfo) + state = line[4] + if not "active" in state: + broken_paths.append(luninfo) + numpaths += 1 + group['numpaths'] = numpaths + paths_info.append(line[2]) return groups # Get list of UUIDs of all multipath devices

6 years, 11 months

4982 FIX zypper: Made check more robust against different SLES 12 service packs

by Simon Betz

Module: check_mk Branch: master Commit: b54552819be1f69c1492661c96f8b95e2bf7b783 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b54552819be1f6… Author: Simon Betz <si(a)mathias-kettner.de> Date: Mon Jul 24 14:36:51 2017 +0200 4982 FIX zypper: Made check more robust against different SLES 12 service packs Change-Id: I54358ae5122e26fdbc1cfc77d42ee807fd287c5b --- .werks/4982 | 11 +++++++++++ checks/zypper | 13 ++++++++++--- 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/.werks/4982 b/.werks/4982 new file mode 100644 index 0000000..d7267a9 --- /dev/null +++ b/.werks/4982 @@ -0,0 +1,11 @@ +Title: zypper: Made check more robust against different SLES 12 service packs +Level: 1 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i1 +Date: 1500899536 + + diff --git a/checks/zypper b/checks/zypper index d97a48a..23feab7 100644 --- a/checks/zypper +++ b/checks/zypper @@ -37,7 +37,7 @@ # Updates for openSUSE 12.1 12.1-1.4 | openSUSE-2012-324 | 1 | recommended | needed | util-linux: make mount honor 'noexec' and 'user' option # 1 | apache | package | (any) # 2 | mysql | package | (any) -# + # ...for SLES11: # <<<zypper:sep(124)>>> # 4 patches needed (2 security patches) @@ -45,7 +45,7 @@ # SLES11-SP4-Updates | slessp4-mysql-12847 | 1 | security | needed # SLES11-SP4-Updates | slessp4-timezone-12844 | 1 | recommended | needed # SLES11-SP4-Updates | slessp4-wget-12826 | 1 | recommended | needed -# + # ...new since SLES12: # <<<zypper:sep(124)>>> # 4 patches needed (1 security patches) @@ -54,6 +54,13 @@ # SLES12-SP1-Updates | SUSE-SLE-SERVER-12-SP1-2016-1149 | recommended | low | --- | needed | Recommended update for gcc48 # SLES12-SP1-Updates | SUSE-SLE-SERVER-12-SP1-2016-1150 | recommended | low | --- | needed | Recommended update for release-notes-sles +# <<<zypper:sep(124)>>> +# 4 patches needed (1 security patches) +# SLES12-SP0-Updates | SUSE-SLE-SERVER-12-2016-967 | recommended | low | needed | Recommended update for timezone +# SLES12-SP0-Updates | SUSE-SLE-SERVER-12-2016-981 | recommended | moderate | needed | Recommended update for mdadm +# SLES12-SP0-Updates | SUSE-SLE-SERVER-12-2016-987 | recommended | low | needed | Recommended update for procps +# SLES12-SP0-Updates | SUSE-SLE-SERVER-12-2016-997 | recommended | moderate | needed | Recommended update for bind + def inventory_zypper(info): # the agent section is only present when the agent has # detected that zypper is installed, therefore the check @@ -71,7 +78,7 @@ def check_zypper(_no_item, _no_params, info): # 5 patches needed (2 security patches) if len(line) >= 5: patch_type = None - if len(line) >= 6 and line[5].lower().strip() == 'needed': # since SLES12 + if len(line) >= 7 and line[5].lower().strip() == 'needed': # since SLES12 patch_type = line[2].strip() elif line[4].lower().strip() == 'needed': patch_type = line[3].strip()

6 years, 11 months

4853 FIX agent_netapp: Re-enabled some deprecated SSL Ciphers which were used in old 7mode filers

by Andreas Boesl

Module: check_mk Branch: master Commit: 4af123207b9b3dd52abfdddb458692cabc6ca7c6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4af123207b9b3d… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Jul 24 12:51:16 2017 +0200 4853 FIX agent_netapp: Re-enabled some deprecated SSL Ciphers which were used in old 7mode filers Our latest builtin python version removed the support for some SSL ciphers, because they are considered deprecated/insecure. These old ciphers are required, because some of the 7mode filers are unable to work with newer ciphers. Change-Id: I1675b0601cae1f6267054f66ee553ef22470df94 --- .werks/4853 | 14 ++++++++++++++ agents/special/agent_netapp | 11 +++++++++++ 2 files changed, 25 insertions(+) diff --git a/.werks/4853 b/.werks/4853 new file mode 100644 index 0000000..1778c3e --- /dev/null +++ b/.werks/4853 @@ -0,0 +1,14 @@ +Title: agent_netapp: Re-enabled some deprecated SSL Ciphers which were used in old 7mode filers +Level: 1 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i1 +Date: 1500893070 + +Our latest builtin python version removed the support for some SSL ciphers, +because they are considered deprecated/insecure. + +These old ciphers are required, because some of the 7mode filers are unable to work with newer ciphers. diff --git a/agents/special/agent_netapp b/agents/special/agent_netapp index 334093d..77f2654 100755 --- a/agents/special/agent_netapp +++ b/agents/special/agent_netapp @@ -175,6 +175,17 @@ else: except: pass + requests.packages.urllib3.util.ssl_.DEFAULT_CIPHERS += ":" + ":".join([ + "DH+3DES", + "DH+HIGH", + "ECDH+3DES", + "ECDH+HIGH", + "RSA+3DES", + "RSA+HIGH", + ]) + + + try: # lxml was quite promising in our test environment: Uses 2 times less CPU resources # Unfortunaly, it is not a builtin module and need to be installed manually with

6 years, 11 months

4980 FIX mssql_counters.file_sizes: Added readable titles of related metrics

by Simon Betz

Module: check_mk Branch: master Commit: 40302a4549dd7977bc44fe903124a0a2511a155e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=40302a4549dd79… Author: Simon Betz <si(a)mathias-kettner.de> Date: Mon Jul 24 12:25:27 2017 +0200 4980 FIX mssql_counters.file_sizes: Added readable titles of related metrics Change-Id: I7b3048240dc14d82ee0f80fa998ccff203efca4e --- .werks/4980 | 13 +++++++++++++ web/plugins/metrics/check_mk.py | 22 ++++++++++++++++++++++ 2 files changed, 35 insertions(+) diff --git a/.werks/4980 b/.werks/4980 new file mode 100644 index 0000000..46a5307 --- /dev/null +++ b/.werks/4980 @@ -0,0 +1,13 @@ +Title: mssql_counters.file_sizes: Added readable titles of related metrics +Level: 1 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i1 +Date: 1500891539 + +Previously the titles of the metrics 'data_files', 'log_files_used' +and 'log_files' were generated automatically and were not readable. +Now they have readable titles. diff --git a/web/plugins/metrics/check_mk.py b/web/plugins/metrics/check_mk.py index b260ff6..b223ba2 100644 --- a/web/plugins/metrics/check_mk.py +++ b/web/plugins/metrics/check_mk.py @@ -460,6 +460,24 @@ metric_info["file_count"] = { # database, tablespace +metric_info["data_files"] = { + "title" : _("Data files size"), + "unit" : "bytes", + "color" : "34/a", +} + +metric_info["log_files_used"] = { + "title" : _("Used size of log files"), + "unit" : "bytes", + "color" : "25/a", +} + +metric_info["log_files_total"] = { + "title" : _("Total size of log files"), + "unit" : "bytes", + "color" : "16/a", +} + metric_info["database_size"] = { "title" : _("Database size"), "unit" : "bytes", @@ -4859,6 +4877,10 @@ check_metrics["check_mk-mssql_counters.sqlstats"] = { "sql_re-compilations/sec" : { "name" : "requests_per_second" }, } +check_metrics["check_mk-mssql_counters.file_sizes"] = { + "log_files": { "name" : "log_files_total" }, +} + check_metrics["check_mk-cisco_mem"] = { "mem_used" : { "name" : "mem_used_percent" } }

6 years, 11 months

4852 FIX Livestatus connections: fixed bug where data from previous connection got reused

by Andreas Boesl

Module: check_mk Branch: master Commit: f81a29332490829b82d308a135ccdabd7a6f3df2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f81a2933249082… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Jul 24 10:51:39 2017 +0200 4852 FIX Livestatus connections: fixed bug where data from previous connection got reused When using persistent connections, there was a risk that the response data from previous livestatus queries got intermingled with the data from the latest query. This caused quite a lot of confusing for most of the GUI plugins, which crashed occasionally. Change-Id: Ib0629b08c1313a058f73339c60eb807ee9dc0ca6 --- .werks/4852 | 16 ++++++++++++++++ livestatus/api/python/livestatus.py | 30 +++++++++++++++++++----------- 2 files changed, 35 insertions(+), 11 deletions(-) diff --git a/.werks/4852 b/.werks/4852 new file mode 100644 index 0000000..294ec72 --- /dev/null +++ b/.werks/4852 @@ -0,0 +1,16 @@ +Title: Livestatus connections: fixed bug where data from previous connection got reused +Level: 1 +Component: livestatus +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i1 +Date: 1500885870 + +When using persistent connections, there was a risk that the response data from +previous livestatus queries got intermingled with the data from the latest query. + + +This caused quite a lot of confusing for most of the GUI plugins, which crashed occasionally. + diff --git a/livestatus/api/python/livestatus.py b/livestatus/api/python/livestatus.py index 5df2c38..7098da2 100644 --- a/livestatus/api/python/livestatus.py +++ b/livestatus/api/python/livestatus.py @@ -315,7 +315,10 @@ class BaseConnection: def disconnect(self): self.socket = None if self.persist: - del persistent_connections[self.socketurl] + try: + del persistent_connections[self.socketurl] + except KeyError: + pass def receive_data(self, size): result = "" @@ -384,6 +387,7 @@ class BaseConnection: try: length = int(resp[4:15].lstrip()) except: + self.disconnect() raise MKLivestatusSocketError("Malformed output. Livestatus TCP socket might be unreachable.") data = self.receive_data(length) @@ -392,6 +396,7 @@ class BaseConnection: try: return ast.literal_eval(data) except: + self.disconnect() raise MKLivestatusSocketError("Malformed output") elif code == "404": @@ -424,6 +429,10 @@ class BaseConnection: raise except Exception, e: + # Catches + # MKLivestatusQueryError + # MKLivestatusSocketError + # FIXME: ? self.disconnect() raise MKLivestatusSocketError("Unhandled exception: %s" % e) @@ -722,6 +731,7 @@ class MultiSiteConnection(Helpers): result += r stillalive.append( (sitename, site, connection) ) except Exception, e: + connection.disconnect() self.deadsites[sitename] = { "exception" : e, "site" : site, @@ -733,13 +743,15 @@ class MultiSiteConnection(Helpers): # of Limit: since all sites are queried in parallel, the Limit: is simply # applied to all sites - resulting in possibly more results then Limit requests. def query_parallel(self, query, add_headers = ""): + stillalive = [] if self.only_sites != None: - active_sites = [ c for c in self.connections if c[0] in self.only_sites ] + connect_to_sites = [ c for c in self.connections if c[0] in self.only_sites ] + # Unused sites are assumed to be alive + stillalive.extend( [ c for c in self.connections if c[0] not in self.only_sites]) else: - active_sites = self.connections + connect_to_sites = self.connections start_time = time.time() - stillalive = [] limit = self.limit if limit != None: limit_header = "Limit: %d\n" % limit @@ -747,7 +759,7 @@ class MultiSiteConnection(Helpers): limit_header = "" # First send all queries - for sitename, site, connection in active_sites: + for sitename, site, connection in connect_to_sites: try: connection.send_query(query, add_headers + limit_header) except Exception, e: @@ -764,11 +776,7 @@ class MultiSiteConnection(Helpers): # Then retrieve all answers. We will be as slow as the slowest of all # connections. result = [] - for sitename, site, connection in self.connections: - if self.only_sites != None and sitename not in self.only_sites: - stillalive.append( (sitename, site, connection) ) # state unknown, assume still alive - continue - + for sitename, site, connection in connect_to_sites: try: r = connection.recv_response(query, add_headers + limit_header) stillalive.append( (sitename, site, connection) ) @@ -780,12 +788,12 @@ class MultiSiteConnection(Helpers): continue except Exception, e: + connection.disconnect() self.deadsites[sitename] = { "exception" : e, "site" : site, } - self.connections = stillalive return result

6 years, 11 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits July 2017