Checkmk git commits July 2017

checkmk-commits@lists.checkmk.com

11 participants
286 discussions

by Lars Michelsen

Module: check_mk Branch: master Commit: 8d1c88e99339c51d06b071ea36b1c2e71ed7ce1c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8d1c88e99339c5… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jul 14 14:02:45 2017 +0200 Reclassified werk Change-Id: Ie80809146bac64fdb2e1b986d3f6d2e9cc95287e --- .werks/4915 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/4915 b/.werks/4915 index 02001ea..6a610f6 100644 --- a/.werks/4915 +++ b/.werks/4915 @@ -5,7 +5,7 @@ Compatible: compat Edition: cre Version: 1.5.0i1 Date: 1499693045 -Class: feature +Class: fix The graphs have been different between common memory checks and services provided by solaris_mem. This has been changed now. A side effect is the

6 years, 11 months

Views: Improved formating of group headers

by Lars Michelsen

Module: check_mk Branch: master Commit: d15b30a5ca50fd23101b51421fbca4ee7b406c7f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d15b30a5ca50fd… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jul 14 13:50:10 2017 +0200 Views: Improved formating of group headers Change-Id: I6e4d81b006d8cdc6cfe4dbcf8b7e6febd4decce6 --- web/plugins/views/layouts.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/web/plugins/views/layouts.py b/web/plugins/views/layouts.py index 2bc3f29..8a9a2d8 100644 --- a/web/plugins/views/layouts.py +++ b/web/plugins/views/layouts.py @@ -180,7 +180,7 @@ def render_grouped_boxes(rows, view, group_cells, cells, num_columns, show_check painted = False for cell in group_cells: if painted: - html.td(",") + html.td(", ") painted = cell.paint(rows_with_ids[0][1]) html.close_tr() html.close_table() @@ -410,7 +410,7 @@ def render_tiled(rows, view, group_cells, cells, _ignore_num_columns, show_check painted = False for cell in group_cells: if painted: - html.td(',') + html.td(', ') painted = cell.paint(row) html.close_tr() @@ -608,7 +608,7 @@ def render_grouped_list(rows, view, group_cells, cells, num_columns, show_checkb painted = False for cell in group_cells: if painted: - html.td(',') + html.td(', ') painted = cell.paint(row) html.close_tr()

6 years, 11 months

werk tool: support "current" argument for selecting current version

by Lars Michelsen

Module: check_mk Branch: master Commit: 2d37aaeb363b0892a91de10fb2db2a9f5afe6ded URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2d37aaeb363b08… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jul 14 13:59:31 2017 +0200 werk tool: support "current" argument for selecting current version Change-Id: I29c6cd887566a5a739ac6591f0df5da7a3dac490 --- werk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/werk b/werk index cc60985..7989387 100755 --- a/werk +++ b/werk @@ -302,6 +302,9 @@ def main_list(args, format): reverse = False for a in args: + if a == "current": + a = g_current_version + if a == '-r': reverse = True continue

6 years, 11 months

Reserved 10 Werk IDS

by Jukka Aro

Module: check_mk Branch: master Commit: 31da5e562dbf4ffd6616bfbe5ad4140eade8c908 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=31da5e562dbf4f… Author: Jukka Aro <ja(a)mathias-kettner.de> Date: Fri Jul 14 12:51:00 2017 +0200 Reserved 10 Werk IDS Change-Id: Ie6955ec160d924fa3b0520041be38af38f67917a --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index 4e01312..24a45e5 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -5028 +5038

6 years, 11 months

Fixed issue in recent change

by Lars Michelsen

Module: check_mk Branch: master Commit: 26fa3f3fe2d3ae073445fff03cdd0dc43bb08d50 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=26fa3f3fe2d3ae… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jul 14 12:43:22 2017 +0200 Fixed issue in recent change Change-Id: Ie827b674a45360ea7e558896a99c0a7a61bba00b --- web/htdocs/backup.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/web/htdocs/backup.py b/web/htdocs/backup.py index 28a2f98..159fc72 100644 --- a/web/htdocs/backup.py +++ b/web/htdocs/backup.py @@ -1363,7 +1363,8 @@ class BackupTargetLocal(BackupTargetType): # Check write access for the site user try: - file(os.path.join(value, "write_test_%d" % time.time()), "w") + test_file_path = os.path.join(value, "write_test_%d" % time.time()) + file(test_file_path, "w") os.unlink(test_file_path) except IOError, e: if is_cma():

6 years, 11 months

4992 FIX Fixed sending fake DOWN states for hosts when using Nagios core

by Lars Michelsen

Module: check_mk Branch: master Commit: c4a03e8eded75e9294605cd3fa189af603a48cdf URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c4a03e8eded75e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jul 14 09:22:43 2017 +0200 4992 FIX Fixed sending fake DOWN states for hosts when using Nagios core Change-Id: I66666dd4bd4712033636e53670566679a623ccaa --- .werks/4992 | 11 +++++++++++ web/plugins/views/commands.py | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/4992 b/.werks/4992 new file mode 100644 index 0000000..6b15fbc --- /dev/null +++ b/.werks/4992 @@ -0,0 +1,11 @@ +Title: Fixed sending fake DOWN states for hosts when using Nagios core +Level: 1 +Component: multisite +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i1 +Date: 1500016948 + + diff --git a/web/plugins/views/commands.py b/web/plugins/views/commands.py index 7b623db..82efaa0 100644 --- a/web/plugins/views/commands.py +++ b/web/plugins/views/commands.py @@ -292,7 +292,7 @@ def render_fake_form(what): html.open_td() if what == "host": html.button("_fake_0", _("Up")) - html.button("_fake_2", _("Down")) + html.button("_fake_1", _("Down")) else: html.button("_fake_0", _("OK")) html.button("_fake_1", _("Warning"))

6 years, 11 months

4991 FIX Fixed the Installed-Size header of baked deb packages

by Lars Michelsen

Module: check_mk Branch: master Commit: 89c5a41941130b8bb0c8fce18345998aafbfeaf3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=89c5a41941130b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jul 14 09:03:46 2017 +0200 4991 FIX Fixed the Installed-Size header of baked deb packages The debian packages of the agents previously had a fixed Installed-Size header of 1 KB which is obviously not correct. The estimated installed size is now calculated individually for each package. Change-Id: I08cfb5f456422b41de2035e711f1e2be1a143baf --- .werks/4991 | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/.werks/4991 b/.werks/4991 new file mode 100644 index 0000000..510ae12 --- /dev/null +++ b/.werks/4991 @@ -0,0 +1,13 @@ +Title: Fixed the Installed-Size header of baked deb packages +Level: 1 +Component: agents +Class: fix +Compatible: compat +Edition: cee +State: unknown +Version: 1.5.0i1 +Date: 1500015688 + +The debian packages of the agents previously had a fixed Installed-Size +header of 1 KB which is obviously not correct. The estimated installed +size is now calculated individually for each package.

6 years, 11 months

4995 FIX Fixed broken link from contact group list page to rulesets

by Lars Michelsen

Module: check_mk Branch: master Commit: 258ec5390f359af9d9d43cb6330d500c2086110e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=258ec5390f359a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jul 14 10:52:23 2017 +0200 4995 FIX Fixed broken link from contact group list page to rulesets Change-Id: I95150dc80532e80832a1f4df58d2af5c8167f62f --- .werks/4995 | 11 +++++++++++ web/htdocs/wato.py | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/4995 b/.werks/4995 new file mode 100644 index 0000000..5796736 --- /dev/null +++ b/.werks/4995 @@ -0,0 +1,11 @@ +Title: Fixed broken link from contact group list page to rulesets +Level: 1 +Component: wato +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i1 +Date: 1500022330 + + diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 2c8bd1a..7b7d7d4 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -7347,7 +7347,7 @@ class ModeContactgroups(ModeGroups): super(ModeContactgroups, self).buttons() html.context_button(_("New contact group"), folder_preserving_link([("mode", "edit_contact_group")]), "new") html.context_button(_("Rules"), folder_preserving_link([("mode", "rulesets"), - ("filled_in", "search"), ("search", _("contact group"))]), "rulesets") + ("filled_in", "search"), ("search", "contactgroups")]), "rulesets") def _page_no_groups(self):

6 years, 11 months

4994 FIX Analyze host rulesets: Fixed rendering of some values (e.g. Count , size and age of files)

by Lars Michelsen

Module: check_mk Branch: master Commit: 12dff89982a84af06506925f307b865d0c24ed2d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=12dff89982a84a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jul 14 10:43:07 2017 +0200 4994 FIX Analyze host rulesets: Fixed rendering of some values (e.g. Count, size and age of files) Change-Id: Ice2320b40148edfcf11e1e2865f1fa3f487179dc --- .werks/4994 | 11 +++++++++++ web/htdocs/valuespec.py | 2 +- web/htdocs/wato.py | 2 +- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/.werks/4994 b/.werks/4994 new file mode 100644 index 0000000..adc0362 --- /dev/null +++ b/.werks/4994 @@ -0,0 +1,11 @@ +Title: Analyze host rulesets: Fixed rendering of some values (e.g. Count, size and age of files) +Level: 1 +Component: wato +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i1 +Date: 1500021760 + + diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index ab88b86..a4733dd 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -1132,7 +1132,7 @@ class ListOfStrings(ValueSpec): if self._vertical: # TODO: This is a workaround for a bug. This function needs to return str objects right now. - s = map(lambda v: html.render_tr(html.render_td( HTML(self._valuespec.value_to_text(v)) )), value) + s = map(lambda v: html.render_tr(html.render_td(HTML(self._valuespec.value_to_text(v)))), value) return "%s" % html.render_table(HTML().join(s)) else: return ", ".join([ self._valuespec.value_to_text(v) for v in value ]) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index a9b8fbb..2c8bd1a 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -2408,7 +2408,7 @@ def output_analysed_ruleset(all_rulesets, rulespec, hostname, service, known_set # We have a setting elif valuespec: - if ruleset.match_type() in ( "all", "list" ): + if ruleset.match_type() == "all": html.write(", ".join([valuespec.value_to_text(e) for e in setting])) else: html.write(valuespec.value_to_text(setting))

6 years, 11 months

Improved error handling when trying to edit/ clone not existing notification rules

by Lars Michelsen

Module: check_mk Branch: master Commit: 979a4a38d199f1d5d89e63bf9bbdde1ce09b670a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=979a4a38d199f1… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jul 14 11:57:47 2017 +0200 Improved error handling when trying to edit/clone not existing notification rules Change-Id: I9cde608d325bfa1caacaa3a70f2c10a80aa4b6c0 --- web/htdocs/htmllib.py | 6 +++++- web/htdocs/wato.py | 14 ++++++++++---- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index 26eed7f..f35f0a9 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -1116,7 +1116,10 @@ class RequestHandler(object): raise MKUserError(varname, _("The given text is wrong encoded. " "You need to provide a UTF-8 encoded text.")) - def get_integer_input(self, varname): + def get_integer_input(self, varname, deflt=None): + if deflt is not None and not self.has_var(varname): + return deflt + try: return int(self.var(varname)) except TypeError: @@ -1124,6 +1127,7 @@ class RequestHandler(object): except ValueError: raise MKUserError(varname, _("The parameter \"%s\" is not an integer.") % varname) + # Returns a dictionary containing all parameters the user handed over to this request. # The concept is that the user can either provide the data in a single "request" variable, # which contains the request data encoded as JSON, or provide multiple GET/POST vars which diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 7b7d7d4..c458be0 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -8640,8 +8640,8 @@ notification_rule_start_async_repl = False def mode_notification_rule(phase, profilemode): global notification_rule_start_async_repl - edit_nr = int(html.var("edit", "-1")) - clone_nr = int(html.var("clone", "-1")) + edit_nr = html.get_integer_input("edit", -1) + clone_nr = html.get_integer_input("clone", -1) if profilemode: userid = config.user.id config.user.need_permission("general.edit_notifications") @@ -8681,11 +8681,17 @@ def mode_notification_rule(phase, profilemode): if new: if clone_nr >= 0 and not html.var("_clear"): rule = {} - rule.update(rules[clone_nr]) + try: + rule.update(rules[clone_nr]) + except IndexError: + raise MKUserError(None, _("This %s does not exist.") % "notification rule") else: rule = {} else: - rule = rules[edit_nr] + try: + rule = rules[edit_nr] + except IndexError: + raise MKUserError(None, _("This %s does not exist.") % "notification rule") vs = vs_notification_rule(userid)

6 years, 11 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits July 2017