Module: check_mk
Branch: master
Commit: a0af9af62508faf33bbfa45676a750f30b92738f
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a0af9af62508fa…
Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de>
Date: Wed Sep 4 10:21:06 2013 +0200
Updated bug entries #1037
---
.bugs/1037 | 1 +
1 file changed, 1 insertion(+)
diff --git a/.bugs/1037 b/.bugs/1037
index 4c9999f..461ab1d 100644
--- a/.bugs/1037
+++ b/.bugs/1037
@@ -41,3 +41,4 @@ I have had a number of crashes on this server as the Windows machine is
running on a VM server which has had problems, but the currupt logstate.txt
file is always 123k in size and looks the same when edited.
+2013-08-28: user did supply original logstate.txt file, see feedback/gitbug folder
Module: check_mk
Branch: master
Commit: 42a949e60e37a94f625e09b14bf354c0b56c82ae
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=42a949e60e37a9…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Wed Sep 4 10:08:16 2013 +0200
Updated changelog
---
ChangeLog | 3 +++
1 file changed, 3 insertions(+)
diff --git a/ChangeLog b/ChangeLog
index 917ecfd..2851764 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -131,6 +131,9 @@
* "Unchecked Services" view now uses the staleness of services for filtering
* Globe dashlets make use of the parameter "id" to make it possible to
provide unique ids in the render HTML code to the dashlets
+ * Multisite can now track wether or not a user is online, this need to be
+ enabled e.g. via Global Settings in WATO (Save last access times of
+ users)
* Added popup message notification system to make it possible to notify
multisite users about various things. It is linked on WATO Users page at
the moment. An image will appear for a user in the sidebar footer with
Module: check_mk
Branch: master
Commit: ae9c556f9397ebdef37c11989629aa78e8eec873
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ae9c556f9397eb…
Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de>
Date: Tue Sep 3 14:44:47 2013 +0200
improved help text for snmp timeout in wato
---
web/plugins/wato/check_mk_configuration.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/web/plugins/wato/check_mk_configuration.py b/web/plugins/wato/check_mk_configuration.py
index d5e3532..e5f1e03 100644
--- a/web/plugins/wato/check_mk_configuration.py
+++ b/web/plugins/wato/check_mk_configuration.py
@@ -1894,7 +1894,8 @@ register_rule(group,
( "timeout",
Integer(
title = _("Timeout between retries"),
- help = _("The default is 1 sec."),
+ help = _("A request is sent to the SNMP daemon, than wait up to this "
+ " number of seconds until retrying."),
default_value = 1,
minvalue = 1,
maxvalue = 60,
Module: check_mk
Branch: master
Commit: bf6a259fd2664e913a24528c0a11bd8d00d27289
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bf6a259fd2664e…
Author: Götz Golla <gg(a)mathias-kettner.de>
Date: Tue Sep 3 14:35:37 2013 +0200
The Check_MK_inventory check can now be ignored based on hosts or
host tags with the ignored_services variable, like all other checks
---
modules/check_mk.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/modules/check_mk.py b/modules/check_mk.py
index 705c2fc..6d73f42 100755
--- a/modules/check_mk.py
+++ b/modules/check_mk.py
@@ -1959,7 +1959,8 @@ define service {
}
""" % (active_service_template, hostname, extra_service_conf_of(hostname, "Check_MK")))
# Inventory checks - if user has configured them. Not for clusters.
- if inventory_check_interval and not is_cluster(hostname):
+ if inventory_check_interval and not is_cluster(hostname) \
+ and not service_ignored(hostname,None,'Check_MK inventory'):
outfile.write("""
define service {
use\t\t\t\t%s
Module: check_mk
Branch: master
Commit: 4620d5a735fe640927ae07fea3df956fd484351b
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4620d5a735fe64…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Mon Sep 2 13:57:23 2013 +0200
Sorting group filters by alias now
---
web/plugins/views/filters.py | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/web/plugins/views/filters.py b/web/plugins/views/filters.py
index 9e914f1..739dcce 100644
--- a/web/plugins/views/filters.py
+++ b/web/plugins/views/filters.py
@@ -112,12 +112,10 @@ declare_filter(102, FilterIPAddress())
# Helper that retrieves the list of host/service/contactgroups via Livestatus
+# use alias by default but fallback to name if no alias defined
def all_groups(what):
groups = dict(html.live.query("GET %sgroups\nColumns: name alias\n" % what))
- names = groups.keys()
- names.sort()
- # use alias by default but fallback to name if no alias defined
- return [ (name, groups[name] or name) for name in names ]
+ return [ (name, groups[name] or name) for name in groups.keys() ]
class FilterGroupCombo(Filter):
def __init__(self, what, title, enforce):
@@ -137,7 +135,7 @@ class FilterGroupCombo(Filter):
choices = all_groups(self.what.split("_")[-1])
if not self.enforce:
choices = [("", "")] + choices
- html.select(self.htmlvars[0], choices)
+ html.sorted_select(self.htmlvars[0], choices)
if not self.enforce:
html.write(" <nobr>")
html.checkbox(self.htmlvars[1], label=_("negate"))