Module: check_mk
Branch: master
Commit: 05739a2a07e069118ed2da78d9649aee840c87fb
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=05739a2a07e069…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Mon Jul 20 11:24:39 2015 +0200
#2479 Allowing dots in host-, service- and contact groups now
---
.werks/2479 | 9 +++++++++
ChangeLog | 1 +
web/htdocs/wato.py | 4 ++--
3 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/.werks/2479 b/.werks/2479
new file mode 100644
index 0000000..8a03471
--- /dev/null
+++ b/.werks/2479
@@ -0,0 +1,9 @@
+Title: Allowing dots in host-, service- and contact groups now
+Level: 1
+Component: wato
+Compatible: compat
+Version: 1.2.7i3
+Date: 1437384233
+Class: feature
+
+
diff --git a/ChangeLog b/ChangeLog
index 12d5096..99fb2f8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -92,6 +92,7 @@
* 2373 Skip unmonitored hosts during bulk discovery...
* 2462 Users with access to host/services can now edit the disabled services rule for
their hosts/folders...
* 2463 Hiding not permitted actions from service discovery page when only permitted
on host...
+ * 2479 Allowing dots in host-, service- and contact groups now
* 2344 FIX: Improved validation of selected rules when editing BI aggregations...
* 2346 FIX: Notifications: Fixed garbled page when switching on/off
bulks/backlog/user rules
* 2372 FIX: Avoid freezing WATO during bulk discovery if hosts do not respond in a
timely manner
diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py
index 02e0142..7726140 100644
--- a/web/htdocs/wato.py
+++ b/web/htdocs/wato.py
@@ -8479,8 +8479,8 @@ def mode_edit_group(phase, what):
raise MKUserError("name", _("Please specify a name of
the new group."))
if ' ' in name:
raise MKUserError("name", _("Sorry, spaces are not
allowed in group names."))
- if not re.match("^[-a-z0-9A-Z_]*$", name):
- raise MKUserError("name", _("Invalid group name. Only
the characters a-z, A-Z, 0-9, _ and - are allowed."))
+ if not re.match("^[-a-z0-9A-Z_\.]*$", name):
+ raise MKUserError("name", _("Invalid group name. Only
the characters a-z, A-Z, 0-9, _, . and - are allowed."))
if name in groups:
raise MKUserError("name", _("Sorry, there is already a
group with that name"))
groups[name] = {