Module: check_mk
Branch: master
Commit: 094fc3a54e1dd7923d9c4098113d8fb4cb895c33
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=094fc3a54e1dd7…
Author: Andreas Boesl <ab(a)mathias-kettner.de>
Date: Tue Dec 17 10:51:07 2013 +0100
FIX Inline SNMP now longer throws an exception when using SNMPv3 credentials
During the generation of the monitoring configuration an exception was thrown, when the
snmp host had SNMPv3 credentials set and the global settings "Use Inline SNMP"
was activated.
---
.werks/245 | 11 +++++++++++
ChangeLog | 1 +
modules/check_mk.py | 2 +-
3 files changed, 13 insertions(+), 1 deletion(-)
diff --git a/.werks/245 b/.werks/245
new file mode 100644
index 0000000..beabc34
--- /dev/null
+++ b/.werks/245
@@ -0,0 +1,11 @@
+Title: Inline SNMP now longer throws an exception when using SNMPv3 credentials
+Level: 1
+Component: checks
+Class: fix
+State: unknown
+Version: 1.2.5i1
+Date: 1387273469
+Targetversion: future
+
+During the generation of the monitoring configuration an exception was thrown, when the
+snmp host had SNMPv3 credentials set and the global settings "Use Inline SNMP"
was activated.
diff --git a/ChangeLog b/ChangeLog
index 0d2540e..6fb2362 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -44,6 +44,7 @@
* 0370 FIX: brocade_mlx_module*: Improved output of checks
* 0372 FIX: megaraid_ldisks: Ignoring adapters without configured logical disks...
* 0345 FIX: Linux agent: fix detaching of background plugins...
+ * 0245 FIX: Inline SNMP now longer throws an exception when using SNMPv3
credentials...
Multisite:
* 0371 Added log class filter to hostsvcevents view
diff --git a/modules/check_mk.py b/modules/check_mk.py
index aac0506..6349fd7 100755
--- a/modules/check_mk.py
+++ b/modules/check_mk.py
@@ -3159,7 +3159,7 @@ no_inventory_possible = None
output.write("def is_snmpv2c_host(hostname):\n return %r\n\n" %
is_snmpv2c_host(hostname))
output.write("def is_bulkwalk_host(hostname):\n return %r\n\n" %
is_bulkwalk_host(hostname))
output.write("def snmp_timing_of(hostname):\n return %r\n\n" %
snmp_timing_of(hostname))
- output.write("def snmp_credentials_of(hostname):\n return %r\n\n" %
snmp_credentials_of(hostname))
+ output.write("def snmp_credentials_of(hostname):\n return %s\n\n" %
pprint.pformat(snmp_credentials_of(hostname)))
output.write("def snmp_port_of(hostname):\n return %r\n\n" %
snmp_port_of(hostname))
else:
output.write("def snmp_port_spec(hostname):\n return %r\n\n" %
snmp_port_spec(hostname))