Checkmk git commits January 2013

checkmk-commits@lists.checkmk.com

3 participants
210 discussions

Check_MK Git: check_mk: Updated bug entries #0634, #0708, #0703

by Lars Michelsen

Module: check_mk Branch: master Commit: 7102c5899addd175884a9b9e6fab85153449d20f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7102c5899addd1… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jan 4 14:25:53 2013 +0100 Updated bug entries #0634, #0708, #0703 --- .bugs/634 | 7 +++++-- .bugs/703 | 7 +++++-- .bugs/708 | 7 +++++-- 3 files changed, 15 insertions(+), 6 deletions(-) diff --git a/.bugs/634 b/.bugs/634 index f492721..7bc90d1 100644 --- a/.bugs/634 +++ b/.bugs/634 @@ -1,9 +1,12 @@ Title: Documentation about distributed WATO Component: docu -State: open +Class: todo +State: done Date: 2012-02-22 19:26:04 Targetversion: 1.2.0 -Class: todo When we finalize the version 1.2.0 we surely need some documentation about distributed WATO. + +2013-01-04 13:53:08: changed state open -> done +Has already been written by ab. diff --git a/.bugs/703 b/.bugs/703 index df1f45f..9260fd2 100644 --- a/.bugs/703 +++ b/.bugs/703 @@ -1,8 +1,11 @@ Title: Dasboard misses iframefunc capability Component: multisite -State: open +Class: feature +State: done Date: 2012-07-27 10:27:06 Targetversion: 1.2.0 -Class: feature Analog to urlfunc there should be a iframefunc to be able to create dynamic iframe based dashlets. + +2013-01-04 13:56:19: changed state open -> done +This has already been implemented. diff --git a/.bugs/708 b/.bugs/708 index bf26a8a..26f7c55 100644 --- a/.bugs/708 +++ b/.bugs/708 @@ -1,9 +1,9 @@ Title: should be able to clear logwatch status for multiple hosts Component: multisite -State: open +Class: feature +State: done Date: 2012-05-11 17:48:29 Targetversion: future -Class: feature if you receive events for a central failure, i.e. lan or san issues or a certain patch triggering errors on all systems, it would be very good to @@ -11,3 +11,6 @@ acknowledge the error for all system after you updated your filters i didn't find a way to acknowledge log messages for more than a single host. there might be hundreds of affected systems and it's overly complicated and long to clear one by one. + +2013-01-04 13:57:00: changed state open -> done +This has already been implemented some releases before

11 years, 9 months

Check_MK Git: check_mk: Merge branch 'master' of mathias-kettner.de: check_mk

by Lars Michelsen

Module: check_mk Branch: master Commit: 8fd9ed0ce2cc2ba0529f8d8d110725971c2c63ff URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8fd9ed0ce2cc2b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jan 7 08:32:03 2013 +0100 Merge branch 'master' of mathias-kettner.de:check_mk ---

11 years, 9 months

Check_MK Git: check_mk: Fix repetition bug of empty tables in table-module

by Mathias Kettner

Module: check_mk Branch: master Commit: 45397e397821296bb8d6e058a6f81861d4ea2102 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=45397e39782129… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Jan 6 22:03:11 2013 +0100 Fix repetition bug of empty tables in table-module --- web/htdocs/table.py | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/web/htdocs/table.py b/web/htdocs/table.py index aa3be81..72a90f5 100644 --- a/web/htdocs/table.py +++ b/web/htdocs/table.py @@ -95,6 +95,7 @@ def end(): if not table["rows"]: html.write("<div class=info>%s</div>" % table["empty_text"]) + table = None return html.write('<table class="data')

11 years, 9 months

Check_MK Git: check_mk: ValueSpec dict: new oneline rendering-mode

by Mathias Kettner

Module: check_mk Branch: master Commit: d74031c0fca54b0eb30e4b7f8cd63eec7f37a246 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d74031c0fca54b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Jan 5 15:15:47 2013 +0100 ValueSpec dict: new oneline rendering-mode --- web/htdocs/check_mk.css | 5 +++++ web/htdocs/status.css | 4 ++++ web/htdocs/valuespec.py | 21 +++++++++++++++++---- 3 files changed, 26 insertions(+), 4 deletions(-) diff --git a/web/htdocs/check_mk.css b/web/htdocs/check_mk.css index 9562b41..1d03130 100644 --- a/web/htdocs/check_mk.css +++ b/web/htdocs/check_mk.css @@ -359,6 +359,11 @@ div.warning a { table.dictionary { } +table.dictionary b.header { + font-size: 80%; + font-weight: normal; +} + table.dictionary td.dictright { white-space: nowrap; padding: 0px; diff --git a/web/htdocs/status.css b/web/htdocs/status.css index b6ab766..ed94ca2 100644 --- a/web/htdocs/status.css +++ b/web/htdocs/status.css @@ -296,6 +296,10 @@ table.data td.number { text-align: right; } +table.data td.nobr { + white-space: nowrap; +} + td.narrow { width: 10px; } diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index 43b7f83..030b553 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -1781,7 +1781,7 @@ class Dictionary(ValueSpec): self._columns = kwargs.get("columns", 1) # possible: 1 or 2 self._render = kwargs.get("render", "normal") # also: "form" -> use forms.section() self._form_narrow = kwargs.get("form_narrow", False) # used if render == "form" - self._headers = kwargs.get("headers") + self._headers = kwargs.get("headers") # "sup" -> small headers in online mode def _get_elements(self): if type(self._elements) == list: @@ -1798,8 +1798,11 @@ class Dictionary(ValueSpec): self.render_input_normal(varprefix, value, self._render == "oneline") def render_input_normal(self, varprefix, value, oneline = False): - if not oneline: + headers_sup = oneline and self._headers == "sup" + if headers_sup or not oneline: html.write("<table class=dictionary>") + if headers_sup: + html.write('<tr>') for param, vs in self._get_elements(): if not oneline: html.write('<tr><td class=dictleft>') @@ -1815,9 +1818,14 @@ class Dictionary(ValueSpec): else: visible = True if vs.title(): + if headers_sup: + html.write('<td><b class=header>') html.write(" %s" % vs.title()) - if oneline: - html.write(": ") + if oneline: + if self._headers == "sup": + html.write('</b><br>') + else: + html.write(": ") if self._columns == 2: if vs.title(): @@ -1843,8 +1851,13 @@ class Dictionary(ValueSpec): html.write("</div>") if not oneline: html.write("</td></tr>") + elif headers_sup: + html.write("</td>") + if not oneline: html.write("</table>") + elif oneline and self._headers == "sup": + html.write('</tr></table>') def render_input_form(self, varprefix, value): if self._headers:

11 years, 9 months

Check_MK Git: check_mk: Allow table without title

by Mathias Kettner

Module: check_mk Branch: master Commit: b5ac9728bf095d9e2a2c5dc3a35557e99ac8c83b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b5ac9728bf095d… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Jan 5 13:45:24 2013 +0100 Allow table without title --- web/htdocs/table.py | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/web/htdocs/table.py b/web/htdocs/table.py index f710e85..aa3be81 100644 --- a/web/htdocs/table.py +++ b/web/htdocs/table.py @@ -29,7 +29,7 @@ mode = None next_func = None row_css = None -def begin(title, **kwargs): +def begin(title=None, **kwargs): global table, mode, next_func if table: @@ -87,7 +87,8 @@ def end(): global table finish_previous() html.unplug() - html.write("<h3>%s</h3>" % table["title"]) + if table["title"]: + html.write("<h3>%s</h3>" % table["title"]) if table.get("help"): html.help(table["help"])

11 years, 9 months

Check_MK Git: check_mk: Merge branch 'master' of ssh://mathias-kettner.de/ check_mk

by Mathias Kettner

Module: check_mk Branch: master Commit: a022ea1332b121d0e6def7f1e118cc8727c65fe7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a022ea1332b121… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Jan 5 13:45:27 2013 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

11 years, 9 months

Check_MK Git: check_mk: Updated bug entries #0801

by Lars Michelsen

Module: check_mk Branch: master Commit: 50827e2355f7f6a7c62f667ac5384e969066ff0a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=50827e2355f7f6… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jan 4 09:05:52 2013 +0100 Updated bug entries #0801 --- .bugs/801 | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.bugs/801 b/.bugs/801 index c887ca0..35117fb 100644 --- a/.bugs/801 +++ b/.bugs/801 @@ -1,9 +1,12 @@ Title: Documentation should no longer mention checkname Component: docu -State: open +Class: cleanup +State: done Date: 2012-09-19 16:41:43 Targetversion: 1.2.0 -Class: cleanup checkname is no longer supported. very few checks still use it but it also confuses new authors of checks. + +2013-01-04 09:05:49: changed state open -> done +I jst removed all notes on this old var.

11 years, 9 months

Check_MK Git: check_mk: gb: added blame COMMAND as shortcut to git blame . bugs/<bugid>

by Lars Michelsen

Module: check_mk Branch: master Commit: d449200038433e7e69c01b2fa008645b663dcdef URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d449200038433e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jan 4 10:07:37 2013 +0100 gb: added blame COMMAND as shortcut to git blame .bugs/<bugid> --- gb | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/gb b/gb index 076fa51..923b232 100755 --- a/gb +++ b/gb @@ -185,6 +185,7 @@ where COMMAND is one of: delete #.. - delete bug(s) grep [-v] KW1 KW2... - show bugs containing all of the given keywords (-v: verbose) edit [#] - open bug # in editor (or newest bug) + blame [#] - show who worked on a bug commit - commit all changed and new bugs """) @@ -413,6 +414,22 @@ def main_new(args): invalidate_my_bugid(bug["id"]) sys.stdout.write("Bug saved with id %d.\n" % bug["id"]) +def main_blame(args): + if len(args) == 0: + if g_last_bug == None: + bail_out("No last bug, please specify id.") + id = g_last_bug + else: + if len(args) != 1: + usage() + id = int(args[0]) + + bug = g_bugs.get(id) + if not bug: + bail_out("No such bug.\n") + + os.system("git blame %d" % id) + def main_resolve(args): if len(args) == 0: if g_last_bug == None: @@ -609,6 +626,7 @@ commands = { "new" : main_new, "resolve" : main_resolve, "solve" : main_resolve, + "blame" : main_blame, "delete" : main_delete, "grep" : main_grep, "edit" : main_edit,

11 years, 9 months

Check_MK Git: check_mk: FIX: Added error handling when trying to --restore with a non existant file

by Lars Michelsen

Module: check_mk Branch: master Commit: d86195274f695575121ce71f9461f4d2d1f787b6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d86195274f6955… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jan 4 10:12:27 2013 +0100 FIX: Added error handling when trying to --restore with a non existant file --- .bugs/807 | 7 +++++-- ChangeLog | 1 + modules/check_mk.py | 3 +++ 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/.bugs/807 b/.bugs/807 index 75ab120..f5a42e8 100644 --- a/.bugs/807 +++ b/.bugs/807 @@ -1,9 +1,12 @@ Title: cmk --restore does report errors Component: core -State: open +Class: cleanup +State: done Date: 2012-10-10 12:58:08 Targetversion: 1.2.0 -Class: cleanup cmk --restore does not set an returncode != 1 or print errors if the restore failed if the input file was unreadable or missing or somehow else troubled. + +2013-01-04 10:11:48: changed state open -> done +Added error message when the file given to restore does not exist diff --git a/ChangeLog b/ChangeLog index 6ae1cc0..9230d87 100644 --- a/ChangeLog +++ b/ChangeLog @@ -8,6 +8,7 @@ * Do object cache precompile for monitoring core on cmk -R/-O * Avoid duplicate verification of monitoring config on cmk -R/-O * FIX: Parameter --cleanup-autochecks (long for -u) works now like suggested in help + * FIX: Added error handling when trying to --restore with a non existant file Notifications: * Fix flexible notifications on non-OMD systems diff --git a/modules/check_mk.py b/modules/check_mk.py index a35e1cb..ad39048 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -3278,6 +3278,9 @@ def do_restore(tarname): if opt_verbose: sys.stderr.write("Restoring from '%s'...\n" % tarname) + if not os.path.exists(tarname): + raise MKGeneralException("Unable to restore: File does not exist") + for name, path, canonical_name, descr, is_dir, owned_by_nagios, group_www in backup_paths: absdir = os.path.abspath(path) if is_dir:

11 years, 9 months

Check_MK Git: check_mk: Updated bug entries #0771

by Lars Michelsen

Module: check_mk Branch: master Commit: 7798a56179490d0f0a694ef0a26f9d2834576441 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7798a56179490d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jan 4 13:27:37 2013 +0100 Updated bug entries #0771 --- .bugs/771 | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.bugs/771 b/.bugs/771 index 51c9dc1..51ab36e 100644 --- a/.bugs/771 +++ b/.bugs/771 @@ -1,11 +1,15 @@ Title: Services in Hosttables: wrong headings Component: multisite -State: open +Class: nastiness +State: done Date: 2012-06-14 13:29:43 Targetversion: 1.2.0 -Class: nastiness When adding service columns to host tables the column headers of those columns should be the service name, not the title of the painter. The latter one is for example "Perf-O-Meter". Better would be "CPU load". (if this is not specified by the user in the first place). + +2013-01-04 13:27:34: changed state open -> done +Just implemented this change. Using service description (join index) when no title defined in +the view for this column.

11 years, 9 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits January 2013