Module: check_mk
Branch: master
Commit: cea80ffb8d19e46c811ec843330e59e1880508c0
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cea80ffb8d19e4…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Wed Oct 8 16:05:18 2014 +0200
visuals: new helper function for getting filter headers
---
web/htdocs/visuals.py | 26 ++++++++++++++++++++++++++
1 file changed, 26 insertions(+)
diff --git a/web/htdocs/visuals.py b/web/htdocs/visuals.py
index 689875b..ce9f581 100644
--- a/web/htdocs/visuals.py
+++ b/web/htdocs/visuals.py
@@ -912,6 +912,32 @@ def add_context_to_uri_vars(visual, only_infos=None, only_count=False):
html.set_var(uri_varname, value)
+# Compute Livestatus-Filters based on a given context. Returns
+# the only_sites list and a string with the filter headers
+def get_filter_headers(datasource, context):
+ # Prepare Filter headers for Livestatus
+ filter_headers = ""
+ only_sites = None
+ html.stash_vars()
+ for filter_name, filter_vars in context.items():
+ # first set the HTML variables. Sorry - the filters need this
+ if type(filter_vars) == dict: # this is a multi-context filter
+ for uri_varname, value in filter_vars.items():
+ html.set_var(uri_varname, value)
+ else:
+ html.set_var(filter_name, filter_vars)
+
+ # Now compute filter headers for all infos of the used datasource
+ our_infos = datasource["infos"]
+ for filter_name, filter_object in multisite_filters.items():
+ if filter_object.info in our_infos:
+ header = filter_object.filter(datasource["table"])
+ if header.startswith("Sites:"):
+ only_sites = header.strip().split(" ")[1:]
+ else:
+ filter_headers += header
+ html.unstash_vars()
+ return filter_headers, only_sites
#.
Module: check_mk
Branch: master
Commit: 714649f43d1a918927f9f9077701eba37ab5672f
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=714649f43d1a91…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Wed Oct 8 16:05:42 2014 +0200
fix host group filter from firing of not variable is set
---
web/plugins/visuals/filters.py | 3 +++
1 file changed, 3 insertions(+)
diff --git a/web/plugins/visuals/filters.py b/web/plugins/visuals/filters.py
index 243b033..e63c225 100644
--- a/web/plugins/visuals/filters.py
+++ b/web/plugins/visuals/filters.py
@@ -209,6 +209,9 @@ class FilterGroupCombo(Filter):
return html.var(htmlvar)
def filter(self, infoname):
+ if not html.has_var(self.htmlvars[0]):
+ return "" # Skip if filter is not being set at all
+
current_value = self.current_value()
if not current_value:
if not self.enforce:
Module: check_mk
Branch: master
Commit: 69bae97e1b4932c998a8fac2acd8b802a9ca32e8
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=69bae97e1b4932…
Author: Konstantin Büttner <kb(a)mathias-kettner.de>
Date: Wed Oct 8 15:19:25 2014 +0200
Fixed spelling
---
web/plugins/views/commands.py | 2 +-
web/plugins/wato/active_checks.py | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/web/plugins/views/commands.py b/web/plugins/views/commands.py
index a2b1ef2..dd8a41f 100644
--- a/web/plugins/views/commands.py
+++ b/web/plugins/views/commands.py
@@ -45,7 +45,7 @@ def command_reschedule(cmdtag, spec, row, row_nr, total_rows):
spread = saveint(html.var("_resched_spread"))
text = _("<b>reschedule an immediate check")
if spread:
- text += _(" spreaded over %d minutes ") % spread
+ text += _(" spread over %d minutes ") % spread
text += "</b>" + _("of")
diff --git a/web/plugins/wato/active_checks.py b/web/plugins/wato/active_checks.py
index 26cdae9..4aba07f 100644
--- a/web/plugins/wato/active_checks.py
+++ b/web/plugins/wato/active_checks.py
@@ -487,13 +487,13 @@ register_rule(group,
("job",
CascadingDropdown(
title = _("Mode of the Check"),
- help = _("Choose if you just want to query the version number,"
- " or if you want to check the response to a address querie"),
+ help = _("Choose, whether you just want to query the version number,"
+ " or if you want to check the response to an adress query."),
choices = [
("version", _("Check for Version")),
- ("address", _("Check for a Address"),
+ ("address", _("Check for an Adress"),
Dictionary(
- title = _("Address Check mode"),
+ title = _("Adress Check mode"),
optional_keys = False,
elements = [
( "street",
Module: check_mk
Branch: master
Commit: f92baded8c01384003b7feb5a948c2b9b9e0657d
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f92baded8c0138…
Author: Konstantin Büttner <kb(a)mathias-kettner.de>
Date: Wed Oct 8 14:17:26 2014 +0200
Some spelling fixed
---
mkeventd/web/plugins/wato/mkeventd.py | 8 ++++----
web/plugins/views/datasources.py | 2 +-
web/plugins/wato/check_mk_configuration.py | 6 +++---
web/plugins/wato/check_parameters.py | 6 +++---
4 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/mkeventd/web/plugins/wato/mkeventd.py b/mkeventd/web/plugins/wato/mkeventd.py
index 148b49f..6ea1e41 100644
--- a/mkeventd/web/plugins/wato/mkeventd.py
+++ b/mkeventd/web/plugins/wato/mkeventd.py
@@ -292,10 +292,10 @@ vs_mkeventd_rule = Dictionary(
ListOf(
GroupSelection("contact"),
title = _("Fallback Contact Groups"),
- help = _("When displaying events in the Check_MK GUI you can make a user only see events "
- "for hosts he is a contact for. When you expect this rule to reveice events from "
- "hosts that are <i>not</i> known to the monitoring you can specify contact groups "
- "for the visibility here. Note: if you activate this option and do not specify "
+ help = _("When displaying events in the Check_MK GUI, you can make a user see only events "
+ "for hosts he is a contact for. When you expect this rule to receive events from "
+ "hosts that are <i>not</i> known to the monitoring, you can specify contact groups "
+ "for visibility here. Note: If you activate this option and do not specify "
"any group, then users with restricted permissions can never see these events."),
movable = False,
)
diff --git a/web/plugins/views/datasources.py b/web/plugins/views/datasources.py
index 70563de..88b5a4a 100644
--- a/web/plugins/views/datasources.py
+++ b/web/plugins/views/datasources.py
@@ -89,7 +89,7 @@ multisite_datasources["hostsbygroup"] = {
"keys" : [ "host_name", "host_downtimes" ],
"join" : ( "services", "host_name" ),
"idkeys" : [ "site", "hostgroup_name", "host_name" ],
- "description" : _("Using this datasources host rows might appear multiple times depending "
+ "description" : _("Using this, datasources host rows might appear multiple times depending "
"on their membership in hostgroups."),
}
diff --git a/web/plugins/wato/check_mk_configuration.py b/web/plugins/wato/check_mk_configuration.py
index 8079e5c..9d86a84 100644
--- a/web/plugins/wato/check_mk_configuration.py
+++ b/web/plugins/wato/check_mk_configuration.py
@@ -534,7 +534,7 @@ register_configvar(group,
Checkbox(title = _("Allow upload of insecure WATO snapshots"),
label = _("upload insecure snapshots"),
help = _("When enabled, insecure snapshots are allowed. Please keep in mind that the upload "
- "of unverified snapshots represent a security risk, since the content of a snapshot is executed "
+ "of unverified snapshots represents a security risk, since the content of a snapshot is executed "
"during runtime. Any manipulations in the content - either willingly or unwillingly (XSS attack) "
"- pose a serious security risk."),
default_value = False),
@@ -553,7 +553,7 @@ register_configvar(group,
"wato_hide_varnames",
Checkbox(title = _("Hide names of configuration variables"),
label = _("hide variable names"),
- help = _("When enabled, internal configuration variable names of Check_MK are hidded "
+ help = _("When enabled, internal configuration variable names of Check_MK are hidden "
"from the user (for example in the rule editor)"),
default_value = True),
domain = "multisite")
@@ -563,7 +563,7 @@ register_configvar(group,
"wato_hide_help_in_lists",
Checkbox(title = _("Hide help text of rules in list views"),
label = _("hide help text"),
- help = _("When disabled, WATO shows the help texts of the rules also in the list views."),
+ help = _("When disabled, WATO shows the help texts of rules also in the list views."),
default_value = True),
domain = "multisite")
diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py
index 235e893..14a849b 100644
--- a/web/plugins/wato/check_parameters.py
+++ b/web/plugins/wato/check_parameters.py
@@ -1824,7 +1824,7 @@ register_check_parameters(
( 'levels',
Tuple(
title = _("Maximum Number of E-Mails in Queue"),
- help = _("This rule applies to the number of E-Mails in the various Exchange Message Queues"),
+ help = _("This rule applies to the number of e-mails in the various Exchange Message Queues"),
elements = [
Integer(title = _("Warning if above"), unit = _("E-Mails")),
Integer(title = _("Critical if above"), unit = _("E-Mails"))
@@ -1834,7 +1834,7 @@ register_check_parameters(
Integer(
title = _("Offset"),
help = _("Use this only if you want to overwrite the postion of the information in the agent "
- "Output. Also refer to the rule <i>Microsoft Exchange Queues Inventory</i> ")
+ "output. Also refer to the rule <i>Microsoft Exchange Queues Inventory</i> ")
)
),
],
@@ -6508,7 +6508,7 @@ register_check_parameters(
title = _("Collection time levels"),
elements = [
Tuple(
- title = _("Time of garbage gollection in ms per minute"),
+ title = _("Time of garbage collection in ms per minute"),
elements = [
Integer(title = _("Warning at"),
unit = _("ms"),