Checkmk git commits April 2016

checkmk-commits@lists.checkmk.com

8 participants
356 discussions

Remove file race condition when saving annotations

by Mathias Kettner

Module: check_mk Branch: master Commit: c0a991f33db64fea3b2c511e9604eca91788860c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c0a991f33db64f… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Apr 8 09:03:03 2016 +0200 Remove file race condition when saving annotations --- web/htdocs/availability.py | 4 +++- web/plugins/views/availability.py | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/web/htdocs/availability.py b/web/htdocs/availability.py index 5e0f654..6b94c39 100644 --- a/web/htdocs/availability.py +++ b/web/htdocs/availability.py @@ -955,7 +955,9 @@ def melt_short_intervals(entries, duration, dont_merge): def save_annotations(annotations): - file(defaults.var_dir + "/availability_annotations.mk", "w").write(repr(annotations) + "\n") + path = defaults.var_dir + "/availability_annotations.mk" + file(path + ".new", "w").write(repr(annotations) + "\n") + os.rename(path + ".new", path) def load_annotations(lock = False): diff --git a/web/plugins/views/availability.py b/web/plugins/views/availability.py index 4780b80..fbe2d46 100644 --- a/web/plugins/views/availability.py +++ b/web/plugins/views/availability.py @@ -28,8 +28,6 @@ # # - Host-Downtimes müssen auch auf Services wirken # - Test mit Hosts und BI-Aggregaten -# - Wenn man Reload macht nach dem Speichern in einer Annotation, landet man -# wieder in der Maske. # - Wenn man eine Annotation gelöscht hat, braucht man erst einen Reload, # damit die Zeitleiste korrekt dargestellt wird. Anscheinend haben wir # hier ein Reihenfolgenproblem. @@ -726,6 +724,7 @@ def edit_annotation(): # Called at the beginning of every availability page def handle_delete_annotations(): + html.debug(u"Ich lösche") if html.var("_delete_annotation"): site_id = html.var("anno_site") or "" hostname = html.var("anno_host") @@ -745,6 +744,7 @@ def handle_delete_annotations(): availability.delete_annotation(annotations, site_host_svc, fromtime, untiltime) availability.save_annotations(annotations) + def handle_edit_annotations(): # Avoid reshowing edit form after edit and reload if html.is_transaction() and not html.transaction_valid():

8 years, 5 months

Deleting annotations takes place at correct time

by Mathias Kettner

Module: check_mk Branch: master Commit: 3c8e391bea4a8bd95770af029c14fe9fbe76b3d4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3c8e391bea4a8b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Apr 8 09:11:52 2016 +0200 Deleting annotations takes place at correct time --- web/plugins/views/availability.py | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/web/plugins/views/availability.py b/web/plugins/views/availability.py index fbe2d46..9da5b5e 100644 --- a/web/plugins/views/availability.py +++ b/web/plugins/views/availability.py @@ -28,9 +28,6 @@ # # - Host-Downtimes müssen auch auf Services wirken # - Test mit Hosts und BI-Aggregaten -# - Wenn man eine Annotation gelöscht hat, braucht man erst einen Reload, -# damit die Zeitleiste korrekt dargestellt wird. Anscheinend haben wir -# hier ein Reihenfolgenproblem. import availability, table @@ -193,6 +190,12 @@ def render_availability_page(view, datasource, filterheaders, display_options, o av_object = None title += view_title(view) + # Deletion must take place before computation, since it affects the outcome + html.plug() + handle_delete_annotations() + confirmation_html_code = html.drain() + html.unplug() + # Now compute all data, we need this also for CSV export if not html.has_user_errors(): av_rawdata = availability.get_availability_rawdata(what, filterheaders, only_sites, @@ -211,7 +214,8 @@ def render_availability_page(view, datasource, filterheaders, display_options, o if 'T' in display_options: html.top_heading(title) - handle_delete_annotations() + html.write(confirmation_html_code) + # Remove variables for editing annotations, otherwise they will make it into the uris html.del_all_vars("editanno_") @@ -724,7 +728,6 @@ def edit_annotation(): # Called at the beginning of every availability page def handle_delete_annotations(): - html.debug(u"Ich lösche") if html.var("_delete_annotation"): site_id = html.var("anno_site") or "" hostname = html.var("anno_host")

8 years, 5 months

3332 FIX Avoid falling back to annotation edit form when reloading page directly after editing

by Mathias Kettner

Module: check_mk Branch: master Commit: 815575638b747324a04a5e6661087867c03ea6ff URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=815575638b7473… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Apr 8 08:58:07 2016 +0200 3332 FIX Avoid falling back to annotation edit form when reloading page directly after editing --- .werks/3332 | 10 ++++++++++ ChangeLog | 1 + web/plugins/views/availability.py | 3 +++ 3 files changed, 14 insertions(+) diff --git a/.werks/3332 b/.werks/3332 new file mode 100644 index 0000000..91d4bbe --- /dev/null +++ b/.werks/3332 @@ -0,0 +1,10 @@ +Title: Avoid falling back to annotation edit form when reloading page directly after editing +Level: 1 +Component: reporting +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1460098667 + + diff --git a/ChangeLog b/ChangeLog index 591e254..464a98c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -260,6 +260,7 @@ * 3268 FIX: Availability options were invalid after resetting them... * 3269 FIX: Fix rendering of floating point values < 1 in graphs (e.g. CPU load) * 3331 FIX: Availability: avoid duplication of annotation when changing time while editing + * 3332 FIX: Avoid falling back to annotation edit form when reloading page directly after editing Event Console: * 2999 The contact name is now included in Event Console notifications... diff --git a/web/plugins/views/availability.py b/web/plugins/views/availability.py index 46e7863..4780b80 100644 --- a/web/plugins/views/availability.py +++ b/web/plugins/views/availability.py @@ -746,6 +746,9 @@ def handle_delete_annotations(): availability.save_annotations(annotations) def handle_edit_annotations(): + # Avoid reshowing edit form after edit and reload + if html.is_transaction() and not html.transaction_valid(): + return False if html.var("anno_host") and not html.var("_delete_annotation"): finished = edit_annotation() else:

8 years, 5 months

Updated inline comment

by Mathias Kettner

Module: check_mk Branch: master Commit: 4847c10207e91df114c55bde999ddde09312c808 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4847c10207e91d… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Apr 8 08:50:36 2016 +0200 Updated inline comment --- web/plugins/views/availability.py | 1 - 1 file changed, 1 deletion(-) diff --git a/web/plugins/views/availability.py b/web/plugins/views/availability.py index 91db940..46e7863 100644 --- a/web/plugins/views/availability.py +++ b/web/plugins/views/availability.py @@ -26,7 +26,6 @@ # ZUTUN / TODO: # -# - Duplizieren der Annotations reparieren # - Host-Downtimes müssen auch auf Services wirken # - Test mit Hosts und BI-Aggregaten # - Wenn man Reload macht nach dem Speichern in einer Annotation, landet man

8 years, 5 months

3331 FIX Availability: avoid duplication of annotation when changing time while editing

by Mathias Kettner

Module: check_mk Branch: master Commit: 5f28b52c87097c63fb84d063f656729e4a1c1404 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5f28b52c87097c… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Apr 8 08:50:07 2016 +0200 3331 FIX Availability: avoid duplication of annotation when changing time while editing Conflicts: ChangeLog web/plugins/views/availability.py --- .werks/3331 | 10 ++++++++++ ChangeLog | 1 + web/htdocs/availability.py | 5 ++--- web/plugins/views/availability.py | 15 +++++++++------ 4 files changed, 22 insertions(+), 9 deletions(-) diff --git a/.werks/3331 b/.werks/3331 new file mode 100644 index 0000000..6209a8b --- /dev/null +++ b/.werks/3331 @@ -0,0 +1,10 @@ +Title: Availability: avoid duplication of annotation when changing time while editing +Level: 1 +Component: reporting +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1460097833 + + diff --git a/ChangeLog b/ChangeLog index 04251ef..591e254 100644 --- a/ChangeLog +++ b/ChangeLog @@ -259,6 +259,7 @@ * 3249 FIX: Fix missing filter for non-OK services when report is called via context button * 3268 FIX: Availability options were invalid after resetting them... * 3269 FIX: Fix rendering of floating point values < 1 in graphs (e.g. CPU load) + * 3331 FIX: Availability: avoid duplication of annotation when changing time while editing Event Console: * 2999 The contact name is now included in Event Console notifications... diff --git a/web/htdocs/availability.py b/web/htdocs/availability.py index 158c706..5e0f654 100644 --- a/web/htdocs/availability.py +++ b/web/htdocs/availability.py @@ -972,13 +972,12 @@ def load_annotations(lock = False): return {} -def update_annotations(site_host_svc, annotation): +def update_annotations(site_host_svc, annotation, replace_existing): annotations = load_annotations(lock = True) entries = annotations.get(site_host_svc, []) new_entries = [] for entry in entries: - if entry["from"] == annotation["from"] \ - and entry["until"] == annotation["until"]: + if entry == replace_existing: continue # Skip existing entries with same identity new_entries.append(entry) new_entries.append(annotation) diff --git a/web/plugins/views/availability.py b/web/plugins/views/availability.py index 4f2ca83..91db940 100644 --- a/web/plugins/views/availability.py +++ b/web/plugins/views/availability.py @@ -658,14 +658,17 @@ def edit_annotation(): annotations = availability.load_annotations() annotation = availability.find_annotation(annotations, site_host_svc, fromtime, untiltime) if not annotation: - annotation = { + value = { "from" : fromtime, "until" : untiltime, "text" : "", } - annotation["host"] = hostname - annotation["service"] = service - annotation["site"] = site_id + else: + value = annotation.copy() + + value["host"] = hostname + value["service"] = service + value["site"] = site_id # FIXME: Why use plugging here? Can we clean this up? html.plug() @@ -697,7 +700,7 @@ def edit_annotation(): label = _("Reclassify downtime of this period"), )), ( "text", TextAreaUnicode(title = _("Annotation"), allow_empty = False) ), ], - annotation, + value, varprefix = "editanno_", formname = "editanno", focus = "text") @@ -708,7 +711,7 @@ def edit_annotation(): del value["host"] value["date"] = time.time() value["author"] = config.user_id - availability.update_annotations(site_host_svc, value) + availability.update_annotations(site_host_svc, value, replace_existing=annotation) html.drain() # omit previous HTML code, not needed html.unplug() html.del_all_vars(prefix = "editanno_")

8 years, 5 months

Removed bogus comment

by Mathias Kettner

Module: check_mk Branch: master Commit: e84d047c40d0ad4659064e7c52dc699d259382f4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e84d047c40d0ad… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Apr 8 08:33:18 2016 +0200 Removed bogus comment --- web/htdocs/availability.py | 7 ------- 1 file changed, 7 deletions(-) diff --git a/web/htdocs/availability.py b/web/htdocs/availability.py index ba6bce2..158c706 100644 --- a/web/htdocs/availability.py +++ b/web/htdocs/availability.py @@ -24,13 +24,6 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. -#### TODO: Jetzt noch die Timeline, die *nicht* inline ist. Dazu der -#### choords ergänzen. Die render_timeline() Funktion malt aber ja -#### auch noch die Tabelle mit Hovercode und noch was was ich vergessen -#### habe. Auch die Tabelle muss formalisiert erzeugt werden. Dann -#### die Möglichkeit "All Timelines" schaffen und diese dann 1:1 im -#### Reporting abbilden. - import bi, views, visuals import sites # TODO: Get rid of import of views

8 years, 5 months

by Sven Rueß

Module: check_mk Branch: master Commit: 4044478628949f2b8621c3bcec3ff6bcb4687dc9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4044478628949f… Author: Sven Rueß <sr(a)mathias-kettner.de> Date: Thu Apr 7 19:27:23 2016 +0200 new bug related to wato folders and contact group names --- .bugs/2493 | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.bugs/2493 b/.bugs/2493 new file mode 100644 index 0000000..5842a7e --- /dev/null +++ b/.bugs/2493 @@ -0,0 +1,9 @@ +Title: Contact group name is not stripped at WATO folders +Component: wato +State: open +Date: 2016-04-07 19:23:35 +Targetversion: 1.2.8 +Class: bug + +Long names of contact groups are not stripped at WATo folders. The name is displayed over the size of the folder. +It looks not very nice.

8 years, 5 months

Reserved 1 bug IDS

by Sven Rueß

Module: check_mk Branch: master Commit: 8691290d3361226820c173c51015888eec88bd32 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8691290d336122… Author: Sven Rueß <sr(a)mathias-kettner.de> Date: Thu Apr 7 19:23:23 2016 +0200 Reserved 1 bug IDS --- .bugs/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.bugs/first_free b/.bugs/first_free index e7ff0db..e2e75c0 100644 --- a/.bugs/first_free +++ b/.bugs/first_free @@ -1 +1 @@ -2493 +2494

8 years, 5 months

Fixed missed cleanup during this week prediction fixes

by Lars Michelsen

Module: check_mk Branch: master Commit: 39c82e37d56e9e6031eb22e75d05a76c5df101ed URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=39c82e37d56e9e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Apr 7 17:28:25 2016 +0200 Fixed missed cleanup during this week prediction fixes --- web/htdocs/prediction.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/htdocs/prediction.py b/web/htdocs/prediction.py index 2caf7c6..00490d7 100644 --- a/web/htdocs/prediction.py +++ b/web/htdocs/prediction.py @@ -232,7 +232,7 @@ def get_rrd_data(hostname, service_description, varname, cf, fromtime, untiltime try: response = sites.live().query_row(query)[0] except Exception, e: - if opt_debug: + if config.debug: raise raise MKGeneralException("Cannot get historic metrics via Livestatus: %s" % e)

8 years, 5 months

3375 FIX Fixed exception when adding a bookmark while having a list not named my_bookmarks

by Lars Michelsen

Module: check_mk Branch: master Commit: b2b4360fd4381e816c9c8f0212b1f88ae7c1f027 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b2b4360fd4381e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Apr 7 17:23:32 2016 +0200 3375 FIX Fixed exception when adding a bookmark while having a list not named my_bookmarks --- .werks/3375 | 10 ++++++++++ ChangeLog | 1 + web/plugins/sidebar/shipped.py | 34 +++++++++++++++++++++++----------- 3 files changed, 34 insertions(+), 11 deletions(-) diff --git a/.werks/3375 b/.werks/3375 new file mode 100644 index 0000000..658dcad --- /dev/null +++ b/.werks/3375 @@ -0,0 +1,10 @@ +Title: Fixed exception when adding a bookmark while having a list not named my_bookmarks +Level: 1 +Component: multisite +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1460042581 + + diff --git a/ChangeLog b/ChangeLog index 555a0e2..04251ef 100644 --- a/ChangeLog +++ b/ChangeLog @@ -181,6 +181,7 @@ * 3327 FIX: Disallow scheduling downtimes with an end date that is before the start date * 3373 FIX: Fixed exception when handling syntax errors while loading pagetype files * 3374 FIX: Fixed broken Logwatch page when a host has no log directory (yet) + * 3375 FIX: Fixed exception when adding a bookmark while having a list not named my_bookmarks WATO: * 3244 WATO BI Module: swap order of aggregation function and child node selection... diff --git a/web/plugins/sidebar/shipped.py b/web/plugins/sidebar/shipped.py index a29230a..9adaf88 100644 --- a/web/plugins/sidebar/shipped.py +++ b/web/plugins/sidebar/shipped.py @@ -1163,6 +1163,21 @@ class BookmarkList(pagetypes.Overridable): @classmethod + def add_default_bookmark_list(cls): + attrs = { + "title" : u"My Bookmarks", + "public" : False, + "owner" : config.user_id, + "name" : "my_bookmarks", + "description" : u"Your personal bookmarks", + "default_topic" : u"My Bookmarks", + "bookmarks" : [], + } + + cls.add_instance((config.user_id, "my_bookmarks"), cls(attrs)) + + + @classmethod def load_legacy_bookmarks(self): # Don't load the legacy bookmarks when there is already a my_bookmarks list if self.has_instance((config.user_id, "my_bookmarks")): @@ -1173,20 +1188,12 @@ class BookmarkList(pagetypes.Overridable): if user_id == config.user_id: return - bookmark_list = { - "title" : u"My Bookmarks", - "public" : False, - "owner" : config.user_id, - "name" : "my_bookmarks", - "description" : u"Your personal bookmarks", - "default_topic" : u"My Bookmarks", - "bookmarks" : [], - } + self.add_default_bookmark_list() + bookmark_list = self.instance((config.user_id, "my_bookmarks")) for title, url in load_legacy_bookmarks(): - bookmark_list["bookmarks"].append(self.new_bookmark(title, url)) + bookmark_list.add_bookmark(title, url) - self.add_instance((config.user_id, "my_bookmarks"), self(bookmark_list)) @classmethod def new_bookmark(self, title, url): @@ -1209,6 +1216,7 @@ class BookmarkList(pagetypes.Overridable): topic.append(bookmark) return sorted(topics.items()) + def add_bookmark(self, title, url): self._["bookmarks"].append(BookmarkList.new_bookmark(title, url)) @@ -1310,6 +1318,10 @@ def try_shorten_url(url): def add_bookmark(title, url): BookmarkList.load() + + if not BookmarkList.has_instance((config.user_id, "my_bookmarks")): + BookmarkList.add_default_bookmark_list() + bookmarks = BookmarkList.instance((config.user_id, "my_bookmarks")) bookmarks.add_bookmark(title, try_shorten_url(url)) bookmarks.save_user_instances()

8 years, 5 months

← Newer
1
...
24
25
26
27
28
29
30
...
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