Checkmk git commits April 2016

checkmk-commits@lists.checkmk.com

8 participants
356 discussions

3465 FIX df: Fix displayed vertical range of graph of all filesystem checks

by Mathias Kettner

Module: check_mk Branch: master Commit: 60b7ca41e884f4f191652a01d88f99452869ca12 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=60b7ca41e884f4… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Apr 25 17:23:02 2016 +0200 3465 FIX df: Fix displayed vertical range of graph of all filesystem checks The graph definition had an explicit vertical range of <tt>(0, 0)</tt>. That effectively had set the displayed range to 0..1 Bytes/day - which led to an always empty or near useless graph. This has been fixed. --- .werks/3465 | 12 ++++++++++++ ChangeLog | 1 + web/plugins/metrics/check_mk.py | 1 - 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/.werks/3465 b/.werks/3465 new file mode 100644 index 0000000..5963c40 --- /dev/null +++ b/.werks/3465 @@ -0,0 +1,12 @@ +Title: df: Fix displayed vertical range of graph of all filesystem checks +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1461597698 + +The graph definition had an explicit vertical range of <tt>(0, 0)</tt>. That +effectively had set the displayed range to 0..1 Bytes/day - which led to an +always empty or near useless graph. This has been fixed. diff --git a/ChangeLog b/ChangeLog index 3e21c00..f3617a4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -184,6 +184,7 @@ * 3464 FIX: netstat.linux: fix monitoring of UDP listeners... * 3523 FIX: esx_vsphere_hostsystem: fixed exception when no multipath state info is available * 3425 FIX: Fixed extra section handling if no related check plugin exists + * 3465 FIX: df: Fix displayed vertical range of graph of all filesystem checks... Multisite: * 3187 notification view: new filter for log command via regex diff --git a/web/plugins/metrics/check_mk.py b/web/plugins/metrics/check_mk.py index 8595d69..95b10e3 100644 --- a/web/plugins/metrics/check_mk.py +++ b/web/plugins/metrics/check_mk.py @@ -5292,7 +5292,6 @@ graph_info.append({ "metrics" : [ ( "fs_trend", "line" ), ], - "range" : (0, 0), }) graph_info.append({

8 years, 2 months

3426 FIX sms: fixed wrong message handling after message was quoted and therefore too long

by Simon Betz

Module: check_mk Branch: master Commit: dc82320b0511face6e4b5508bee4d750ae2e5254 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dc82320b0511fa… Author: Simon Betz <si(a)mathias-kettner.de> Date: Mon Apr 25 16:49:16 2016 +0200 3426 FIX sms: fixed wrong message handling after message was quoted and therefore too long --- .werks/3426 | 10 ++++++++++ ChangeLog | 1 + notifications/sms | 10 +++++++--- 3 files changed, 18 insertions(+), 3 deletions(-) diff --git a/.werks/3426 b/.werks/3426 new file mode 100644 index 0000000..a088e73 --- /dev/null +++ b/.werks/3426 @@ -0,0 +1,10 @@ +Title: sms: fixed wrong message handling after message was quoted and therefore too long +Level: 1 +Component: notifications +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1461595506 + + diff --git a/ChangeLog b/ChangeLog index 1707ac5..3e21c00 100644 --- a/ChangeLog +++ b/ChangeLog @@ -316,6 +316,7 @@ * 3380 FIX: Fixed graphs in service notifications having spaces in service descriptions * 3418 FIX: Do not send host notifications if a service group is required... NOTE: Please refer to the migration notes! + * 3426 FIX: sms: fixed wrong message handling after message was quoted and therefore too long BI: * 3271 New option in aggregation for tuning aggregation of downtimes... diff --git a/notifications/sms b/notifications/sms index 5512028..97edd9c6 100755 --- a/notifications/sms +++ b/notifications/sms @@ -87,17 +87,21 @@ elif notification_type == "CUSTOM": message += " " + os.environ['NOTIFY_NOTIFICATIONCOMMENT'] recipient = os.environ['NOTIFY_CONTACTPAGER'].replace(" ", "") -quoted_message = "'" + message.replace("'", "'\"'\"'") + "'" +def quote_message(msg, max_length=None): + if max_length: + return "'" + msg.replace("'", "'\"'\"'")[:max_length-2] + "'" + else: + return "'" + msg.replace("'", "'\"'\"'") + "'" if send_path: - if os.system("%s %s %s" % (send_path, recipient, quoted_message[:160])) >> 8 != 0: + if os.system("%s %s %s" % (send_path, recipient, quote_message(message, 160))) >> 8 != 0: sys.exit(1) elif spool_dir: # On some distros, like debian, smstools does not ship with the sendsms/smssend helper # script. On this distro, simply drop the SMS in the outgoing spool directory. import tempfile, shutil fd, path = tempfile.mkstemp(prefix = 'cmk_sms_') - os.write(fd, 'To: %s\n\n%s' % (recipient, quoted_message)) + os.write(fd, 'To: %s\n\n%s' % (recipient, quote_message(message))) os.close(fd) os.chmod(path, 0660) filename = path.split('/')[-1]

8 years, 2 months

Fetched livestatus from downstream.

by Sven Panne

Module: check_mk Branch: master Commit: efb37b194495a6ddc97d2e1a8d262c089a380103 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=efb37b194495a6… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon Apr 25 16:37:21 2016 +0200 Fetched livestatus from downstream. --- livestatus/src/LogEntry.cc | 20 +++++-- livestatus/src/OffsetSStringColumn.cc | 2 +- livestatus/src/Query.cc | 92 +++++++++++++-------------------- livestatus/src/Query.h | 8 +-- livestatus/src/Table.h | 34 ++++++++---- 5 files changed, 81 insertions(+), 75 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=efb37b1944…

8 years, 2 months

Cleaned up dead (and broken) code

by Lars Michelsen

Module: check_mk Branch: master Commit: f9c743cc036c74fee48f404a0be7a7921236e5dc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f9c743cc036c74… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Apr 25 15:56:20 2016 +0200 Cleaned up dead (and broken) code --- web/htdocs/config.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/web/htdocs/config.py b/web/htdocs/config.py index 19692ae..d3df6d3 100644 --- a/web/htdocs/config.py +++ b/web/htdocs/config.py @@ -558,10 +558,8 @@ def default_site(): for site_name, site in sites.items(): if site_is_local(site_name): return site_name - try: - return config.sites.keys()[0] - except: - return None + return None + def is_multisite(): # TODO: Remove all calls of this function

8 years, 2 months

Favorite icon: Use generic per request cache instead of old hack

by Lars Michelsen

Module: check_mk Branch: master Commit: 894544069e907c770681dd8d3e6067854ecf2c6c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=894544069e907c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Apr 25 16:15:43 2016 +0200 Favorite icon: Use generic per request cache instead of old hack --- web/plugins/icons/builtin.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/web/plugins/icons/builtin.py b/web/plugins/icons/builtin.py index 93ed044..3a78620 100644 --- a/web/plugins/icons/builtin.py +++ b/web/plugins/icons/builtin.py @@ -776,11 +776,10 @@ multisite_icons_and_actions['aggregations'] = { # '----------------------------------------------------------------------' def paint_stars(what, row, tags, host_custom_vars): - try: - stars = html.stars - except: + stars = html.get_cached("stars") + if stars is None: stars = set(config.load_user_file("favorites", [])) - html.stars = stars + html.set_cache("stars", stars) if what == "host": starred = row["host_name"] in stars

8 years, 2 months

Fixed broken BI caused by wrong merging

by Lars Michelsen

Module: check_mk Branch: master Commit: fa65d3672410b857397fd212f137d3da648b44aa URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fa65d3672410b8… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Apr 25 15:48:12 2016 +0200 Fixed broken BI caused by wrong merging --- web/htdocs/bi.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/web/htdocs/bi.py b/web/htdocs/bi.py index 4866e68..dc935d9 100644 --- a/web/htdocs/bi.py +++ b/web/htdocs/bi.py @@ -1261,10 +1261,6 @@ def get_status_info_filtered(filter_header, only_sites, limit, add_columns, fetc data = sites.live().query(query) - html.live.set_only_sites(only_sites) - html.live.set_prepend_site(True) - html.live.set_auth_domain('bi') - sites.live().set_prepend_site(False) sites.live().set_only_sites(None) sites.live().set_auth_domain('read')

8 years, 2 months

Various cleanups of configuration options and their defaults

by Lars Michelsen

Module: check_mk Branch: master Commit: 01dc8f107d9849ac7a36497837d90e558e9a5657 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=01dc8f107d9849… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Apr 25 16:16:30 2016 +0200 Various cleanups of configuration options and their defaults --- web/htdocs/lib.py | 1 + web/htdocs/sidebar.py | 5 +---- web/plugins/config/builtin.py | 3 +++ web/plugins/sidebar/shipped.py | 6 +----- 4 files changed, 6 insertions(+), 9 deletions(-) diff --git a/web/htdocs/lib.py b/web/htdocs/lib.py index 8f4f09d..af50f06 100644 --- a/web/htdocs/lib.py +++ b/web/htdocs/lib.py @@ -797,6 +797,7 @@ try: import ast literal_eval = ast.literal_eval except ImportError: + # pylint: disable=no-member # Python <2.5 compatibility try: from compiler import parse diff --git a/web/htdocs/sidebar.py b/web/htdocs/sidebar.py index b5d8d35..d0c7c87 100644 --- a/web/htdocs/sidebar.py +++ b/web/htdocs/sidebar.py @@ -802,10 +802,7 @@ def search_url_tmpl(used_filters, matched_instances): def search_livestatus(used_filters): - try: - limit = config.quicksearch_dropdown_limit - except: - limit = 80 + limit = config.quicksearch_dropdown_limit # We need to know which plugin lead to finding a particular host, so it # is neccessary to make one query for each plugin - sorry. For example diff --git a/web/plugins/config/builtin.py b/web/plugins/config/builtin.py index c23c1d1..3f4a20a 100644 --- a/web/plugins/config/builtin.py +++ b/web/plugins/config/builtin.py @@ -72,6 +72,9 @@ sidebar_show_scrollbar = False # Enable regular checking for popup notifications sidebar_notify_interval = None +# Maximum number of results to show in quicksearch dropdown +quicksearch_dropdown_limit = 80 + # _ _ _ _ # | | (_)_ __ ___ (_) |_ ___ # | | | | '_ ` _ \| | __/ __| diff --git a/web/plugins/sidebar/shipped.py b/web/plugins/sidebar/shipped.py index 9dbe220..c3f54f8 100644 --- a/web/plugins/sidebar/shipped.py +++ b/web/plugins/sidebar/shipped.py @@ -478,11 +478,7 @@ def render_sitestatus(): title = _("Site %s is switched off") % site["alias"] else: switch = "off" - try: - linkview = config.sitestatus_link_view - except: - linkview = "sitehosts" - text = link(site["alias"], "view.py?view_name=%s&site=%s" % (linkview, sitename)) + text = link(site["alias"], "view.py?view_name=sitehosts&site=%s" % sitename) ex = state.get("exception") shs = state.get("status_host_state")

8 years, 2 months

Fixed missing change from recent commit

by Lars Michelsen

Module: check_mk Branch: master Commit: f972b8f97041e33cd7cb3b6ea9f876166f5f69d2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f972b8f97041e3… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Apr 25 15:02:35 2016 +0200 Fixed missing change from recent commit --- web/htdocs/visuals.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/htdocs/visuals.py b/web/htdocs/visuals.py index ba740b9..911b110 100644 --- a/web/htdocs/visuals.py +++ b/web/htdocs/visuals.py @@ -789,7 +789,7 @@ def page_edit_visual(what, all_visuals, custom_field_handler = None, visib = {} for key, vs in visibility_elements: if visual.get(key): - visib.append(key) + visib[key] = visual[key] visual["visibility"] = visib vs_general.render_input("general", visual)

8 years, 2 months

Added per user profile cache for e.g. faster access to users contact groups

by Lars Michelsen

Module: check_mk Branch: master Commit: 54b72b2562cc9bdd7622fd42e80147fcbf522f44 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=54b72b2562cc9b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Apr 25 14:54:23 2016 +0200 Added per user profile cache for e.g. faster access to users contact groups This cache is written when saving the user database and can be read whenever the user profiles of just one or some users are needed. The cache contains the multisite/check_mk config related attributes, no runtime information like the serial or transids. --- web/htdocs/userdb.py | 35 ++++++++++++++++++++++++----------- web/htdocs/visuals.py | 2 +- 2 files changed, 25 insertions(+), 12 deletions(-) diff --git a/web/htdocs/userdb.py b/web/htdocs/userdb.py index 5b2240e..a8e29f5 100644 --- a/web/htdocs/userdb.py +++ b/web/htdocs/userdb.py @@ -598,6 +598,8 @@ def save_users(profiles): if 'last_seen' in user: save_custom_attr(user_id, 'last_seen', repr(user['last_seen'])) + save_cached_profile(user_id, user, multisite_keys, non_contact_keys) + # During deletion of users we don't delete files which might contain user settings # and e.g. customized views which are not easy to reproduce. We want to keep the # files which are the result of a lot of work even when e.g. the LDAP sync deletes @@ -636,12 +638,29 @@ def rewrite_users(): users = load_users(lock = True) save_users(users) + +def save_cached_profile(user_id, user, multisite_keys, non_contact_keys): + # Only save contact AND multisite attributes to the profile. Not the + # infos that are stored in the custom attribute files. + cache = {} + for key in user.keys(): + if key in multisite_keys or key not in non_contact_keys: + cache[key] = user[key] + + config.save_user_file("cached_profile", cache, user=user_id) + + +def load_cached_profile(): + return config.load_user_file("cached_profile", None) + + def contactgroups_of_user(user_id): - users = load_users() - if user_id not in users: - return [] - else: - return users[user_id].get("contactgroups", []) + user = load_cached_profile() + if user == None: + # No cached profile present. Load all users to get the users data + user = load_users(lock=False)[user_id] + + return user.get("contactgroups", []) #. @@ -768,12 +787,6 @@ class GroupChoice(DualListChoice): return [ (k, t['alias'] and t['alias'] or k) for (k, t) in this_group.items() ] -# TODO: This is not performing good with a large user base. Hope it works for our needs. -# Maybe we need to change it to livestatus or change our data structures somehow in the future. -def groups_of_user(user_id): - users = load_users(lock=False) - return users[user_id]["contactgroups"] - #. # .-Custom-Attrs.--------------------------------------------------------. # | ____ _ _ _ _ | diff --git a/web/htdocs/visuals.py b/web/htdocs/visuals.py index 4a2cd0b..ba740b9 100644 --- a/web/htdocs/visuals.py +++ b/web/htdocs/visuals.py @@ -217,7 +217,7 @@ def available(what, all_visuals): return True if type(visual["public"]) == tuple and visual["public"][0] == "contact_groups": - user_groups = set(userdb.groups_of_user(user)) + user_groups = set(userdb.contactgroups_of_user(user)) if user_groups.intersection(visual["public"][1]): return True

8 years, 2 months

3425 FIX Fixed extra section handling if no related check plugin exists

by Simon Betz

Module: check_mk Branch: master Commit: b4aa7c9c03d0676dacd9df90b6cab22ac5215ac9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b4aa7c9c03d067… Author: Simon Betz <si(a)mathias-kettner.de> Date: Mon Apr 25 14:36:48 2016 +0200 3425 FIX Fixed extra section handling if no related check plugin exists --- .werks/3425 | 10 ++++++++++ ChangeLog | 1 + modules/nagios.py | 3 ++- 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/.werks/3425 b/.werks/3425 new file mode 100644 index 0000000..b3d8fe2 --- /dev/null +++ b/.werks/3425 @@ -0,0 +1,10 @@ +Title: Fixed extra section handling if no related check plugin exists +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1461587736 + + diff --git a/ChangeLog b/ChangeLog index 2345416..1707ac5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -183,6 +183,7 @@ * 3463 FIX: ups_modulys_alarms: avoid crash on some SOCOMEC UPS where some alarm OIDs are empty * 3464 FIX: netstat.linux: fix monitoring of UDP listeners... * 3523 FIX: esx_vsphere_hostsystem: fixed exception when no multipath state info is available + * 3425 FIX: Fixed extra section handling if no related check plugin exists Multisite: * 3187 notification view: new filter for log command via regex diff --git a/modules/nagios.py b/modules/nagios.py index cd22a3a..a66ea42 100644 --- a/modules/nagios.py +++ b/modules/nagios.py @@ -1036,7 +1036,8 @@ no_discovery_possible = None continue if check_info[check_type].get("extra_sections"): for section in check_info[check_type]["extra_sections"]: - needed_check_types.add(section) + if section in check_info: + needed_check_types.add(section) needed_sections.add(section.split(".")[0]) period = check_period_of(hostname, descr) if period:

8 years, 2 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits April 2016