6 Dec
2010
6 Dec
'10
3:51 p.m.
Module: check_mk
Branch: master
Commit: 79d2b9dfe4cb95189378309b89359e505c0eb696
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=79d2b9dfe4cb95…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Mon Dec 6 15:50:14 2010 +0100
snmp_info check: Not using snmp_info_single anymore
---
checks/snmp_info | 8 ++++----
web/htdocs/actions.py | 4 ++--
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/checks/snmp_info b/checks/snmp_info
index eb83c86..49b2c83 100644
--- a/checks/snmp_info
+++ b/checks/snmp_info
@@ -25,17 +25,17 @@
# Boston, MA 02110-1301 USA.
def inventory_snmp_info(checktype, info):
- if len(info) >= 4:
+ if len(info[0]) >= 4:
return [ (None, None, None) ]
def check_snmp_info(checktype, params, info):
- if len(info) >= 4:
- return (0, "OK - %s, %s, %s, %s" % (info[0][-1], info[2][-1],
info[3][-1], info[1][-1]))
+ if len(info[0]) >= 4:
+ return (0, "OK - %s, %s, %s, %s" % (info[0][0], info[0][2], info[0][3],
info[0][1]))
else:
return (3, "UNKNOWN - No data retrieved")
check_info['snmp_info'] = (check_snmp_info, "SNMP Info", 0,
inventory_snmp_info)
-snmp_info_single['snmp_info'] = ( None, ".1.3.6.1.2.1.1", [
"1.0", "4.0", "5.0", "6.0" ] )
+snmp_info['snmp_info'] = ( ".1.3.6.1.2.1.1", [ '1.0',
'4.0', '5.0', '6.0', ] )
# Do not use this check per default
snmp_scan_functions['snmp_info'] = lambda oid: False
diff --git a/web/htdocs/actions.py b/web/htdocs/actions.py
index fc03700..9b49fa1 100644
--- a/web/htdocs/actions.py
+++ b/web/htdocs/actions.py
@@ -23,7 +23,7 @@
# 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.
-
+
from lib import *
import time
import config
@@ -44,7 +44,7 @@ def ajax_action(h):
def action_reschedule():
if not config.may("action.reschedule"):
raise MKGeneralException("You are not allowed to reschedule checks.")
-
+
site = html.var("site")
host = html.var("host", "")
if not host: