Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64635 discussions

Check_MK Git: check_mk: fixed version for werk 934

by Andreas Boesl

Module: check_mk Branch: master Commit: ad3197103fd23d053fa8941a5c23ecfbc34b1c8b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ad3197103fd23d… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Jun 3 14:48:51 2014 +0200 fixed version for werk 934 --- .werks/934 | 2 +- ChangeLog | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.werks/934 b/.werks/934 index 4f20e7f..aff05b2 100644 --- a/.werks/934 +++ b/.werks/934 @@ -1,7 +1,7 @@ Title: Logwatch messages with class unknown ( 'u' ) now displayed as WARN Level: 1 Component: multisite -Version: 1.2.5i3 +Version: 1.2.5i4 Date: 1401799125 Class: fix diff --git a/ChangeLog b/ChangeLog index ad420f3..586ff12 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,7 @@ 1.2.5i4: + Multisite: + * 0934 FIX: Logwatch messages with class unknown ( 'u' ) now displayed as WARN... + 1.2.5i3: Core & Setup: @@ -115,7 +118,6 @@ * 0921 FIX: dashboards: fixed bug not updating header timestamp... * 0923 FIX: json export: fixed bug not stripping html tags from output * 0931 FIX: pnp-template ps.perf: fixed display bug of cpu averaging - * 0934 FIX: Logwatch messages with class unknown ( 'u' ) now displayed as WARN... WATO: * 0784 Improved security of WATO bulk inventory by using transaction ids

10 years, 4 months

Check_MK Git: check_mk: FIX Logwatch messages with class unknown ( 'u' ) now displayed as WARN

by Andreas Boesl

Module: check_mk Branch: master Commit: f7949d8d696640bf87cb1435b4408bf4f6a325be URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f7949d8d696640… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Jun 3 14:43:18 2014 +0200 FIX Logwatch messages with class unknown ( 'u' ) now displayed as WARN Certain windows messages don't have a correct error level classification and there get reported as the error type 'u' (unknown).<br> Unknown types were not shown correctly in the multisite logfile viewer. --- .werks/934 | 10 ++++++++++ ChangeLog | 1 + web/htdocs/logwatch.py | 4 ++++ 3 files changed, 15 insertions(+) diff --git a/.werks/934 b/.werks/934 new file mode 100644 index 0000000..4f20e7f --- /dev/null +++ b/.werks/934 @@ -0,0 +1,10 @@ +Title: Logwatch messages with class unknown ( 'u' ) now displayed as WARN +Level: 1 +Component: multisite +Version: 1.2.5i3 +Date: 1401799125 +Class: fix + +Certain windows messages don't have a correct error level classification +and there get reported as the error type 'u' (unknown).<br> +Unknown types were not shown correctly in the multisite logfile viewer. diff --git a/ChangeLog b/ChangeLog index c0898b7..5a187f4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -113,6 +113,7 @@ * 0921 FIX: dashboards: fixed bug not updating header timestamp... * 0923 FIX: json export: fixed bug not stripping html tags from output * 0931 FIX: pnp-template ps.perf: fixed display bug of cpu averaging + * 0934 FIX: Logwatch messages with class unknown ( 'u' ) now displayed as WARN... WATO: * 0784 Improved security of WATO bulk inventory by using transaction ids diff --git a/web/htdocs/logwatch.py b/web/htdocs/logwatch.py index 6b734be..7bc20fe 100644 --- a/web/htdocs/logwatch.py +++ b/web/htdocs/logwatch.py @@ -360,6 +360,10 @@ def parse_file(host, file, hidecontext = False): line_level = 1 line_class = 'WARN' + if line[0] == 'u': + line_level = 1 + line_class = 'WARN' + elif line[0] == 'C': line_level = 2 line_class = 'CRIT'

10 years, 4 months

Check_MK Git: check_mk: Headrify: savely skip directories

by Mathias Kettner

Module: check_mk Branch: master Commit: 52d65b485af7d36d66cab5a2109857f0005f73d7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=52d65b485af7d3… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Jun 3 10:19:55 2014 +0200 Headrify: savely skip directories --- doc/helpers/headrify | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/doc/helpers/headrify b/doc/helpers/headrify index 72e583e..33a2bdc 100755 --- a/doc/helpers/headrify +++ b/doc/helpers/headrify @@ -39,6 +39,10 @@ EOF headrify () { + if [ ! -f "$file" ] ; then + echo "Skipping $file. It's not a file." + return + fi echo "$file..." PERMISSIONS=$(stat -c %a "$file") TMP=$(mktemp .headrify.new.XXXXXX) @@ -89,7 +93,7 @@ headrify () else cat $file >> $TMP fi - mv $TMP $file + mv $TMP $file || rm -f $TMP chmod $PERMISSIONS "$file" }

10 years, 4 months

Check_MK Git: check_mk: Fixed file header of LogEntry.cc

by Mathias Kettner

Module: check_mk Branch: master Commit: 201a1eb2c74447483c708ce541d0e755798d6b39 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=201a1eb2c74447… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Jun 3 10:38:44 2014 +0200 Fixed file header of LogEntry.cc --- livestatus/src/LogEntry.cc | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/livestatus/src/LogEntry.cc b/livestatus/src/LogEntry.cc index 5d4783b..2706a20 100644 --- a/livestatus/src/LogEntry.cc +++ b/livestatus/src/LogEntry.cc @@ -4,24 +4,23 @@ // | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | // | | |___| | | | __/ (__| < | | | | . \ | // | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | -// | |_____| | -// | __ __ _ ____ | -// | | \/ (_) ___ _ __ ___ / ___|___ _ __ ___ | -// | | |\/| | |/ __| '__/ _ \ | | / _ \| '__/ _ \ | -// | | | | | | (__| | | (_) | | |__| (_) | | | __/ | -// | |_| |_|_|\___|_| \___/ \____\___/|_| \___| | // | | // | Copyright Mathias Kettner 2013 mk(a)mathias-kettner.de | // +------------------------------------------------------------------+ // -// This file is part of the Check_MK Micro Core. Copyright by Mathias -// Kettner, Preysingstr. 74, 81667 München, Germany. All rights are -// reserved. You may *not* redistribute or modify this software unless -// you have a written permission of the owner. This file is *not* -// available under GNU GPL. If you do not like this then please use a -// different monitoring core. +// This file is part of Check_MK. +// The official homepage is at http://mathias-kettner.de/check_mk. // -// Please note: This software is experimental. Use at your own risk. +// 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. #include <string.h> #include <time.h>

10 years, 4 months

Check_MK Git: check_mk: fixed permissions of agent_ibmsvc

by Andreas Boesl

Module: check_mk Branch: master Commit: 8b954f740c9ebe0bcb4c05b254a2abe135b289ae URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8b954f740c9ebe… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Jun 3 10:31:00 2014 +0200 fixed permissions of agent_ibmsvc --- agents/special/agent_ibmsvc | 1 + 1 file changed, 1 insertion(+) diff --git a/agents/special/agent_ibmsvc b/agents/special/agent_ibmsvc index 3e3ac39..3806044 100755 --- a/agents/special/agent_ibmsvc +++ b/agents/special/agent_ibmsvc @@ -215,3 +215,4 @@ def output_profile(): if g_profile: output_profile() +

10 years, 4 months

Check_MK Git: check_mk: fixed permissions of agent_ibmsvc

by Andreas Boesl

Module: check_mk Branch: master Commit: 6c6809d2a54b1ecf1351bb73d08600eff6e0d36b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6c6809d2a54b1e… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Jun 3 10:26:02 2014 +0200 fixed permissions of agent_ibmsvc --- 0 files changed diff --git a/agents/special/agent_ibmsvc b/agents/special/agent_ibmsvc old mode 100644 new mode 100755

10 years, 4 months

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, 4 months

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, 4 months

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, 4 months

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, 4 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits