Checkmk git commits December 2011

checkmk-commits@lists.checkmk.com

3 participants
336 discussions

Check_MK Git: check_mk: Improved ValueSpecs

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 3e197a28b0984a9d12d5f1b8a31fe60a974e4367 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3e197a28b0984a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Dec 31 18:51:15 2011 +0100 Improved ValueSpecs --- web/htdocs/check_mk.css | 9 +++++++++ web/htdocs/forms.py | 4 ++-- web/htdocs/htmllib.py | 13 +++++++++++++ web/htdocs/pages.css | 3 +++ web/htdocs/valuespec.py | 31 +++++++++++++++++++++++-------- web/htdocs/wato.py | 13 +++++++++++++ 6 files changed, 63 insertions(+), 10 deletions(-) diff --git a/web/htdocs/check_mk.css b/web/htdocs/check_mk.css index e8b8e48..57802d8 100644 --- a/web/htdocs/check_mk.css +++ b/web/htdocs/check_mk.css @@ -77,6 +77,15 @@ input:hover, select:hover, textarea:hover { background-color: #EDECEB; } +/* Select element with icons */ +select.icon option { + background-repeat: no-repeat; + background-position: bottom left; + background-size: 18px; + padding-left:22px; + height: 18px; +} + input.buttonlink { padding: 1px; diff --git a/web/htdocs/forms.py b/web/htdocs/forms.py index aab1955..c39dc64 100644 --- a/web/htdocs/forms.py +++ b/web/htdocs/forms.py @@ -27,7 +27,7 @@ from lib import * -def edit_dictionary(entries, value): +def edit_dictionary(entries, value, focus=None): new_value = value.copy() if html.check_transaction(): messages = [] @@ -57,7 +57,7 @@ def edit_dictionary(entries, value): else: v = vs.default_value() vs.render_input(name, v) - if first: + if (not focus and first) or (name == focus): vs.set_focus(name) first = False html.write("<tr><td class=buttons colspan=2>") diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index 80d47d8..f7546b4 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -461,6 +461,19 @@ class html: if varname: self.form_vars.append(varname) + def icon_select(self, varname, options, deflt=""): + current = self.var(varname, deflt) + self.write("<select class=icon name=\"%s\" id=\"%s\" size=\"1\">\n" % + (varname, varname)) + for value, text, icon in options: + if value == None: value = "" + sel = value == current and " selected" or "" + self.write('<option style="background-image:url(images/icon_%s.png);" ' + 'value=\"%s\"%s>%s</option>\n' % (icon, value, sel, text)) + self.write("</select>\n") + if varname: + self.form_vars.append(varname) + def begin_radio_group(self, horizontal=False): if self.mobile: if horizontal: diff --git a/web/htdocs/pages.css b/web/htdocs/pages.css index f0cb41f..d682e79 100644 --- a/web/htdocs/pages.css +++ b/web/htdocs/pages.css @@ -400,6 +400,7 @@ table.form td.legend, table.form td.title { color: #274750; border: 1px solid #fff; padding-top: 10px; + padding-bottom: 10px; } /* Bottom row with action buttons, right justified */ @@ -434,6 +435,8 @@ table.form td.content { padding-right: 2ex; border: 1px solid #fff; border-left-style: none; + padding-top: 10px; + padding-bottom: 10px; } td.legend, td.content { diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index 13e03c8..a288aac 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -24,7 +24,7 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. -import math, os +import math, os, time from lib import * # Abstract base class of all value declaration classes. @@ -239,7 +239,7 @@ class TextAscii(ValueSpec): raise MKUserError(varprefix, _("The value must be of type str, but it has type %s") % type(value)) def validate_value(self, value, varprefix): - if not self._allow_empty and value == "": + if not self._allow_empty and value.strip() == "": raise MKUserError(varprefix, _("An empty value is not allowed here.")) class TextUnicode(TextAscii): @@ -366,6 +366,8 @@ class Checkbox(ValueSpec): # help_separator: if you set this to a character, e.g. "-", then # value_to_text will omit texts from the character up to the end of # a choices name. +# Note: The list of choices may contain 2-tuples or 3-tuples. +# The format is (value, text {, icon} ) class DropdownChoice(ValueSpec): def __init__(self, **kwargs): ValueSpec.__init__(self, **kwargs) @@ -379,14 +381,18 @@ class DropdownChoice(ValueSpec): # Convert values from choices to keys defval = "0" options = [] - for n, (val, title) in enumerate(self._choices): - options.append((str(n), title)) - if val == value: + for n, entry in enumerate(self._choices): + options.append((str(n),) + entry[1:]) + if entry[0] == value: defval = str(n) - html.select(varprefix, options, defval) + if len(options[0]) == 3: + html.icon_select(varprefix, options, defval) + else: + html.select(varprefix, options, defval) def value_to_text(self, value): - for val, title in self._choices: + for entry in self._choices: + val, title = entry[:2] if value == val: if self._help_separator: return title.split(self._help_separator, 1)[0].strip() @@ -395,7 +401,8 @@ class DropdownChoice(ValueSpec): def from_html_vars(self, varprefix): sel = html.var(varprefix) - for n, (val, title) in enumerate(self._choices): + for n, entry in enumerate(self._choices): + val = entry[0] if sel == str(n): return val return self._choices[0][0] # can only happen if user garbled URL @@ -858,3 +865,11 @@ class ElementSelection(ValueSpec): if type(value) != str: raise MKUserError(varprefix, _("The datatype must be str (string), but is %s") % type(value)) + +class AutoTimestamp(FixedValue): + def __init__(self, **kwargs): + ValueSpec.__init__(self, **kwargs) + self._value = time.time() + + def value_to_text(self, value): + return time.strftime("%F %T", time.localtime(value)) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index bfcde17..40220ab 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -6930,6 +6930,19 @@ def save_users(profiles): # Call the users_saved hook call_hook(call_hook_users_saved, users) +# Dropdown for choosing a multisite user +class UserSelection(ElementSelection): + def __init__(self, **kwargs): + ElementSelection.__init__(self, **kwargs) + + def get_elements(self): + users = load_users() + elements = dict([ (name, "%s - %s" % (name, us.get("alias", name))) for (name, us) in users.items() ]) + return elements + + def value_to_text(self, value): + return self._elements.get(value, value).split(" - ")[-1] + #. # .-Roles----------------------------------------------------------------. # | ____ _ |

12 years, 11 months

Check_MK Git: check_mk: New icon for deletion

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: c1f4f8e640369ba3b8c65a5248bf3bef4afd97ba URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c1f4f8e640369b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Dec 31 18:51:30 2011 +0100 New icon for deletion --- web/htdocs/images/icon_delete.png | Bin 0 -> 4997 bytes 1 files changed, 0 insertions(+), 0 deletions(-) diff --git a/web/htdocs/images/icon_delete.png b/web/htdocs/images/icon_delete.png new file mode 100644 index 0000000..37b1486 Binary files /dev/null and b/web/htdocs/images/icon_delete.png differ

12 years, 11 months

Check_MK Git: check_mk: Separator for Dropdown Choice

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: b7f396d93525fc1932dcf58c99cd53ce5a23d85e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b7f396d93525fc… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Dec 30 18:58:59 2011 +0100 Separator for Dropdown Choice --- web/htdocs/forms.py | 2 +- web/htdocs/valuespec.py | 11 +++++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/web/htdocs/forms.py b/web/htdocs/forms.py index 7ad903e..aab1955 100644 --- a/web/htdocs/forms.py +++ b/web/htdocs/forms.py @@ -28,7 +28,7 @@ from lib import * def edit_dictionary(entries, value): - new_value = {} + new_value = value.copy() if html.check_transaction(): messages = [] for name, vs in entries: diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index 2c5d11f..13e03c8 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -362,11 +362,15 @@ class Checkbox(ValueSpec): if type(value) != bool: raise MKUserError(varprefix, _("The value has type %s, but must be either True or False") % (type(value))) -# A type-save dropdown choice +# A type-save dropdown choice. Parameters: +# help_separator: if you set this to a character, e.g. "-", then +# value_to_text will omit texts from the character up to the end of +# a choices name. class DropdownChoice(ValueSpec): def __init__(self, **kwargs): ValueSpec.__init__(self, **kwargs) self._choices = kwargs["choices"] + self._help_separator = kwargs.get("help_separator") def canonical_value(self): return self._choices[0][0] @@ -384,7 +388,10 @@ class DropdownChoice(ValueSpec): def value_to_text(self, value): for val, title in self._choices: if value == val: - return title + if self._help_separator: + return title.split(self._help_separator, 1)[0].strip() + else: + return title def from_html_vars(self, varprefix): sel = html.var(varprefix)

12 years, 11 months

Check_MK Git: check_mk: Move icon_button() to htmllib

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 113cde35b3ca66bf6855b0b492def77e94552b38 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=113cde35b3ca66… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Dec 29 13:16:02 2011 +0100 Move icon_button() to htmllib --- web/htdocs/htmllib.py | 13 +++++++++ web/htdocs/valuespec.py | 2 +- web/htdocs/wato.py | 67 +++++++++++++++++++--------------------------- 3 files changed, 42 insertions(+), 40 deletions(-) diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index 31d4158..0cbbc74 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -322,6 +322,16 @@ class html: (obj_id, style, title, disabled, text, href)) # self.write("<a href=\"%s\" class=button%s%s>%s</a>" % (href, obj_id, style, text)) + def icon_button(url, help, icon): + html.write('<a href="%s">' + '<img class=iconbutton title="%s" src="images/button_%s_lo.png" ' + 'onmouseover=\"hilite_icon(this, 1)\" ' + 'onmouseout=\"hilite_icon(this, 0)\">' + '</a>\n' % (url, help, icon)) + + def empty_icon_button(): + html.write('<img class=trans src="images/trans.png">') + def jsbutton(self, varname, text, onclick, style=''): if style: style = ' style="%s"' % style @@ -662,6 +672,9 @@ class html: self.browser_reload = secs self.browser_redirect = url + def immediate_browser_redirect(self, secs, url): + self.javascript("setReload(%s, '%s');" % (secs, url)) + def header(self, title='', **args): if self.output_format == "html": if not self.header_sent: diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index 893a8f5..2c5d11f 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -113,7 +113,7 @@ class FixedValue(ValueSpec): if self._totext != None: return self._totext else: - return self.title() + return str(value) def from_html_vars(self, varprefix): return self._value diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index d035edd..bfcde17 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -999,9 +999,9 @@ def show_subfolders(folder): enter_url = make_link_to([("mode", "folder")], entry) html.write("<td class=buttons>") - icon_button(edit_url, _("Edit the properties of this folder"), "edit") + html.icon_button(edit_url, _("Edit the properties of this folder"), "edit") if config.may("wato.manage_folders"): - icon_button(delete_url, _("Delete this folder"), "delete") + html.icon_button(delete_url, _("Delete this folder"), "delete") html.write("</td>") @@ -1155,11 +1155,11 @@ def show_hosts(folder): html.write('</td>\n') html.write("<td class=buttons>") - icon_button(edit_url, _("Edit the properties of this host"), "edit") - icon_button(services_url, _("Edit the services of this host, do an inventory"), "services") + html.icon_button(edit_url, _("Edit the properties of this host"), "edit") + html.icon_button(services_url, _("Edit the services of this host, do an inventory"), "services") if config.may("wato.manage_hosts"): - icon_button(clone_url, _("Create a clone of this host"), "insert") - icon_button(delete_url, _("Delete this host"), "delete") + html.icon_button(clone_url, _("Create a clone of this host"), "insert") + html.icon_button(delete_url, _("Delete this host"), "delete") html.write("</td>\n") # Hostname with link to details page (edit host) @@ -4187,9 +4187,9 @@ def mode_snapshot(phase): html.write('<tr class="data %s0"><td>' % odd) # Buttons - icon_button(make_action_link( + html.icon_button(make_action_link( [("mode","snapshot"),("_restore_snapshot", name)]), _("Restore"), "restore") - icon_button(make_action_link( + html.icon_button(make_action_link( [("mode","snapshot"),("_delete_file", name)]), _("Delete"), "delete") html.write("<td>") @@ -4632,8 +4632,8 @@ def mode_groups(phase, what): edit_url = make_link([("mode", "edit_%s_group" % what), ("edit", name)]) delete_url = html.makeactionuri([("_delete", name)]) html.write("<td class=buttons>") - icon_button(edit_url, _("Properties"), "edit") - icon_button(delete_url, _("Delete"), "delete") + html.icon_button(edit_url, _("Properties"), "edit") + html.icon_button(delete_url, _("Delete"), "delete") html.write("</td><td>%s</td><td>%s</td>" % (name, alias)) if what == "contact": html.write("<td>%s</td>" % ", ".join( @@ -4852,8 +4852,8 @@ def mode_timeperiods(phase): delete_url = html.makeactionuri([("_delete", name)]) html.write("<td class=buttons>") - icon_button(edit_url, _("Properties"), "edit") - icon_button(delete_url, _("Delete"), "delete") + html.icon_button(edit_url, _("Properties"), "edit") + html.icon_button(delete_url, _("Delete"), "delete") html.write("</td>") html.write("<td>%s</td>" % name) @@ -5305,8 +5305,8 @@ def mode_sites(phase): edit_url = make_link([("mode", "edit_site"), ("edit", id)]) delete_url = html.makeactionuri([("_delete", id)]) html.write("<td class=buttons>") - icon_button(edit_url, _("Properties"), "edit") - icon_button(delete_url, _("Delete"), "delete") + html.icon_button(edit_url, _("Properties"), "edit") + html.icon_button(delete_url, _("Delete"), "delete") # Alias html.write("</td><td>%s</td><td>%s</td>" % (id, site.get("alias", ""))) @@ -6373,9 +6373,9 @@ def mode_users(phase): delete_url = html.makeactionuri([("_delete", id)]) clone_url = make_link([("mode", "edit_user"), ("clone", id)]) html.write("<td class=buttons>") - icon_button(edit_url, _("Properties"), "edit") - icon_button(clone_url, _("Create a copy of this user"), "clone") - icon_button(delete_url, _("Delete"), "delete") + html.icon_button(edit_url, _("Properties"), "edit") + html.icon_button(clone_url, _("Create a copy of this user"), "clone") + html.icon_button(delete_url, _("Delete"), "delete") html.write("</td>") # ID @@ -6630,7 +6630,7 @@ def mode_edit_user(phase): id="automation_secret") html.write(" ") html.write("<b style='position: relative; top: 4px;'>  ") - icon_button("javascript:wato_randomize_secret('automation_secret', 20);", + html.icon_button("javascript:wato_randomize_secret('automation_secret', 20);", _("Create random secret"), "random") html.write("</b>") html.write("</ul>") @@ -7032,8 +7032,8 @@ def mode_roles(phase): edit_url = make_link([("mode", "edit_role"), ("edit", id)]) clone_url = html.makeactionuri([("_clone", id)]) delete_url = html.makeactionuri([("_delete", id)]) - icon_button(edit_url, _("Properties"), "edit") - icon_button(clone_url, _("Clone"), "clone") + html.icon_button(edit_url, _("Properties"), "edit") + html.icon_button(clone_url, _("Clone"), "clone") if not role.get("builtin"): html.buttonlink(delete_url, _("Delete")) html.write("</td>") @@ -7353,16 +7353,16 @@ def mode_hosttags(phase): delete_url = html.makeactionuri([("_delete", tag_id)]) html.write("<td>") if nr == 0: - empty_icon_button() + empty_html.icon_button() else: - icon_button(html.makeactionuri([("_move", str(-nr))]), + html.icon_button(html.makeactionuri([("_move", str(-nr))]), _("Move this tag group one position up"), "up") if nr == len(hosttags) - 1: - empty_icon_button() + empty_html.icon_button() else: - icon_button(html.makeactionuri([("_move", str(nr))]), + html.icon_button(html.makeactionuri([("_move", str(nr))]), _("Move this tag group one position down"), "down") - icon_button(delete_url, _("Delete this tag group"), "delete") + html.icon_button(delete_url, _("Delete this tag group"), "delete") html.write("</td>") html.write("<td>%s</td>" % tag_id) html.write("<td>%s</td>" % title) @@ -8171,7 +8171,7 @@ def mode_edit_ruleset(phase): ("host", hostname), ("item", repr(item)), ("rule_folder", folder[".path"])]) - icon_button(edit_url, _("Edit this rule"), "edit") + html.icon_button(edit_url, _("Edit this rule"), "edit") rule_button("insert", _("Insert a copy of this rule into the folder '%s'") % g_folder["title"], folder, rel_rulenr) rule_button("delete", _("Delete this rule"), folder, rel_rulenr) @@ -8302,7 +8302,7 @@ def create_rule(rulespec, hostname=None, item=NO_ITEM): def rule_button(action, help=None, folder=None, rulenr=0): if action == None: - empty_icon_button() + empty_html.icon_button() else: vars = [("_folder", folder[".path"]), ("_rulenr", str(rulenr)), @@ -8310,18 +8310,7 @@ def rule_button(action, help=None, folder=None, rulenr=0): if html.var("host"): vars.append(("host", html.var("host"))) url = html.makeactionuri(vars) - icon_button(url, help, action) - -def empty_icon_button(): - html.write('<img class=trans src="images/trans.png">') - -def icon_button(url, help, icon): - html.write('<a href="%s">' - '<img class=iconbutton title="%s" src="images/button_%s_lo.png" ' - 'onmouseover=\"hilite_icon(this, 1)\" ' - 'onmouseout=\"hilite_icon(this, 0)\">' - '</a>\n' % (url, help, icon)) - + html.icon_button(url, help, action) def parse_rule(ruleset, orig_rule): rule = orig_rule

12 years, 11 months

Check_MK Git: check_mk: Create new helper lib forms.py

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 1f68a922c18d4cc32b19b63d6f441372cc7232a5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1f68a922c18d4c… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Dec 29 13:33:03 2011 +0100 Create new helper lib forms.py --- web/htdocs/forms.py | 70 +++++++++++++++++++++++++++++++++++++++++++++++++ web/htdocs/htmllib.py | 8 +++--- web/htdocs/pages.css | 5 +++ web/htdocs/wato.css | 5 --- 4 files changed, 79 insertions(+), 9 deletions(-) diff --git a/web/htdocs/forms.py b/web/htdocs/forms.py new file mode 100644 index 0000000..7ad903e --- /dev/null +++ b/web/htdocs/forms.py @@ -0,0 +1,70 @@ +#!/usr/bin/python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2012 mk(a)mathias-kettner.de | +# +------------------------------------------------------------------+ +# +# This file is part of Check_MK. +# The official homepage is at http://mathias-kettner.de/check_mk. +# +# check_mk is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation in version 2. check_mk is distributed +# in the hope that it will be useful, but WITHOUT ANY WARRANTY; with- +# out even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. See the GNU General Public License for more de- +# ails. You should have received a copy of the GNU General Public +# License along with GNU Make; see the file COPYING. If not, write +# to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, +# Boston, MA 02110-1301 USA. + +from lib import * + + +def edit_dictionary(entries, value): + new_value = {} + if html.check_transaction(): + messages = [] + for name, vs in entries: + try: + v = vs.from_html_vars(name) + vs.validate_value(v, name) + new_value[name] = v + except MKUserError, e: + messages.append(vs.title() + ": " + e.message) + html.add_user_error(e.varname, e.message) + if messages: + html.show_error("".join(["%s<br>\n" % m for m in messages])) + else: + return new_value + + html.begin_form("form") + html.write("<table class=form>\n") + first = True + for name, vs in entries: + html.write("<tr><td class=legend>%s" % vs.title()) + if vs.help(): + html.write("<br><i>%s</i>" % vs.help()) + html.write("</td><td class=content>") + if name in value: + v = value[name] + else: + v = vs.default_value() + vs.render_input(name, v) + if first: + vs.set_focus(name) + first = False + html.write("<tr><td class=buttons colspan=2>") + html.button("save", _("Save")) + html.write("</td></tr>\n") + html.write("</table>\n") + html.hidden_fields() + html.end_form() + + diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index 0cbbc74..80d47d8 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -322,15 +322,15 @@ class html: (obj_id, style, title, disabled, text, href)) # self.write("<a href=\"%s\" class=button%s%s>%s</a>" % (href, obj_id, style, text)) - def icon_button(url, help, icon): - html.write('<a href="%s">' + def icon_button(self, url, help, icon): + self.write('<a href="%s">' '<img class=iconbutton title="%s" src="images/button_%s_lo.png" ' 'onmouseover=\"hilite_icon(this, 1)\" ' 'onmouseout=\"hilite_icon(this, 0)\">' '</a>\n' % (url, help, icon)) - def empty_icon_button(): - html.write('<img class=trans src="images/trans.png">') + def empty_icon_button(self): + self.write('<img class=trans src="images/trans.png">') def jsbutton(self, varname, text, onclick, style=''): if style: diff --git a/web/htdocs/pages.css b/web/htdocs/pages.css index 124d389..f0cb41f 100644 --- a/web/htdocs/pages.css +++ b/web/htdocs/pages.css @@ -321,6 +321,11 @@ tr.groupheader a:hover { border: 1px solid #fff; } +img.iconbutton { + width: 20px; + height: 20px; +} + /*-------------------------------------------------------------------------. | _____ | | | ___|__ _ __ _ __ ___ ___ | diff --git a/web/htdocs/wato.css b/web/htdocs/wato.css index d249448..4021bac 100644 --- a/web/htdocs/wato.css +++ b/web/htdocs/wato.css @@ -290,11 +290,6 @@ Boston, MA 02110-1301 USA. top: 3px; } -.wato img.iconbutton { - width: 20px; - height: 20px; -} - .wato img.trans { width: 24px; }

12 years, 11 months

Check_MK Git: check_mk: WATO: put ValueSpecs into valuespec.py

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 0d5c9fad7d01dd55c5932a3fc64d6cf3df97a526 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0d5c9fad7d01dd… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Dec 29 12:16:25 2011 +0100 WATO: put ValueSpecs into valuespec.py --- web/htdocs/valuespec.py | 853 +++++++++++++++++++++++++++++++++++++++++++++++ web/htdocs/wato.py | 826 +--------------------------------------------- 2 files changed, 854 insertions(+), 825 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=0d5c9fad7d…

12 years, 11 months

Check_MK Git: check_mk: Updated bug entries #0131

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: a07fa42afe297a9f1e50750db4b525115cf9d33e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a07fa42afe297a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Dec 29 09:29:45 2011 +0100 Updated bug entries #0131 --- .bugs/131 | 14 +++++++++++--- 1 files changed, 11 insertions(+), 3 deletions(-) diff --git a/.bugs/131 b/.bugs/131 index 80999ee..cd10ed2 100644 --- a/.bugs/131 +++ b/.bugs/131 @@ -17,6 +17,14 @@ When monitoring switches the services are ordered as follows: 2 20 -It would be good to cleanup such interface names by adding a leading zero to the numbers to -have a proper sorting of the elements. We can make it like in the brocade checks: As we -know the total number of ports we can decide whether to use 2, 3 or 4 digits. +It would be good to cleanup such interface names by adding a leading zero to +the numbers to have a proper sorting of the elements. We can make it like +in the brocade checks: As we know the total number of ports we can decide +whether to use 2, 3 or 4 digits. + +Because there are switches with more than 100 ports we could first +get the number of ports and then use even more zeroes if neccessary. +Look at brocade_fcport for details. + +Also we could make this configurable in order not to break existing +checks.

12 years, 11 months

Check_MK Git: check_mk: ibm_imm_health: added last missing scan function

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: f41dcea52e941a0569c7155dba40e6bc408a90a3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f41dcea52e941a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Dec 29 09:25:54 2011 +0100 ibm_imm_health: added last missing scan function --- .bugs/105 | 7 +++++-- ChangeLog | 1 + checks/ibm_imm_health | 3 +++ 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/.bugs/105 b/.bugs/105 index 25a3dfb..04b6e75 100644 --- a/.bugs/105 +++ b/.bugs/105 @@ -1,10 +1,10 @@ Title: SNMP scan: implement missing scan functions Component: core +State: done +Class: cleanup Benefit: 3 -State: open Cost: 5 Date: 2011-01-24 16:22:26 -Class: cleanup Targetversion: 1.2.0 All SNMP checks must define scan functions. Otherwise the scan @@ -14,3 +14,6 @@ There is just one scan function missing: $ doc/helpers/validate_checks -a | grep scan ibm_imm_health snmp_scan manpage + +2011-12-29 09:25:41: changed state open -> done +Should work now. diff --git a/ChangeLog b/ChangeLog index a54e183..01e4823 100644 --- a/ChangeLog +++ b/ChangeLog @@ -12,6 +12,7 @@ been converted from counters to rates. You might need to delete your existing RRDs of these checks. Sorry, but these have been that last checks still using counters... + * ibm_imm_health: added last missing scan function 1.1.13i2: diff --git a/checks/ibm_imm_health b/checks/ibm_imm_health index 52f63b8..8783498 100644 --- a/checks/ibm_imm_health +++ b/checks/ibm_imm_health @@ -54,3 +54,6 @@ def check_ibm_imm_health(_no_item, _no_params, info): check_info['ibm_imm_health'] = ( check_ibm_imm_health, "System health", 0, inventory_ibm_imm_health ) snmp_info['ibm_imm_health'] = ( ".1.3.6.1.4.1.2.3.51.3.1", ["4"] ) + +snmp_scan_functions['ibm_imm_health'] = lambda oid: \ + oid('.1.3.6.1.2.1.1.1.0').lower().endswith(" mips")

12 years, 11 months

Check_MK Git: check_mk: Removed old comment

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: c84b5e7a9725fd1d8462deeed6ddddac27c5cd50 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c84b5e7a9725fd… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Dec 28 16:57:13 2011 +0100 Removed old comment --- livestatus/src/Query.cc | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/livestatus/src/Query.cc b/livestatus/src/Query.cc index 3c514dc..31a9640 100644 --- a/livestatus/src/Query.cc +++ b/livestatus/src/Query.cc @@ -488,7 +488,6 @@ void Query::parseAuthUserHeader(char *line) void Query::parseStatsGroupLine(char *line) { - // Can be re-enabled from 1.2i1 logger(LOG_WARNING, "Warning: StatsGroupBy is deprecated. " "Please use Columns instead."); parseColumnsLine(line);

12 years, 11 months

Check_MK Git: check_mk: cmk -R/O: use omd re{start, load} core

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 5732ae04f10fa2dbaeee0b0f95cec49f42249f2a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5732ae04f10fa2… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Dec 28 17:03:50 2011 +0100 cmk -R/O: use omd re{start,load} core --- .bugs/89 | 7 +++++-- .bugs/97 | 7 +++++-- ChangeLog | 1 + modules/check_mk.py | 8 ++++++-- 4 files changed, 17 insertions(+), 6 deletions(-) diff --git a/.bugs/89 b/.bugs/89 index 624b6d4..20580d0 100644 --- a/.bugs/89 +++ b/.bugs/89 @@ -1,12 +1,15 @@ Title: Re-Enable StatsGroupBy deprecated warning (1.2i1) Component: livestatus +State: done +Class: cleanup Benefit: 1 -State: open Cost: 1 Date: 2011-01-05 10:33:21 -Class: cleanup Targetversion: 1.2.0 StatsGroupBy ist deprecated. Die Warnung dazu erst ab 1.2i1 aktivieren: src/Query.cc:442 + +2011-12-28 16:57:33: changed state open -> done +Is already enabled sind a couple of versions. diff --git a/.bugs/97 b/.bugs/97 index 1fab09d..7182df8 100644 --- a/.bugs/97 +++ b/.bugs/97 @@ -1,10 +1,10 @@ Title: Restart nagios on OMD - use OMD method Component: core +State: done +Class: cleanup Benefit: 1 -State: open Cost: 2 Date: 2011-01-22 13:53:40 -Class: cleanup Targetversion: 1.2.0 When doing a restart of Nagios or a config check while running @@ -19,3 +19,6 @@ makes 'omd restart core' work in the first place. --> better wait a time until all Check_MK users surely use OMD versions that have that fix. + +2011-12-28 17:03:08: changed state open -> done +Check_MK now uses omd re{start,load} core if OMD is used. diff --git a/ChangeLog b/ChangeLog index 42f327c..a54e183 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,7 @@ 1.1.13i3: Core, Setup, etc.: * cmk -d does now honor --cache and --no-tcp + * cmk -O/-R now uses omd re{start,load} core if using OMD Checks & Agents: * Windows agent: output eventlog texts in UTF-8 encoding. This diff --git a/modules/check_mk.py b/modules/check_mk.py index e90115a..d90ea9e 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -3635,12 +3635,16 @@ def do_restart_nagios(only_reload): action = only_reload and "load" or "start" sys.stdout.write("Re%sing Nagios..." % action) sys.stdout.flush() - command = nagios_startscript + " re%s 2>&1" % action + if omd_root: + command = "omd re%s core 2>&1" % action + else: + command = nagios_startscript + " re%s 2>&1" % action + process = os.popen(command, "r") output = process.read() if process.close(): sys.stdout.write("ERROR: %s\n" % output) - raise MKGeneralException("Cannot re%s Nagios: %s" % (action, output)) + raise MKGeneralException("Cannot re%s the monitoring core: %s" % (action, output)) else: sys.stdout.write(tty_ok + "\n")

12 years, 11 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits December 2011