Module: check_mk
Branch: master
Commit: 48049d46b354d5232216d8a876d3c548f1c2ab21
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=48049d46b354d5…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Wed Oct 16 23:18:45 2013 +0200
Updated bug entries #1076
---
.bugs/1076 | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/.bugs/1076 b/.bugs/1076
new file mode 100644
index 0000000..8434893
--- /dev/null
+++ b/.bugs/1076
@@ -0,0 +1,11 @@
+Title: $COUNT$ empty in non-counting rule
+Component: ec
+State: open
+Date: 2013-10-16 23:17:16
+Targetversion: 1.4.0
+Class: bug
+
+If you use the placeholder $COUNT$ in actions or emails and have no counting
+rule, then the macro is not being replaced. Would should make a better macro
+replacement, that is not based on the actual fields of an event but on the
+declared fields, and apply default values for any missing field.
Module: check_mk
Branch: master
Commit: 7d563871daf1c4d6b98ddad9c4906ba01e733aa3
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7d563871daf1c4…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Wed Oct 16 21:52:21 2013 +0200
Updated bug entries #1075
---
.bugs/1075 | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/.bugs/1075 b/.bugs/1075
new file mode 100644
index 0000000..c73c80e
--- /dev/null
+++ b/.bugs/1075
@@ -0,0 +1,10 @@
+Title: Do averaging in the prediction algo
+Component: checks
+State: open
+Date: 2013-10-16 21:48:25
+Targetversion: future
+Class: feature
+
+We could add averaging directly into the prediction
+algo (it est averaging over time). So that we smoothing
+as well the reference data as the current check data.
Module: check_mk
Branch: master
Commit: fc82fa155a275914caf614e576f3a07e3817ff56
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fc82fa155a2759…
Author: Bastian Kuhn <bk(a)mathias-kettner.de>
Date: Wed Oct 16 13:43:18 2013 +0200
Updated bug entries #0831, #0671
---
.bugs/671 | 7 +++++--
.bugs/831 | 8 ++++++++
2 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/.bugs/671 b/.bugs/671
index d27a46e..6dd1984 100644
--- a/.bugs/671
+++ b/.bugs/671
@@ -1,9 +1,12 @@
Title: Quicksearch: search for IP addresses
Component: multisite
-State: open
+Class: feature
+State: done
Date: 2012-03-30 16:12:34
Targetversion: future
-Class: feature
In Quicksearch it should be possible to search for
IP addresses (and find hosts).
+
+2013-10-16 13:41:07: changed state open -> done
+Its possible since a few versions
diff --git a/.bugs/831 b/.bugs/831
new file mode 100644
index 0000000..998061d
--- /dev/null
+++ b/.bugs/831
@@ -0,0 +1,8 @@
+Title: Quicksearch: Duplicate results
+Component: multisite
+State: open
+Date: 2013-10-16 13:41:13
+Targetversion: 1.4.0
+Class: bug
+
+In Version 1.2.3i4, the quicksearch repeats some of the results what means that some of the hosts are shown twice.
Module: check_mk
Branch: master
Commit: 880de2797a02b20a575ed27a9ffd087790d34a3a
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=880de2797a02b2…
Author: Bastian Kuhn <bk(a)mathias-kettner.de>
Date: Wed Oct 16 08:12:43 2013 +0200
Fixed typos
---
web/htdocs/wato.py | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py
index a573c7d..e42506b 100644
--- a/web/htdocs/wato.py
+++ b/web/htdocs/wato.py
@@ -8382,8 +8382,7 @@ def load_notification_table():
( "service_blacklist",
ListOfStrings(
title = _("Blacklist the following services"),
- help = _("Configure regular expressions that match the beginning of the service names here. Prefix an "
- "entry with <tt>!</tt> in order to <i>exclude</i> that service."),
+ help = _("Configure regular expressions that match the beginning of the service names here."),
orientation = "horizontal",
valuespec = RegExp(size = 20),
validate = validate_only_services,
Module: check_mk
Branch: master
Commit: 1f8dc39436beb14837c2e3b6731f3fe087e2f921
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1f8dc39436beb1…
Author: Andreas Boesl <ab(a)mathias-kettner.de>
Date: Wed Oct 16 16:15:29 2013 +0200
check_tcp: Now able to set custom service description
---
ChangeLog | 1 +
checks/check_tcp | 2 +-
web/plugins/wato/active_checks.py | 6 ++++++
3 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/ChangeLog b/ChangeLog
index 6525e3e..3110be6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -34,6 +34,7 @@
* steelhead_perrs: New check for Rivergate Gateways
* alcatel_power: Check for power supplies on Alcatel switches
* qnap_disks: New check for Hardisks in Qnap devices
+ * check_tcp: Now able to set custom service description
WATO:
* You can now have site-specific global settings when using
diff --git a/checks/check_tcp b/checks/check_tcp
index c491171..8c4d780 100644
--- a/checks/check_tcp
+++ b/checks/check_tcp
@@ -84,7 +84,7 @@ def check_tcp_arguments(params):
active_check_info['tcp'] = {
"command_line" : '$USER1$/check_tcp $ARG1$',
"argument_function" : check_tcp_arguments,
- "service_description" : lambda args: "TCP Port %d" % args[0],
+ "service_description" : lambda args: args[1].get("svc_description", "TCP Port %d" % args[0]),
"has_perfdata" : True,
}
diff --git a/web/plugins/wato/active_checks.py b/web/plugins/wato/active_checks.py
index c25ccc7..52d46d2 100644
--- a/web/plugins/wato/active_checks.py
+++ b/web/plugins/wato/active_checks.py
@@ -239,6 +239,12 @@ register_rule(group,
help = _("If you specify a hostname here, then a dynamic DNS lookup "
"will be done instead of using the IP address of the host "
"as configured in your host properties."))),
+ ( "svc_description",
+ TextAscii(
+ title = _("Custom service description"),
+ allow_empty = False,
+ help = _("Here you can specify a custom service description. "
+ "If this parameter is not set the service is named <tt>TCP Port {Portnumber}</tt>"))),
( "response_time",
Tuple(
title = _("Expected response time"),