Checkmk git commits October 2014

checkmk-commits@lists.checkmk.com

6 participants
310 discussions

Check_MK Git: check_mk: Fix exception on validation error in CascadingDropdown

by Mathias Kettner

Module: check_mk Branch: master Commit: 2ac399f95bf19ee0d8e6849b1f261c23d7ce2302 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2ac399f95bf19e… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Oct 3 00:02:21 2014 +0200 Fix exception on validation error in CascadingDropdown --- web/htdocs/valuespec.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index aec4ea4..dbdde99 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -1254,7 +1254,7 @@ class CascadingDropdown(ValueSpec): # 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 + # 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) @@ -1264,7 +1264,10 @@ class CascadingDropdown(ValueSpec): vp = varprefix + "_%d" % nr # Form already submitted once (and probably in complain state) if cur_val != None: - def_val_2 = vs.from_html_vars(vp) + try: + def_val_2 = vs.from_html_vars(vp) + except MKUserError: + def_val_2 = vs.default_value() if cur_val == str(nr): disp = "" else:

9 years, 8 months

Check_MK Git: check_mk: New valuespec for selecting a time format

by Mathias Kettner

Module: check_mk Branch: master Commit: 41b08180254d30dd3bc80936d23698eff738b70c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=41b08180254d30… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Oct 5 16:04:11 2014 +0200 New valuespec for selecting a time format --- web/htdocs/valuespec.py | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index a06e48a..98019b3 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -2128,6 +2128,20 @@ def DateFormat(**args): return DropdownChoice(**args) +def TimeFormat(**args): + args.setdefault("title", _("Time format")) + args.setdefault("default_value", "%H:%M:%S") + args["choices"] = [ + ("%H:%M:%S", "18:27:36"), + ("%l:%M:%S %p", "12:27:36 PM"), + ("%H:%M", "18:27"), + ("%l:%M %p", "6:27 PM"), + ("%H", "18"), + ("%l %p", "6 PM"), + ] + return DropdownChoice(**args) + + # Make a configuration value optional, i.e. it may be None. # The user has a checkbox for activating the option. Example:

9 years, 8 months

Check_MK Git: check_mk: Extra new valuespec DateFormat from views/painters. py

by Mathias Kettner

Module: check_mk Branch: master Commit: 7a9899dc4acab8a1448570cf3eb08acfbc5367b1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7a9899dc4acab8… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Oct 5 15:47:46 2014 +0200 Extra new valuespec DateFormat from views/painters.py This new valuespec can now be used at other places as well. --- web/htdocs/valuespec.py | 15 +++++++++++++++ web/plugins/views/painters.py | 12 +----------- 2 files changed, 16 insertions(+), 11 deletions(-) diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index 25e0437..a06e48a 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -2114,6 +2114,21 @@ class PNPTimerange(Timerange): Timerange.__init__(self, **kwargs) +# A selection of various date formats +def DateFormat(**args): + args.setdefault("title", _("Date format")) + args.setdefault("default_value", "%Y-%m-%d") + args["choices"] = [ + ("%Y-%m-%d", "1970-12-18"), + ("%d.%m.%Y", "18.12.1970"), + ("%m/%d/%Y", "12/18/1970"), + ("%d.%m.", "18.12."), + ("%m/%d", "12/18"), + ] + return DropdownChoice(**args) + + + # Make a configuration value optional, i.e. it may be None. # The user has a checkbox for activating the option. Example: # debug_log: it is either None or set to a filename. diff --git a/web/plugins/views/painters.py b/web/plugins/views/painters.py index dd0daa5..6033075 100644 --- a/web/plugins/views/painters.py +++ b/web/plugins/views/painters.py @@ -97,17 +97,7 @@ multisite_painter_options["ts_format"] = { } multisite_painter_options["ts_date"] = { - 'valuespec' : DropdownChoice( - title = _("Date format"), - default_value = "%Y-%m-%d", - choices = [ - ("%Y-%m-%d", "1970-12-18"), - ("%d.%m.%Y", "18.12.1970"), - ("%m/%d/%Y", "12/18/1970"), - ("%d.%m.", "18.12."), - ("%m/%d", "12/18") - ], - ) + 'valuespec' : DateFormat(), } # This helper function returns the value of the given custom var

9 years, 8 months

Check_MK Git: check_mk: Fix exception when editing dashboard properties

by Mathias Kettner

Module: check_mk Branch: master Commit: 537b8aeabcd0aad71fa3f0130b7c3717325f9ac4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=537b8aeabcd0aa… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Oct 3 12:02:11 2014 +0200 Fix exception when editing dashboard properties --- web/htdocs/dashboard.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/htdocs/dashboard.py b/web/htdocs/dashboard.py index fd5cd55..c2dcd2d 100644 --- a/web/htdocs/dashboard.py +++ b/web/htdocs/dashboard.py @@ -639,7 +639,7 @@ def page_edit_dashboard(): ], ) - visuals.page_edit_visual('dashboards', _("Dashboard"), dashboards, + visuals.page_edit_visual('dashboards', dashboards, create_handler = create_dashboard, custom_field_handler = custom_field_handler )

9 years, 9 months

Check_MK Git: check_mk: #1158 FIX Moved filter logic to visuals module

by Lars Michelsen

Module: check_mk Branch: master Commit: fcd5ddb122ebce56bd71c6095ff48b2b16946076 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fcd5ddb122ebce… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Oct 2 15:17:55 2014 +0200 #1158 FIX Moved filter logic to visuals module This change is kind of an internal code restucturing. So if you do not understand this, you mostly do not need to care about it. The filter logic, which was former part of the views, has been moved to the visuals module to be available to all visuals types like dashboards in the future. If you have defined custom filter plugins for your views, which are normally located below share/check_mk/web/plugins/views/*.py, you need to move the filter definitions to share/check_mk/web/plugins/visuals/*.py. --- .werks/1158 | 18 ++ ChangeLog | 2 + mkeventd/web/plugins/views/mkeventd.py | 153 ---------------- mkeventd/web/plugins/visuals/mkeventd.py | 168 ++++++++++++++++++ web/htdocs/dashboard.py | 5 +- web/htdocs/index.py | 2 +- web/htdocs/pagefunctions.py | 47 ----- web/htdocs/valuespec.py | 94 ---------- web/htdocs/views.py | 200 +-------------------- web/htdocs/visuals.py | 270 ++++++++++++++++++++++++++++- web/plugins/views/bi.py | 192 -------------------- web/plugins/views/inventory.py | 237 +------------------------ web/plugins/views/wato.py | 86 --------- web/plugins/visuals/bi.py | 212 ++++++++++++++++++++++ web/plugins/{views => visuals}/filters.py | 28 ++- web/plugins/visuals/inventory.py | 257 +++++++++++++++++++++++++++ web/plugins/visuals/wato.py | 114 ++++++++++++ 17 files changed, 1073 insertions(+), 1012 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=fcd5ddb122…

9 years, 9 months

Check_MK Git: check_mk: Refactored visual code again

by Lars Michelsen

Module: check_mk Branch: master Commit: 2a283cddc1679bddcfa81a00c7a479fcf61cbfee URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2a283cddc1679b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Oct 2 14:10:56 2014 +0200 Refactored visual code again The "context_type"-concept was not fitting all needs, for example a single host visual showing multiple services could not be filtered by details of the services. We decided to recode this feature again to slightly simplify the mechanism again and make all features usable again. To the users which already used the dasboard designer or created custom views with the git builds since introducion of the "context type" feature will need to perform some migrations by hand. You will either need to remove all your custom views and dashboards from var/check_mk/web/*/user_dashboards.mk and var/check_mk/web/*/user_views.mk. Or you try to migrate the defined views and dashboards in this file. For this you will need to remove the attribute "context_type" from views and dashboards and replace it with the new "single_infos" attribute. The "single_infos" attribute contains a list of strings which each references a info type which should be identified by specific attributes like the hostname to get a single object of that type. For example replace the definition "context_type": "host" with "single_infos": ['host'] in case of e.g. a view which only shows data about one single host. --- mkeventd/web/plugins/views/mkeventd.py | 2 - mkeventd/web/plugins/visuals/mkeventd.py | 30 +--- web/htdocs/dashboard.py | 122 ++++++------- web/htdocs/valuespec.py | 9 +- web/htdocs/views.py | 289 +++++++++++++----------------- web/htdocs/visuals.py | 173 ++++++++++++------ web/plugins/dashboard/builtin.py | 16 +- web/plugins/dashboard/dashlets.py | 2 +- web/plugins/pages/shipped.py | 4 +- web/plugins/views/bi.py | 3 - web/plugins/views/datasources.py | 24 --- web/plugins/views/inventory.py | 1 - web/plugins/visuals/context_types.py | 210 ---------------------- web/plugins/visuals/infos.py | 116 ++++++++++++ 14 files changed, 431 insertions(+), 570 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=2a283cddc1…

9 years, 9 months

Check_MK Git: check_mk: Fixed different problems with visual recoding

by Lars Michelsen

Module: check_mk Branch: master Commit: c825fc05602551d1c6ecb0460b24fe55f1b1ae34 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c825fc05602551… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Oct 2 16:58:25 2014 +0200 Fixed different problems with visual recoding --- web/htdocs/dashboard.py | 34 ++++++++++++++++-------------- web/htdocs/views.py | 42 +++++++++++++++++++------------------ web/htdocs/visuals.py | 32 +++++++++++++++++++++------- web/plugins/dashboard/dashlets.py | 3 ++- 4 files changed, 67 insertions(+), 44 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=c825fc0560…

9 years, 9 months

Check_MK Git: check_mk: Fix: Not showing filters twice in views

by Lars Michelsen

Module: check_mk Branch: master Commit: 83737581d7888c64cd9a38b2bd469644309e674e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=83737581d7888c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Oct 2 15:22:09 2014 +0200 Fix: Not showing filters twice in views --- web/htdocs/visuals.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/web/htdocs/visuals.py b/web/htdocs/visuals.py index 172e254..7c21ae9 100644 --- a/web/htdocs/visuals.py +++ b/web/htdocs/visuals.py @@ -809,7 +809,8 @@ def show_filters(visual, info_keys): filter = get_filter(fn) if not filter.info or filter.info in info_keys: show_filters.append(filter) - return show_filters + + return list(set(show_filters)) # remove duplicates #. # .--ValueSpecs----------------------------------------------------------.

9 years, 9 months

Check_MK Git: check_mk: removed old win_disk inventory check

by Goetz Golla

Module: check_mk Branch: master Commit: b97162deb253feb36711b14299370617a4ff2794 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b97162deb253fe… Author: Goetz Golla <gg(a)mathias-kettner.de> Date: Thu Oct 2 16:28:26 2014 +0200 removed old win_disk inventory check --- inventory/win_disk | 57 ---------------------------------------------------- 1 file changed, 57 deletions(-) diff --git a/inventory/win_disk b/inventory/win_disk deleted file mode 100644 index 520c359..0000000 --- a/inventory/win_disk +++ /dev/null @@ -1,57 +0,0 @@ -#!/usr/bin/python -# -*- encoding: utf-8; py-indent-offset: 4 -*- -# +------------------------------------------------------------------+ -# | ____ _ _ __ __ _ __ | -# | / ___| |__ ___ ___| | __ | \/ | |/ / | -# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | -# | | |___| | | | __/ (__| < | | | | . \ | -# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | -# | | -# | Copyright Mathias Kettner 2013 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. - -# Example output: -# <<<win_disk:sep(58)>>> -# Manufacturer : (Standardlaufwerke) -# Model : VBOX HARDDISK ATA Device -# Name : \\.\PHYSICALDRIVE0 -# SerialNumber : 42566539323537333930652d3836636263352065 -# InterfaceType : IDE -# Size : 32210196480 -# Partitions : 2 - -def inv_win_disk(info): - node = inv_tree("hardware.harddisks.") - for varname, value in info: - varname = re.sub(" *","", varname) - value = re.sub("^ ", "", value) - if varname == "SerialNumber": - node["serial"] = value - elif varname == "Manufacturer": - node["vendor"] = value - elif varname == "Name": - node["product"] = value - elif varname == "Model": - node["model"] = value - elif varname == "InterfaceType": - node["type"] = value - elif varname == "Size": - node["size"] = int(value) - -inv_info['win_disk'] = { - "inv_function" : inv_win_disk, -}

9 years, 9 months

Check_MK Git: check_mk: temperature.include: Now handles parameters defined None

by Konstantin Büttner

Module: check_mk Branch: master Commit: 1e78c9d3c681ad342abd14fb358830061e15f382 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1e78c9d3c681ad… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Thu Oct 2 16:26:10 2014 +0200 temperature.include: Now handles parameters defined None --- checks/temperature.include | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/checks/temperature.include b/checks/temperature.include index 3020d78..efca005 100644 --- a/checks/temperature.include +++ b/checks/temperature.include @@ -45,10 +45,10 @@ def check_temperature(temp, params): infotext = "Temperature is %s °C" % tostring(temp) levelstext = " (warn/crit at %s/%s °C)" % (tostring(warn), tostring(crit)) - if temp >= crit: + if crit != None and temp >= crit: status = 2 infotext += levelstext - elif temp >= warn: + elif warn != None and temp >= warn: status = 1 infotext += levelstext else:

9 years, 9 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits October 2014