Module: check_mk
Branch: master
Commit: d8fe4bccae347885d5c5ef6a505399dcaacc6a65
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d8fe4bccae3478…
Author: Andreas Boesl <ab(a)mathias-kettner.de>
Date: Fri Jan 26 10:44:02 2018 +0100
5257 FIX Fixed broken creation of new tag groups and auxilary tags
Change-Id: I4eb2ec89638c20380c00294d240817ca86c36466
---
.werks/5257 | 10 ++++++++++
web/htdocs/watolib.py | 14 ++++++--------
2 files changed, 16 insertions(+), 8 deletions(-)
diff --git a/.werks/5257 b/.werks/5257
new file mode 100644
index 0000000..e6c8541
--- /dev/null
+++ b/.werks/5257
@@ -0,0 +1,10 @@
+Title: Fixed broken creation of new tag groups and auxilary tags
+Level: 1
+Component: wato
+Compatible: compat
+Edition: cre
+Version: 1.5.0i3
+Date: 1516959691
+Class: fix
+
+
diff --git a/web/htdocs/watolib.py b/web/htdocs/watolib.py
index b2e8c2d..f650544 100644
--- a/web/htdocs/watolib.py
+++ b/web/htdocs/watolib.py
@@ -6139,20 +6139,18 @@ def configured_aux_tags():
return get_effective_aux_tags(config.wato_aux_tags)
-# When a tag group is not defined in the users tag groups,
-# it must be a builtin tag group
def is_builtin_host_tag_group(tag_group_id):
- for tag_group in config.wato_host_tags:
+ for tag_group in builtin_host_tags:
if tag_group[0] == tag_group_id:
- return False
- return True
+ return True
+ return False
def is_builtin_aux_tag(taggroup_id):
- for builtin_taggroup in config.wato_aux_tags:
+ for builtin_taggroup in builtin_aux_tags:
if builtin_taggroup[0] == taggroup_id:
- return False
- return True
+ return True
+ return False
def save_hosttags(hosttags, auxtags):
Module: check_mk
Branch: master
Commit: c3c22850bcf81737265a7bf1ffa70fa8a1a1ad08
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c3c22850bcf817…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Fri Jan 26 10:14:28 2018 +0100
5657 FIX Custom user attributes that are not editable by the user can now edited by the admin
Change-Id: If6e6bdd2dbb5c1e5758af36507f6a052aa3f9f8e
---
.werks/5657 | 11 +++++++++++
web/htdocs/wato.py | 2 +-
2 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/.werks/5657 b/.werks/5657
new file mode 100644
index 0000000..a6cb47d
--- /dev/null
+++ b/.werks/5657
@@ -0,0 +1,11 @@
+Title: Custom user attributes that are not editable by the user can now edited by the admin
+Level: 1
+Component: wato
+Class: fix
+Compatible: compat
+Edition: cre
+State: unknown
+Version: 1.5.0i3
+Date: 1516958049
+
+
diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py
index cb28caf..3926ade 100644
--- a/web/htdocs/wato.py
+++ b/web/htdocs/wato.py
@@ -10825,7 +10825,7 @@ def mode_edit_user(phase):
vs = attr['valuespec']
forms.section(_u(vs.title()))
- if attr['user_editable'] and not is_locked(name):
+ if not is_locked(name):
vs.render_input("ua_" + name, user.get(name, vs.default_value()))
else:
html.write(vs.value_to_text(user.get(name, vs.default_value())))
Module: check_mk
Branch: master
Commit: 2444a471ce71eefe43c5abb9c8d8f729ece2095e
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2444a471ce71ee…
Author: Jukka Aro <ja(a)mathias-kettner.de>
Date: Thu Jan 25 15:28:39 2018 +0100
Windows: increase wait time for OHM tests
Wait 3 s in order to give OpenHardwareMonitorCLI.exe some more time to
start. Waiting only 1 s was not enough, the test was failing quite often
as OHM was not running properly and not giving any output yet.
---
agents/windows/it/test_section_openhardwaremonitor.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/agents/windows/it/test_section_openhardwaremonitor.py b/agents/windows/it/test_section_openhardwaremonitor.py
index a459176..020bc7c 100644
--- a/agents/windows/it/test_section_openhardwaremonitor.py
+++ b/agents/windows/it/test_section_openhardwaremonitor.py
@@ -27,7 +27,7 @@ def testconfig(request, config):
def wait_agent():
def inner():
# Wait a little so that OpenHardwareMonitorCLI.exe starts properly.
- time.sleep(1)
+ time.sleep(3)
return inner