Module: check_mk
Branch: master
Commit: 1cbc6cde9c5ef92e35590519ff5c4b0fcda26a9e
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1cbc6cde9c5ef9…
Author: Konstantin Büttner <kb(a)mathias-kettner.de>
Date: Mon Feb 5 17:36:38 2018 +0100
checktestlib.py: Add docstrings and a TODO
Change-Id: Ifc207fac229fada4055445b42809320262469c6e
---
tests/checks/checktestlib.py | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/tests/checks/checktestlib.py b/tests/checks/checktestlib.py
index 8092a91..86691f0 100644
--- a/tests/checks/checktestlib.py
+++ b/tests/checks/checktestlib.py
@@ -133,6 +133,7 @@ class CheckResult(object):
class DiscoveryEntry(Tuploid):
+ """A single entry as returned by the discovery (or in oldspeak: inventory) function."""
def __init__(self, entry):
item, default_params = entry
@@ -146,7 +147,15 @@ class DiscoveryEntry(Tuploid):
class DiscoveryResult(object):
+ """
+ The result of the discovery as a whole.
+
+ Much like in the case of the check result, this also makes sure
+ that yield-based discovery functions run, and that no exceptions
+ get lost in the laziness.
+ """
+ # TODO: Add some more consistency checks here.
def __init__(self, result):
self.entries = []
for entry in result:
Module: check_mk
Branch: master
Commit: 83b14e0f8d095958b300caf5c32e36b06e469193
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=83b14e0f8d0959…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Mon Feb 5 09:33:18 2018 +0100
5720 Standard tables now tell their number of rows in page title area
When a data table is rendered, e.g. like it is done in the configuration GUI on
a lot of pages, the tables write the number of shown rows to detail text of the
header area of the page.
Change-Id: I2cce0be4096c66b6bd1b07c44f07b3f20327a7c9
---
.werks/5720 | 12 ++++++++++++
web/htdocs/table.py | 6 ++++++
2 files changed, 18 insertions(+)
diff --git a/.werks/5720 b/.werks/5720
new file mode 100644
index 0000000..a75811b
--- /dev/null
+++ b/.werks/5720
@@ -0,0 +1,12 @@
+Title: Standard tables now tell their number of rows in page title area
+Level: 1
+Component: multisite
+Compatible: compat
+Edition: cre
+Version: 1.5.0i3
+Date: 1517609742
+Class: feature
+
+When a data table is rendered, e.g. like it is done in the configuration GUI on
+a lot of pages, the tables write the number of shown rows to detail text of the
+header area of the page.
diff --git a/web/htdocs/table.py b/web/htdocs/table.py
index d687d61..0d9e75a 100644
--- a/web/htdocs/table.py
+++ b/web/htdocs/table.py
@@ -324,6 +324,7 @@ class Table(object):
def _write_table(self, rows, actions_enabled, actions_visible, search_term):
+ self._update_headinfo(len(rows))
table_id = self.id
num_cols = len(self.headers)
@@ -399,6 +400,11 @@ class Table(object):
html.close_table()
+ def _update_headinfo(self, num_rows):
+ headinfo = _("1 row") if num_rows == 1 else _("%d rows") % num_rows
+ html.javascript("update_headinfo('%s');" % headinfo)
+
+
def _write_csv(self, csv_separator):
rows = self.rows
Module: check_mk
Branch: master
Commit: 1e45026257167159bbbd60a0a442d10d342e4a78
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1e450262571671…
Author: Marcel Arentz <ma(a)mathias-kettner.de>
Date: Mon Feb 5 15:15:38 2018 +0100
Added bug/nastiness regarding disabled services
Change-Id: I617bb6f3c1379bbcc874de531e2ad93e7f282dc1
---
.bugs/2974 | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/.bugs/2974 b/.bugs/2974
new file mode 100644
index 0000000..cf0b3ce
--- /dev/null
+++ b/.bugs/2974
@@ -0,0 +1,8 @@
+Title: Services marked as vanished even if they have been disabled previously
+Component: checks
+State: open
+Date: 2018-02-05 15:12:29
+Targetversion: 1.4.0
+Class: nastiness
+
+Even if a service has been disabled previously it will be marked as vanished and the service "Check_MK Discovery" will change to WARN. The expected behaviour would be to silently dissappear these disabled services.