[checkmk-commits] Check_MK Git: check_mk: Cleanup for LVM Checks

Module: check_mk Branch: master Commit: ff2e0aa58d9e196973373687671ca958d3407b3e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ff2e0aa58d9e19… Author: Bastian Kuhn &lt;bk(a)mathias-kettner.de&gt; Date: Mon Jun 1 15:00:28 2015 +0200 Cleanup for LVM Checks --- .werks/1251 | 2 +- ChangeLog | 2 +- agents/plugins/lvm | 4 ++-- checkman/lvm_pvs | 15 --------------- checkman/lvm_vgs | 2 +- checks/lvm_pvs | 39 --------------------------------------- checks/lvm_vgs | 21 +++++++++++++++------ 7 files changed, 20 insertions(+), 65 deletions(-) diff --git a/.werks/1251 b/.werks/1251 index 52c96ea..1b8c96f 100644 --- a/.werks/1251 +++ b/.werks/1251 @@ -1,4 +1,4 @@ -Title: lvm_pvs, lvm_vgs: New Checks for LVM volume groups and physical volumes +Title: lvm_vgs: New Checks for LVM volume groups Level: 1 Component: checks Compatible: compat diff --git a/ChangeLog b/ChangeLog index 3e61790..e939efa 100644 --- a/ChangeLog +++ b/ChangeLog @@ -195,7 +195,7 @@ * 1249 alcatel_cpu, alcatel_temp, alcatel_fans: New checks for Alcatel switches based on IND1 MIB * 1250 alcatel_timetra_cpu: New CPU Check for Alcatel Switches supporting the TIMETRA MIB * 2215 pfsense_status, pfsense_if: Two new checks to monitor the interfaces and status of pfSense firewalls... - * 1251 lvm_pvs, lvm_vgs: New Checks for LVM volume groups and physical volumes... + * 1251 lvm_vgs: New Checks for LVM volume groups... * 2280 agent_vsphere: now provides more information if the login attempt fails... * 2116 bluenet_sensor, bluenet_sensor.hum: new checks to monitor temperature and humidity of Bachmann Bluenet PDUs * 1252 hitachi_hus_status: New check to monitor global status on Hitachi Hus Systems diff --git a/agents/plugins/lvm b/agents/plugins/lvm index 26dc110..6f0b9de 100755 --- a/agents/plugins/lvm +++ b/agents/plugins/lvm @@ -2,5 +2,5 @@ echo "<<<lvm_vgs>>>" vgs --units b --nosuffix --noheadings --separator ' ' -echo "<<<lvm_pvs>>>" -pvs --units b --nosuffix --noheadings --separator ' ' +#echo "<<<lvm_pvs>>>" +#pvs --units b --nosuffix --noheadings --separator ' ' diff --git a/checkman/lvm_pvs b/checkman/lvm_pvs deleted file mode 100644 index 1812655..0000000 --- a/checkman/lvm_pvs +++ /dev/null @@ -1,15 +0,0 @@ -title: LVM: Physical volume -agents: linux -catalog: os/storage -license: GPL -distribution: check_mk -description: - This Check monitors the size and the usage of physical volumes in LVM. - It useses same configuration like normal filesystems and supports almost the same - options (except inodes etc.) - - You need to install the agent plugin {lvm}. - - -inventory: - One item is generated per physical volume diff --git a/checkman/lvm_vgs b/checkman/lvm_vgs index 4a5b450..76d7815 100644 --- a/checkman/lvm_vgs +++ b/checkman/lvm_vgs @@ -4,7 +4,7 @@ catalog: os/storage license: GPL distribution: check_mk description: - This Check monitors the size and the usage of LVM volume groups. + This Check monitors the usage of LVM volume groups. It useses same configuration like normal filesystems and supports almost the same options (except inodes etc.) diff --git a/checks/lvm_pvs b/checks/lvm_pvs deleted file mode 100644 index 6962c8d..0000000 --- a/checks/lvm_pvs +++ /dev/null @@ -1,39 +0,0 @@ -#!/usr/bin/python -# -*- encoding: utf-8; py-indent-offset: 4 -*- - -# (c) 2013 Heinlein Support GmbH -# Robert Sander &lt;r.sander(a)heinlein-support.de&gt; - -# This 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. This file 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. - -lvm_pvs_default_values = ( 90, 95 ) - -def inventory_lvm_pvs(info): - for line in info: - yield line[0], {} - -def check_lvm_pvs(item, params, info): - pvlist = [] - for pv, vg, fmt, attr, size, free in info: - size_mb = int(size) / 1048576 - avail_mb = int(free) / 1048576 - pvlist.append((pv, size_mb, avail_mb, 0)) - return df_check_filesystem_list(item, params, pvlist) - -check_info['lvm_pvs'] = { - "check_function" : check_lvm_pvs, - "inventory_function" : inventory_lvm_pvs, - "service_description" : "LVM PVs %s", - "has_perfdata" : True, - "group" : "filesystem", - "default_levels_variable" : "filesystem_default_levels", -} diff --git a/checks/lvm_vgs b/checks/lvm_vgs index b3b5f10..38c9c67 100644 --- a/checks/lvm_vgs +++ b/checks/lvm_vgs @@ -1,12 +1,21 @@ #!/usr/bin/python # -*- encoding: utf-8; py-indent-offset: 4 -*- - -# (c) 2013 Heinlein Support GmbH -# Robert Sander &lt;r.sander(a)heinlein-support.de&gt; - -# This is free software; you can redistribute it and/or modify it +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2014 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. This file is distributed +# 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-