Checkmk git commits May 2018

checkmk-commits@lists.checkmk.com

10 participants
375 discussions

by Tom Baerwinkel

Module: check_mk Branch: master Commit: 4c742891eb0d74a10e3cf29bd81864fb0051d8c6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4c742891eb0d74… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Tue May 15 11:24:46 2018 +0200 Minor refactoring of paint_logwatch Change-Id: Ic46e8012c3c32c95212d551d1fedd80996dce630 --- web/plugins/icons/builtin.py | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/web/plugins/icons/builtin.py b/web/plugins/icons/builtin.py index c7ab694..b68883c 100644 --- a/web/plugins/icons/builtin.py +++ b/web/plugins/icons/builtin.py @@ -449,14 +449,13 @@ multisite_icons_and_actions['custom_action'] = { # | | # '----------------------------------------------------------------------' -def logwatch_url(sitename, hostname, item): - return html.makeuri_contextless([("site", sitename), ("host", hostname), ("file", item)], filename="logwatch.py") - def paint_logwatch(what, row, tags, host_custom_vars): - if what != "service": + if what != "service" or row[what + "_check_command"] not in ['check_mk-logwatch', 'check_mk-logwatch.groups']: return - if row[what + "_check_command"] in [ 'check_mk-logwatch', 'check_mk-logwatch.groups' ]: - return 'logwatch', _('Open Log'), logwatch_url(row["site"], row['host_name'], row['service_description'][4:]) + + sitename, hostname, item = row['site'], row['host_name'], row['service_description'][4:] + url = html.makeuri_contextless([("site", sitename), ("host", hostname), ("file", item)], filename="logwatch.py") + return 'logwatch', _('Open Log'), url multisite_icons_and_actions['logwatch'] = { 'service_columns': [ 'host_name', 'service_description', 'check_command' ],

6 years, 4 months

Remove Python <2.5 support from the mail Plugin which did not work anyway

by Tom Baerwinkel

Module: check_mk Branch: master Commit: dd91ae6d71a73302ae4952786dd14703078c5cfd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dd91ae6d71a733… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Tue May 15 10:42:56 2018 +0200 Remove Python <2.5 support from the mail Plugin which did not work anyway Change-Id: Ie14aa3642ba077020df73939c3271c41a32c5216 --- notifications/mail | 26 +++++--------------------- 1 file changed, 5 insertions(+), 21 deletions(-) diff --git a/notifications/mail b/notifications/mail index 5404d7a..c0d862c 100755 --- a/notifications/mail +++ b/notifications/mail @@ -40,20 +40,10 @@ import urllib import urllib2 import base64 -try: - from email.mime.multipart import MIMEMultipart - from email.mime.text import MIMEText - from email.mime.application import MIMEApplication - from email.mime.image import MIMEImage -except ImportError: - # python <2.5 compat - # pylint: disable=no-name-in-module,import-error - from email.MIMEMultipart import MIMEMultipart - from email.MIMEText import MIMEText - from email.MIMEImage import MIMEImage - from email.MIMEBase import MIMEBase - from email import Encoders - MIMEApplication = None +from email.mime.multipart import MIMEMultipart +from email.mime.text import MIMEText +from email.mime.application import MIMEApplication +from email.mime.image import MIMEImage try: from simplejson import json @@ -461,13 +451,7 @@ def multipart_mail(target, subject, from_address, reply_to, content_txt, content if what == 'img': part = MIMEImage(contents, name = name) else: - if MIMEApplication != None: - part = MIMEApplication(contents, name = name) - else: - # python <2.5 compat - part = MimeBase('application', 'octet-stream') # pylint: disable=undefined-variable - part.set_payload(contents) - Encoders.encode_base64(part) + part = MIMEApplication(contents, name = name) part.add_header('Content-ID', '<%s>' % name) # how must be inline or attachment

6 years, 4 months

CMK-517: Add Werk 5277

by Andreas Umbreit

Module: check_mk Branch: master Commit: d5205ed8e8775f4862c4def909dea316fd3c97c0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d5205ed8e8775f… Author: Andreas Umbreit <au(a)mathias-kettner.de> Date: Mon May 14 10:25:35 2018 +0200 CMK-517: Add Werk 5277 5277 cmk-update-agent: Add support for proxy servers The agent updater is now able to connect to the Check_MK server via proxy. With this werk, a new checkbox "Use proxy server" is added to the Agent Updater rule configuration. You can now either configure a HTTP, SOCKS4 or SOCKS5 proxy (with optional credentials) or choose to follow the environment variables "HTTP_PROXY" and "HTTPS_PROXY" that may be set locally on the hosts. Please note that the configuration default is still set to ignore local proxy settings. Change-Id: I795942a25a5435956589eff21de6f4e7bf28e17f --- .werks/5277 | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/.werks/5277 b/.werks/5277 new file mode 100644 index 0000000..cfb52e4 --- /dev/null +++ b/.werks/5277 @@ -0,0 +1,14 @@ +Title: cmk-update-agent: Add support for proxy servers +Level: 2 +Component: agents +Compatible: compat +Edition: cee +Version: 1.6.0i1 +Date: 1526285787 +Class: feature + +The agent updater is now able to connect to the Check_MK server via proxy. + +With this werk, a new checkbox "Use proxy server" is added to the Agent Updater rule configuration. You can now either configure a HTTP, SOCKS4 or SOCKS5 proxy (with optional credentials) or choose to follow the environment variables "HTTP_PROXY" and "HTTPS_PROXY" that may be set locally on the hosts. + +Please note that the configuration default is still set to ignore local proxy settings.

6 years, 4 months

CMK-517: Add depencencies to test env

by Andreas Umbreit

Module: check_mk Branch: master Commit: 70e1ae335262dfd533edb584f1119650ee8b8ce3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=70e1ae335262df… Author: Andreas Umbreit <au(a)mathias-kettner.de> Date: Mon May 14 10:04:44 2018 +0200 CMK-517: Add depencencies to test env Change-Id: I8059f4d4da3b871e26e982bf83cb8c425787542c --- Pipfile | 2 +- Pipfile.lock | 309 +++++++++++++++++++++++++++++++---------------------------- 2 files changed, 165 insertions(+), 146 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=70e1ae3352…

6 years, 4 months

CMK-517: Update build-dependencies for cmk-update-agent(.exe)

by Andreas Umbreit

Module: check_mk Branch: master Commit: cbc67dcc012b9b6d47b3b83630567fced3a94a41 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cbc67dcc012b9b… Author: Andreas Umbreit <au(a)mathias-kettner.de> Date: Fri May 11 17:11:31 2018 +0200 CMK-517: Update build-dependencies for cmk-update-agent(.exe) Change-Id: I6082349affc01a28f62c919c8b36dec346b440ab --- .../windows/frozen_binaries/pyinstaller-deps.make | 70 ++++++++++++++------- .../src/pip/PyInstaller-3.2.1.tar.bz2 | Bin 2441721 -> 0 bytes .../src/pip/PyInstaller-3.3.1.tar.gz | Bin 0 -> 3458638 bytes .../frozen_binaries/src/pip/PySocks-1.6.8.tar.gz | Bin 0 -> 283450 bytes .../src/pip/altgraph-0.15-py2.py3-none-any.whl | Bin 0 -> 23260 bytes .../src/pip/asn1crypto-0.22.0-py2.py3-none-any.whl | Bin 97896 -> 0 bytes .../src/pip/asn1crypto-0.24.0-py2.py3-none-any.whl | Bin 0 -> 101571 bytes .../pip/certifi-2017.7.27.1-py2.py3-none-any.whl | Bin 349554 -> 0 bytes .../src/pip/certifi-2018.4.16-py2.py3-none-any.whl | Bin 0 -> 150367 bytes .../src/pip/cffi-1.10.0-cp27-cp27m-win32.whl | Bin 147485 -> 0 bytes .../src/pip/cffi-1.11.5-cp27-cp27m-win32.whl | Bin 0 -> 153593 bytes .../pip/cryptography-2.0.3-cp27-cp27m-win32.whl | Bin 1106984 -> 0 bytes .../pip/cryptography-2.2.2-cp27-cp27m-win32.whl | Bin 0 -> 1107198 bytes .../frozen_binaries/src/pip/dis3-0.1.2.tar.gz | Bin 0 -> 14466 bytes .../src/pip/ipaddress-1.0.18-py2-none-any.whl | Bin 17511 -> 0 bytes .../src/pip/ipaddress-1.0.22-py2.py3-none-any.whl | Bin 0 -> 18155 bytes .../src/pip/macholib-1.9-py2.py3-none-any.whl | Bin 0 -> 40512 bytes .../src/pip/pefile-2017.11.5.tar.gz | Bin 0 -> 61774 bytes .../src/pip/pyOpenSSL-17.2.0-py2.py3-none-any.whl | Bin 52643 -> 0 bytes .../src/pip/pyOpenSSL-17.5.0-py2.py3-none-any.whl | Bin 0 -> 53583 bytes .../frozen_binaries/src/pip/pypiwin32-223.tar.gz | Bin 0 -> 622 bytes ...-win32.whl => pywin32-223-cp27-cp27m-win32.whl} | Bin 6651109 -> 6769375 bytes ....whl => setuptools-39.1.0-py2.py3-none-any.whl} | Bin 477476 -> 566761 bytes .../src/pip/six-1.10.0-py2.py3-none-any.whl | Bin 10341 -> 0 bytes .../src/pip/six-1.11.0-py2.py3-none-any.whl | Bin 0 -> 10702 bytes .../src/pip/win_inet_pton-1.0.1.tar.gz | Bin 0 -> 2012 bytes 26 files changed, 48 insertions(+), 22 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=cbc67dcc01…

6 years, 4 months

6092 FIX docker_node_images: Fixed crash in case of agent output from old docker versions

by Lars Michelsen

Module: check_mk Branch: master Commit: 2160470b0c76193df9314da5fdcf57cb4ae27cae URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2160470b0c7619… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue May 15 10:32:27 2018 +0200 6092 FIX docker_node_images: Fixed crash in case of agent output from old docker versions Change-Id: I4618ff64ae00d78e83420a29bf08b9b68ba2fc19 --- .werks/6092 | 11 +++++++++++ inventory/docker_node_images | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/6092 b/.werks/6092 new file mode 100644 index 0000000..4743717 --- /dev/null +++ b/.werks/6092 @@ -0,0 +1,11 @@ +Title: docker_node_images: Fixed crash in case of agent output from old docker versions +Level: 1 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1526373122 + + diff --git a/inventory/docker_node_images b/inventory/docker_node_images index c9be7fa..5757723 100644 --- a/inventory/docker_node_images +++ b/inventory/docker_node_images @@ -36,7 +36,7 @@ def _parse_docker_node_images(info): data = json.loads(" ".join(line)) - if section_name == "images": + if section_name == "images" and data: parsed.setdefault((data["Repository"], data["Tag"]), data) elif section_name.startswith("images_labels"):

6 years, 4 months

Use hashlib instead of builtin hash function for ModeDiscovery

by Tom Baerwinkel

Module: check_mk Branch: master Commit: 003757f204eaba5fad1799c98d1c0fcfe9a7044a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=003757f204eaba… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Wed May 9 15:05:23 2018 +0200 Use hashlib instead of builtin hash function for ModeDiscovery Change-Id: I727d3142884e3584422c2f247d77cc0b912eaebe --- web/htdocs/wato.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index c43e520..294cb73 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -3620,7 +3620,7 @@ class ModeDiscovery(WatoMode): # may contain such chars, we need to use some encoded form of it. Simple escaping/encoding # like we use for values of variables is not enough here. def _checkbox_name(self, check_type, item): - return "_move_%s" % hash("%s_%s" % (check_type, item)) + return "_move_%s" % sha256("%s_%s" % (check_type, item)).hexdigest() #.

6 years, 4 months

6079 FIX BI Aggregation: Fixed crash when opening ' BI Aggregations containing this Service' in service drop down menu if service is not part of any aggregation

by Simon Betz

Module: check_mk Branch: master Commit: 121c31b355c999220eb48da796c4fc0de534797a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=121c31b355c999… Author: Simon Betz <si(a)mathias-kettner.de> Date: Mon May 14 18:11:26 2018 +0200 6079 FIX BI Aggregation: Fixed crash when opening 'BI Aggregations containing this Service' in service drop down menu if service is not part of any aggregation Change-Id: I5ed83c234860f82fac3867488e054f2d1757018a --- .werks/6079 | 10 ++++++++++ web/htdocs/bi.py | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.werks/6079 b/.werks/6079 new file mode 100644 index 0000000..24ec061 --- /dev/null +++ b/.werks/6079 @@ -0,0 +1,10 @@ +Title: BI Aggregation: Fixed crash when opening 'BI Aggregations containing this Service' in service drop down menu if service is not part of any aggregation +Level: 1 +Component: bi +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1526314124 +Class: fix + + diff --git a/web/htdocs/bi.py b/web/htdocs/bi.py index 90eedc7..d863beb 100644 --- a/web/htdocs/bi.py +++ b/web/htdocs/bi.py @@ -3380,7 +3380,7 @@ def table(columns, add_headers, only_sites, limit, filters): if only_service: affected = g_tree_cache["affected_services"].get(only_service) if affected == None: - items = [] + items = {} else: by_groups = {} for group, aggr in affected:

6 years, 4 months

Use hashlib for the row IDs of views

by Tom Baerwinkel

Module: check_mk Branch: master Commit: 1ad4056fafd26f9d7016186354e76bc186b39271 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1ad4056fafd26f… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Mon May 14 09:32:37 2018 +0200 Use hashlib for the row IDs of views Change-Id: Icc195103f2ef5269e7a733cd538c8e8c57e65753 --- web/htdocs/views.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/web/htdocs/views.py b/web/htdocs/views.py index c57568e..65e1b75 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -26,6 +26,7 @@ import utils import config, time, os, re, pprint +import hashlib import weblib, traceback, forms, valuespec, inventory, visuals, metrics import sites import bi @@ -2886,7 +2887,7 @@ def row_id(view, row): key = '' for col in multisite_datasources[view['datasource']]['idkeys']: key += '~%s' % row[col] - return str(hash(key)) + return hashlib.sha256(key).hexdigest() def paint_stalified(row, text): if is_stale(row):

6 years, 4 months

Removed duplicate line.

by Sven Panne

Module: check_mk Branch: master Commit: 9526da7422c31ee67ad30545040590c6e3c61aa9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9526da7422c31e… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon May 14 16:01:09 2018 +0200 Removed duplicate line. Change-Id: Ib4a17ab18adf03fff826fd3016074c2888efa3c9 --- cmk/ec/main.py | 1 - 1 file changed, 1 deletion(-) diff --git a/cmk/ec/main.py b/cmk/ec/main.py index bf60a13..cf7f7dd 100644 --- a/cmk/ec/main.py +++ b/cmk/ec/main.py @@ -1203,7 +1203,6 @@ class EventServer(ECServerThread): self._mongodb = mongodb self._active_history_period = active_history_period self._event_status = event_status - self._active_history_period = active_history_period self._time_periods = TimePeriods(self._logger) self.create_pipe()

6 years, 4 months

← Newer
1
...
18
19
20
21
22
23
24
...
38
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits May 2018