Checkmk git commits March 2012

checkmk-commits@lists.checkmk.com

3 participants
160 discussions

Check_MK Git: check_mk: ValueSpec Tuple: fix complain handling

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 239abd0aa64594e859ab5b54dea8bfd3a3821980 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=239abd0aa64594… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Mar 12 15:20:15 2012 +0100 ValueSpec Tuple: fix complain handling --- web/htdocs/valuespec.py | 15 ++++++++++++--- 1 files changed, 12 insertions(+), 3 deletions(-) diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index 602dbd9..09b610f 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -563,9 +563,6 @@ class ListOf(ValueSpec): # numbering in labels, etc. possible). The current number # of entries is stored in the hidden variable 'varprefix' def render_input(self, varprefix, value): - if html.has_var(varprefix + "_count"): # already filled in, complain - value = self.from_html_vars(varprefix) - html.write('<input type=hidden name="%s_count" value="%d" id="%s_count">\n' % (varprefix, len(value), varprefix)) @@ -584,6 +581,12 @@ class ListOf(ValueSpec): # Actual table of currently existing entries html.write('<table class="valuespec_listof" id="%s_table">' % varprefix) + if html.has_var(varprefix + "_count"): # already filled in, complain + value = [None] * int(html.var(varprefix + "_count")) + # the underlying render_input-functions should ignore the + # value in this case themselves, so that the "None" should not + # harm here. + for nr, v in enumerate(value): html.push_transformation(lambda x: x.replace(self._magic, str(nr+1))) html.write('<tr><td class=vlof_buttons>') @@ -1351,6 +1354,12 @@ class Tuple(ValueSpec): html.write('<table class="valuespec_tuple">') if not self._vertical: html.write("<tr>") + + # If the form is already filled in and we are in complain mode, + # the value in value must be ignored + if html.form_filled_in(): + value = (None,) * len(self._elements) + for no, (element, val) in enumerate(zip(self._elements, value)): vp = varprefix + "_" + str(no) if element.help():

12 years, 3 months

Check_MK Git: check_mk: ValueSpec ListOf(): fix complain situation

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 6ccf18817b08ec85fc8362884c95978dd5c59348 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6ccf18817b08ec… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Mar 12 15:14:24 2012 +0100 ValueSpec ListOf(): fix complain situation --- web/htdocs/check_mk.css | 6 +++--- web/htdocs/valuespec.py | 3 +++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/web/htdocs/check_mk.css b/web/htdocs/check_mk.css index 5017605..e59458c 100644 --- a/web/htdocs/check_mk.css +++ b/web/htdocs/check_mk.css @@ -321,8 +321,8 @@ table.valuespec_listof td.vlof_buttons { white-space: nowrap; } table.valuespec_listof td.vlof_content { - border: 1px solid white; - box-shadow: 1px 1px 2px #808080; - background-image: url("images/form_background.png"); + /* border: 1px solid white; + box-shadow: 1px 1px 2px #808080; */ + background-image: url("images/form_background.png"); background-repeat: repeat; } diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index 5bd8b5b..602dbd9 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -563,6 +563,9 @@ class ListOf(ValueSpec): # numbering in labels, etc. possible). The current number # of entries is stored in the hidden variable 'varprefix' def render_input(self, varprefix, value): + if html.has_var(varprefix + "_count"): # already filled in, complain + value = self.from_html_vars(varprefix) + html.write('<input type=hidden name="%s_count" value="%d" id="%s_count">\n' % (varprefix, len(value), varprefix))

12 years, 3 months

Check_MK Git: check_mk: New ValueSpec for IPv4 Network

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: b020459e54b25113faaf4a74bcfcf2e526ec55c1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b020459e54b251… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Mar 12 14:40:19 2012 +0100 New ValueSpec for IPv4 Network --- web/htdocs/valuespec.py | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 43 insertions(+), 0 deletions(-) diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index d43887e..5bd8b5b 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -328,6 +328,49 @@ class EmailAddress(TextAscii): def value_to_text(self, value): return '<a href="mailto:%s">%s</a>' % (value, value) + +# Network as used in routing configuration, such as +# "10.0.0.0/8" or "192.168.56.1" +class IPv4Network(TextAscii): + def __init__(self, **kwargs): + kwargs.setdefault("size", 12) + TextAscii.__init__(self, **kwargs) + + def validate_value(self, value, varprefix): + if "/" in value: + try: + network, bits = value.split("/") + bits = int(bits) + except: + raise MKUserError(varprefix, _("Please use the syntax X.X.X.X/YY")) + else: + network = value + bits = 32 + + if bits < 0 or bits > 32: + raise MKUserError(varprefix, _("Invalid number of bits. Must be in range 1 ... 32")) + + if value.count(".") != 3: + raise MKUserError(varprefix, _("The network must contain three dots")) + try: + octets = map(int, network.split(".")) + if len(octets) != 4: + raise MKUserError(varprefix, _("Please specify four octets (X.X.X.X/YY)")) + for o in octets: + if o < 0 or o > 255: + raise MKUserError(varprefix, _("Invalid octet %d (must be in range 1 ... 255)") % o) + except MKUserError: + raise + except: + raise MKUserError(varprefix, _("Please use the syntax X.X.X.X/YY")) + + # Make sure that non-network bits are zero + l = (octets[0] << 24) + (octets[1] << 16) + (octets[2] << 8) + (octets[3]) + for b in range(bits, 32): + if l & (2 ** (31-b)) != 0: + raise MKUserError(varprefix, _("Please make sure that only the %d non-network bits are non-zero") % bits) + + # Valuespec for a HTTP Url (not HTTPS), that # automatically adds http:// to the value class HTTPUrl(TextAscii):

12 years, 3 months

Check_MK Git: check_mk: ListOf: fix replacing of magic

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 87ca1815b80b0d4344b7406ac35a208d27e98dfc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=87ca1815b80b0d… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Mar 12 13:43:23 2012 +0100 ListOf: fix replacing of magic --- web/htdocs/htmllib.py | 10 ++++++++++ web/htdocs/valuespec.py | 2 ++ 2 files changed, 12 insertions(+), 0 deletions(-) diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index cc81e2f..f10e9d1 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -174,10 +174,17 @@ class html: self.context_buttons_open = False self.mobile = False self.buffering = True + self.transformations = [] def set_buffering(self, b): self.buffering = b + def push_transformation(self, tf): + self.transformations.append(tf) + + def pop_transformation(self): + del self.transformations[-1] + def plugin_stylesheets(self): global plugin_stylesheets try: @@ -201,6 +208,9 @@ class html: self.link_target = framename def write(self, text): + for tf in self.transformations: + text = tf(text) + if type(text) == unicode: text = text.encode("utf-8") if self.buffering: diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index 7026177..d43887e 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -539,6 +539,7 @@ class ListOf(ValueSpec): # Actual table of currently existing entries html.write('<table class="valuespec_listof" id="%s_table">' % varprefix) for nr, v in enumerate(value): + html.push_transformation(lambda x: x.replace(self._magic, str(nr+1))) html.write('<tr><td class=vlof_buttons>') html.hidden_field(varprefix + "_indexof_%d" % (nr+1), "") # reconstruct order after moving stuff self.del_button(varprefix, nr+1) @@ -547,6 +548,7 @@ class ListOf(ValueSpec): html.write("</td><td class=vlof_content>") self._valuespec.render_input(varprefix + "_%d" % (nr+1), v) html.write("</td></tr>") + html.pop_transformation() html.write("</table>") html.write("<br>") html.jsbutton(varprefix + "_add", self._add_label,

12 years, 3 months

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

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 5d20feb73d55651fc9e28d3b1bfa0aff6473df3b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5d20feb73d5565… Author: Florian Heigl <fh(a)mathias-kettner.de> Date: Wed Mar 7 11:48:04 2012 +0100 Merge branch 'master' of mathias-kettner.de:check_mk ---

12 years, 3 months

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

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 9396a1f4e66f95d32cf6cbeec08f1430a84cb1ea URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9396a1f4e66f95… Author: Florian Heigl <fh(a)mathias-kettner.de> Date: Mon Mar 12 08:48:07 2012 +0100 Merge branch 'master' of mathias-kettner.de:check_mk ---

12 years, 3 months

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

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 0a7e27a4b163e8a6dc877e31c5f60dfc202b5864 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0a7e27a4b163e8… Author: Florian Heigl <fh(a)mathias-kettner.de> Date: Tue Mar 6 19:58:13 2012 +0100 Merge branch 'master' of mathias-kettner.de:check_mk ---

12 years, 3 months

Check_MK Git: check_mk: Solaris Agent: let disk usage support Symantec VxFS

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 2f8a03f4f0987666c21ebd5fa957a8f0db54a6e6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2f8a03f4f09876… Author: Florian Heigl <fh(a)mathias-kettner.de> Date: Tue Mar 6 19:50:44 2012 +0100 Solaris Agent: let disk usage support Symantec VxFS --- agents/check_mk_agent.solaris | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/agents/check_mk_agent.solaris b/agents/check_mk_agent.solaris index 4cf39ab..095460d 100755 --- a/agents/check_mk_agent.solaris +++ b/agents/check_mk_agent.solaris @@ -46,7 +46,7 @@ echo Version: 1.1.13i4 echo AgentOS: solaris echo '<<<df>>>' -for fs in ufs zfs +for fs in ufs zfs vxfs do df -lk -F $fs 2>/dev/null | sed 1d | \ while read Filesystem kbytes used avail capacity Mountedon

12 years, 3 months

Check_MK Git: check_mk: Test

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 696add861417163727069338a7e83efa5b4339bb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=696add86141716… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Sat Mar 10 12:33:44 2012 +0100 Test --- .gitignore | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/.gitignore b/.gitignore index 0adddb9..94e5851 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ var/ .bugs/.my_ids .bugs/.last check-mk-agent-*.exe +

12 years, 3 months

Check_MK Git: check_mk: WATO: bugfix, invisible folder attributes no longer lost on 'Save'

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 138fa4ef5e8706e1d4086fcf6478086223cfb08b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=138fa4ef5e8706… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Sat Mar 10 00:03:28 2012 +0100 WATO: bugfix, invisible folder attributes no longer lost on 'Save' --- web/htdocs/wato.py | 22 ++++++++++------------ 1 files changed, 10 insertions(+), 12 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 86629a5..b65adab 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -4043,30 +4043,28 @@ def configure_attributes(hosts, for_what, parent, myself=None, without_attribute if attrname in without_attributes: continue # e.g. needed to skip ipaddress in CSV-Import - # Skip hidden attributes + # Hide invisible attributes hide_attribute = False - if not attr.show_in_form(): + if for_what == "host" and not attr.show_in_form(): + hide_attribute = True + elif (for_what == "folder" or for_what == "bulk") and not attr.show_in_folder(): hide_attribute = True - # In folder not all attributes are shown - if for_what == "folder" and not attr.show_in_folder(): - continue - - # Add host tag dependencies, but only in host mode. In other - # modes we always need to show all attributes. - if for_what == "host": + # Determine visibility information if this attribute is not always hidden + if not hide_attribute: depends_on_tags = attr.depends_on_tags() depends_on_roles = attr.depends_on_roles() - if depends_on_tags: + # Add host tag dependencies, but only in host mode. In other + # modes we always need to show all attributes. + if for_what == "host" and depends_on_tags: dependency_mapping_tags[attrname] = depends_on_tags + if depends_on_roles: dependency_mapping_roles[attrname] = depends_on_roles if not depends_on_tags and not depends_on_roles: # One attribute is always shown -> topic is always visible topic_is_volatile = False - else: - topic_is_volatile = False # "bulk": determine, if this attribute has the same setting for all hosts. values = []

12 years, 3 months

← Newer
1
...
8
9
10
11
12
13
14
15
16
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits March 2012