Module: check_mk
Branch: master
Commit: a4deb80284a3bd45e43cf4a25bc946e4c632ab04
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a4deb80284a3bd…
Author: Andreas Boesl <ab(a)mathias-kettner.de>
Date: Fri Feb 19 16:02:27 2016 +0100
minor fixes in error output (no werk)
---
agents/special/agent_vsphere | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/agents/special/agent_vsphere b/agents/special/agent_vsphere
index 2a32224..d0372a3 100755
--- a/agents/special/agent_vsphere
+++ b/agents/special/agent_vsphere
@@ -1118,14 +1118,15 @@ def connect_to_server():
error = "Cannot connect to vSphere Server. Please check the IP and SSL certificate (if applicable) "\
"\and try again. This error is not related to the login credentials. Error message: %r" % e
-def retrieve_basic_info():
+def retrieve_systeminfo():
global systeminfo
# Retrieve basic data, which requires no login
payload = telegram_list["systeminfo"]
reply_code, reply_msg, reply_headers, reply_data = query_server(payload)
for entry, function in systemfields:
element = get_pattern("<%(entry)s.*>(.*)</%(entry)s>" % { "entry": entry }, reply_data)
- systeminfo[entry] = function and function(element[0]) or element[0]
+ if element:
+ systeminfo[entry] = function and function(element[0]) or element[0]
def login():
global server_cookie
@@ -1159,7 +1160,11 @@ def login():
# +----------------------------------------------------------------------+
connect_to_server()
-retrieve_basic_info()
+retrieve_systeminfo()
+
+if not systeminfo:
+ sys.stderr.write("Unable to get data from Web API"+ "\n")
+ sys.exit(1)
# The cookie access time is required to determine the agents check interval
# This is required later on by the performancecounters. Depending on the
Module: check_mk
Branch: master
Commit: 6153f8c01856010648093b623610c28e6cddc4ba
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6153f8c0185601…
Author: Sebastian Herbord <sh(a)mathias-kettner.de>
Date: Thu Feb 18 16:39:06 2016 +0100
#3079 FIX win_printers: fixed typo that kept default parameters from being used
This bug was only recently introduced and 1.2.8b1 should be the only release that included it
---
.werks/3079 | 10 ++++++++++
ChangeLog | 1 +
2 files changed, 11 insertions(+)
diff --git a/.werks/3079 b/.werks/3079
new file mode 100644
index 0000000..dc7b133
--- /dev/null
+++ b/.werks/3079
@@ -0,0 +1,10 @@
+Title: win_printers: fixed typo that kept default parameters from being used
+Level: 1
+Component: checks
+Class: fix
+Compatible: compat
+State: unknown
+Version: 1.2.9i1
+Date: 1455809865
+
+This bug was only recently introduced and 1.2.8b1 should be the only release that included it
diff --git a/ChangeLog b/ChangeLog
index b9cf1f9..c4ab363 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -33,6 +33,7 @@
* 3188 FIX: ps.include: fixed typo
* 3226 FIX: isc_dhcpd: Fixed exception during discovery when pools can not be gathered by agent
* 3189 FIX: mem.vmalloc: newer kernel versions (64bit) report wrong data, i.d. both VmallocUsed and Chunk equal zero, thus this check is obsolete
+ * 3079 FIX: win_printers: fixed typo that kept default parameters from being used...
Multisite:
* 3187 notification view: new filter for log command via regex