Module: check_mk
Branch: master
Commit: 8758ee511b75900c350002abd49a87aea4276a60
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8758ee511b7590…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Wed Sep 19 11:13:15 2012 +0200
Dashboard: Param wato_folder="" means WATO root folder, use it and also
display the title of this folder
---
ChangeLog | 2 ++
web/htdocs/dashboard.py | 10 +++++++---
2 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index d853353..f3564a3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -102,6 +102,8 @@
Multisite:
* Added css class="dashboard_<name>" to the dashboard div for easier
customization of the dashboard style of a special dashboard
+ * Dashboard: Param wato_folder="" means WATO root folder, use it and also
+ display the title of this folder
* Sidebar: Sorting aggregation groups in BI snapin now
* Sidebar: Sorting sites in master control snapin case insensitive
* FIX: fixed localization of general permissions
diff --git a/web/htdocs/dashboard.py b/web/htdocs/dashboard.py
index b070a2e..c2076e0 100644
--- a/web/htdocs/dashboard.py
+++ b/web/htdocs/dashboard.py
@@ -112,14 +112,18 @@ def render_dashboard(name):
# sensitive.
wato_folder = html.var("wato_folder")
- if not wato_folder: # ignore wato folder in case of root folder
- wato_folder = None
+
+ # When an empty wato_folder attribute is given a user really wants
+ # to see only the hosts contained in the root folder. So don't ignore
+ # the root folder anymore.
+ #if not wato_folder: # ignore wato folder in case of root folder
+ # wato_folder = None
# The title of the dashboard needs to be prefixed with the WATO path,
# in order to make it clear to the user, that he is seeing only partial
# data.
title = board["title"]
- if wato_folder:
+ if wato_folder is not None:
title = wato.api.get_folder_title(wato_folder) + " - " + title
html.header(title, javascripts=["dashboard"], stylesheets=["pages", "dashboard", "status", "views"])
Module: check_mk
Branch: master
Commit: 36700892ebd8ccbb84e0e9c49ea057d25f5ddd2e
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=36700892ebd8cc…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Wed Sep 19 11:20:11 2012 +0200
Made more rulegroup titles localizable
---
ChangeLog | 1 +
web/plugins/wato/check_mk_configuration.py | 16 ++++++++--------
2 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index f3564a3..654f6de 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -84,6 +84,7 @@
* Encoding special chars in RegExp valuespec (e.g. logwatch patterns)
* Added check_interval and retry_interval rules for host checks
* Removed wmic_process rule from "inventory services" as the check does not support inventory
+ * Made more rulegroup titles localizable
* FIX: Removed double collect_hosts() call in activate changes hook
* FIX: Fixed double hook execution when using localized multisite
* FIX: User list shows names of contactgroups when no alias given
diff --git a/web/plugins/wato/check_mk_configuration.py b/web/plugins/wato/check_mk_configuration.py
index 1792cfa..65fc14a 100644
--- a/web/plugins/wato/check_mk_configuration.py
+++ b/web/plugins/wato/check_mk_configuration.py
@@ -591,7 +591,7 @@ register_rule(group,
register_rulegroup("monconf", _("Monitoring Configuration"),
_("Intervals for checking, retries, clustering, configuration for inventory and similar"))
-group = "monconf/Service Checks"
+group = "monconf/" + _("Service Checks")
register_rule(group,
"extra_service_conf:max_check_attempts",
@@ -670,7 +670,7 @@ register_rule(group,
),
itemtype = "service")
-group = "monconf/Host Checks"
+group = "monconf/" + _("Host Checks")
register_rule(group,
"extra_host_conf:max_check_attempts",
@@ -714,7 +714,7 @@ register_rule(group,
"the state of the host will stay at its last status.")),
)
-group = "monconf/Notifications"
+group = "monconf/" + _("Notifications")
register_rule(group,
"extra_host_conf:notifications_enabled",
DropdownChoice(
@@ -872,7 +872,7 @@ register_rule(group,
),
)
-group = "monconf/Inventory and Check_MK settings"
+group = "monconf/" + _("Inventory and Check_MK settings")
register_rule(group,
"only_hosts",
@@ -913,7 +913,7 @@ register_rule(group,
"to the cluster.<br><br>Please make sure that you re-inventorize the "
"cluster and the physical nodes after changing this ruleset."),
itemtype = "service")
-group = "monconf/Various"
+group = "monconf/" + _("Various")
class MonitoringIcon(ValueSpec):
def __init__(self, **kwargs):
@@ -1004,7 +1004,7 @@ register_rule(group,
register_rulegroup("agent", _("Access to Agents"),
_("Settings concerning the connection to the Check_MK and SNMP agents"))
-group = "agent/General Settings"
+group = "agent/" + _("General Settings")
register_rule(group,
"dyndns_hosts",
title = _("Hosts with dynamic DNS lookup during monitoring"),
@@ -1013,7 +1013,7 @@ register_rule(group,
"activate the changes. In some rare cases DNS lookups must be done each time "
"a host is connected to, e.g. when the IP address of the host is dynamic "
"and can change."))
-group = "agent/SNMP"
+group = "agent/" + _("SNMP")
_snmpv3_basic_elements = [
DropdownChoice(
@@ -1126,7 +1126,7 @@ register_rule(group,
"is configured with this ruleset will then use the information from that "
"file instead of using real SNMP. "))
-group = "agent/Check_MK Agent"
+group = "agent/" + _("Check_MK Agent")
register_rule(group,
"agent_ports",