[checkmk-commits] Check_MK Git: check_mk: changed bvip checks a bit

Module: check_mk Branch: master Commit: e95cca92f7a7836b1337d3119362b0006403818f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e95cca92f7a783… Author: Bastian Kuhn &lt;bk(a)mathias-kettner.de&gt; Date: Thu Jul 16 16:49:01 2015 +0200 changed bvip checks a bit --- checkman/bvip_cams | 12 ----------- checkman/bvip_video_alerts | 2 +- checks/bvip_cams | 47 -------------------------------------------- checks/bvip_video_alerts | 25 +++++++++++------------ 4 files changed, 12 insertions(+), 74 deletions(-) diff --git a/checkman/bvip_cams b/checkman/bvip_cams deleted file mode 100644 index e79bc94..0000000 --- a/checkman/bvip_cams +++ /dev/null @@ -1,12 +0,0 @@ -title: Bosch Video over IP: Cameras -agents: snmp -catalog: hw/environment/bosch -license: GPL -distribution: check_mk -description: - This Checks gaters the list of cameras on Bosch Videos Systems. - If multipe Cameras connected behind one IP Adress, this Check helps - to identify them and reports {CRIT} for each camera who gets lost. - -inventory: - Creates one check. diff --git a/checkman/bvip_video_alerts b/checkman/bvip_video_alerts index 3bfd4f9..22f2415 100644 --- a/checkman/bvip_video_alerts +++ b/checkman/bvip_video_alerts @@ -8,5 +8,5 @@ description: no picture from the lense), it will be reported. inventory: - Creates one check . + Creates one check per camera. diff --git a/checks/bvip_cams b/checks/bvip_cams deleted file mode 100644 index 4de2ffd..0000000 --- a/checks/bvip_cams +++ /dev/null @@ -1,47 +0,0 @@ -#!/usr/bin/python -# -*- encoding: utf-8; py-indent-offset: 4 -*- -# +------------------------------------------------------------------+ -# | ____ _ _ __ __ _ __ | -# | / ___| |__ ___ ___| | __ | \/ | |/ / | -# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | -# | | |___| | | | __/ (__| < | | | | . \ | -# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | -# | | -# | Copyright Mathias Kettner 2013 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. - -def inventory_bvip_cams(info): - return [(None, {'cameras' : [ x[0] for x in info ]})] - -def check_bvip_cams(_no_item, params, info): - for line in info: - camera = line[0] - if camera not in params['cameras']: - yield 2, "Missing: %s" % cameras - else: - yield 0, camera - - -check_info["bvip_cams"] = { - "check_function" : check_bvip_cams, - "inventory_function" : inventory_bvip_cams, - "service_description" : "Cameras", - "snmp_scan_function" : bvip_scan_function, - "snmp_info" : (".1.3.6.1.4.1.3967.1.1.1.3", [ 1 ]), - "includes" : [ 'bvip.include' ], -} - diff --git a/checks/bvip_video_alerts b/checks/bvip_video_alerts index 035bafc..3bc2cca 100644 --- a/checks/bvip_video_alerts +++ b/checks/bvip_video_alerts @@ -26,27 +26,24 @@ def inventory_bvip_video_alerts(info): - return [(None, None)] + for cam, alerts in info: + yield cam, None + +def check_bvip_video_alerts(item, _no_params, info): + for cam, alerts in info: + if cam == item: + if alerts != '0': + return 2, "Device on Alarm State" + else: + return 0, "No alarms" -def check_bvip_video_alerts(_no_item, _no_params, info): - total = 0 - alerts = 0 - for line in info: - state = int(line[0]) - total += 1 - if state != 0: - alerts += 1 - state = 0 - if alerts != 0: - state = 2 - return state, "Cams: %s, Alerts: %s" % ( total, alerts ) check_info["bvip_video_alerts"] = { "check_function" : check_bvip_video_alerts, "inventory_function" : inventory_bvip_video_alerts, "service_description" : "Video Alerts", "snmp_scan_function" : bvip_scan_function, - "snmp_info" : (".1.3.6.1.4.1.3967.1.3.1", [ 1 ]), + "snmp_info" : (".1.3.6.1.4.1.3967.1", [ "1.1.3.1" , "3.1.1"]), "includes" : [ 'bvip.include' ], }