Checkmk git commits May 2011

checkmk-commits@lists.checkmk.com

2 participants
134 discussions

Check_MK Git: check_mk: WATO: fix translation problem

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 592fb9c4ed71665b1a403d56189edb47aeadf8a3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=592fb9c4ed7166… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon May 30 18:39:34 2011 +0200 WATO: fix translation problem --- web/htdocs/wato.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 96593f9..3f8562d 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -2059,7 +2059,7 @@ def interactive_progress(items, title, stats, finishvars, timewait): html.write("</table>") html.write("</center>") json_items = '[ %s ]' % ','.join([ "'" + h + "'" for h in items ]) - html.javascript('progress_scheduler("%s", "%s", 50, %s, "%s", "' + _("FINISHED.") + '");' % + html.javascript(('progress_scheduler("%s", "%s", 50, %s, "%s", "' + _("FINISHED.") + '");') % (html.var('mode'), html.makeuri([]), json_items, html.makeuri(finishvars))) # +----------------------------------------------------------------------+

13 years

Check_MK Git: check_mk: Multisite: fix position of sidebar buttons

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 37d12426a892cb7c92c914e3a960feda17d11485 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=37d12426a892cb… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon May 30 16:00:58 2011 +0200 Multisite: fix position of sidebar buttons --- web/htdocs/check_mk.css | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/web/htdocs/check_mk.css b/web/htdocs/check_mk.css index 912eeaf..39926ad 100644 --- a/web/htdocs/check_mk.css +++ b/web/htdocs/check_mk.css @@ -397,7 +397,6 @@ div.snapin div.snapinexception p { div.snapin div.footnotelink { margin-top: 5px; text-align: right; - padding-right: 31px; } div.snapin div.footnotelink a {

13 years

Check_MK Git: check_mk: Multisite: fix layout in foldable snapin

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: d69c53ef2260bcf9c3ed0003cdcaa47b65af3f37 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d69c53ef2260bc… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon May 30 15:42:28 2011 +0200 Multisite: fix layout in foldable snapin --- web/htdocs/htmllib.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index ae6ae74..78f9636 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -686,7 +686,7 @@ class html: 'src="images/tree_%s.png" %s>' % (treename, id, img_num, onclick)) if title[0] == '<': # custom HTML code - self.write(title) + self.write(title + "<br>") else: self.write('<b class="treeangle title" class=treeangle %s>%s</b><br>' % (onclick, title))

13 years

Check_MK Git: check_mk: WATO: fix translation bug

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: dba16619f041df77b2e927bcc012bf86f67e121d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dba16619f041df… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon May 30 15:36:53 2011 +0200 WATO: fix translation bug --- web/htdocs/wato.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 07f71ba..96593f9 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -251,7 +251,7 @@ def show_filefolder_list(thing, what, title): html.write("</tr>") html.write("</table>") else: - html.write("<h3>" + _("There are no %s in this folder.") + "</h3>" % title.lower()) + html.write("<h3>" + _("There are no %s in this folder.") % title.lower() + "</h3>" )

13 years

Check_MK Git: check_mk: cmk --localize: make -v show executed commands

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 10940df89f674b6c69b56f485deeedb27159b928 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=10940df89f674b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon May 30 13:52:35 2011 +0200 cmk --localize: make -v show executed commands --- modules/localize.py | 18 ++++++++++++------ 1 files changed, 12 insertions(+), 6 deletions(-) diff --git a/modules/localize.py b/modules/localize.py index 3244f0f..daa9d3d 100755 --- a/modules/localize.py +++ b/modules/localize.py @@ -32,6 +32,10 @@ class LocalizeException(Exception): def __str__(self): return self.reason +def verbose_system(command): + if opt_verbose: + sys.stdout.write("Running %s...\n" % command) + return os.system(command) domain = 'multisite' @@ -117,21 +121,23 @@ def get_languages(): def init_files(lang): - global po_file, local_po_file, mo_file, local_mo_file + global po_file, mo_file po_file = locale_base + '/%s/LC_MESSAGES/%s.po' % (lang, domain) mo_file = locale_base + '/%s/LC_MESSAGES/%s.mo' % (lang, domain) def localize_update_po(): # Merge the current .pot file with a given .po file - if os.system('msgmerge -U %s %s >/dev/null' % (po_file, pot_file)) != 0: + if opt_verbose: + sys.stdout.write("Merging translations...") + if verbose_system('msgmerge -U %s %s >/dev/null' % (po_file, pot_file)) != 0: sys.stderr.write('Failed!\n') else: sys.stdout.write('Success! Output: %s\n' % po_file) def localize_init_po(lang): - if os.system('msginit -i %s --no-translator -l %s -o %s >/dev/null' % \ + if verbose_system('msginit -i %s --no-translator -l %s -o %s >/dev/null' % \ (pot_file, lang, po_file)) != 0: sys.stderr.write('Failed!\n') @@ -145,7 +151,7 @@ def localize_sniff(): else: paths = web_dir - if os.system('xgettext --no-wrap --sort-output --force-po ' + if verbose_system('xgettext --no-wrap --sort-output --force-po ' '-L Python --from-code=utf-8 --omit-header ' '-o %s $(find %s -type f -name \*.py | xargs) >/dev/null' % \ (pot_file, paths)) != 0: @@ -201,7 +207,7 @@ def localize_edit(lang): if not os.path.exists(editor): editor = 'vi' - if 0 == os.system("%s '%s'" % (editor, po_file)): + if 0 == verbose_system("%s '%s'" % (editor, po_file)): localize_compile(lang) else: sys.stderr.write("Aborted.\n") @@ -241,7 +247,7 @@ def localize_compile(lang): if not os.path.exists(po_file): raise LocalizeException('The .po file %s does not exist.' % po_file) - if os.system('msgfmt %s -o %s' % (po_file, mo_file)) != 0: + if verbose_system('msgfmt %s -o %s' % (po_file, mo_file)) != 0: sys.stderr.write('Failed!\n') else: sys.stdout.write('Success! Output: %s\n' % mo_file)

13 years

Check_MK Git: check_mk: WATO: i18n'ed WATO

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 3883838e06128f71a4902975f82771351ff1767b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3883838e06128f… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon May 30 13:07:00 2011 +0200 WATO: i18n'ed WATO --- web/htdocs/wato.py | 325 ++++++++++++++++++++++++++-------------------------- 1 files changed, 164 insertions(+), 161 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=3883838e06…

13 years

Check_MK Git: check_mk: WATO: Checkbox in search dialog for global search

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 6746bf40a9f5204060aad3260b19e8d9288a6401 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6746bf40a9f520… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon May 30 12:15:07 2011 +0200 WATO: Checkbox in search dialog for global search --- web/htdocs/wato.py | 14 ++++++++++++-- 1 files changed, 12 insertions(+), 2 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 1821cec..03a78ca 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -809,9 +809,14 @@ def mode_search(phase): ## # Show search form html.begin_form("search") - html.hidden_fields() html.write("<table class=form>") + # Wether to search only in this folder + html.write("<tr><td class=legend></td><td class=content>") + html.checkbox("onlyhere", True) + html.write(" Search only in the folder <b>%s</b> and below" % g_folder["title"]) + html.write("</td></tr>") + # host name html.write("<tr><td class=legend>Hostname</td><td class=content>") html.text_input("host") @@ -837,6 +842,7 @@ def mode_search(phase): html.write("</td></tr>\n") html.write("</table>\n") + html.hidden_fields() html.end_form() # Show search results @@ -858,7 +864,11 @@ def mode_search(phase): "tags" : tags, } html.write("<h3>Search results:</h3>") - if not search_hosts_in_folder(g_folder, crit): + if html.var("onlyhere"): + folder = g_folder + else: + folder = g_root_folder + if not search_hosts_in_folder(folder, crit): html.message(_("No matching hosts found.")) html.write("</td></tr></table>")

13 years

Check_MK Git: check_mk: Multisite: fix default value of checkboxes

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: fd933a5e733638eb20a475372d3b0e9bdee69304 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fd933a5e733638… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon May 30 12:14:52 2011 +0200 Multisite: fix default value of checkboxes --- web/htdocs/htmllib.py | 16 +++++++++++++++- 1 files changed, 15 insertions(+), 1 deletions(-) diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index 662f981..ae6ae74 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -215,6 +215,11 @@ class html: if value != None: self.write("<input type=hidden name=%s value=\"%s\">\n" % (var, attrencode(value))) + # Beware: call this method just before end_form(). It will + # add all current non-underscored HTML variables as hiddedn + # field to the form - *if* they are not used in any input + # field. (this is the reason why you must not add any further + # input fields after this method has been called). def hidden_fields(self, varlist = None, **args): add_action_vars = args.get("add_action_vars", False) if varlist != None: @@ -325,7 +330,16 @@ class html: error = self.user_errors.get(varname) if error: html = "<x class=inputerror>" - value = self.req.vars.get(varname, deflt) + # Problem with checkboxes: The browser will add the variable + # only to the URL if the box is checked. So in order to detect + # wether we should add the default value, we need to detect + # if the form is printed for the first time. This is the + # case if "filled_in" is not set. + if not self.has_var("filled_in"): + value = self.req.vars.get(varname, deflt) + else: + value = self.req.vars.get(varname, "") + if value != "" and value != False: checked = " CHECKED" else:

13 years

Check_MK Git: check_mk: FIX: Added PNP-template for winperf_phydisk

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 3d5a06d9e769bf64a122df20a234201dbbfd1bf8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3d5a06d9e769bf… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon May 30 10:31:07 2011 +0200 FIX: Added PNP-template for winperf_phydisk --- ChangeLog | 1 + pnp-templates/check_mk-winperf_phydisk.php | 1 + 2 files changed, 2 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3f766cc..1350768 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,6 +4,7 @@ Checks & Agents: * FIX: apc_symmetra: fix remaining runtime calculation (by factor 100) + * FIX: Added PNP-template for winperf_phydisk * brocade_port: check for Brocade FC ports has been rewritten with lots of new features. * AIX agent now simulates <<<netctr>>> output (by Jörg Linge) diff --git a/pnp-templates/check_mk-winperf_phydisk.php b/pnp-templates/check_mk-winperf_phydisk.php new file mode 120000 index 0000000..8b45325 --- /dev/null +++ b/pnp-templates/check_mk-winperf_phydisk.php @@ -0,0 +1 @@ +check_mk-diskstat.php \ No newline at end of file

13 years

Check_MK Git: check_mk: Fixed syntax error in man page of f5_bigip_pool

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 8c30e787412ca6a25afa5803345a541660292cbc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8c30e787412ca6… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri May 27 09:22:14 2011 +0200 Fixed syntax error in man page of f5_bigip_pool --- checkman/f5_bigip_pool | 13 +++++++++---- 1 files changed, 9 insertions(+), 4 deletions(-) diff --git a/checkman/f5_bigip_pool b/checkman/f5_bigip_pool index 769251a..b7a2032 100644 --- a/checkman/f5_bigip_pool +++ b/checkman/f5_bigip_pool @@ -4,12 +4,17 @@ author: Florian Heigl <fh(a)mathias-kettner.de> license: GPL distribution: check_mk description: - The check queries the MIB tables of F5 BIG-IP loadbalancers (local traffic managers) for the status of any load balancing pools. It gathers the number of loadbalancers backing the pool and how many of those are working. It doesn't currently honor the 'MinUpMembers' parameter that can be set to trigger actions for the pool if too many members fail. -It supports devices running the 9.0 and above releases of the F5 OS. It's tested against 9.3 devices. + The check queries the MIB tables of F5 BIG-IP loadbalancers (local traffic managers) for the + status of any load balancing pools. It gathers the number of loadbalancers backing the pool + and how many of those are working. It doesn't currently honor the 'MinUpMembers' parameter + that can be set to trigger actions for the pool if too many members fail. -inventory: - The check gather a list of the pools defined on a system. It will include non-enabled ones, as this is considered a temporary state. + It supports devices running the 9.0 and above releases of the F5 OS. It's tested against 9.3 + devices. +inventory: + The check gather a list of the pools defined on a system. It will include non-enabled ones, + as this is considered a temporary state. perfdata: the check does not (yet) generate performance data.

13 years

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits May 2011