Checkmk git commits June 2012

checkmk-commits@lists.checkmk.com

2 participants
296 discussions

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

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 73b3550cce8b5c89265ae172ddc7349ec11e05cf URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=73b3550cce8b5c… Author: Florian Heigl <fh(a)mathias-kettner.de> Date: Wed Jun 27 13:44:44 2012 +0200 Merge branch 'master' of mathias-kettner.de:check_mk ---

12 years, 3 months

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

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 3a4264430a8ca26154315f72487037491537cf0d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3a4264430a8ca2… Author: Florian Heigl <fh(a)mathias-kettner.de> Date: Tue Jun 26 16:47:15 2012 +0200 Merge branch 'master' of mathias-kettner.de:check_mk ---

12 years, 3 months

Check_MK Git: check_mk: Linux Agent: In the <<<df>>> section NFSv4 filesystems were correctly

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 83c8ec6510cd92fd950562db12b3d07286035d9f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=83c8ec6510cd92… Author: Florian Heigl <fh(a)mathias-kettner.de> Date: Tue Jun 26 16:45:12 2012 +0200 Linux Agent: In the <<<df>>> section NFSv4 filesystems were correctly suppressed, but older NFS sometimes ended up as filesystems for some people Also exclude rational MVFS. It seems that generally the -l option to df is not really efficient / reliable. Thanks to Matthew Stier for reporting. Also translate some more headings / comments to english. --- agents/check_mk_agent.linux | 21 ++++++++++++++------- 1 files changed, 14 insertions(+), 7 deletions(-) diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index 871ca50..4074fd5 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -66,12 +66,19 @@ then echo $(sed -n '/^service[[:space:]]*check_mk/,/}/s/^[[:space:]]*only_from[[:space:]]*=[[:space:]]*$.*$/\1/p' /etc/xinetd.d/* | head -n1) fi -# Partitionen (-P verhindert Zeilenumbruch bei langen Mountpunkten) -# Achtung: NFS-Mounts werden grundsaetzlich ausgeblendet, um -# Haenger zu vermeiden. Diese sollten ohnehin besser auf dem -# Server, als auf dem Client ueberwacht werden. +# Print out Partitions / Filesystems. (-P gives non-wrapped POSIXed output) +# Heads up: NFS-mounts are generally supressed to avoid agent hangs. +# If hard NFS mounts are configured or you have too large nfs retry/timeout +# settings, accessing those mounts from the agent would leave you with +# thousands of agent processes and, ultimately, a dead monitored system. +# These should generally be monitored on the NFS server, not on the clients. + echo '<<<df>>>' -df -PTlk -x smbfs -x tmpfs -x cifs -x iso9660 -x udf -x nfsv4 | sed 1d +# The exclusion list is getting a bit of a problem. -l should hide any remote FS but seems +# to be all but working. +excludefs="-x smbfs -x tmpfs -x cifs -x iso9660 -x udf -x nfsv4 -x nfs -x mvfs" +df -PTlk $excludefs | sed 1d + # VMWare shows its own filesystems with 'vdf'. Just one # problem: it outputs not 7 but only 6 columns if which vdf > /dev/null @@ -111,11 +118,11 @@ echo '<<<ps>>>' ps ax -o user,vsz,rss,pcpu,command --columns 10000 | sed -e 1d -e 's/ *$[^ ]*$ *$[^ ]*$ *$[^ ]*$ *$[^ ]*$ */(\1,\2,\3,\4) /' -# Speicherauslastung +# Memory usage echo '<<<mem>>>' egrep -v '^Swap:|^Mem:|total:' < /proc/meminfo -# Load und Anzahl Prozesse +# Load and number of processes echo '<<<cpu>>>' echo "$(cat /proc/loadavg) $(grep -E '^CPU|^processor' < /proc/cpuinfo | wc -l)"

12 years, 3 months

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

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 2ab5d4edd5f629c4655ba6dd6ae69a0ce241b4c3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2ab5d4edd5f629… Author: Florian Heigl <fh(a)mathias-kettner.de> Date: Wed Jun 27 14:25:30 2012 +0200 Merge branch 'master' of mathias-kettner.de:check_mk ---

12 years, 3 months

Check_MK Git: check_mk: Checks/ aix_multipath Do no longer monitor SAS enclosures. Tried, caused issues.

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 5d1e481d42c8d0785b70b99fe14201c47821a06c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5d1e481d42c8d0… Author: Florian Heigl <fh(a)mathias-kettner.de> Date: Wed Jun 27 14:25:23 2012 +0200 Checks/aix_multipath Do no longer monitor SAS enclosures. Tried, caused issues. --- checkman/aix_multipath | 3 ++- checks/aix_multipath | 6 +++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/checkman/aix_multipath b/checkman/aix_multipath index cc871e5..4578402 100644 --- a/checkman/aix_multipath +++ b/checkman/aix_multipath @@ -18,5 +18,6 @@ item: inventory: One service is created for each LUN that is reported by - the lspath utility. + the lspath utility. Devices that do not start with {"hdisk"} + are not included in inventory. diff --git a/checks/aix_multipath b/checks/aix_multipath index d13eb94..3a8a6eb 100644 --- a/checks/aix_multipath +++ b/checks/aix_multipath @@ -34,7 +34,11 @@ def inventory_aix_multipath(info): disks = {} for disk, controller, status in info: - disks[disk] = disks.get(disk, 0) + 1 + # filtering here to only see disks. there are other multipath devices, + # too, but those have incomplete status => false positives + if disk.startswith("hdisk"): + disks[disk] = disks.get(disk, 0) + 1 + print disks return [(disk, {'paths' : disks[disk]}) for disk in disks.keys()] def check_aix_multipath(item, params, info):

12 years, 3 months

Check_MK Git: check_mk: Fixed plugin output of nfsmount for stale handles

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: ed6caea68bf2b5c35a00f81497e799e737494f63 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ed6caea68bf2b5… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Jun 27 14:07:39 2012 +0200 Fixed plugin output of nfsmount for stale handles --- checks/nfsmounts | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/checks/nfsmounts b/checks/nfsmounts index ac74045..c655c7b 100644 --- a/checks/nfsmounts +++ b/checks/nfsmounts @@ -37,7 +37,7 @@ def check_nfsmounts(item, _no_params, info): blocksize = int(line[5]) if size_blocks < 0 or free_blocks < 0 or blocksize > 1024*1024: - return (2, "WARN - Stale NFS handle") + return (2, "CRIT - Stale NFS handle") if line[1] == 'ok': gb = 1024 * 1024 * 1024.0

12 years, 3 months

Check_MK Git: check_mk: Restored ASM diskgroup check (where is the agent?)

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 2ba2cc676d47067e059cc2bd653f4ed541f58ffd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2ba2cc676d4706… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Jun 27 14:06:03 2012 +0200 Restored ASM diskgroup check (where is the agent?) --- checks/oracle_asm_diskgroup | 50 +++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 50 insertions(+), 0 deletions(-) diff --git a/checks/oracle_asm_diskgroup b/checks/oracle_asm_diskgroup new file mode 100644 index 0000000..ec08299 --- /dev/null +++ b/checks/oracle_asm_diskgroup @@ -0,0 +1,50 @@ +#!/usr/bin/python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2012 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. + +# Example output from asmcmd lsdg: +# State Type Rebal Sector Block AU Total_MB Free_MB Req_mir_free_MB Usable_file_MB Offline_disks Voting_files Name +# MOUNTED NORMAL N 512 4096 1048576 512000 92888 0 46444 0 N DATA/ +# MOUNTED NORMAL N 512 4096 1048576 3072 2146 309 918 0 Y OCR_VOTE/ +# The agent section <<<oracle_asm_diskgroup>>> does not output the header line + +check_includes['oracle_asm_diskgroup'] = [ "df.include" ] + +def inventory_oracle_asm_diskgroup(info): + return [ (line[-1].rstrip("/"), {}) for line in info ] + +def check_oracle_asm_diskgroup(item, params, info): + + for state, typ, rebal, sector, block, au, total_mb, \ + free_mb, req_mir_free_mb, usable_file_mb, offline_disks, \ + voting_files, name in info: + if name.rstrip('/') == item: + return df_check_filesystem(g_hostname, item, int(total_mb), + int(free_mb), params) + return (3, "UNKNOWN - Disk group not found") + +check_info["oracle_asm_diskgroup"] = (check_oracle_asm_diskgroup, "ASM Diskgroup %s", 1, inventory_oracle_asm_diskgroup) +checkgroup_of['oracle_asm_diskgroup'] = "fs" +check_default_levels["oracle_asm_diskgroup"] = "filesystem_default_levels"

12 years, 3 months

Check_MK Git: check_mk: Updated ChangeLog

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 1a0f602c6d36bbec8107a0a3f647e19fbc6b16c5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1a0f602c6d36bb… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Jun 27 09:31:35 2012 +0200 Updated ChangeLog --- ChangeLog | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1662c56..73175c1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -21,9 +21,9 @@ for explicitely listing SIDs to monitor * mk_logwatch on Linux: new options regex and iregex for file selection * remove obsolete ORACLE checks where no agent plugins where available - * printer_supply: Fix problem on DELL printers with "S/N" in output + * FIX: printer_supply: Fix problem on DELL printers with "S/N" in output (thanks to Sebastian Talmon) - * winperf_phydisk: Fix typo (lead to WATO rule not being applied) + * FIX: winperf_phydisk: Fix typo (lead to WATO rule not being applied) Multisite: * Show number of rows and number of selected rows in header line

12 years, 3 months

Check_MK Git: check_mk: winperf_phydisk: Fix typo ( lead to WATO rule not being applied)

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: ac76ee0f6fa077b73f1ce02c73d94b1a115bee2f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ac76ee0f6fa077… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Jun 27 09:31:17 2012 +0200 winperf_phydisk: Fix typo (lead to WATO rule not being applied) --- ChangeLog | 1 + checks/winperf_phydisk | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 90a4c31..1662c56 100644 --- a/ChangeLog +++ b/ChangeLog @@ -23,6 +23,7 @@ * remove obsolete ORACLE checks where no agent plugins where available * printer_supply: Fix problem on DELL printers with "S/N" in output (thanks to Sebastian Talmon) + * winperf_phydisk: Fix typo (lead to WATO rule not being applied) Multisite: * Show number of rows and number of selected rows in header line diff --git a/checks/winperf_phydisk b/checks/winperf_phydisk index b69a811..82002a2 100644 --- a/checks/winperf_phydisk +++ b/checks/winperf_phydisk @@ -25,7 +25,7 @@ # Boston, MA 02110-1301 USA. # Example output from agent -# <<<winperf_pydisk>>> +# <<<winperf_phydisk>>> # 12947256139.12 # 2 instances: 0_C: _Total # 198 0 0 rawcount @@ -71,4 +71,4 @@ def check_winperf_phydisk(item, params, info): return check_diskstat_generic(item, params, this_time, winperf_phydisk_convert(info)) check_info['winperf_phydisk'] = (check_winperf_phydisk, "Disk IO %s", 1, inventory_winperf_phydisk) -checkgroup_of["winperf_pydisk"] = "disk_io" +checkgroup_of["winperf_phydisk"] = "disk_io"

12 years, 3 months

Check_MK Git: check_mk: printer_supply: Fix problem on DELL printers with " S/N" in output

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 941d0409a4f09bc4e9992006c5c1c99b6221e6ef URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=941d0409a4f09b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Jun 27 09:30:16 2012 +0200 printer_supply: Fix problem on DELL printers with "S/N" in output --- ChangeLog | 2 ++ checks/printer_supply | 4 ++++ 2 files changed, 6 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5f2eb05..90a4c31 100644 --- a/ChangeLog +++ b/ChangeLog @@ -21,6 +21,8 @@ for explicitely listing SIDs to monitor * mk_logwatch on Linux: new options regex and iregex for file selection * remove obsolete ORACLE checks where no agent plugins where available + * printer_supply: Fix problem on DELL printers with "S/N" in output + (thanks to Sebastian Talmon) Multisite: * Show number of rows and number of selected rows in header line diff --git a/checks/printer_supply b/checks/printer_supply index 974d4e9..cb73800 100644 --- a/checks/printer_supply +++ b/checks/printer_supply @@ -59,6 +59,8 @@ printer_supply_some_remaining_status = 1 # Workaround for toners and drum units in c5900 devices # which have equal names for the single parts. # Add the color description to that item +# Fix name for toners in DELL devices that have serial +# numbers in item name def printer_supply_fix_infos(info): colors = [] new_info = [] @@ -72,6 +74,8 @@ def printer_supply_fix_infos(info): elif line[3] == '': color = colors[index - len(colors)] line_0 = '%s %s' % (color.title(), line_0) + if " S/N:" in line_0: + line_0 = line_0[:line_0.find(" S/N:")] new_info.append([line_0] + line[1:]) return new_info

12 years, 3 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits June 2012