Module: check_mk
Branch: master
Commit: e4363a984a463497660a4b6a634f4530d0d421d2
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e4363a984a4634…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Sat Nov 21 23:00:01 2015 +0100
New optional parameter for interval WATO function
needed for agent deployment
---
web/htdocs/check_mk.css | 16 ----------------
web/htdocs/pages.css | 6 ++++++
web/htdocs/wato.py | 13 +++++++------
3 files changed, 13 insertions(+), 22 deletions(-)
diff --git a/web/htdocs/check_mk.css b/web/htdocs/check_mk.css
index 2b5d787..9eb3b5f 100644
--- a/web/htdocs/check_mk.css
+++ b/web/htdocs/check_mk.css
@@ -693,19 +693,3 @@ td.nowiki table td, td.nowiki table th {
border: 1px solid #888;
}
-
-/*--Deployment-------------------------------------------------------------.
-| ____ _ _ |
-| | _ \ ___ _ __ | | ___ _ _ _ __ ___ ___ _ __ | |_ |
-| | | | |/ _ \ '_ \| |/ _ \| | | | '_ ` _ \ / _ \ '_ \| __| |
-| | |_| | __/ |_) | | (_) | |_| | | | | | | __/ | | | |_ |
-| |____/ \___| .__/|_|\___/ \__, |_| |_| |_|\___|_| |_|\__| |
-| |_| |___/ |
-+--------------------------------------------------------------------------+
-| Styles for agent deployment (used in CEE only) |
-'-------------------------------------------------------------------------*/
-
-.wato div.agent_deployment img.iconbutton {
- width: 60px;
- height: 16px;
-}
diff --git a/web/htdocs/pages.css b/web/htdocs/pages.css
index 4d981d7..43245f0 100644
--- a/web/htdocs/pages.css
+++ b/web/htdocs/pages.css
@@ -465,6 +465,12 @@ img.iconbutton {
padding: 0px 2px;
}
+
+.wato a.checkbox img.iconbutton {
+ width: 60px;
+ height: 16px;
+}
+
img.iconbutton:hover {
opacity: 0.5;
filter: alpha(opacity=50); /* For IE8 and earlier */
diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py
index a9f924d..894db11 100644
--- a/web/htdocs/wato.py
+++ b/web/htdocs/wato.py
@@ -16308,18 +16308,19 @@ def load_rulesets(folder):
# Load all rules of all folders into a dictionary that
# has the rules' varnames as keys and a list of (folder, rule)
# as values.
-def load_rulesets_recursively(folder, all_rulesets):
+def load_rulesets_recursively(folder, all_rulesets, only_varname=None):
for subfolder in folder[".folders"].values():
- load_rulesets_recursively(subfolder, all_rulesets)
+ load_rulesets_recursively(subfolder, all_rulesets, only_varname)
rs = load_rulesets(folder)
for varname, rules in rs.items():
- all_rulesets.setdefault(varname, [])
- all_rulesets[varname] += [ (folder, rule) for rule in rules ]
+ if only_varname == None or varname == only_varname:
+ all_rulesets.setdefault(varname, [])
+ all_rulesets[varname] += [ (folder, rule) for rule in rules ]
-def load_all_rulesets():
+def load_all_rulesets(only_varname=None):
all_rulesets = {}
- load_rulesets_recursively(g_root_folder, all_rulesets)
+ load_rulesets_recursively(g_root_folder, all_rulesets, only_varname)
return all_rulesets