Checkmk git commits January 2012

checkmk-commits@lists.checkmk.com

2 participants
334 discussions

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 0695c6ef26e72b3d626a740b8979285fa22f760d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0695c6ef26e72b… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Fri Jan 13 18:23:53 2012 +0100 Bug add --- .bugs/596 | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/.bugs/596 b/.bugs/596 new file mode 100644 index 0000000..a1898f3 --- /dev/null +++ b/.bugs/596 @@ -0,0 +1,8 @@ +Title: Wato verweist für die Hostag Konfiguration noch in die multisite.mk +Component: wato +State: open +Date: 2012-01-13 18:21:44 +Targetversion: 1.2.0 +Class: nastiness + +Anstelle eines Links in die Multisite Einstellungen zu Host Tags, wird via Text auf die multisite.mk verwiesen um hostags anzulegen

12 years, 7 months

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

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 3a736403b4b63c1595a2045cb36db9b681c612df URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3a736403b4b63c… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Fri Jan 13 17:58:57 2012 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

12 years, 7 months

Check_MK Git: check_mk: Wato: Added Filesize ValueSpec

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 52fd532f076e23b8f294159b73c960df2bedaa0d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=52fd532f076e23… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Fri Jan 13 17:58:52 2012 +0100 Wato: Added Filesize ValueSpec --- web/htdocs/valuespec.py | 32 ++++++++++++++++++++++++++++++++ 1 files changed, 32 insertions(+), 0 deletions(-) diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index 2f4863c..02bd5b5 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -46,6 +46,7 @@ class ValueSpec: # is prepended to the HTML variable names and is needed # in order to make the variable unique in case that another # Value of the same type is being used as well. + # The function may assume that the type of the value is valid. def render_input(self, varprefix, value): pass @@ -72,6 +73,7 @@ class ValueSpec: # Creates a text-representation of the value that can be # used in tables and other contextes. It is to be read # by the user and need not to be parsable. + # The function may assume that the type of the value is valid. def value_to_text(self, value): return repr(value) @@ -225,6 +227,36 @@ class Integer(ValueSpec): if self._maxvalue != None and value > self._maxvalue: raise MKUserError(varprefix, _("%s is too high. The maximum allowed value is %s." % ( value, self._maxvalue))) +# Filesize in Byte,Kbyte,Mbyte,Gigatbyte, Terrabyte +class Filesize(Integer): + def __init__(self, **kwargs): + Integer.__init__(self, **kwargs) + self._names = [ 'Byte', 'KByte', 'MByte', 'GByte', 'TByte', ] + + + def get_exponent(self, value): + for exp, unit_name in list(enumerate(self._names))[::-1]: + if value == 0: + return 0,0 + if value % (1024 ** exp) == 0: + return exp, value / (1024 ** exp) + + def render_input(self, varprefix, value): + exp, count = self.get_exponent(value) + html.number_input(varprefix + '_size', count, size = self._size) + html.write(" ") + html.select(varprefix + '_unit', enumerate(self._names), exp) + + def from_html_vars(self, varprefix): + try: + return int(html.var(varprefix + '_size')) * (1024 ** int(html.var(varprefix + '_unit'))) + except: + raise MKUserError(varprefix + '_size', _("Please enter a valid integer number")) + + def value_to_text(self, value): + exp, count = self.get_exponent(value) + return "%s %s" % (count, self._names[exp]) + # Editor for a line of text class TextAscii(ValueSpec):

12 years, 7 months

Check_MK Git: check_mk: Completed fileinfo VarSpec

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 06952329fc3077625d447141b85b40ed3f719402 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=06952329fc3077… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Fri Jan 13 16:44:31 2012 +0100 Completed fileinfo VarSpec --- web/plugins/wato/check_parameters.py | 19 ++++++++++++++++++- 1 files changed, 18 insertions(+), 1 deletions(-) diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index b8d4cbe..02c40a9 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -276,7 +276,24 @@ checkgroups.append(( ] ) ), - + ("minsize", + Tuple( + title = _("Minimal size"), + elements = [ + Filesize(title = _("Warning lower as")), + Filesize(title = _("Critical lower as")), + ] + ) + ), + ("maxsize", + Tuple( + title = _("Maximal size"), + elements = [ + Filesize(title = _("Warning higher as")), + Filesize(title = _("Critical higher as")), + ] + ) + ) ] ),

12 years, 7 months

Check_MK Git: check_mk: moved user profile management page to wato module

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 7bad074ec674e3f6dbda0298ec762e39b3538a98 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7bad074ec674e3… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jan 13 15:59:33 2012 +0100 moved user profile management page to wato module --- web/htdocs/lib.py | 27 ++++++----- web/htdocs/login.py | 98 ------------------------------------ web/htdocs/sidebar.py | 2 +- web/htdocs/wato.py | 112 ++++++++++++++++++++++++++++++++++++++++++ web/plugins/pages/shipped.py | 1 - web/plugins/pages/wato.py | 1 + 6 files changed, 129 insertions(+), 112 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=7bad074ec6…

12 years, 7 months

Check_MK Git: check_mk: wato: Processing taglist as string

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 20dc5004a982961230010b6af873eb29baf8a4e2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=20dc5004a98296… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jan 13 15:04:46 2012 +0100 wato: Processing taglist as string --- web/htdocs/js/wato.js | 2 +- web/htdocs/wato.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/web/htdocs/js/wato.js b/web/htdocs/js/wato.js index 2979286..677891c 100644 --- a/web/htdocs/js/wato.js +++ b/web/htdocs/js/wato.js @@ -87,7 +87,7 @@ function wato_fix_visibility() { var oCheckbox = oTr.childNodes[1].childNodes[0]; if( oCheckbox.checked == false ){ var attrname = oCheckbox.parentNode.parentNode.id; - if(attrname in inherited_tags && inherited_tags[attrname]){ + if(attrname in inherited_tags && inherited_tags[attrname] !== null){ currentTags = currentTags.concat(inherited_tags[attrname].split("|")); } } else { diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index d404ede..ea67819 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -3875,7 +3875,7 @@ def configure_attributes(hosts, for_what, parent, myself=None, without_attribute inherited_value = container["attributes"][attrname] has_inherited = True if topic == _("Host tags"): - inherited_tags["attr_%s" % attrname] = attr.get_tag_list(inherited_value) + inherited_tags["attr_%s" % attrname] = '|'.join(attr.get_tag_list(inherited_value)) break container = container.get(".parent") @@ -3886,7 +3886,7 @@ def configure_attributes(hosts, for_what, parent, myself=None, without_attribute inherited_value = attr.default_value() # Also add the default values to the inherited values dict if topic == _("Host tags"): - inherited_tags["attr_%s" % attrname] = attr.get_tag_list(inherited_value) + inherited_tags["attr_%s" % attrname] = '|'.join(attr.get_tag_list(inherited_value)) # Legend and Help html.write('<tr id="attr_%s"><td class=legend>' % attrname)

12 years, 7 months

Check_MK Git: check_mk: Adding whole tag list to inherited tags

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: d531ea0e641f4a3db3a2696e89f611706f9f06cd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d531ea0e641f4a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jan 13 14:59:48 2012 +0100 Adding whole tag list to inherited tags --- web/htdocs/wato.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index b5c085a..d404ede 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -3875,7 +3875,7 @@ def configure_attributes(hosts, for_what, parent, myself=None, without_attribute inherited_value = container["attributes"][attrname] has_inherited = True if topic == _("Host tags"): - inherited_tags["attr_%s" % attrname] = inherited_value + inherited_tags["attr_%s" % attrname] = attr.get_tag_list(inherited_value) break container = container.get(".parent") @@ -3886,7 +3886,7 @@ def configure_attributes(hosts, for_what, parent, myself=None, without_attribute inherited_value = attr.default_value() # Also add the default values to the inherited values dict if topic == _("Host tags"): - inherited_tags["attr_%s" % attrname] = inherited_value + inherited_tags["attr_%s" % attrname] = attr.get_tag_list(inherited_value) # Legend and Help html.write('<tr id="attr_%s"><td class=legend>' % attrname)

12 years, 7 months

Check_MK Git: check_mk: WATO: Fixed json parsing & javascript erros

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: c92001033b89cd617696ffa831ee503e17d882b2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c92001033b89cd… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jan 13 14:22:07 2012 +0100 WATO: Fixed json parsing & javascript erros --- web/htdocs/js/wato.js | 4 ++-- web/htdocs/wato.py | 13 +++++++------ 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/web/htdocs/js/wato.js b/web/htdocs/js/wato.js index ba09ca1..2979286 100644 --- a/web/htdocs/js/wato.js +++ b/web/htdocs/js/wato.js @@ -87,8 +87,8 @@ function wato_fix_visibility() { var oCheckbox = oTr.childNodes[1].childNodes[0]; if( oCheckbox.checked == false ){ var attrname = oCheckbox.parentNode.parentNode.id; - if( attrname in inherited_tags ){ - currentTags = currentTags.concat(inherited_tags[oCheckbox.parentNode.parentNode.id].split("|")); + if(attrname in inherited_tags && inherited_tags[attrname]){ + currentTags = currentTags.concat(inherited_tags[attrname].split("|")); } } else { /* Find the <select>/<checkbox> object in this tr */ diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index d022547..b5c085a 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -4000,13 +4000,14 @@ def configure_attributes(hosts, for_what, parent, myself=None, without_attribute # Provide Javascript world with the tag dependency information # of all attributes. - html.javascript("var inherited_tags = %r;\n"\ - "var wato_depends_on = %r;\n"\ - "var volatile_topics = %r;\n"\ + import json + html.javascript("var inherited_tags = %s;\n"\ + "var wato_depends_on = %s;\n"\ + "var volatile_topics = %s;\n"\ "wato_fix_visibility();\n" % ( - inherited_tags, - dependency_mapping, - volatile_topics)) + json.dumps(inherited_tags), + json.dumps(dependency_mapping), + json.dumps(volatile_topics))) # Check if at least one host in a folder (or its subfolders)

12 years, 7 months

Check_MK Git: check_mk: Also showing dependent tags when related field is using the default value

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 659f498caaa0339db68ffe126a88f9276abf15b4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=659f498caaa033… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jan 13 12:55:05 2012 +0100 Also showing dependent tags when related field is using the default value --- web/htdocs/wato.py | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index e062abb..d022547 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -3884,6 +3884,9 @@ def configure_attributes(hosts, for_what, parent, myself=None, without_attribute if not container: # We are the root folder - we inherit the default values inherited_from = _("Default value") inherited_value = attr.default_value() + # Also add the default values to the inherited values dict + if topic == _("Host tags"): + inherited_tags["attr_%s" % attrname] = inherited_value # Legend and Help html.write('<tr id="attr_%s"><td class=legend>' % attrname)

12 years, 7 months

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

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 0e8fa93b0c085b0b0a471be316f893ec2d6e7a96 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0e8fa93b0c085b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jan 13 12:55:11 2012 +0100 Merge branch 'master' of ssh://git.mathias-kettner.de/var/www/80/git.mathias-kettner.de/check_mk ---

12 years, 7 months

← Newer
1
...
19
20
21
22
23
24
25
...
34
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits January 2012