26 Nov
2014
26 Nov
'14
9:32 a.m.
Module: check_mk
Branch: master
Commit: 8438a85961d135c6bb815f71069c5511d8d7215b
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8438a85961d135…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Wed Nov 26 15:32:21 2014 +0100
New keywords OID_END_BIN and OID_END_OCTET_STRING for SNMP
---
modules/snmp.py | 23 ++++++++++++++++-------
1 file changed, 16 insertions(+), 7 deletions(-)
diff --git a/modules/snmp.py b/modules/snmp.py
index 22dd216..6ba2e4b 100644
--- a/modules/snmp.py
+++ b/modules/snmp.py
@@ -28,9 +28,11 @@
import subprocess
-OID_END = 0
-OID_STRING = -1
-OID_BIN = -2
+OID_END = 0 # Suffix-part of OID that was not specified
+OID_STRING = -1 # Complete OID as string ".1.3.6.1.4.1.343...."
+OID_BIN = -2 # Complete OID as binary string
"\x01\x03\x06\x01..."
+OID_END_BIN = -3 # Same, but just the end part
+OID_END_OCTET_STRING = -4 # yet same, but omit first byte (assuming that is the length
byte)
def strip_snmp_value(value, hex_plain = False):
v = value.strip()
@@ -127,7 +129,10 @@ def get_snmp_table(hostname, ip, check_type, oid_info):
# in later. If the column in OID_STRING or OID_BIN we do something
# similar: we fill in the complete OID of the entry, either as
# string or as binary UTF-8 encoded number string
- if column in [ OID_END, OID_STRING, OID_BIN ]:
+ if column in [ OID_END, OID_STRING, OID_BIN, OID_END_BIN,
OID_END_OCTET_STRING ]:
+ if index_column >= 0:
+ raise MKGeneralException("Invalid SNMP OID specification in
implementation of check. "
+ "You can only use one of OID_END, OID_STRING, OID_BIN,
OID_END_BIN and OID_END_OCTET_STRING.")
index_column = colno
columns.append((fetchoid, []))
index_format = column
@@ -161,12 +166,16 @@ def get_snmp_table(hostname, ip, check_type, oid_info):
fetchoid, max_column = columns[max_len_col]
for o, value in max_column:
if index_format == OID_END:
- eo = extract_end_oid(fetchoid, o)
- index_rows.append((o, eo))
+ index_rows.append((o, extract_end_oid(fetchoid, o)))
elif index_format == OID_STRING:
index_rows.append((o, o))
- else:
+ elif index_format == OID_BIN:
index_rows.append((o, oid_to_bin(o)))
+ elif index_format == OID_END_BIN:
+ index_rows.append((o, oid_to_bin(extract_end_oid(fetchoid, o))))
+ else: # OID_END_OCTET_STRING:
+ index_rows.append((o, oid_to_bin(extract_end_oid(fetchoid, o))[1:]))
+
columns[index_column] = fetchoid, index_rows