Checkmk git commits May 2012

checkmk-commits@lists.checkmk.com

2 participants
440 discussions

Check_MK Git: check_mk: Fix default value of ValueSpec Dictionary

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 86aae873f19bbc65b6ff79c83b584a247811395c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=86aae873f19bbc… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri May 25 11:20:42 2012 +0200 Fix default value of ValueSpec Dictionary --- web/htdocs/valuespec.py | 8 ++++++++ web/plugins/wato/active_checks.py | 3 ++- 2 files changed, 10 insertions(+), 1 deletions(-) diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index 07cc648..62ee869 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -1656,6 +1656,14 @@ class Dictionary(ValueSpec): in self._elements if name in self._required_keys or not self._optional_keys]) + def default_value(self): + def_val = {} + for name, vs in self._elements: + if name in self._required_keys or not self._optional_keys: + def_val[name] = vs.default_value() + + return def_val + def value_to_text(self, value): parts = [] for param, vs in self._elements: diff --git a/web/plugins/wato/active_checks.py b/web/plugins/wato/active_checks.py index ea82ea6..215578f 100644 --- a/web/plugins/wato/active_checks.py +++ b/web/plugins/wato/active_checks.py @@ -503,7 +503,8 @@ register_rule(group, title = _("Service description"), help = _("Please make sure that this is unique per host " "and does not collide with other services."), - allow_empty = False) + allow_empty = False, + default_value = _("Customcheck")) ), ( "command_line", TextAscii(

12 years, 1 month

Check_MK Git: check_mk: FIX: fix configuration of passive checks via custom_checks

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 54a050400583309107b286b5451a3b4780b63421 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=54a05040058330… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri May 25 11:10:38 2012 +0200 FIX: fix configuration of passive checks via custom_checks --- ChangeLog | 1 + modules/check_mk.py | 21 +++++++++++---------- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index f777f82..fe36100 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,7 @@ 1.2.0b5: Core: * FIX: handle UTF-8 encoded binary strings correctly (e.g. in host alias) + * FIX: fix configuration of passive checks via custom_checks WATO: * Site management: "disabled" only applies to Livestatus now diff --git a/modules/check_mk.py b/modules/check_mk.py index e8459e6..7f33d18 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -1850,16 +1850,17 @@ define service { command_name = entry.get("command_name", "check-mk-custom") command_line = entry.get("command_line", "") - plugin_name = command_line.split()[0] - if command_line[0] not in [ '$', '/' ]: - try: - for dir in [ "/local", "" ]: - path = omd_root + dir + "/lib/nagios/plugins/" - if os.path.exists(path + plugin_name): - command_line = path + command_line - break - except: - pass + if command_line: + plugin_name = command_line.split()[0] + if command_line[0] not in [ '$', '/' ]: + try: + for dir in [ "/local", "" ]: + path = omd_root + dir + "/lib/nagios/plugins/" + if os.path.exists(path + plugin_name): + command_line = path + command_line + break + except: + pass custom_commands_to_define.add(command_name)

12 years, 1 month

Check_MK Git: check_mk: Fixed another complain problem in CascadingDropdown

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 8627bb47231dc6ea66afdc7fc4a79fb3006696f3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8627bb47231dc6… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri May 25 11:07:01 2012 +0200 Fixed another complain problem in CascadingDropdown --- web/htdocs/valuespec.py | 40 +++++++++++++++++++++++++++------------- 1 files changed, 27 insertions(+), 13 deletions(-) diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index 2d90ff5..07cc648 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -789,8 +789,8 @@ class CascadingDropdown(ValueSpec): ValueSpec.__init__(self, **kwargs) self._choices = [] for entry in kwargs["choices"]: - if len(entry) == 2: - entry = entry + (None,) + if len(entry) == 2: # plain entry with no sub-valuespec + entry = entry + (None,) # normlize to three entries self._choices.append(entry) self._separator = kwargs.get("separator", ", ") self._html_separator = kwargs.get("html_separator", " ") @@ -803,10 +803,15 @@ class CascadingDropdown(ValueSpec): return self._choices[0][0] def render_input(self, varprefix, value): - def_val = 0 + def_val = '0' options = [] for nr, (val, title, vs) in enumerate(self._choices): options.append((str(nr), title)) + # Determine the default value for the select, so the + # the dropdown pre-selects the line corresponding with value. + # Note: the html.select with automatically show the modified + # selection, if the HTML variable varprefix_sel aleady + # exists. if value == val or ( type(value) == tuple and value[0] == val): def_val = str(nr) @@ -818,22 +823,31 @@ class CascadingDropdown(ValueSpec): else: html.sorted_select(vp, options, def_val, onchange=onchange) + # make sure, that the visibility is done correctly, in both + # cases: + # 1. Form painted for the first time (no submission yet, vp missing in URL + # 2. Form already submitted -> honor URL variable vp for visibility cur_val = html.var(vp) html.write(self._html_separator) for nr, (val, title, vs) in enumerate(self._choices): if vs: vp = varprefix + "_%d" % nr - if value == val \ - or (type(value) == tuple and value[0] == val): - def_val_2 = value[1] - disp = "" - elif cur_val == str(nr): - def_val_2 = vs.default_value() - disp = "" - else: - def_val_2 = vs.default_value() - disp = "none" + # Form already submitted once (and probably in complain state) + if cur_val != None: + def_val_2 = vs.default_value() # not used anyway, form already submitted + if cur_val == str(nr): + disp = "" + else: + disp = "none" + else: # form painted the first time + if value == val \ + or (type(value) == tuple and value[0] == val): + def_val_2 = value[1] + disp = "" + else: + def_val_2 = vs.default_value() + disp = "none" html.write('' % (varprefix, nr, disp)) vs.render_input(vp, def_val_2) html.write('')

12 years, 1 month

Check_MK Git: check_mk: Updated bug entries #0757

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 7efcb6202f46534c605f4aa5ed368032527f46ed URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7efcb6202f4653… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri May 25 10:29:54 2012 +0200 Updated bug entries #0757 --- .bugs/757 | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 47 insertions(+), 0 deletions(-) diff --git a/.bugs/757 b/.bugs/757 new file mode 100644 index 0000000..7410890 --- /dev/null +++ b/.bugs/757 @@ -0,0 +1,47 @@ +Title: Compilation of livecheck with dietlibc broken on SLES11SP1/2 +Component: livecheck +State: open +Date: 2012-05-25 10:28:46 +Targetversion: future +Class: nastiness + +Generally we should enable compiling livecheck with dietlibc in +all of our OMD builds (where diet is available). An then fix +the compile problem currently arising: + +cc -nostdlib -static -L/opt/dietlibc/lib-x86_64 +/opt/dietlibc/lib-x86_64/start.o -g -O2 -I.. -s -o livecheck l +ivecheck.c strutil.cc check_icmp.c -isystem /opt/dietlibc/include +-D__dietlibc__ /opt/dietlibc/lib-x86_64/libc. +a -lgcc +In file included from check_icmp.c:68: +/usr/include/netinet/ip_icmp.h:29: warning: ‘u_int8_t’ is deprecated +/usr/include/netinet/ip_icmp.h:30: warning: ‘u_int8_t’ is deprecated +/usr/include/netinet/ip_icmp.h:31: warning: ‘u_int16_t’ is deprecated +/usr/include/netinet/ip_icmp.h:36: warning: ‘u_int16_t’ is deprecated +/usr/include/netinet/ip_icmp.h:37: warning: ‘u_int16_t’ is deprecated +/usr/include/netinet/ip_icmp.h:39: warning: ‘u_int32_t’ is deprecated +/usr/include/netinet/ip_icmp.h:42: warning: ‘u_int16_t’ is deprecated +/usr/include/netinet/ip_icmp.h:43: warning: ‘u_int16_t’ is deprecated +In file included from check_icmp.c:68: +/usr/include/netinet/ip_icmp.h:134: warning: ‘u_int32_t’ is deprecated +/usr/include/netinet/ip_icmp.h:135: warning: ‘u_int32_t’ is deprecated +/usr/include/netinet/ip_icmp.h:140: warning: ‘u_int8_t’ is deprecated +/usr/include/netinet/ip_icmp.h:141: warning: ‘u_int8_t’ is deprecated +/usr/include/netinet/ip_icmp.h:142: warning: ‘u_int16_t’ is deprecated +/usr/include/netinet/ip_icmp.h:149: warning: ‘u_int16_t’ is deprecated +/usr/include/netinet/ip_icmp.h:150: warning: ‘u_int16_t’ is deprecated +/usr/include/netinet/ip_icmp.h:152: warning: ‘u_int32_t’ is deprecated +/usr/include/netinet/ip_icmp.h:157: warning: ‘u_int16_t’ is deprecated +/usr/include/netinet/ip_icmp.h:158: warning: ‘u_int16_t’ is deprecated +/usr/include/netinet/ip_icmp.h:163: warning: ‘u_int8_t’ is deprecated +/usr/include/netinet/ip_icmp.h:164: warning: ‘u_int8_t’ is deprecated +/usr/include/netinet/ip_icmp.h:165: warning: ‘u_int16_t’ is deprecated +/usr/include/netinet/ip_icmp.h:182: warning: ‘u_int32_t’ is deprecated +/usr/include/netinet/ip_icmp.h:183: warning: ‘u_int32_t’ is deprecated +/usr/include/netinet/ip_icmp.h:184: warning: ‘u_int32_t’ is deprecated +/usr/include/netinet/ip_icmp.h:192: warning: ‘u_int32_t’ is deprecated +/usr/include/netinet/ip_icmp.h:193: warning: ‘u_int8_t’ is deprecated +/tmp/cchZoOhZ.o:(.eh_frame+0x12): undefined reference to `__gxx_personality_v0' +collect2: ld returned 1 exit status +make[2]: *** [livecheck] Error 1

12 years, 1 month

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: 5da1d8a9dae9c8092814d9865f3b062ad0641301 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5da1d8a9dae9c8… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri May 25 10:48:06 2012 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

12 years, 1 month

Check_MK Git: check_mk: Updated bug entries #0751

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 6350e0c318f3dbe8da8e4e7cf9ef8c8171c74067 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6350e0c318f3db… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri May 25 10:34:26 2012 +0200 Updated bug entries #0751 --- .bugs/751 | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.bugs/751 b/.bugs/751 index 27ca54e..2a45a93 100644 --- a/.bugs/751 +++ b/.bugs/751 @@ -1,11 +1,15 @@ Title: CascadingDropdown: visibility broken in case of complain Component: multisite -State: open +Class: bug +State: done Date: 2012-05-16 05:43:37 Targetversion: 1.2.0 -Class: bug If the validate_value raises an exception, the sub-vs will not be visible. Try this out: got the the details of one multisite connection, select "Connect via TCP", leave the host field empty and save. + +2012-05-25 10:34:23: changed state open -> done +This should be solved now. Hope I understood that magic thing ;-). +Need to review my changes with Mathias.

12 years, 1 month

Check_MK Git: check_mk: FIX: Fixed styling issues of view filters with dropdown fields

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 385ea8da4e89b71d391e511e9b9dbc992fff410a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=385ea8da4e89b7… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri May 25 10:43:28 2012 +0200 FIX: Fixed styling issues of view filters with dropdown fields --- .bugs/698 | 7 +++++-- ChangeLog | 1 + web/htdocs/views.css | 7 +++++++ 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/.bugs/698 b/.bugs/698 index eb4f95e..dd1d75d 100644 --- a/.bugs/698 +++ b/.bugs/698 @@ -1,9 +1,9 @@ Title: View filter box overflow on too long names Component: multisite -State: open +Class: bug +State: done Date: 2012-05-24 20:16:11 Targetversion: 1.2.0 -Class: bug When having too long names in @@ -13,3 +13,6 @@ WATO folder hostgroup filter dropdowns the dropdown gets too large for the filter box + +2012-05-25 10:42:31: changed state open -> done +I just fixed this by defining fixed widths for the dropdown fields. diff --git a/ChangeLog b/ChangeLog index 0570955..f777f82 100644 --- a/ChangeLog +++ b/ChangeLog @@ -44,6 +44,7 @@ * FIX: Fixed styling issues of sidebar in IE7 * FIX: fix problem where filter settings (of checkboxes) are not effective when it comes to executing commands + * FIX: Fixed styling issues of view filters with dropdown fields Mobile: * FIX: Fixed logtime filter settings in all mobile views diff --git a/web/htdocs/views.css b/web/htdocs/views.css index b62b405..921a8b4 100644 --- a/web/htdocs/views.css +++ b/web/htdocs/views.css @@ -97,6 +97,13 @@ div.floatfilter .content { padding-left: 4px; text-align: left; } +div.floatfilter .content select { + width: 300px; +} +div.floatfilter .content select#opthostgroup, +div.floatfilter .content select#optservicegroup { + width: 240px; +} div.floatfilter.double .content { height: 72px; }

12 years, 1 month

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: 5cdd00eddb74db951df19c4e62b71f5aea5516f0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5cdd00eddb74db… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri May 25 10:33:22 2012 +0200 Merge branch 'master' of mathias-kettner.de:check_mk Conflicts: ChangeLog ---

12 years, 1 month

Check_MK Git: check_mk: FIX: Fixed handling of validation errors in cascading dropdown fields

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 082fcff265bd0ce81da87d2734d806d0663f0842 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=082fcff265bd0c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri May 25 10:31:42 2012 +0200 FIX: Fixed handling of validation errors in cascading dropdown fields --- ChangeLog | 1 + web/htdocs/valuespec.py | 19 ++++++++++++------- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 55fba84..b726bad 100644 --- a/ChangeLog +++ b/ChangeLog @@ -18,6 +18,7 @@ is valid on the replication slaves * FIX: implement locking in order to prevent data corruption on concurrent changes + * FIX: Fixed handling of validation errors in cascading dropdown fields Multisite: * New display type 'boxes-omit-root' for BI views diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index 3898041..2d90ff5 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -1,4 +1,4 @@ -#!/usr/bin/python + # -*- encoding: utf-8; py-indent-offset: 4 -*- # +------------------------------------------------------------------+ # | ____ _ _ __ __ _ __ | @@ -812,25 +812,30 @@ class CascadingDropdown(ValueSpec): def_val = str(nr) vp = varprefix + "_sel" - onchange="valuespec_cascading_change(this, '%s', %d);" % (varprefix, len(self._choices)) + onchange="valuespec_cascading_change(this, '%s', %d);" % (varprefix, len(self._choices)) if self._sorted: html.select(vp, options, def_val, onchange=onchange) else: html.sorted_select(vp, options, def_val, onchange=onchange) + cur_val = html.var(vp) + html.write(self._html_separator) for nr, (val, title, vs) in enumerate(self._choices): if vs: vp = varprefix + "_%d" % nr - if value == val or ( - type(value) == tuple and value[0] == val): - def_val = value[1] + if value == val \ + or (type(value) == tuple and value[0] == val): + def_val_2 = value[1] + disp = "" + elif cur_val == str(nr): + def_val_2 = vs.default_value() disp = "" else: - def_val = vs.default_value() + def_val_2 = vs.default_value() disp = "none" html.write('' % (varprefix, nr, disp)) - vs.render_input(vp, def_val) + vs.render_input(vp, def_val_2) html.write('') def value_to_text(self, value):

12 years, 1 month

Check_MK Git: check_mk: Updated bug entries #0755

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: e540969e2ae9364b8bae5da386207ba1564578d1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e540969e2ae936… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri May 25 10:21:01 2012 +0200 Updated bug entries #0755 --- .bugs/755 | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.bugs/755 b/.bugs/755 index f799cee..ec42e3b 100644 --- a/.bugs/755 +++ b/.bugs/755 @@ -1,9 +1,9 @@ Title: Implement locking in WATO Component: wato -State: open +Class: bug +State: done Date: 2012-05-24 19:49:08 Targetversion: 1.2.0 -Class: bug We need to prevent multiple users using WATO at the same time getting into conflict. This should be done in the following way: @@ -19,3 +19,6 @@ getting into conflict. This should be done in the following way: [3] Activating foreign changes will need a special permission. Still people need to make sure that the use personalized logins. + +2012-05-25 10:21:00: changed state open -> done +Implemented as described.

12 years, 1 month

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits May 2012