Module: check_mk
Branch: master
Commit: 50cd682183038040ac07204639168435d81c068e
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=50cd6821830380…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Fri Mar 4 14:38:53 2011 +0100
snmp scan: drop quotes from strings
---
.bugs/178 | 10 +++++++---
modules/check_mk.py | 3 +++
2 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/.bugs/178 b/.bugs/178
index 09358cc..b4fb54f 100644
--- a/.bugs/178
+++ b/.bugs/178
@@ -1,12 +1,16 @@
Title: get_single_oid should drop quotes on strings
Component: core
+State: done
+Class: bug
+Date: 2011-03-04 14:30:38
Benefit: 1
-State: open
Cost: 1
-Date: 2011-03-04 14:30:38
-Class: bug
+Fun: 0
The snmp scan function uses get_single_oid(). That function
does not strip the quotes from strings. This is a bug.
Some scan functions depend on the quotes, so fix them as
well.
+
+2011-03-04 14:38:49: changed state open -> done
+Done. Strings are stripped if existing.
diff --git a/modules/check_mk.py b/modules/check_mk.py
index 31aef25..6039187 100755
--- a/modules/check_mk.py
+++ b/modules/check_mk.py
@@ -632,6 +632,9 @@ def get_single_oid(hostname, ipaddress, oid):
or value.startswith('No Such Object available') or value.startswith('No Such Instance currently exists'):
value = None
+ # Strip quotes
+ if value.startswith('"') and value.endswith('"'):
+ value = value[1:-1]
# try to remove text, only keep number
# value_num = value_text.split(" ")[0]
# value_num = value_num.lstrip("+")
Module: check_mk
Branch: master
Commit: 3102db8606771ff54584dfc29cc5b0ba2bb3c166
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3102db8606771f…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Thu Mar 3 09:44:04 2011 +0100
Added snmp_uptime check
---
ChangeLog | 4 ++++
checks/snmp_uptime | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 55 insertions(+), 0 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index c6a7fa7..9f84e5a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Checks & Agents:
+ * Added SNMP uptime check which behaves identical to the agent base uptime
+ check
+
1.1.10b1:
Core, Setup, etc.:
* FIX: do not assume 127.0.0.1 as IP address for usewalk_hosts if
diff --git a/checks/snmp_uptime b/checks/snmp_uptime
new file mode 100644
index 0000000..cd874e7
--- /dev/null
+++ b/checks/snmp_uptime
@@ -0,0 +1,51 @@
+#!/usr/bin/python
+# -*- encoding: utf-8; py-indent-offset: 4 -*-
+# +------------------------------------------------------------------+
+# | ____ _ _ __ __ _ __ |
+# | / ___| |__ ___ ___| | __ | \/ | |/ / |
+# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / |
+# | | |___| | | | __/ (__| < | | | | . \ |
+# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ |
+# | |
+# | Copyright Mathias Kettner 2010 mk(a)mathias-kettner.de |
+# +------------------------------------------------------------------+
+#
+# This file is part of Check_MK.
+# The official homepage is at http://mathias-kettner.de/check_mk.
+#
+# check_mk is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation in version 2. check_mk is distributed
+# in the hope that it will be useful, but WITHOUT ANY WARRANTY; with-
+# out even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE. See the GNU General Public License for more de-
+# ails. You should have received a copy of the GNU General Public
+# License along with GNU Make; see the file COPYING. If not, write
+# to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+# Boston, MA 02110-1301 USA.
+
+# Author: Lars Michelsen <lm(a)mathias-kettner.de>
+
+def inventory_snmp_uptime(checktype, info):
+ if len(info[0]) >= 1:
+ return [ (None, None, None) ]
+
+def check_snmp_uptime(checktype, params, info):
+ if len(info[0]) >= 1:
+ ticks = info[0][0]
+ uptime = saveint(ticks[:-2])
+ days, rest = divmod(uptime, 60*60*24)
+ hours, rest = divmod(rest, 60*60)
+ minutes, seconds = divmod(rest, 60)
+ now = int(time.time())
+ since = time.strftime("%c", time.localtime(now - uptime))
+ return (0, "OK - up since %s (%dd %02d:%02d:%02d)" %
+ (since, days, hours, minutes, seconds), [ ("uptime", uptime) ])
+ else:
+ return (3, "UNKNOWN - No data retrieved")
+
+check_info['snmp_uptime'] = (check_snmp_uptime, "Uptime", 1, inventory_snmp_uptime)
+snmp_info['snmp_uptime'] = ( ".1.3.6.1.2.1.1", [ '3.0' ] ) # DISMAN-EVENT-MIB::sysUpTime
+
+# Do not use this check per default
+snmp_scan_functions['snmp_uptime'] = lambda oid: False
Module: check_mk
Branch: master
Commit: e5e231ff1c3af24df311662e28f7eb4fb3e42366
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e5e231ff1c3af2…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Fri Mar 4 14:33:27 2011 +0100
Updated bug entries
---
.bugs/178 | 12 ++++++++++++
1 files changed, 12 insertions(+), 0 deletions(-)
diff --git a/.bugs/178 b/.bugs/178
new file mode 100644
index 0000000..09358cc
--- /dev/null
+++ b/.bugs/178
@@ -0,0 +1,12 @@
+Title: get_single_oid should drop quotes on strings
+Component: core
+Benefit: 1
+State: open
+Cost: 1
+Date: 2011-03-04 14:30:38
+Class: bug
+
+The snmp scan function uses get_single_oid(). That function
+does not strip the quotes from strings. This is a bug.
+Some scan functions depend on the quotes, so fix them as
+well.