Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64158 discussions

Check_MK Git: check_mk: Updated changelog

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 4b9fba62f99f3dadede55f23e102fdf743f5d188 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4b9fba62f99f3d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Mar 22 12:58:09 2011 +0100 Updated changelog --- ChangeLog | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 07b2bff..d50bbe8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -44,6 +44,7 @@ * FIX: decru_*: added snmp scan functions * canon_pages: Added new check for monitoring processed pages on canon printer/multi-function devices + * strem1_sensors: added check to monitor sensors attached to Sensatorinc EM1 devices 1.1.10:

13 years, 6 months

Check_MK Git: check_mk: Added windows_update check

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: bba523c3cd06a9f267d119429604193e56d306da URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bba523c3cd06a9… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Mar 22 14:34:15 2011 +0100 Added windows_update check --- ChangeLog | 3 + agents/windows/plugins/windows_updates.vbs | 56 +++++++++++++++++++ checks/windows_updates | 83 ++++++++++++++++++++++++++++ 3 files changed, 142 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index d50bbe8..31a3487 100644 --- a/ChangeLog +++ b/ChangeLog @@ -45,6 +45,9 @@ * canon_pages: Added new check for monitoring processed pages on canon printer/multi-function devices * strem1_sensors: added check to monitor sensors attached to Sensatorinc EM1 devices + * windows_update: Added check to monitor windows update states on windows + clients. The check monitors the number of pending updates and checks if + a reboot is needed after updates have been installed. 1.1.10: diff --git a/agents/windows/plugins/windows_updates.vbs b/agents/windows/plugins/windows_updates.vbs new file mode 100644 index 0000000..972c5dd --- /dev/null +++ b/agents/windows/plugins/windows_updates.vbs @@ -0,0 +1,56 @@ +' ----------------------------------------------------------------------------- +' windows_updates.vbs - check_mk agent plugin to monitor pending windows updates +' +' To use this just place it in the plugins/ directory below the path of the +' check_mk_agent. After that an inventory run on the Nagios host should lead +' to a new inventorized service. +' +' Author: Lars Michelsen <lm(a)mathias-kettner.de>, 2011-03-21 +' ----------------------------------------------------------------------------- + +Option Explicit + +Dim result, reboot, numImp, numOpt, important, opti +Dim updtSearcher, colDownloads, objEntry + +If CreateObject("Microsoft.Update.AutoUpdate").DetectNow <> 0 Then + WScript.Echo "<<<windows_updates>>>" + WScript.Quit(0) +End If + +Set updtSearcher = CreateObject("Microsoft.Update.Session").CreateUpdateSearcher + +reboot = 0 +numImp = 0 +numOpt = 0 + +If CreateObject("Microsoft.Update.SystemInfo").RebootRequired Then + reboot = 1 +End If + +Set result = updtSearcher.Search("IsInstalled = 0 and IsHidden = 0") +Set colDownloads = result.Updates + +For Each objEntry in colDownloads + if objEntry.AutoSelectOnWebSites Then + if numImp = 0 Then + important = objEntry.Title + else + important = important & "; " & objEntry.Title + End If + numImp = numImp + 1 + Else + If numOpt = 0 Then + opti = objEntry.Title + Else + opti = opti & "; " & objEntry.Title + End If + numOpt = numOpt + 1 + End If +Next + +WScript.Echo "<<<windows_updates>>>" +WScript.Echo reboot & " " & numImp & " " & numOpt +WScript.Echo important +WScript.Echo opti +WScript.Quit() diff --git a/checks/windows_updates b/checks/windows_updates new file mode 100644 index 0000000..e94827e --- /dev/null +++ b/checks/windows_updates @@ -0,0 +1,83 @@ +#!/usr/bin/python +# -*- encoding: utf-8 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | 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> + +# <<<windows_updates>>> +# 0 2 5 +# Windows XP Service Pack 3 (KB936929); Windows-Tool zum Entfernen sch�dlicher Software - M�rz 2011 (KB890830) +# Update f�r WMDRM-f�hige Medienplayer (KB891122); Windows Media Player 11; Windows Search 4.0 f�r Windows XP (KB940157); Microsoft Base Smartcard-Kryptografiedienstanbieter-Paket: x86 (KB909520); Update f�r die Microsoft .NET Framework 3.5 Service Pack 1- und .NET Framework 3.5-Produktfamilie (KB951847) x86 + +# First row: Reboot_required, num_important, num_optional +# Second row: List of all important updates +# Thirt row: List of all optional updates + +windows_updates_default_params = (None, None, None, None) + +def inventory_windows_updates(checktype, info): + if info and len(info[0]) == 3: + return [(None, "windows_updates_default_params")] + +def check_windows_updates(_unused, params, info): + if info and len(info[0]) == 3: + status = 0 + reboot_required, num_imp, num_opt = map(saveint, info[0]) + imp_warn, imp_crit, opt_warn, opt_crit = params + important = '' + if len(info) >= 2: + important = ' '.join(info[1]) + optional = '' + if len(info) >= 3: + optional = ' '.join(info[2]) + + txt = [] + perfdata = [] + for label, updates, cur, warn, crit in [ ('important', important, num_imp, imp_warn, imp_crit), + ('optional', optional, num_opt, opt_warn, opt_crit) ]: + this_txt = '%d %s' % (cur, label) + if label == 'important' and cur > 0: + this_txt += ' (%s)' % updates + if crit and cur >= crit: + this_txt += ' (CRIT: >=%d)' % crit + if status < 2: + status = 2 + elif warn and cur >= warn: + this_txt += ' (WARN: >=%d)' % warn + if status < 1: + status = 1 + txt.append(this_txt) + perfdata.append((label, cur, warn, crit)) + + if reboot_required == 1: + if status < 1: + status = 1 + txt.append('WARN: A reboot is required to finish update installations') + + return (status, '%s - %s' % (nagios_state_names[status], ', '.join(txt)), perfdata) + + return (3, 'UNKNOWN - No windows update information provided') + +check_info['windows_updates'] = (check_windows_updates, "System Updates", 1, inventory_windows_updates)

13 years, 6 months

Check_MK Git: check_mk: Linux mk_oracle: Updated tablespace query to use ' used blocks' instead of 'user blocks'

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 28d15d6b4349ac5eae5a47ce17c0ecda36c9f4b1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=28d15d6b4349ac… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Mar 22 14:43:17 2011 +0100 Linux mk_oracle: Updated tablespace query to use 'used blocks' instead of 'user blocks' --- ChangeLog | 1 + agents/plugins/mk_oracle | 10 ++++++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 31a3487..e75f9ff 100644 --- a/ChangeLog +++ b/ChangeLog @@ -48,6 +48,7 @@ * windows_update: Added check to monitor windows update states on windows clients. The check monitors the number of pending updates and checks if a reboot is needed after updates have been installed. + * Linux mk_oracle: Updated tablespace query to use 'used blocks' instead of 'user blocks' 1.1.10: diff --git a/agents/plugins/mk_oracle b/agents/plugins/mk_oracle index 4f311ea..e6ad4a2 100644 --- a/agents/plugins/mk_oracle +++ b/agents/plugins/mk_oracle @@ -66,8 +66,14 @@ echo '<<<oracle_tablespaces>>>' for SID in $SIDS do sqlplus "$SID" <<EOF | sed 's/READ ONLY/READONLY/g' -select f.file_name, f.tablespace_name, f.status, f.AUTOEXTENSIBLE, f.blocks, f.maxblocks, f.USER_BLOCKS, f.INCREMENT_BY, f.ONLINE_STATUS, t.BLOCK_SIZE, t.status from dba_data_files f, dba_tablespaces t where f.tablespace_name = t.tablespace_name +select f.file_name, f.tablespace_name, f.status, f.AUTOEXTENSIBLE, f.blocks, f.maxblocks, f.blocks - b.free_blocks as used_blocks, f.INCREMENT_BY, f.ONLINE_STATUS, t.BLOCK_SIZE, t.status +from dba_data_files f, dba_tablespaces t ,(SELECT file_id, SUM(blocks) free_blocks FROM dba_free_space b GROUP BY file_id) b +where f.tablespace_name = t.tablespace_name +and f.file_id=b.file_id UNION -select f.file_name, f.tablespace_name, f.status, f.AUTOEXTENSIBLE, f.blocks, f.maxblocks, f.USER_BLOCKS, f.INCREMENT_BY, 'TEMP', t.BLOCK_SIZE, t.status from dba_temp_files f, dba_tablespaces t where f.tablespace_name = t.tablespace_name; +select f.file_name, f.tablespace_name, f.status, f.AUTOEXTENSIBLE, f.blocks, f.maxblocks, f.blocks - b.free_blocks as used_blocks, f.INCREMENT_BY, 'TEMP', t.BLOCK_SIZE, t.status +from dba_temp_files f, dba_tablespaces t ,(SELECT file_id, SUM(blocks) free_blocks FROM dba_free_space b GROUP BY file_id) b +where f.tablespace_name = t.tablespace_name +and f.file_id=b.file_id ; EOF done

13 years, 6 months

Check_MK Git: check_mk: printer_supply: further change of handling of -2

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 0812ebdd4d65b67e7334693e656ebeb8d58c7bdf URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0812ebdd4d65b6… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Mar 21 18:01:34 2011 +0100 printer_supply: further change of handling of -2 --- checks/printer_supply | 44 +++++++++++++++++++++++++++----------------- 1 files changed, 27 insertions(+), 17 deletions(-) diff --git a/checks/printer_supply b/checks/printer_supply index 1532201..13d0bfa 100644 --- a/checks/printer_supply +++ b/checks/printer_supply @@ -74,26 +74,34 @@ def printer_supply_fix_infos(info): def inventory_printer_supply(checkname, info): # Ignore devices which show -2 for current value and -2 for max value -> useless - return [ (line[0], "printer_supply_default_levels") for line in printer_supply_fix_infos(info) - if savefloat(line[2]) != -2 and float(line[1]) != -2 ] + return [ (line[0], "printer_supply_default_levels") + for line in printer_supply_fix_infos(info) + if not (line[1] == '-2' and line[2] == '-2') ] # ignore useless devices def check_printer_supply(item, params, info): for line in printer_supply_fix_infos(info): if line[0] == item: - maxlevel = float(line[1]) - current = savefloat(line[2]) - leftperc = 100.0 * current / maxlevel + maxlevel = int(line[1]) + current = saveint(line[2]) warn, crit = params # in percent - infotext = "%.0f%% (levels at %.0f%% / %.0f%%)" % (leftperc, warn, crit) perfdata = [ ("pages", current, warn / 100.0 * maxlevel, crit / 100.0 * maxlevel, 0, maxlevel ) ] - if current == -1 or maxlevel == -1: - return (0, "OK - there are no restrictions on this supply") - elif current == -3: - return (printer_supply_some_remaining_status, "%s - Some remaining" % - (nagios_state_names[printer_supply_some_remaining_status]), perfdata) - elif current == -2 or maxlevel == -2: - return (3, "UNKNOWN - Couldn't get info about supply") - elif leftperc <= crit: + + # handle cases with partial data + if maxlevel == -2 or current in [ -3, -2, -1 ]: # no percentage possible + if current == -1 or maxlevel == -1: + return (0, "OK - there are no restrictions on this supply") + elif current == -3: + return (printer_supply_some_remaining_status, "%s - Some remaining" % + (nagios_state_names[printer_supply_some_remaining_status]), perfdata) + elif current == -2: + return (3, "UNKNOWN - current level is unknown") + elif maxlevel == -2: + # no percentage possible. We compare directly against levels + return (0, "OK - current level is %d" % current, [("pages", current)]) + + leftperc = 100.0 * current / maxlevel + infotext = "%.0f%% (levels at %.0f%% / %.0f%%)" % (leftperc, warn, crit) + if leftperc <= crit: return (2, "CRIT - %s" % infotext, perfdata) elif leftperc <= warn: return (1, "WARNING - %s" % infotext, perfdata) @@ -104,11 +112,13 @@ def check_printer_supply(item, params, info): check_info['printer_supply'] = (check_printer_supply, "Supply %s", 1, inventory_printer_supply) -snmp_info['printer_supply'] = ( ".1.3.6.1.2.1.43", [ '11.1.1.6', - '11.1.1.8', - '11.1.1.9', +snmp_info['printer_supply'] = ( ".1.3.6.1.2.1.43", [ '11.1.1.6', # Printer-MIB::prtMarkerSuppliesDescription + '11.1.1.8', # Printer-MIB::prtMarkerSuppliesMaxCapacity + '11.1.1.9', # Printer-MIB::prtMarkerSuppliesLevel '12.1.1.4' ] ) + + check_config_variables.append("printer_supply_some_remaining_status") snmp_scan_functions['printer_supply'] = \

13 years, 6 months

Check_MK Git: check_mk: Makefile: new target setversion, changing version in batch mode

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: d5fe67bf148881be195360740a9d08bcf4044729 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d5fe67bf148881… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Mar 21 16:43:18 2011 +0100 Makefile: new target setversion, changing version in batch mode --- Makefile | 29 +++++++++++++++-------------- 1 files changed, 15 insertions(+), 14 deletions(-) diff --git a/Makefile b/Makefile index 6fa7fcc..567195d 100644 --- a/Makefile +++ b/Makefile @@ -100,21 +100,22 @@ mk-livestatus: version: - [ "$$(head -c 14 /etc/issue)" = "Ubuntu 10.04.2" ] || { echo 'You are not on the reference system!' ; exit 1; } + [ "$$(head -c 12 /etc/issue)" = "Ubuntu 10.10" ] || { echo 'You are not on the reference system!' ; exit 1; } @newversion=$$(dialog --stdout --inputbox "New Version:" 0 0 "$(VERSION)") ; \ - if [ -n "$$newversion" ] ; then \ - sed -ri 's/^(VERSION[[:space:]]*= *).*/\1'"$$newversion/" Makefile ; \ - for agent in agents/* ; do \ - if [ "$$agent" != agents/windows -a "$$agent" != agents/plugins ] ; then \ - sed -i 's/echo Version: [0-9.a-z]*/'"echo Version: $$newversion/g" $$agent; \ - fi ; \ - done ; \ - sed -i 's/#define CHECK_MK_VERSION .*/#define CHECK_MK_VERSION "'$$newversion'"/' agents/windows/check_mk_agent.cc ; \ - sed -i 's/^AC_INIT.*/AC_INIT([MK Livestatus], ['"$$newversion"'], [mk(a)mathias-kettner.de])/' livestatus/configure.ac ; \ - sed -i 's/^VERSION=.*/VERSION='"$$newversion"'/' scripts/setup.sh ; \ - echo 'check-mk_$$newversion-1_all.deb net optional' > debian/files ; \ - sed -i 's/^CHECK_MK_VERSION=.*/CHECK_MK_VERSION='$$newversion/ scripts/install_nagios.sh ; \ - fi ; \ + if [ -n "$$newversion" ] ; then $(MAKE) NEW_VERSION=$$newversion setversion ; fi + +setversion: + sed -ri 's/^(VERSION[[:space:]]*= *).*/\1'"$(NEW_VERSION)/" Makefile ; \ + for agent in agents/* ; do \ + if [ "$$agent" != agents/windows -a "$$agent" != agents/plugins ] ; then \ + sed -i 's/echo Version: [0-9.a-z]*/'"echo Version: $(NEW_VERSION)/g" $$agent; \ + fi ; \ + done ; \ + sed -i 's/#define CHECK_MK_VERSION .*/#define CHECK_MK_VERSION "'$(NEW_VERSION)'"/' agents/windows/check_mk_agent.cc ; \ + sed -i 's/^AC_INIT.*/AC_INIT([MK Livestatus], ['"$(NEW_VERSION)"'], [mk(a)mathias-kettner.de])/' livestatus/configure.ac ; \ + sed -i 's/^VERSION=.*/VERSION='"$(NEW_VERSION)"'/' scripts/setup.sh ; \ + echo 'check-mk_$(NEW_VERSION)-1_all.deb net optional' > debian/files ; \ + sed -i 's/^CHECK_MK_VERSION=.*/CHECK_MK_VERSION='$(NEW_VERSION)/ scripts/install_nagios.sh ; \ cd agents/windows ; rm *.exe ; make headers:

13 years, 6 months

Check_MK Git: check_mk: FIX: added snmp scan functions for decru_* and fjdary*

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 2d02da2cc143b8b319cba3eeb7b7b987e728ccc2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2d02da2cc143b8… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Mar 21 14:39:04 2011 +0100 FIX: added snmp scan functions for decru_* and fjdary* --- ChangeLog | 2 ++ checks/decru_cpu | 4 ++-- checks/decru_fans | 5 ++--- checks/decru_perf | 5 ++--- checks/decru_power | 5 ++--- checks/decru_temps | 5 ++--- checks/fjdarye60_devencs | 2 +- checks/fjdarye60_disks | 2 ++ 8 files changed, 15 insertions(+), 15 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2426909..c54fbd2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -40,6 +40,8 @@ * printer_alerts: Added new check for monitoring alert states reported by printers using the PRINTER-MIB * diskstat: rewritten check: now show different devices, r+w in one check + * FIX: fjdarye60_devencs, fjdarye60_disks.summary: added snmp scan functions + * FIX: decru_*: added snmp scan functions 1.1.10: diff --git a/checks/decru_cpu b/checks/decru_cpu index e3b9c4a..03107a2 100644 --- a/checks/decru_cpu +++ b/checks/decru_cpu @@ -42,5 +42,5 @@ def check_decru_cpu(item, _no_params, info): check_info['decru_cpu'] = (check_decru_cpu, "CPU utilization", 1, inventory_decru_cpu) snmp_info['decru_cpu'] = ( ".1.3.6.1.4.1.12962.1.1", [ 8 ] ) -# oder (SNMPv2-MIB::sysObjectID.0 = OID: SNMPv2-SMI::enterprises.12962.2.1.4): -# snmp_scan_info['decru_cpu'] = ( ".1.3.6.1.2.1.1.2.0", "=", ".1.3.6.1.4.1.12962.2.1.4" ) +snmp_scan_functions['decru_cpu'] = \ + lambda oid: "datafort" in oid('.1.3.6.1.2.1.1.1.0').lower() diff --git a/checks/decru_fans b/checks/decru_fans index e05ddfe..1c8633f 100644 --- a/checks/decru_fans +++ b/checks/decru_fans @@ -48,6 +48,5 @@ def check_decru_fans(item, params, info): check_info['decru_fans'] = (check_decru_fans, "FAN %s", 1, inventory_decru_fans) snmp_info['decru_fans'] = ( ".1.3.6.1.4.1.12962.1.2.3.1", [ 2, 3 ] ) -# snmp_scan_info['decru_fans'] = ( "enterprises.12962.1.1.1.1", "=", "san" ) -# oder (SNMPv2-MIB::sysObjectID.0 = OID: SNMPv2-SMI::enterprises.12962.2.1.4): -# snmp_scan_info['decru_fans'] = ( ".1.3.6.1.2.1.1.2.0", "=", ".1.3.6.1.4.1.12962.2.1.4" ) +snmp_scan_functions['decru_fans'] = \ + lambda oid: "datafort" in oid('.1.3.6.1.2.1.1.1.0').lower() diff --git a/checks/decru_perf b/checks/decru_perf index 5929a3c..85879be 100644 --- a/checks/decru_perf +++ b/checks/decru_perf @@ -57,6 +57,5 @@ def check_decru_perf(item, _no_params, info): check_info['decru_perf'] = (check_decru_perf, "COUNTER %s", 1, inventory_decru_perf) snmp_info['decru_perf'] = ( ".1.3.6.1.4.1.12962.1.1.2.1.1", [ 1, 2 ] ) -# snmp_scan_info['decru_perf'] = ( "enterprises.12962.1.1.1.1", "=", "san" ) -# oder (SNMPv2-MIB::sysObjectID.0 = OID: SNMPv2-SMI::enterprises.12962.2.1.4): -# snmp_scan_info['decru_perf'] = ( ".1.3.6.1.2.1.1.2.0", "=", ".1.3.6.1.4.1.12962.2.1.4" ) +snmp_scan_functions['decru_perf'] = \ + lambda oid: "datafort" in oid('.1.3.6.1.2.1.1.1.0').lower() diff --git a/checks/decru_power b/checks/decru_power index 1aae145..5a29642 100644 --- a/checks/decru_power +++ b/checks/decru_power @@ -40,6 +40,5 @@ def check_decru_power(item, params, info): check_info['decru_power'] = (check_decru_power, "POWER %s", 0, inventory_decru_power) snmp_info['decru_power'] = ( ".1.3.6.1.4.1.12962.1.2.6.1", [ 2, 3 ] ) -# snmp_scan_info['decru_power'] = ( "enterprises.12962.1.1.1.1", "=", "san" ) -# oder (SNMPv2-MIB::sysObjectID.0 = OID: SNMPv2-SMI::enterprises.12962.2.1.4): -# snmp_scan_info['decru_power'] = ( ".1.3.6.1.2.1.1.2.0", "=", ".1.3.6.1.4.1.12962.2.1.4" ) +snmp_scan_functions['decru_power'] = \ + lambda oid: "datafort" in oid('.1.3.6.1.2.1.1.1.0').lower() diff --git a/checks/decru_temps b/checks/decru_temps index 6472f3d..6d97951 100644 --- a/checks/decru_temps +++ b/checks/decru_temps @@ -46,6 +46,5 @@ def check_decru_temps(item, params, info): check_info['decru_temps'] = (check_decru_temps, "TEMP %s", 1, inventory_decru_temps) snmp_info['decru_temps'] = ( ".1.3.6.1.4.1.12962.1.2.4.1", [ 2, 3 ] ) -# snmp_scan_info['decru_temps'] = ( "enterprises.12962.1.1.1.1", "=", "san" ) -# oder (SNMPv2-MIB::sysObjectID.0 = OID: SNMPv2-SMI::enterprises.12962.2.1.4): -# snmp_scan_info['decru_temps'] = ( ".1.3.6.1.2.1.1.2.0", "=", ".1.3.6.1.4.1.12962.2.1.4" ) +snmp_scan_functions['decru_temps'] = \ + lambda oid: "datafort" in oid('.1.3.6.1.2.1.1.1.0').lower() diff --git a/checks/fjdarye60_devencs b/checks/fjdarye60_devencs index b2598b9..4850a79 100644 --- a/checks/fjdarye60_devencs +++ b/checks/fjdarye60_devencs @@ -52,5 +52,5 @@ check_info['fjdarye60_devencs'] = (check_fjdarye60, "Device Enclosure %s", 0, i # 1: fjdaryDeIndex, 3: fjdaryDeStatus snmp_info['fjdarye60_devencs'] = (".1.3.6.1.4.1.211.1.21.1.60.2.7.2.1", [ 1, 3 ]) -snmp_scan_functions['fjdarye60_disks'] \ +snmp_scan_functions['fjdarye60_devencs'] \ = lambda oid: oid(".1.3.6.1.2.1.1.2.0") == ".1.3.6.1.4.1.211.1.21.1.60" diff --git a/checks/fjdarye60_disks b/checks/fjdarye60_disks index 5864aad..e836507 100644 --- a/checks/fjdarye60_disks +++ b/checks/fjdarye60_disks @@ -68,6 +68,8 @@ def check_fjdarye60_disks_summary(index, expected_status, info): check_info['fjdarye60_disks.summary'] = (check_fjdarye60_disks_summary, "Disk summary", 0, inventory_fjdarye60_disks_summary) snmp_info['fjdarye60_disks.summary'] = (".1.3.6.1.4.1.211.1.21.1.60.2.12.2.1", [ 1, 3 ]) +snmp_scan_functions['fjdarye60_disks.summary'] \ + = lambda oid: oid(".1.3.6.1.2.1.1.2.0") == ".1.3.6.1.4.1.211.1.21.1.60" # -------------------------------------------------------------------------------- # 2. Single disk version of check -> one check for each disk

13 years, 6 months

Check_MK Git: check_mk: Merge branch 'master' of ssh://mathias-kettner.de/ check_mk

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 594b6d76731bd53480f92bb8b8fae9f95b839164 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=594b6d76731bd5… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Mar 21 14:39:49 2011 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk Conflicts: ChangeLog ---

13 years, 6 months

Check_MK Git: check_mk: canon_pages: Added new check for monitoring processed pages on canon printer/ multi-function devices

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: aa0567e515a57646175348bacaccd50918278e50 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=aa0567e515a576… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Mar 21 08:22:44 2011 +0100 canon_pages: Added new check for monitoring processed pages on canon printer/multi-function devices --- checkman/canon_pages | 18 ++++++++++++ checks/canon_pages | 71 ++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 89 insertions(+), 0 deletions(-) diff --git a/checkman/canon_pages b/checkman/canon_pages new file mode 100644 index 0000000..103b4b7 --- /dev/null +++ b/checkman/canon_pages @@ -0,0 +1,18 @@ +title: Monitors printed/scanned pages in canon printers +agents: snmp +author: Lars Michelsen <lm(a)mathias-kettner.de> +license: GPL +distribution: check_mk +description: + This check reads the number of printed pages separated by paper format and + colored or black/white print jobs. If supported by the device the check also + monitors the number of scanned pages. + + This check can be used with all printer supporting the {CANON-MIB} + (.1.3.6.1.4.1.1602.1.11). + +perfdata: + The number of processed pages. The label is {count} for all services. + +inventory: + One service is being created for each measure point diff --git a/checks/canon_pages b/checks/canon_pages new file mode 100644 index 0000000..48d2cec --- /dev/null +++ b/checks/canon_pages @@ -0,0 +1,71 @@ +#!/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>, 2011-03-16 + +# [[['301', '28495']], [['112', '24']], [['113', '14880']], [['122', '146']], [['123', '15870']], [['501', '3761']], [['101', '30920']]] + +canon_pages_map = { + '101': 'total', + '112': 'b/w A3', + '113': 'b/w A4', + '122': 'color A3', + '123': 'color A4', + '301': 'print total', + '501': 'scan', +} + +def inventory_canon_pages(checkname, info): + inventory = [] + for data in info: + if data: + inventory.append((canon_pages_map.get(data[0][0], + 'unknown-%s' % data[0][0]), None)) + return inventory + +def check_canon_pages(item, params, info): + for data in info: + if not data or not data[0]: + continue + index, value = data[0] + if canon_pages_map.get(index, 'unknown-'+index) == item: + return (0, 'OK - Current count: %s' % value, [('count', value)]) + + return (3, 'UNKNOWN - Item not found in SNMP') + +check_info['canon_pages'] = (check_canon_pages, "Pages %s", 1, inventory_canon_pages) + +snmp_info['canon_pages'] = [ + ( ".1.3.6.1.4.1.1602.1.11.1.3.1.4", [ OID_END, 101 ]), # count total + ( ".1.3.6.1.4.1.1602.1.11.1.3.1.4", [ OID_END, 112 ]), # count b/w A3 + ( ".1.3.6.1.4.1.1602.1.11.1.3.1.4", [ OID_END, 113 ]), # count b/w A4 + ( ".1.3.6.1.4.1.1602.1.11.1.3.1.4", [ OID_END, 122 ]), # count color A3 + ( ".1.3.6.1.4.1.1602.1.11.1.3.1.4", [ OID_END, 123 ]), # count color A4 + ( ".1.3.6.1.4.1.1602.1.11.1.3.1.4", [ OID_END, 301 ]), # print total + ( ".1.3.6.1.4.1.1602.1.11.1.3.1.4", [ OID_END, 501 ]), # scan +] + +snmp_scan_functions['canon_pages'] = lambda oid: oid("1.3.6.1.4.1.1602.1.1.1.1.0") != None

13 years, 6 months

Check_MK Git: check_mk: Updated changelog

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: c6f00d7aaf511b2f4d50a0172ec06bf3a5dae0d9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c6f00d7aaf511b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Mar 21 08:22:59 2011 +0100 Updated changelog --- ChangeLog | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2426909..ff9c75c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -40,6 +40,8 @@ * printer_alerts: Added new check for monitoring alert states reported by printers using the PRINTER-MIB * diskstat: rewritten check: now show different devices, r+w in one check + * canon_pages: Added new check for monitoring processed pages on canon + printer/multi-function devices 1.1.10:

13 years, 6 months

Check_MK Git: check_mk: Merge branch 'master' of ssh://git.mathias-kettner. de/var/www/80/git.mathias-kettner.de/check_mk

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 618df76563979892fe4fb7d866c713ae02ff6751 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=618df765639798… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Mar 21 12:38:22 2011 +0100 Merge branch 'master' of ssh://git.mathias-kettner.de/var/www/80/git.mathias-kettner.de/check_mk ---

13 years, 6 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits