Module: check_mk
Branch: master
Commit: c1b5ef01b63c707a4082273ccfcbf660c87f8c6d
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c1b5ef01b63c70…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Tue Dec 5 14:07:37 2017 +0100
Fixed saving of owned views (that have no builtin view with equal name) - regression in #5529
Change-Id: Ie44999e71a9ffff03f67e99ebb88a86445144e6e
---
web/htdocs/visuals.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/web/htdocs/visuals.py b/web/htdocs/visuals.py
index 93ac934..3ca54e2 100644
--- a/web/htdocs/visuals.py
+++ b/web/htdocs/visuals.py
@@ -854,7 +854,8 @@ def page_edit_visual(what, all_visuals, custom_field_handler = None,
html.begin_form("visual", method = "POST")
html.hidden_field("back", back_url)
html.hidden_field("mode", mode)
- html.hidden_field("load_user", html.var("load_user", "")) # safe old name in case user changes it
+ if html.has_var("load_user"):
+ html.hidden_field("load_user", html.var("load_user")) # safe old name in case user changes it
html.hidden_field("load_name", oldname) # safe old name in case user changes it
# FIXME: Hier werden die Flags aus visibility nicht korrekt geladen. Wäre es nicht besser,
Module: check_mk
Branch: master
Commit: 298902e146958d744767f63160bac2b727820f9e
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=298902e146958d…
Author: Andreas Boesl <ab(a)mathias-kettner.de>
Date: Tue Dec 5 13:24:22 2017 +0100
add WK 5250
Change-Id: I2e65abddca7d1aa4451e70ef68baadad8727d607
---
.werks/5250 | 13 +++++++++++++
web/htdocs/htmllib.py | 5 +++++
web/htdocs/watolib.py | 7 +++++++
3 files changed, 25 insertions(+)
diff --git a/.werks/5250 b/.werks/5250
new file mode 100644
index 0000000..dd54eb0
--- /dev/null
+++ b/.werks/5250
@@ -0,0 +1,13 @@
+Title: Fixed tmpfs full issue: Activate Changes did not cleanup all temporary files
+Level: 1
+Component: wato
+Class: fix
+Compatible: compat
+Edition: cre
+State: unknown
+Version: 1.5.0i2
+Date: 1512476335
+
+The WATO work directory <tt>~/tmp/check_mk/wato</tt> could grow in size,
+whenever an unexpected exception happened during the activate changes process.
+
diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py
index f5f3cb1..65bcfdb 100644
--- a/web/htdocs/htmllib.py
+++ b/web/htdocs/htmllib.py
@@ -1655,6 +1655,11 @@ class html(HTMLGenerator, RequestHandler):
raise NotImplementedError()
+ def get_request_timeout(self):
+ return self._request_timeout
+
+
+
#
# Messages
#
diff --git a/web/htdocs/watolib.py b/web/htdocs/watolib.py
index 0ae5eba..44ad842 100644
--- a/web/htdocs/watolib.py
+++ b/web/htdocs/watolib.py
@@ -4901,6 +4901,13 @@ class ActivateChangesManager(ActivateChanges):
for site_id in self._sites:
site_state = state["sites"][site_id]
+
+ # The site_state file may be missing/empty, if the operation has started recently.
+ # However, if the file is still missing after a considerable amount
+ # of time, we consider this site activation as dead
+ if site_state == {} and time.time() - self._time_started > html.get_request_timeout() - 10:
+ continue
+
if site_state == {} or site_state["_phase"] == PHASE_INITIALIZED:
# Just been initialized. Treat as running as it has not been
# started and could not lock the site stat file yet.
Module: check_mk
Branch: master
Commit: 5dea33978d77ad4fac287a457ccf6ae7197454cd
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5dea33978d77ad…
Author: Sven Panne <sp(a)mathias-kettner.de>
Date: Mon Dec 4 14:15:30 2017 +0100
5468 FIX Fixed indexing with disjunctions.
To speed things up, livestatus tries to use an index when accessing the
'hosts' and 'services' tables, but there was a bug when a disjunction
('Or:') was used in filters, leading to too few results. This has been
fixed.
Change-Id: I056e6003a65773463d276a131423b34ace75e3ed
---
.werks/5468 | 13 +++++++++++++
1 file changed, 13 insertions(+)
diff --git a/.werks/5468 b/.werks/5468
new file mode 100644
index 0000000..7f1f0b8
--- /dev/null
+++ b/.werks/5468
@@ -0,0 +1,13 @@
+Title: Fixed indexing with disjunctions.
+Level: 1
+Component: livestatus
+Compatible: compat
+Edition: cre
+Version: 1.5.0i2
+Date: 1512393115
+Class: fix
+
+To speed things up, livestatus tries to use an index when accessing the
+'hosts' and 'services' tables, but there was a bug when a disjunction
+('Or:') was used in filters, leading to too few results. This has been
+fixed.
Module: check_mk
Branch: master
Commit: bc7c4ce8f7685e9ddc8f203633c50d488237b401
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bc7c4ce8f7685e…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Mon Dec 4 13:00:44 2017 +0100
Fixed broken link in apache test
Change-Id: I02ef189289c0e871ec9f2f9ac82ca149ea47fd4a
---
web/plugins/wato/ac_tests.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/web/plugins/wato/ac_tests.py b/web/plugins/wato/ac_tests.py
index bc5d7a9..16b00c7 100644
--- a/web/plugins/wato/ac_tests.py
+++ b/web/plugins/wato/ac_tests.py
@@ -370,7 +370,7 @@ class ACTestApacheNumberOfProcesses(ACTest, BPApacheTest):
"<p>Please note that this value is only a rough estimation, because the memory "
"usage of the apache processes may vary with the requests being processed.</p>"
"<p>Possible actions:<ul>"
- "<li>Change the <a href=\"wato.py?mode=edit_configvar&varname=process_tuning\">number of apache processes</a></li>"
+ "<li>Change the <a href=\"wato.py?mode=edit_configvar&varname=apache_process_tuning\">number of apache processes</a></li>"
"</ul>"
"</p>")
Module: check_mk
Branch: master
Commit: 4a753d0ef2e9ca379b46352dca39bcc5a9e9d5ce
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4a753d0ef2e9ca…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Mon Dec 4 11:37:47 2017 +0100
5565 FIX WATO rules: Breadcrumb navigation is now consistent with rule search
The interaction of the rule search and the folder breadcrumb was not working
correctly. The breadcrumb navigation is now updating the search filters, just
like it's done for the quick search filter.
Change-Id: I2b52d08fde1650c65998ae5beafd845ff657caa5
---
.werks/5565 | 12 ++++++++++++
web/htdocs/wato.py | 8 +++++++-
2 files changed, 19 insertions(+), 1 deletion(-)
diff --git a/.werks/5565 b/.werks/5565
new file mode 100644
index 0000000..70bf82a
--- /dev/null
+++ b/.werks/5565
@@ -0,0 +1,12 @@
+Title: WATO rules: Breadcrumb navigation is now consistent with rule search
+Level: 1
+Component: wato
+Compatible: compat
+Edition: cre
+Version: 1.5.0i2
+Date: 1512383794
+Class: fix
+
+The interaction of the rule search and the folder breadcrumb was not working
+correctly. The breadcrumb navigation is now updating the search filters, just
+like it's done for the quick search filter.
diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py
index abcd1f7..3649b90 100644
--- a/web/htdocs/wato.py
+++ b/web/htdocs/wato.py
@@ -12668,6 +12668,12 @@ class ModeRulesets(WatoMode):
html.set_var("search_p_fulltext_USE", "on")
html.del_var("search")
+ # Transform the folder argumen (from URL or bradcrumb) to the "rule search arguments
+ if html.var("folder"):
+ html.set_var("search_p_rule_folder_0", DropdownChoice.option_id(html.var("folder")))
+ html.set_var("search_p_rule_folder_1", DropdownChoice.option_id(True))
+ html.set_var("search_p_rule_folder_USE", "on")
+
self._search_options = ModeRuleSearch().search_options
self._only_host = html.var("host")
@@ -13009,7 +13015,7 @@ class ModeEditRuleset(WatoMode):
def page(self):
if not self._hostname:
- watolib.Folder.current().show_breadcrump(keepvarnames = ["mode", "varname"])
+ watolib.Folder.current().show_breadcrump(keepvarnames=True) # = ["mode", "varname"])
if not config.wato_hide_varnames:
display_varname = '%s["%s"]' % tuple(self._name.split(":")) \