Checkmk git commits June 2014

checkmk-commits@lists.checkmk.com

6 participants
135 discussions

Check_MK Git: check_mk: fast_lta_volumes: new check of capacity of volumes in FAST LTA Storage Systems

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: 20f2df6deafadd1d977881a516a4ea0e04954011 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=20f2df6deafadd… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Mon Jun 2 16:57:02 2014 +0200 fast_lta_volumes: new check of capacity of volumes in FAST LTA Storage Systems Thanks to Christian Dewald / Agfa HealthCare for the donation. --- .werks/961 | 8 ++++ ChangeLog | 1 + checkman/fast_lta_volumes | 33 +++++++++++++++ checks/fast_lta_volumes | 60 +++++++++++++++++++++++++++ pnp-templates/check_mk-fast_lta_volumes.php | 1 + web/plugins/perfometer/check_mk.py | 1 + 6 files changed, 104 insertions(+) diff --git a/.werks/961 b/.werks/961 new file mode 100644 index 0000000..de6a2c1 --- /dev/null +++ b/.werks/961 @@ -0,0 +1,8 @@ +Title: fast_lta_volumes: new check of capacity of volumes in FAST LTA Storage Systems +Level: 1 +Component: checks +Version: 1.2.5i3 +Date: 1401720926 +Class: feature + +Thanks to Christian Dewald / Agfa HealthCare for the donation. diff --git a/ChangeLog b/ChangeLog index 67b6c80..c0898b7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -68,6 +68,7 @@ * 0165 ups checks now supports also GE devices (Thanks to Andy Taylor)... * 0928 runas: new plugin script to include and execute mrpe, local and plugin scripts as different user... * 0929 windows agent: now able to include and execute additional local and plugin scripts as different user... + * 0961 fast_lta_volumes: new check of capacity of volumes in FAST LTA Storage Systems... * 0777 FIX: special agent emcvnx: did not work with security file authentication... * 0786 FIX: zfsget: fixed compatibility with older Solaris agents... * 0809 FIX: brocade_fcport: Fixed recently introduced problem with port speed detection diff --git a/checkman/fast_lta_volumes b/checkman/fast_lta_volumes new file mode 100644 index 0000000..265f2bb --- /dev/null +++ b/checkman/fast_lta_volumes @@ -0,0 +1,33 @@ +title: FAST LTA Storage Systems: Capacity of Volumes +agents: snmp +catalog: hw/storagehw/fastlta +license: GPL +distribution: check_mk +description: + Displays the total / used capacity for volumes of FAST LTA Storage Systems. + + Returns {WARN} or {CRIT} if usage is above given levels. + + It uses the check logic of the {df} check, so for configuration + parameters and examples please refer to the man page of {df}. + +item: + The volumeID as returned by SNMP. + +perfdata: + Three values: The first value is the used space. Also the minimum (0 MB), maximum + and the warning and critical levels in MB are provided. + The second is the change of the usage in MB per range since the last check + (e.g. in MB per 24 hours) and the 3rd is the averaged change (so called + trend), also in MB per range. Please note, that performance data for + trends is enabled per default. You can globally disable that in {main.mk} + with {filesystem_default_levels["trend_perfdata"] = False}. + +inventory: + Finds one check for each volume on a FAST LTA Storage System. + +[parameters] +parameters (dict): See man page of {df}. + +[configuration] +filesystem_default_levels: And other, see man page of {df}. diff --git a/checks/fast_lta_volumes b/checks/fast_lta_volumes new file mode 100644 index 0000000..2291f39 --- /dev/null +++ b/checks/fast_lta_volumes @@ -0,0 +1,60 @@ +#!/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_fast_lta_volumes(info): + inventory = [] + for volname, volquota, volused in info: + inventory.append((volname, {})) + return inventory + + +def check_fast_lta_volumes(item, params, info): + fslist = [] + for volname, volquota, volused in info: + if volname == item: + fslist = [] + size_mb = int(volquota) / 1048576.0 + avail_mb = ( int(volquota) - int(volused) ) / 1048576.0 + fslist.append((item, size_mb, avail_mb)) + return df_check_filesystem_list(item, params, fslist) + + return 3, "Volume %s not found" % item + + +check_info["fast_lta_volumes"] = { + "check_function" : check_fast_lta_volumes, + "inventory_function" : inventory_fast_lta_volumes, + "service_description" : "Fast LTA Volume %s", + "has_perfdata" : True, + "group" : "filesystem", + "includes" : [ "df.include" ], + "snmp_info" : (".1.3.6.1.4.1.27417.5.1.1", [2, # Volume name + 9, # Volume Quota + 11] # Volume used space + ), + "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.8072.3.2.10"), +} + diff --git a/pnp-templates/check_mk-fast_lta_volumes.php b/pnp-templates/check_mk-fast_lta_volumes.php new file mode 120000 index 0000000..aac1010 --- /dev/null +++ b/pnp-templates/check_mk-fast_lta_volumes.php @@ -0,0 +1 @@ +check_mk-hitachi_hnas_volume.php \ No newline at end of file diff --git a/web/plugins/perfometer/check_mk.py b/web/plugins/perfometer/check_mk.py index eb8885a..8a7398a 100644 --- a/web/plugins/perfometer/check_mk.py +++ b/web/plugins/perfometer/check_mk.py @@ -118,6 +118,7 @@ perfometers["check_mk-emcvnx_raidgroups.capacity"] = perfometer_check_mk_df perfometers["check_mk-emcvnx_raidgroups.capacity_contiguous"] = perfometer_check_mk_df perfometers["check_mk-ibm_svc_mdiskgrp"] = perfometer_check_mk_df perfometers["check_mk-fast_lta_silent_cubes.capacity"] = perfometer_check_mk_df +perfometers["check_mk-fast_lta_volumes"] = perfometer_check_mk_df perfometers["check_mk-libelle_business_shadow.archive_dir"] = perfometer_check_mk_df def perfometer_esx_vsphere_datastores(row, check_command, perf_data):

10 years

Check_MK Git: check_mk: agent_ibmsvc: now supporting older python versions and throw error if there is a authentication failure

by Bastian Kuhn

Module: check_mk Branch: master Commit: 54ebfddad693e6449784c0bc4e6bf8f449a6535a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=54ebfddad693e6… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Mon Jun 2 15:35:12 2014 +0200 agent_ibmsvc: now supporting older python versions and throw error if there is a authentication failure --- agents/special/agent_ibmsvc | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/agents/special/agent_ibmsvc b/agents/special/agent_ibmsvc old mode 100755 new mode 100644 index d536d9d..3e3ac39 --- a/agents/special/agent_ibmsvc +++ b/agents/special/agent_ibmsvc @@ -136,7 +136,7 @@ for o,a in opts: elif o in [ '-t', '--timeout' ]: opt_timeout = int(a) elif o in [ '-k', '--accept-any-hostkey' ]: - opt_any_hostkey = "-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no" + opt_any_hostkey = "-o StrictHostKeyChecking=no" elif o in [ '-h', '--help' ]: usage() sys.exit(0) @@ -182,12 +182,21 @@ cmd += "'" if opt_debug: sys.stderr.write("executing external command: %s\n" % cmd) -try: - for line in subprocess.check_output(cmd, shell=True).split('\n'): - print line, -except subprocess.CalledProcessError: + + +result = subprocess.Popen(cmd, shell=True, stdout = subprocess.PIPE, stderr = subprocess.PIPE, stdin = None) +stdout, stderr = result.communicate() +exit_code = result.wait() + +if exit_code not in [ 0, 1 ]: print "Error connecting via ssh" - sys.exit(1) + sys.exit(2) + +if stdout.startswith("CMMVC7016E"): + print str(stdout) + sys.exit(2) +for line in stdout.split('\n'): + print line #############################################################################

10 years

Check_MK Git: check_mk: fast_lta_headunit, fast_lta_silent_cubes: only add services during inventory, if the corresponding OIDs are available during snmpwalk

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: 29b27c33cdc11b1e6232082eba27c9198492cf8e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=29b27c33cdc11b… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Mon Jun 2 14:46:53 2014 +0200 fast_lta_headunit, fast_lta_silent_cubes: only add services during inventory, if the corresponding OIDs are available during snmpwalk --- checks/fast_lta_headunit | 10 ++++++++-- checks/fast_lta_silent_cubes | 2 +- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/checks/fast_lta_headunit b/checks/fast_lta_headunit index dc98687..e3a2edf 100644 --- a/checks/fast_lta_headunit +++ b/checks/fast_lta_headunit @@ -42,7 +42,10 @@ def fast_lta_headunit_scan(oid): # '----------------------------------------------------------------------' def inventory_fast_lta_headunit_status(info): - return [ (None, None) ] + if len(info[0]) > 0: + return [ (None, None) ] + else: + return [] def check_fast_lta_headunit_status(item, _no_params, info): head_unit_status_map = { @@ -98,7 +101,10 @@ check_info["fast_lta_headunit.status"] = { # '----------------------------------------------------------------------' def inventory_fast_lta_headunit_replication(info): - return [ (None, None) ] + if len(info[0]) > 0: + return [ (None, None) ] + else: + return [] def check_fast_lta_headunit_replication(item, _no_params, info): head_unit_replication_map = { diff --git a/checks/fast_lta_silent_cubes b/checks/fast_lta_silent_cubes index 5e6f169..29c34a0 100644 --- a/checks/fast_lta_silent_cubes +++ b/checks/fast_lta_silent_cubes @@ -26,7 +26,7 @@ def inventory_fast_lta_silent_cubes_status(info): - if len(info[0]) > 1: + if len(info) > 0 and len(info[0]) > 1: return [ ("Total", {}) ] else: return []

10 years

Check_MK Git: check_mk: FIX WATO snapshots: excluded some superfluous files from nagvis backup domaim

by Andreas Boesl

Module: check_mk Branch: master Commit: ba66ec2a015ba042e6bdc8f42d2cc202bcde49c9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ba66ec2a015ba0… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Jun 2 10:27:12 2014 +0200 FIX WATO snapshots: excluded some superfluous files from nagvis backup domaim The nagvis backup domain contained some files with hardcoded site names. This caused problems if this snaphot was restored on a different site. --- .werks/933 | 9 +++++++++ ChangeLog | 1 + web/plugins/wato/backup_domains.py | 6 ++++++ 3 files changed, 16 insertions(+) diff --git a/.werks/933 b/.werks/933 new file mode 100644 index 0000000..47b238f --- /dev/null +++ b/.werks/933 @@ -0,0 +1,9 @@ +Title: WATO snapshots: excluded some superfluous files from nagvis backup domaim +Level: 1 +Component: wato +Version: 1.2.5i3 +Date: 1401697554 +Class: fix + +The nagvis backup domain contained some files with hardcoded site names. +This caused problems if this snaphot was restored on a different site. diff --git a/ChangeLog b/ChangeLog index 799e864..67b6c80 100644 --- a/ChangeLog +++ b/ChangeLog @@ -126,6 +126,7 @@ * 0904 FIX: Fixed exception in host parameter overview... * 0971 FIX: Fix missing authentication of PHP addons in D-WATO when activation mode is reload... * 0972 FIX: Do not loose site specific global settings anymore when chaning a site's configuration... + * 0933 FIX: WATO snapshots: excluded some superfluous files from nagvis backup domaim... Notifications: * 0754 Allow users to disable their notifications completely... diff --git a/web/plugins/wato/backup_domains.py b/web/plugins/wato/backup_domains.py index 14d7c6c..49d273d 100644 --- a/web/plugins/wato/backup_domains.py +++ b/web/plugins/wato/backup_domains.py @@ -194,6 +194,12 @@ else: "nagvis": { "title" : _("NagVis Maps, Configurations and User Files"), "prefix" : defaults.omd_root, + "exclude" : [ + "etc/nagvis/apache.conf", + "etc/nagvis/conf.d/omd.ini.php", + "etc/nagvis/conf.d/cookie_auth.ini.php", + "etc/nagvis/conf.d/urls.ini.php" + ], "paths" : [ ("dir", "local/share/nagvis"), ("dir", "etc/nagvis"),

10 years

Check_MK Git: check_mk: Availability: fix precise length of time range by 1 second

by Mathias Kettner

Module: check_mk Branch: master Commit: 301d40e0f6b011ec408954e540d692fd1ef9efd5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=301d40e0f6b011… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Jun 1 17:51:00 2014 +0200 Availability: fix precise length of time range by 1 second --- web/plugins/views/availability.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/plugins/views/availability.py b/web/plugins/views/availability.py index ccdf4ee..a8656d6 100644 --- a/web/plugins/views/availability.py +++ b/web/plugins/views/availability.py @@ -575,7 +575,7 @@ def render_availability_options(): def get_availability_data(datasource, filterheaders, range, only_sites, limit, single_object, include_output, avoptions): has_service = "service" in datasource["infos"] - av_filter = "Filter: time >= %d\nFilter: time <= %d\n" % range + av_filter = "Filter: time >= %d\nFilter: time < %d\n" % range if single_object: tl_site, tl_host, tl_service = single_object av_filter += "Filter: host_name = %s\nFilter: service_description = %s\n" % ( @@ -1459,7 +1459,7 @@ def get_bi_timeline(tree, aggr_group, avoptions, timewarp): html.live.set_limit() # removes limit query = "GET statehist\n" + \ "Columns: " + " ".join(columns) + "\n" +\ - "Filter: time >= %d\nFilter: time <= %d\n" % range + "Filter: time >= %d\nFilter: time < %d\n" % range # Create a specific filter. We really only want the services and hosts # of the aggregation in question. That prevents status changes

10 years

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits June 2014