Checkmk git commits October 2016

checkmk-commits@lists.checkmk.com

10 participants
276 discussions

3973 FIX Backup: Fixed displaying wrong finish time after backup completion

by Lars Michelsen

Module: check_mk Branch: master Commit: 741549a59154c9d9a714d0fb03be9efce35224b1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=741549a59154c9… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Oct 28 11:52:50 2016 +0200 3973 FIX Backup: Fixed displaying wrong finish time after backup completion --- .werks/3973 | 9 +++++++++ ChangeLog | 1 + web/htdocs/backup.py | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.werks/3973 b/.werks/3973 new file mode 100644 index 0000000..449eaec --- /dev/null +++ b/.werks/3973 @@ -0,0 +1,9 @@ +Title: Backup: Fixed displaying wrong finish time after backup completion +Level: 1 +Component: multisite +Compatible: compat +Version: 1.4.0i2 +Date: 1477648349 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index caae362..7ca5610 100644 --- a/ChangeLog +++ b/ChangeLog @@ -56,6 +56,7 @@ * 3902 FIX: Graph search view: Changing painter options made page empty * 3969 FIX: CentOS 5.5: Fixed incompatibility with the available OpenSSL 0.98... * 4037 FIX: Fix graphs that have optional metrics... + * 3973 FIX: Backup: Fixed displaying wrong finish time after backup completion WATO: * 3915 User access times: New icon when never logged in; New column "last seen" diff --git a/web/htdocs/backup.py b/web/htdocs/backup.py index 156e395..8f3ed5c 100644 --- a/web/htdocs/backup.py +++ b/web/htdocs/backup.py @@ -471,7 +471,7 @@ class Jobs(BackupEntityCollection): html.write(_("Started at %s") % render.date_and_time(state["started"])) duration = time.time() - state["started"] if state["state"] == "finished": - html.write(", Finished at %s" % render.date_and_time(state["started"])) + html.write(", Finished at %s" % render.date_and_time(state["finished"])) duration = state["finished"] - state["started"] if "size" in state:

7 years, 10 months

3972 It' s now possible to bulk notifications based on Event console contacts

by Lars Michelsen

Module: check_mk Branch: master Commit: 45666fded546f3187124c5efe96e8563befc9f4e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=45666fded546f3… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Oct 28 11:45:55 2016 +0200 3972 It's now possible to bulk notifications based on Event console contacts --- .werks/3972 | 9 +++++++++ ChangeLog | 1 + modules/notify.py | 9 +++++++++ web/htdocs/wato.py | 1 + 4 files changed, 20 insertions(+) diff --git a/.werks/3972 b/.werks/3972 new file mode 100644 index 0000000..5900711 --- /dev/null +++ b/.werks/3972 @@ -0,0 +1,9 @@ +Title: It's now possible to bulk notifications based on Event console contacts +Level: 1 +Component: notifications +Compatible: compat +Version: 1.4.0i2 +Date: 1477647911 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index 964d617..caae362 100644 --- a/ChangeLog +++ b/ChangeLog @@ -67,6 +67,7 @@ Notifications: * 3957 mail: now allows extra HTML section between body and table + * 3972 It's now possible to bulk notifications based on Event console contacts * 3900 FIX: Notification analysis: Fixed wrong color for host notification states * 3968 FIX: Notifications / Alert handling: Fixed configuring nth notifications without state changes... diff --git a/modules/notify.py b/modules/notify.py index d0555e2..bd32de0 100644 --- a/modules/notify.py +++ b/modules/notify.py @@ -1306,22 +1306,31 @@ def do_bulk_notify(contact, plugin, params, plugin_context, bulk): what = plugin_context["WHAT"] bulk_path = (contact, plugin, str(bulk["interval"]), str(bulk["count"])) bulkby = bulk["groupby"] + if "host" in bulkby: bulk_path += ("host", plugin_context["HOSTNAME"]) elif "folder" in bulkby: bulk_path += ("folder", find_wato_folder(plugin_context)) + if "service" in bulkby: bulk_path += ("service", plugin_context.get("SERVICEDESC", "")) + if "sl" in bulkby: sl = plugin_context.get(what + "_SL", "") bulk_path += ("sl", sl) + if "check_type" in bulkby: command = plugin_context.get(what + "CHECKCOMMAND", "").split("!")[0] bulk_path += ("check_type", command) + if "state" in bulkby: state = plugin_context.get(what + "STATE", "") bulk_path += ("state", state) + if "ec_contact" in bulkby: + ec_contact = plugin_context.get("EC_CONTACT", "") + bulk_path += ("ec_contact", ec_contact) + # User might have specified _FOO instead of FOO bulkby_custom = bulk.get("groupby_custom", []) for macroname in bulkby_custom: diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 7c4997a..0782882 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -6987,6 +6987,7 @@ def vs_notification_bulkby(): ( "sl", _("Service level") ), ( "check_type", _("Check type") ), ( "state", _("Host/Service state") ), + ( "ec_contact", _("Event console contact") ), ], default_value = [ "host" ], )

7 years, 10 months

3986 FIX esx_vsphere_counters.uptime: fixed incorrect alert when receiving corrupted counter data

by Andreas Boesl

Module: check_mk Branch: master Commit: 29076d7fb254bba800a7afcebc250a12abd282eb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=29076d7fb254bb… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Oct 28 11:39:30 2016 +0200 3986 FIX esx_vsphere_counters.uptime: fixed incorrect alert when receiving corrupted counter data The check reported a negative uptime. --- .werks/3986 | 9 +++++++++ ChangeLog | 1 + checks/esx_vsphere_counters | 6 ++++-- 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/.werks/3986 b/.werks/3986 new file mode 100644 index 0000000..25d4471 --- /dev/null +++ b/.werks/3986 @@ -0,0 +1,9 @@ +Title: esx_vsphere_counters.uptime: fixed incorrect alert when receiving corrupted counter data +Level: 1 +Component: checks +Compatible: compat +Version: 1.4.0i2 +Date: 1477647498 +Class: fix + +The check reported a negative uptime. diff --git a/ChangeLog b/ChangeLog index 0450755..964d617 100644 --- a/ChangeLog +++ b/ChangeLog @@ -45,6 +45,7 @@ * 3985 FIX: mrpe: fixed broken long output when using the CMC... * 4035 FIX: df_zos: Fixed ignoring last filesystem after new discovery... * 3741 FIX: omd_status: Fix labelling and structure of several metric graphs + * 3986 FIX: esx_vsphere_counters.uptime: fixed incorrect alert when receiving corrupted counter data... Multisite: * 3959 Two new filters for the comment view: author and comment text field diff --git a/checks/esx_vsphere_counters b/checks/esx_vsphere_counters index f911c1a..8b23ffa 100644 --- a/checks/esx_vsphere_counters +++ b/checks/esx_vsphere_counters @@ -368,8 +368,10 @@ def inventory_esx_vsphere_counters_uptime(parsed): def check_esx_vsphere_counters_uptime(_no_item, params, parsed): if "sys.uptime" not in parsed: raise MKCounterWrapped("Counter data is missing") - - return check_uptime_seconds(params, int(parsed["sys.uptime"][""][0][0][-1])) + uptime = int(parsed["sys.uptime"][""][0][0][-1]) + if uptime < 0: + raise MKCounterWrapped("Counter data is corrupt") + return check_uptime_seconds(params, uptime) check_info['esx_vsphere_counters.uptime'] = {

7 years, 10 months

Refactoring of web/plugins folder.

by Roland Halbig

Module: check_mk Branch: master Commit: 1b32e7ff2300ae69558077a05e80068377d2b88c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1b32e7ff2300ae… Author: Roland Halbig <rh(a)mathias-kettner.de> Date: Tue Oct 18 13:16:19 2016 +0200 Refactoring of web/plugins folder. refactored shipped Implementing Lars' amendments lynt fix corrected sed mistakes small fix removed patch fixed refactoring Refactoring conflict in shipped. Fixed Refactoring in sidebar. --- web/htdocs/forms.py | 60 ++++---- web/htdocs/sidebar.py | 43 ++++-- web/plugins/dashboard/dashlets.py | 106 ++++++++------- web/plugins/pages/shipped.py | 1 + web/plugins/sidebar/bi.py | 4 +- web/plugins/sidebar/mkeventd.py | 2 +- web/plugins/sidebar/shipped.py | 218 ++++++++++++++++------------- web/plugins/sidebar/wato.py | 28 ++-- web/plugins/views/availability.py | 98 ++++++++------ web/plugins/views/commands.py | 81 ++++++----- web/plugins/views/inventory.py | 78 ++++++----- web/plugins/views/layouts.py | 256 ++++++++++++++++++++++------------- web/plugins/views/mkeventd.py | 13 +- web/plugins/views/mobile.py | 58 +++++--- web/plugins/visuals/bi.py | 4 +- web/plugins/visuals/filters.py | 93 ++++++++----- web/plugins/visuals/inventory.py | 28 ++-- web/plugins/visuals/mkeventd.py | 2 +- web/plugins/wato/bi.py | 4 +- web/plugins/wato/check_parameters.py | 1 + web/plugins/wato/mkeventd.py | 10 +- 21 files changed, 702 insertions(+), 486 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=1b32e7ff23…

7 years, 10 months

Fixed issue in recent commit

by Lars Michelsen

Module: check_mk Branch: master Commit: 267d5ee465c7fd2638c58cf3c75645e353b9a84f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=267d5ee465c7fd… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Oct 28 09:20:53 2016 +0200 Fixed issue in recent commit --- web/htdocs/valuespec.py | 1 + 1 file changed, 1 insertion(+) diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index a4e5630..afda586 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -4140,6 +4140,7 @@ class SSHKeyPair(ValueSpec): def _generate_ssh_key(cls, varprefix): key = RSA.generate(4096) private_key = key.exportKey('PEM') + pubkey = key.publickey() public_key = pubkey.exportKey('OpenSSH') return (private_key, public_key)

7 years, 10 months

Bulk discovery: Reduce timeout for automation to get the exception instead of a request timeout

by Lars Michelsen

Module: check_mk Branch: master Commit: 27258bd1db2a324654f98ba02d73832f463d72cd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=27258bd1db2a32… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Oct 28 09:00:18 2016 +0200 Bulk discovery: Reduce timeout for automation to get the exception instead of a request timeout --- 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 08d0f17..7c4997a 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -3438,7 +3438,7 @@ def mode_bulk_discovery(phase): if not html.get_checkbox("ignore_errors"): arguments = [ "@raiseerrors" ] + arguments - timeout = html.request_timeout() + timeout = html.request_timeout() - 2 unlock_exclusive() # Avoid freezing WATO when hosts do not respond timely counts, failed_hosts = check_mk_automation(site_id, "inventory",

7 years, 10 months

SSHKeyPair: Cleaned up hacky creation of SSH keys

by Lars Michelsen

Module: check_mk Branch: master Commit: ef8b38f4d7bef95aa77c88899d44986768767465 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ef8b38f4d7bef9… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Oct 28 08:57:40 2016 +0200 SSHKeyPair: Cleaned up hacky creation of SSH keys --- web/htdocs/valuespec.py | 27 ++++----------------------- 1 file changed, 4 insertions(+), 23 deletions(-) diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index e0b8fd7..a4e5630 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -37,6 +37,7 @@ import hashlib import socket from lib import * import cmk.defines as defines +from Crypto.PublicKey import RSA try: import simplejson as json @@ -4137,22 +4138,9 @@ class SSHKeyPair(ValueSpec): @classmethod def _generate_ssh_key(cls, varprefix): - tmp_file_name_base = cls._tmp_file_name() - private_key_file = tmp_file_name_base + ".key" - public_key_file = private_key_file + ".pub" - f = os.popen("echo | ssh-keygen -t rsa -b 4096 -f %s 2>&1" % - quote_shell_string(private_key_file)) - output = f.read() - status = f.close() - os.remove(tmp_file_name_base) - if status: - os.remove(private_key_file) - os.remove(public_key_file) - raise MKUserError(varprefix, _("Failed to create SSH key pair: %s") % output) - private_key = file(private_key_file).read() - public_key = file(public_key_file).read() - os.remove(private_key_file) - os.remove(public_key_file) + key = RSA.generate(4096) + private_key = key.exportKey('PEM') + public_key = pubkey.exportKey('OpenSSH') return (private_key, public_key) @@ -4164,13 +4152,6 @@ class SSHKeyPair(ValueSpec): return ':'.join(a+b for a,b in zip(fp_plain[::2], fp_plain[1::2])) - @staticmethod - def _tmp_file_name(): - fd, path = tempfile.mkstemp(dir=cmk.paths.tmp_dir) - os.close(fd) - return path - - class SchedulePeriod(CascadingDropdown): def __init__(self, from_end=True, **kwargs):

7 years, 10 months

Fixed issue in recent commit

by Lars Michelsen

Module: check_mk Branch: master Commit: 63b60a1c1e338ea8cab1cc419a6b081b613738ff URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=63b60a1c1e338e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Oct 28 08:53:48 2016 +0200 Fixed issue in recent commit --- web/htdocs/valuespec.py | 1 + 1 file changed, 1 insertion(+) diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index 919fc25..e0b8fd7 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -4158,6 +4158,7 @@ class SSHKeyPair(ValueSpec): @classmethod def _get_key_fingerprint(cls, value): + private_key, public_key = value key = base64.b64decode(public_key.strip().split()[1].encode('ascii')) fp_plain = hashlib.md5(key).hexdigest() return ':'.join(a+b for a,b in zip(fp_plain[::2], fp_plain[1::2]))

7 years, 10 months

Fixed displaying of SSH keys valuespec values on newer platforms

by Lars Michelsen

Module: check_mk Branch: master Commit: 8a1bfefc61ed8077690b517ecaf6a8dd922c56a4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8a1bfefc61ed80… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Oct 28 08:51:25 2016 +0200 Fixed displaying of SSH keys valuespec values on newer platforms --- web/htdocs/valuespec.py | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index c451805..919fc25 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -32,6 +32,8 @@ # - Checkbox -> rename to Boolean import math, os, time, re, sre_constants, urlparse, forms, tempfile +import base64 +import hashlib import socket from lib import * import cmk.defines as defines @@ -4134,8 +4136,8 @@ class SSHKeyPair(ValueSpec): @classmethod - def _generate_ssh_key(clazz, varprefix): - tmp_file_name_base = clazz._tmp_file_name() + def _generate_ssh_key(cls, varprefix): + tmp_file_name_base = cls._tmp_file_name() private_key_file = tmp_file_name_base + ".key" public_key_file = private_key_file + ".pub" f = os.popen("echo | ssh-keygen -t rsa -b 4096 -f %s 2>&1" % @@ -4155,14 +4157,10 @@ class SSHKeyPair(ValueSpec): @classmethod - def _get_key_fingerprint(clazz, value): - private_key, public_key = value - tmp_file_name = clazz._tmp_file_name() - file(tmp_file_name + ".pub", "w").write(public_key) - line = os.popen("ssh-keygen -lf %s" % quote_shell_string(tmp_file_name)).read() - os.remove(tmp_file_name) - # 4096 ff:ac:2b:b0:2a:12:84:f5:94:ae:7a:36:9e:73:a4:0f heute@Klappfisch (RSA) - return line.split()[1] + def _get_key_fingerprint(cls, value): + key = base64.b64decode(public_key.strip().split()[1].encode('ascii')) + fp_plain = hashlib.md5(key).hexdigest() + return ':'.join(a+b for a,b in zip(fp_plain[::2], fp_plain[1::2])) @staticmethod

7 years, 10 months

Revert "Fixed localisations."

by Lars Michelsen

Module: check_mk Branch: master Commit: 13cc8f3757a0073b8c2ed0e7752414d83d2fc8e4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=13cc8f3757a007… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Oct 27 16:37:03 2016 +0200 Revert "Fixed localisations." This reverts commit 347bd0ae7e0006a1f17a9634155458c036787969. --- web/htdocs/htmllib.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index 153b721..0c98995 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -236,7 +236,7 @@ class OutputFunnel(object): text = text.value if type(text) not in [str, unicode]: # also possible: type Exception! - raise MKGeneralException(_('Type Error: html.write accepts str and unicode input objects only!')) + raise MKGeneralException(_('Write accepts str and unicode objects only!')) if self.plugged: self.plugged_text += text @@ -928,7 +928,7 @@ class HTMLCheck_MK(HTMLGenerator): self.icon_button(None, _("Toggle context help texts"), "help", id="helpbutton", onclick="toggle_help()", style="display:none", ty="icon", cssclass=cssclass) - self.open_a(href="http://mathias-kettner.de", class_="head_logo") + self.open_a(href=_("http://mathias-kettner.de"), class_="head_logo") self.img(src="images/logo_cmk_small.png") self.close_a() self.close_td()

7 years, 10 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits October 2016