Module: check_mk
Branch: master
Commit: d5d2fa9e95a91093ee6205b8a669e6b96aadab93
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d5d2fa9e95a910…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Fri May 11 12:25:10 2012 +0200
WATO: fix parent scan on single site installations
---
ChangeLog | 1 +
web/htdocs/wato.py | 2 +-
2 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 5820590..10d374f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,6 +10,7 @@
* Hide check_mk variable names per default now (change via global settings)
* New layout of global settings
* Folder layout: show contact groups of folder
+ * FIX: fix parent scan on single site installations
* FIX: fix folder visibility permission handling
* FIX: honor folder-permissions when creating, deleting
and modifiying rules
diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py
index d04acee..7058b02 100644
--- a/web/htdocs/wato.py
+++ b/web/htdocs/wato.py
@@ -3037,7 +3037,7 @@ def configure_gateway(state, site_id, folder, host, effective, gateway):
# only set it explicitely if it differs from the id of the
# folder.
e = effective_attributes(new_host, gw_folder)
- if e["site"] != site_id:
+ if "site" in e and e["site"] != site_id:
new_host["site"] = site_id
gw_folder[".hosts"][new_host[".name"]] = new_host
Module: check_mk
Branch: master
Commit: 66265edb502b2b239b426439627942ce9e4c1395
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=66265edb502b2b…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Fri May 11 12:14:51 2012 +0200
Remove obsolete URL main.py
---
web/htdocs/main.py | 33 +--------------------------------
web/plugins/pages/shipped.py | 1 -
2 files changed, 1 insertions(+), 33 deletions(-)
diff --git a/web/htdocs/main.py b/web/htdocs/main.py
index 4e0be86..4b25d9e 100644
--- a/web/htdocs/main.py
+++ b/web/htdocs/main.py
@@ -30,7 +30,7 @@ def page_index():
start_url = html.var("start_url", config.start_url)
html.req.headers_out.add("Cache-Control", "max-age=7200, public");
if "%s" in config.page_heading:
- heading = config.page_heading % (defaults.omd_site or "Multisite")
+ heading = config.page_heading % (defaults.omd_site or _("Multisite"))
else:
heading = config.page_heading
@@ -48,37 +48,6 @@ def page_index():
</html>
""" % (heading, start_url))
-def page_main():
- html.header("Check_MK Multisite")
- html.write("""
-<p>Welcome to Check_MK Multisite - a new GUI for viewing status information
-and controlling your monitoring system. Multisite is not just another GUI
-for Nagios - it uses a completely new architecture and design scheme. It's
-key benefits are:</p>
-<ul>
-<li>It is fast.</li>
-<li>it is flexible.</li>
-<li>It supports distributed monitoring.</li>
-</ul>
-
-<p>Multisite is completely based on
-<a href="http://mathias-kettner.de/checkmk_livestatus.html">MK
-Livestatus</a>, which is what makes it fast in the first place - especially
-in huge installations with a large number of hosts and services. </p>
-
-<p>User customizable <b>views</b> is what makes Multisite flexible. Customize
-the builtin views or create completely own views in order to need your
-demands.</p>
-
-<p>Multisite supports distributed monitoring by allowing you to combine an
-arbitrary number of Monitoring servers under a common visualisation layer,
-without the need of a centralized data storage. No SQL database is needed.
-No network traffic is generated due to the monitoring.</p>
-
-<p>Please learn more about Multisite at its <a href="http://mathias-kettner.de/checkmk_multisite.html">Documentation home page</a>.</p>
-""")
- html.footer()
-
# This function does nothing. The sites have already
# been reconfigured according to the variable _site_switch,
# because that variable is processed by connect_to_livestatus()
diff --git a/web/plugins/pages/shipped.py b/web/plugins/pages/shipped.py
index bb4d558..f8ea32f 100644
--- a/web/plugins/pages/shipped.py
+++ b/web/plugins/pages/shipped.py
@@ -40,7 +40,6 @@ import help
pagehandlers.update({
"index" : main.page_index,
- "main" : main.page_main,
"login" : login.page_login,
"logout" : login.page_logout,
"ajax_switch_help" : help.ajax_switch_help,
Module: check_mk
Branch: master
Commit: c492b48d04f6a6fb3f8392b6ade7a89b7dea01f0
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c492b48d04f6a6…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Fri May 11 12:17:21 2012 +0200
Make texts in config.py i10n-able
---
web/htdocs/config.py | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/web/htdocs/config.py b/web/htdocs/config.py
index b50f942..d4381c1 100644
--- a/web/htdocs/config.py
+++ b/web/htdocs/config.py
@@ -111,7 +111,7 @@ def include(filename):
except Exception, e:
global user_id
user_id = "nobody"
- raise MKConfigError("Cannot read configuration file %s: %s:" % (filename, e))
+ raise MKConfigError(_("Cannot read configuration file %s: %s:") % (filename, e))
# Load multisite.mk and all files in multisite.d/. This will happen
# for *each* HTTP request.
@@ -330,7 +330,7 @@ def save_user_file(name, content):
try:
write_settings_file(path, content)
except Exception, e:
- raise MKConfigError("Cannot save %s options for user <b>%s</b> into <b>%s</b>: %s" % \
+ raise MKConfigError(_("Cannot save %s options for user <b>%s</b> into <b>%s</b>: %s") % \
(name, user, path, e))
# -------------------------------------------------------------------
@@ -656,13 +656,13 @@ declare_permission('logout',
)
declare_permission("ignore_soft_limit",
- "Ignore soft query limit",
- "Allows to ignore the soft query limit imposed upon the number of datasets returned by a query",
+ _("Ignore soft query limit"),
+ _("Allows to ignore the soft query limit imposed upon the number of datasets returned by a query"),
[ "admin", "user" ])
declare_permission("ignore_hard_limit",
- "Ignore hard query limit",
- "Allows to ignore the hard query limit imposed upon the number of datasets returned by a query",
+ _("Ignore hard query limit"),
+ _("Allows to ignore the hard query limit imposed upon the number of datasets returned by a query"),
[ "admin" ])
# Make sure, we have all values set right now - until
Module: check_mk
Branch: master
Commit: 4c7e0c42f8f3c5743edb6f6e42bb64b9129b1571
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4c7e0c42f8f3c5…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Fri May 11 10:48:02 2012 +0200
Updated bug entries #0686
---
.bugs/686 | 12 ++++++++++++
1 files changed, 12 insertions(+), 0 deletions(-)
diff --git a/.bugs/686 b/.bugs/686
new file mode 100644
index 0000000..c63e070
--- /dev/null
+++ b/.bugs/686
@@ -0,0 +1,12 @@
+Title: Dashboard/Sidebar on Chrome sometimes not sized
+Component: multisite
+State: open
+Date: 2012-05-11 10:46:54
+Targetversion: 1.2.0
+Class: bug
+
+It seems like we miss an initial resize() event on Chrome.
+This affects both the sidebar and the dashboard. Can we
+simulate that event somehow? Currently the dashboard
+and sidebar sometimes only work after a manual resize
+of the browser window.