Module: check_mk
Branch: master
Commit: 7aaf3425a23f7549e040a23b86dc981ed8333a77
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7aaf3425a23f75…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Fri Mar 1 10:18:22 2013 +0100
FIX: Fixed exception when editing contactgroups without alias
---
ChangeLog | 1 +
web/htdocs/wato.py | 8 +++++---
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 8062d53..d7bca96 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -94,6 +94,7 @@
* FIX: flexible notification valuespec is now localizable
* FIX: Alias values of host/service/contact groups need to be set and unique
within the group
+ * FIX: Fixed exception when editing contactgroups without alias
* Suggest use default value for filesystem levels that make sense
* Valuespec: CascadingDropdown now able to process choice values from functions
* Freshness checking for classical passive Nagios checks (custom_checks)
diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py
index 27a3b7e..4e6c116 100644
--- a/web/htdocs/wato.py
+++ b/web/htdocs/wato.py
@@ -5820,16 +5820,18 @@ def mode_edit_group(phase, what):
html.text_input("name", clone_group or "")
html.set_focus("name")
else:
+ clone_group = None
html.write(name)
html.set_focus("alias")
forms.section(_("Alias"))
html.help(_("An Alias or description of this group."))
alias = groups.get(name, "")
- if not alias and clone_group:
- alias = groups.get(clone_group, "")
if not alias:
- alias = name
+ if clone_group:
+ alias = groups.get(clone_group, "")
+ else:
+ alias = name
html.text_input("alias", alias)
forms.end()
html.button("save", _("Save"))
Module: check_mk
Branch: master
Commit: 6d98d723128bce479c310580a3f4d0d76e37ecba
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6d98d723128bce…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Fri Mar 1 10:04:30 2013 +0100
Updated bug entries #0885
---
.bugs/885 | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/.bugs/885 b/.bugs/885
index 4cd4848..1b0baf3 100644
--- a/.bugs/885
+++ b/.bugs/885
@@ -1,13 +1,13 @@
-Title: Password field in personal settings must not be prefilled by browser
+Title: Fewer mouseclicks in commands and actions
Component: multisite
-Class: bug
-State: done
-Date: 2013-01-21 15:55:44
-Targetversion: 1.2.2
+State: open
+Date: 2013-03-01 10:02:56
+Targetversion: 1.2.3
+Class: feature
-If the browser enters a possible previous password then after saving
-(because of changes to the notifications) the user password gets
-changed and the user logged out - forever.
+Two ideas in order to ease the user actions:
-2013-02-05 15:36:48: changed state open -> done
-Just implemented. Added "autocomplete=off" attribute to input fields.
+1. Make a user setting the completely disabled all confirms in Multisite and WATO.
+2. When a user has done an action on hosts/services, do not display a separate
+result page, but directly to back to the view. The result of the action is then
+displayed in a floating div, that goes away if you hover over.
Module: check_mk
Branch: master
Commit: 56280e80728ed2059c6aafc58f582749214773c2
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=56280e80728ed2…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Thu Feb 28 17:50:11 2013 +0100
agent_vsphere: removed <<<local>>>
Reason: error messages from the agent cannot be sent via <<<local>>>, since
new items here wont be visible. Correct way is to exit with non-zero status.
---
agents/special/agent_vsphere | 14 ++++----------
1 files changed, 4 insertions(+), 10 deletions(-)
diff --git a/agents/special/agent_vsphere b/agents/special/agent_vsphere
index 5630ed1..0b12890 100755
--- a/agents/special/agent_vsphere
+++ b/agents/special/agent_vsphere
@@ -42,9 +42,8 @@ try:
from pysphere import VIServer, VIProperty, MORTypes
from pysphere.resources import VimService_services as VI
except:
- print "<<<local>>>"
- print "2 Agent_error - pysphere API not found. Please install and make a reinventory"
- sys.exit(0)
+ sys.stderr.write("pysphere API not found. Please install and try again.\n")
+ sys.exit(1)
host = VIServer()
@@ -53,9 +52,8 @@ object_collection = {}
try:
host.connect(params['Hostname'], params['u'], params['s'])
except:
- print "<<<local>>>"
- print "2 Agent_error - Cant connect to vSphere Server. May the wrong credentials. Please correct and make a reinventory"
- sys.exit(0)
+ sys.stderr.write("Cannot connect to vSphere Server. May the wrong credentials. Please correct and make a reinventory.")
+ sys.exit(1)
print "<<<check_mk>>>"
print "Version: %s" % host.get_api_version()
@@ -142,9 +140,5 @@ if "virtualmachine" in check:
})
print "<<<<>>>>"
-print "<<<local>>>"
-for name, data in object_collection.items():
- print "0 %s-%s - INFO: Collecting data for %s" % (data[0], name, data[1])
-
host.disconnect()