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…
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…
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,
-}