Checkmk git commits July 2015

checkmk-commits@lists.checkmk.com

8 participants
287 discussions

Check_MK Git: check_mk: #2375 FIX prediction preview:

by Mathias Kettner

automatically select valid prediction period Message-ID: <55adf6d0.hC0Ddb0AYvlZNkn/%mk(a)mathias-kettner.de> User-Agent: Heirloom mailx 12.5 6/20/10 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Module: check_mk Branch: master Commit: 4d34e2fb443dd6816b26a7b0e0262ca213b39b65 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4d34e2fb443dd6… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Jul 21 09:37:29 2015 +0200 #2375 FIX prediction preview: automatically select valid prediction period --- .werks/2375 | 10 ++++++++++ ChangeLog | 1 + web/htdocs/prediction.py | 10 +++++++--- 3 files changed, 18 insertions(+), 3 deletions(-) diff --git a/.werks/2375 b/.werks/2375 new file mode 100644 index 0000000..4ce6c82 --- /dev/null +++ b/.werks/2375 @@ -0,0 +1,10 @@ +Title: prediction preview: automatically select valid prediction period +Level: 1 +Component: multisite +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i3 +Date: 1437464222 + + diff --git a/ChangeLog b/ChangeLog index d9db870..a4be315 100644 --- a/ChangeLog +++ b/ChangeLog @@ -85,6 +85,7 @@ * 2459 FIX: Preventing caching of all HTTP requests to dynamic pages (*.py)... * 2468 FIX: Fixed actions for duplicate host names on different sites... * 2470 FIX: Fixed exception in logwatch log list in rare cases... + * 2375 FIX: prediction preview: automatically select valid prediction period WATO: * 2365 Removed old deprecated notification global options for plain emails... diff --git a/web/htdocs/prediction.py b/web/htdocs/prediction.py index aa89e21..26a0640 100644 --- a/web/htdocs/prediction.py +++ b/web/htdocs/prediction.py @@ -71,24 +71,28 @@ def page_graph(): tg_name = html.var("timegroup") timegroup = None timegroups = [] + now = time.time() for f in os.listdir(dir): if f.endswith(".info"): tg_info = eval(file(dir + "/" + f).read()) tg_info["name"] = f[:-5] timegroups.append(tg_info) - if tg_info["name"] == tg_name: + if tg_info["name"] == tg_name or \ + (tg_name == None and now >= tg_info["range"][0] and now <= tg_info["range"][1]): timegroup = tg_info + tg_name = tg_info["name"] - timegroups.sort(cmp = lambda a,b: cmp(a["range"], b["range"])) + timegroups.sort(cmp = lambda a,b: cmp(a["range"][0], b["range"][0])) if not timegroup: timegroup = timegroups[0] + tg_name = choices[0][0] choices = [ (tg_info["name"], tg_info["name"].title()) for tg_info in timegroups ] html.begin_form("prediction") html.write(_("Show prediction for ")) - html.select("timegroup", choices, choices[0][0], onchange="document.prediction.submit();") + html.select("timegroup", choices, tg_name, onchange="document.prediction.submit();") html.hidden_fields() html.end_form()

8 years, 11 months

Check_MK Git: check_mk: #2480 FIX Fixed exception when configuring predictive levels for network interfaces

by Lars Michelsen

Module: check_mk Branch: master Commit: 762c54cc74d5ad4655e55177b2f0966aa4f3d2b3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=762c54cc74d5ad… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jul 20 12:00:05 2015 +0200 #2480 FIX Fixed exception when configuring predictive levels for network interfaces --- .werks/2480 | 10 ++++++++++ ChangeLog | 1 + checks/if.include | 2 ++ 3 files changed, 13 insertions(+) diff --git a/.werks/2480 b/.werks/2480 new file mode 100644 index 0000000..c6679dc --- /dev/null +++ b/.werks/2480 @@ -0,0 +1,10 @@ +Title: Fixed exception when configuring predictive levels for network interfaces +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i3 +Date: 1437386230 + + diff --git a/ChangeLog b/ChangeLog index 99fb2f8..d9db870 100644 --- a/ChangeLog +++ b/ChangeLog @@ -63,6 +63,7 @@ * 2450 FIX: citrix_serverload: Changed representation of load to percent in rule and graphs, added perfometer * 2408 FIX: ibm_imm_fan: fixed exception while parsing fan percentage values * 2469 FIX: Fixed service discovery on SNMP host having no system description OID + * 2480 FIX: Fixed exception when configuring predictive levels for network interfaces Multisite: * 2385 SEC: Fixed possible reflected XSS on all GUI pages where users can produce unhandled exceptions... diff --git a/checks/if.include b/checks/if.include index abceeb5..46445e8 100644 --- a/checks/if.include +++ b/checks/if.include @@ -174,6 +174,8 @@ def get_specific_traffic_levels(general_traffic_levels, unit, ref_speed, assumed for (traffic_dir, up_or_low), (level_type, levels) in general_traffic_levels.items(): if type(levels) != tuple: traffic_levels[(traffic_dir, 'predictive')] = levels + traffic_levels[(traffic_dir, up_or_low, 'warn')] = None + traffic_levels[(traffic_dir, up_or_low, 'crit')] = None continue # don't convert predictive levels config else: warn, crit = levels

8 years, 11 months

Check_MK Git: check_mk: #2479 Allowing dots in host-, service- and contact groups now

by Lars Michelsen

Module: check_mk Branch: master Commit: 05739a2a07e069118ed2da78d9649aee840c87fb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=05739a2a07e069… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jul 20 11:24:39 2015 +0200 #2479 Allowing dots in host-, service- and contact groups now --- .werks/2479 | 9 +++++++++ ChangeLog | 1 + web/htdocs/wato.py | 4 ++-- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/.werks/2479 b/.werks/2479 new file mode 100644 index 0000000..8a03471 --- /dev/null +++ b/.werks/2479 @@ -0,0 +1,9 @@ +Title: Allowing dots in host-, service- and contact groups now +Level: 1 +Component: wato +Compatible: compat +Version: 1.2.7i3 +Date: 1437384233 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index 12d5096..99fb2f8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -92,6 +92,7 @@ * 2373 Skip unmonitored hosts during bulk discovery... * 2462 Users with access to host/services can now edit the disabled services rule for their hosts/folders... * 2463 Hiding not permitted actions from service discovery page when only permitted on host... + * 2479 Allowing dots in host-, service- and contact groups now * 2344 FIX: Improved validation of selected rules when editing BI aggregations... * 2346 FIX: Notifications: Fixed garbled page when switching on/off bulks/backlog/user rules * 2372 FIX: Avoid freezing WATO during bulk discovery if hosts do not respond in a timely manner diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 02e0142..7726140 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -8479,8 +8479,8 @@ def mode_edit_group(phase, what): raise MKUserError("name", _("Please specify a name of the new group.")) if ' ' in name: raise MKUserError("name", _("Sorry, spaces are not allowed in group names.")) - if not re.match("^[-a-z0-9A-Z_]*$", name): - raise MKUserError("name", _("Invalid group name. Only the characters a-z, A-Z, 0-9, _ and - are allowed.")) + if not re.match("^[-a-z0-9A-Z_\.]*$", name): + raise MKUserError("name", _("Invalid group name. Only the characters a-z, A-Z, 0-9, _, . and - are allowed.")) if name in groups: raise MKUserError("name", _("Sorry, there is already a group with that name")) groups[name] = {

8 years, 11 months

Check_MK Git: check_mk: Fixed "OMD ... performance" checks reporting WARN after update from 1.2.6 to master

by Lars Michelsen

Module: check_mk Branch: master Commit: 01b0013a683969f0a24a457b8ad4a2086b654c4a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=01b0013a683969… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jul 20 11:06:52 2015 +0200 Fixed "OMD ... performance" checks reporting WARN after update from 1.2.6 to master --- checks/livestatus_status | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/checks/livestatus_status b/checks/livestatus_status index 624e41c..43f2693 100644 --- a/checks/livestatus_status +++ b/checks/livestatus_status @@ -100,9 +100,14 @@ def check_livestatus_status(item, params, parsed): yield 0, "Core version: %s" % status["program_version"] yield 0, "Livestatus version: %s" % status["livestatus_version"] - # In CMC <= 1.2.6 event handlers cannot be enabled. So never - # warn. if status["program_version"].startswith("Check_MK 1.2.6"): + # In CMC <= 1.2.6 event handlers cannot be enabled. So never warn. + params["enable_event_handlers"] = 0 + elif status.get("has_event_handlers", '1') == '0': + # After update from < 1.2.7 the check would warn about disabled alert + # handlers since they are disabled in this case. But the user has no alert + # handlers defined, so this is nothing to warn about. Start warn when the + # user defines his first alert handlers. params["enable_event_handlers"] = 0 settings = [

8 years, 11 months

Check_MK Git: check_mk: logwatch: Fixed handling of log messages containing special characters

by Lars Michelsen

Module: check_mk Branch: master Commit: 1d66067e03d839857d4778c275d6046bd2be83c2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1d66067e03d839… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jul 20 10:24:35 2015 +0200 logwatch: Fixed handling of log messages containing special characters --- checks/logwatch | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/checks/logwatch b/checks/logwatch index 19a56cf..5cc609a 100644 --- a/checks/logwatch +++ b/checks/logwatch @@ -389,7 +389,7 @@ def check_logwatch_generic(item, params, loglines, found, groups=False): try: logarch = file(logfile, "a+") logarch.write(time.strftime("<<<%Y-%m-%d %H:%M:%S " + logwatch_state(worst) + ">>>\n")) - logarch.write("\n".join(loglines) + "\n") + logarch.write(("\n".join(loglines)).encode("utf-8") + "\n") logarch.close() except Exception, e: raise MKGeneralException("User %s cannot create logfile: %s" % \ @@ -701,7 +701,7 @@ def check_logwatch_ec(item, params, info): sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM) sock.connect((method[1], method[2])) for message in messages: - sock.send(message + "\n") + sock.send(message.encode("utf-8") + "\n") sock.close() elif not method.startswith('spool:'): @@ -712,7 +712,7 @@ def check_logwatch_ec(item, params, info): # instead of the pipe! sock = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM) sock.connect(method) - sock.send('\n'.join(messages) + '\n') + sock.send(('\n'.join(messages)).encode("utf-8") + '\n') sock.close() else: @@ -723,7 +723,7 @@ def check_logwatch_ec(item, params, info): file_name = '.%s_%s%d' % (g_hostname, item and item.replace('/', '\\') + '_' or '', time.time()) if not os.path.exists(spool_path): os.makedirs(spool_path) - file('%s/%s' % (spool_path, file_name), 'w').write('\n'.join(messages) + '\n') + file('%s/%s' % (spool_path, file_name), 'w').write(('\n'.join(messages)).encode("utf-8") + '\n') os.rename('%s/%s' % (spool_path, file_name), '%s/%s' % (spool_path, file_name[1:])) if forwarded_logfiles:

8 years, 11 months

Check_MK Git: check_mk: Fixed permissions

by Lars Michelsen

Module: check_mk Branch: master Commit: 21f2c42668a98fac21600242e19e70aa590fdf0d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=21f2c42668a98f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jul 20 10:08:49 2015 +0200 Fixed permissions --- 0 files changed diff --git a/notifications/pushover b/notifications/pushover old mode 100644 new mode 100755

8 years, 11 months

Check_MK Git: check_mk: #2478 Integrated notification plugin for mobile phone push messages via Pushover

by Lars Michelsen

Module: check_mk Branch: master Commit: 355ff341ce860d8342aadad9300043eaa9cff01d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=355ff341ce860d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jul 20 10:06:23 2015 +0200 #2478 Integrated notification plugin for mobile phone push messages via Pushover We already had a notfication plugin in the treasures directory which was very limited in the features and was not configurable via WATO. The new plugin provides much more details in the notifications and can now be configured via the GUI. --- .werks/2478 | 11 +++ ChangeLog | 1 + doc/treasures/notifications/pushover | 68 ---------------- notifications/pushover | 147 ++++++++++++++++++++++++++++++++++ web/plugins/wato/notifications.py | 49 ++++++++++++ 5 files changed, 208 insertions(+), 68 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=355ff341ce…

8 years, 11 months

Check_MK Git: check_mk: Reserved 5 Werk IDS

by Lars Michelsen

Module: check_mk Branch: master Commit: aabc0daea12fbc0af134d7e0465f1de0bfaa8651 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=aabc0daea12fbc… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jul 20 10:04:25 2015 +0200 Reserved 5 Werk IDS --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index 721cbb1..bbf80a8 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -2478 +2483

8 years, 11 months

Check_MK Git: check_mk: Fixed syntax error

by Lars Michelsen

Module: check_mk Branch: master Commit: 83dc6b98bf3a09790c6eca81f8382e71f11a323c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=83dc6b98bf3a09… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Sun Jul 19 22:34:52 2015 +0200 Fixed syntax error --- web/plugins/wato/check_parameters.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 17abf91..79a9132 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -4274,8 +4274,8 @@ register_check_parameters( Integer(title = _("Critical at or above"), unit="%" ), ]), TextAscii( - title = _("Sensor name") - help = _("The identifier of the sensor.") + title = _("Sensor name"), + help = _("The identifier of the sensor."), ), match_type = "first", )

8 years, 11 months

Check_MK Git: check_mk: Changed werk description

by Konstantin Büttner

Module: check_mk Branch: master Commit: ff209ab22454b9d4633ecc9fe99b06a05f3896f8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ff209ab22454b9… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Fri Jul 17 14:19:48 2015 +0200 Changed werk description --- .werks/2451 | 5 +++-- ChangeLog | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.werks/2451 b/.werks/2451 index 79a5025..ec42fbd 100644 --- a/.werks/2451 +++ b/.werks/2451 @@ -1,9 +1,10 @@ Title: wut_webtherm.humidity, wut_webtherm.pressure: Two new checks for humidity and air pressure sensors for WuT devices Level: 1 Component: checks -Compatible: compat +Compatible: incomp Version: 1.2.7i3 Date: 1437134633 Class: feature - +Previously, in some cases humidity and pressure sensors were mistakenly interpreted as temperature sensors. Rediscovery is +required to remove these wrong checks. diff --git a/ChangeLog b/ChangeLog index b9b6a3b..265e228 100644 --- a/ChangeLog +++ b/ChangeLog @@ -21,7 +21,8 @@ NOTE: Please refer to the migration notes! * 1273 bvip_cams, bvip_fans, bvip_info, bvip_link, bvip_poe, bvip_temp, bvip_util, bvip_video_alerts: New Checks for Bosch Video over IP Cameras * 2405 New checks for UCS bladecenter: ucs_bladecenter_topsystem, ucs_bladecenter_faulinst... - * 2451 wut_webtherm.humidity, wut_webtherm.pressure: Two new checks for humidity and air pressure sensors for WuT devices + * 2451 wut_webtherm.humidity, wut_webtherm.pressure: Two new checks for humidity and air pressure sensors for WuT devices... + NOTE: Please refer to the migration notes! * 2315 FIX: windows agent: BOM replacement, fixed incorrect byte offset... * 2316 FIX: windows agent: fix garbled output of cached agent plugins... * 2358 FIX: check_mk_agent.solaris: more correct computation of zfs used space...

8 years, 11 months

← Newer
1
...
10
11
12
13
14
15
16
...
29
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits July 2015