Module: check_mk
Branch: master
Commit: fbc157df0f85d9ac5dbc8e66c399e53e69e013a8
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fbc157df0f85d9…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Tue Feb 23 13:32:03 2016 +0100
#3179 FIX Fix labelling of heartbeat interval for liveproxyd settings
Instead of "5/sec" we now correctly write "one heartbeat every 5
sec".
---
.werks/3179 | 10 ++++++++++
ChangeLog | 1 +
web/htdocs/wato.py | 4 ++--
3 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/.werks/3179 b/.werks/3179
new file mode 100644
index 0000000..052fc36
--- /dev/null
+++ b/.werks/3179
@@ -0,0 +1,10 @@
+Title: Fix labelling of heartbeat interval for liveproxyd settings
+Level: 1
+Component: wato
+Class: fix
+Compatible: compat
+State: unknown
+Version: 1.2.9i1
+Date: 1456230677
+
+Instead of "5/sec" we now correctly write "one heartbeat every 5
sec".
diff --git a/ChangeLog b/ChangeLog
index 4a1485c..ecba0ab 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -59,6 +59,7 @@
* 3222 FIX: Fixed broken duplicate user id validation when creating new users
* 3223 FIX: Fixed exception in network scan when hosts can not be resolved
* 3225 FIX: Fixed exception when renaming a host which is configured as parent on a
folder
+ * 3179 FIX: Fix labelling of heartbeat interval for liveproxyd settings...
Event Console:
* 3058 FIX: Event Console is now allowing non loadable MIB modules on startup...
diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py
index c86b075..7cf4439 100644
--- a/web/htdocs/wato.py
+++ b/web/htdocs/wato.py
@@ -9120,8 +9120,8 @@ def mode_edit_site(phase):
title = _("Regular heartbeat"),
orientation = "float",
elements = [
- Integer(label = _("Rate:"),
unit=_("/sec"), minvalue=1, default_value = 5),
- Float(label = _("Timeout:"),
unit=_("sec"), minvalue=0.1, default_value = 2.0),
+ Integer(label = _("One heartbeat every"),
unit=_("sec"), minvalue=1, default_value = 5),
+ Float(label = _("with a timeout of"),
unit=_("sec"), minvalue=0.1, default_value = 2.0,
display_format="%.1f"),
])),
( "channel_timeout",
Float(