Checkmk git commits July 2014

checkmk-commits@lists.checkmk.com

7 participants
221 discussions

Check_MK Git: check_mk: Fixed werk description

by Bastian Kuhn

Module: check_mk Branch: master Commit: 53033ada43f5133d82754da4dfe70ab842e23a60 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=53033ada43f513… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Wed Jul 2 10:49:17 2014 +0200 Fixed werk description --- .werks/174 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.werks/174 b/.werks/174 index cc80b9a..a79c9a8 100644 --- a/.werks/174 +++ b/.werks/174 @@ -1,8 +1,8 @@ -Title: FIX: Fixed appending of --keepalive-fd parameters to checkhelps +Title: Fixed appending of --keepalive-fd parameters to checkhelpers Level: 1 Component: core Version: 1.2.5i5 Date: 1404290005 Class: fix -through a bug in check_mk.py, every reload another dublicate --keepalive-fd parameters was added to the commandline. +through a bug in check_mk.py, every reload another dublicate --keepalive-fd parameter was added to the commandline.

10 years, 2 months

Check_MK Git: check_mk: FIX FIX: Fixed appending of --keepalive-fd parameters to checkhelps

by Bastian Kuhn

Module: check_mk Branch: master Commit: 43e61a3509ce2508aae0a4dac4428e5128f6026e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=43e61a3509ce25… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Wed Jul 2 10:37:51 2014 +0200 FIX FIX: Fixed appending of --keepalive-fd parameters to checkhelps through a bug in check_mk.py, every reload another dublicate --keepalive-fd parameters was added to the commandline. --- .werks/174 | 8 ++++++++ ChangeLog | 1 + modules/check_mk.py | 1 + 3 files changed, 10 insertions(+) diff --git a/.werks/174 b/.werks/174 new file mode 100644 index 0000000..cc80b9a --- /dev/null +++ b/.werks/174 @@ -0,0 +1,8 @@ +Title: FIX: Fixed appending of --keepalive-fd parameters to checkhelps +Level: 1 +Component: core +Version: 1.2.5i5 +Date: 1404290005 +Class: fix + +through a bug in check_mk.py, every reload another dublicate --keepalive-fd parameters was added to the commandline. diff --git a/ChangeLog b/ChangeLog index b136ceb..2751cd7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,6 +3,7 @@ * 1012 Fix quoting of backslashes in custom checks with nagios core... NOTE: Please refer to the migration notes! * 1035 FIX: Do not fail on errors in *.mk files anymore - except in interactive mode... + * 0174 FIX: FIX: Fixed appending of --keepalive-fd parameters to checkhelps... Checks & Agents: * 0168 f5_bigip_pool: Added Wato configuration... diff --git a/modules/check_mk.py b/modules/check_mk.py index 9e943f5..5f97bbc 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -5455,6 +5455,7 @@ def do_check_keepalive(): break hostname = hostname.strip() if hostname == "*": + sys.argv = [ x for x in sys.argv if not x.startswith('--keepalive-fd=') ] os.execvp("cmk", sys.argv + [ "--keepalive-fd=%d" % keepalive_fd ]) elif not hostname: break

10 years, 2 months

Check_MK Git: check_mk: New checks and an special agent for ALLNET IP Sensoric devices

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: 1bf800e9975c05604b976d2de31f09cb3aa2a6bd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1bf800e9975c05… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Wed Jul 2 10:32:19 2014 +0200 New checks and an special agent for ALLNET IP Sensoric devices Included Checks are for temperature, humidity and electric tension sensors. --- .werks/997 | 8 + ChangeLog | 1 + agents/special/agent_allnet_ip_sensoric | 165 +++++++++++++ checkman/allnet_ip_sensoric.humidity | 46 ++++ checkman/allnet_ip_sensoric.temp | 44 ++++ checkman/allnet_ip_sensoric.tension | 19 ++ checks/agent_allnet_ip_sensoric | 36 +++ checks/allnet_ip_sensoric | 243 ++++++++++++++++++++ modules/catalog.py | 1 + .../check_mk-allnet_ip_sensoric.humidity.php | 1 + pnp-templates/check_mk-allnet_ip_sensoric.temp.php | 1 + .../check_mk-allnet_ip_sensoric.tension.php | 34 +++ web/plugins/perfometer/check_mk.py | 9 + web/plugins/wato/datasource_programs.py | 27 +++ 14 files changed, 635 insertions(+) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=1bf800e997…

10 years, 2 months

Check_MK Git: check_mk: added wato_hook_cleanup_folders.py in treasures: a script to delete e. g. folders of other customers on slave sites directly after the replication

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: 55c5056b215cdc268fc38dedd45dc514137d1cc2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=55c5056b215cdc… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Tue Jul 1 18:33:41 2014 +0200 added wato_hook_cleanup_folders.py in treasures: a script to delete e. g. folders of other customers on slave sites directly after the replication --- doc/treasures/wato_hook_cleanup_folders.py | 49 ++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/doc/treasures/wato_hook_cleanup_folders.py b/doc/treasures/wato_hook_cleanup_folders.py new file mode 100644 index 0000000..8ab534c --- /dev/null +++ b/doc/treasures/wato_hook_cleanup_folders.py @@ -0,0 +1,49 @@ +#!/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. + +# put this script into local/share/check_mk/web/plugins/wato +# of a slave site +# this deletes all WATO folders immediatelly after sync except one +# folder with the same name as the site name of the slave site +# +# it can be used to avoid a customer to see config of other customers +# for this to work you need to have one folder per customer on the top +# level and one site per customer with exactly the same name +def pre_activate_changes_cleanup(_unused): + log = open('%s/tmp/hook.log' % defaults.omd_root,'w') + log.write('omd_site: %s, omd_root: %s\n' % (defaults.omd_site, defaults.omd_root)) + confd = "%s/etc/check_mk/conf.d/wato/" % defaults.omd_root + for dirname, dirnames, filenames in os.walk(confd): + for subdirname in dirnames: + if subdirname == defaults.omd_site: + log.write("keeping subdir: %s\n" % subdirname) + else: + log.write("deletinging subdir: %s\n" % subdirname) + shutil.rmtree(confd + subdirname) + break + log.close() + +api.register_hook('pre-activate-changes', pre_activate_changes_cleanup)

10 years, 2 months

Check_MK Git: check_mk: notify_multitech.py: Added a hint about passwords to use

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: a12291264ba00edb82f5e39d7f24e23b6f8949b1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a12291264ba00e… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Wed Jul 2 10:14:56 2014 +0200 notify_multitech.py: Added a hint about passwords to use --- doc/treasures/notify_multitech.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/doc/treasures/notify_multitech.py b/doc/treasures/notify_multitech.py index ba3f949..4d57b35 100755 --- a/doc/treasures/notify_multitech.py +++ b/doc/treasures/notify_multitech.py @@ -42,6 +42,9 @@ # * Under # SMS Services > Send SMS Users # create a user for Check_MK. This one needs to be entered below. +# Make sure you choose a password, which is not longer than 8 characters. +# On the device it is possible to set a longer password, but authentication +# with it is impossible!! :-( # # * Do not forget to go to the "Save & Restart" tab and click "save" there. # This writes your changes into the flash memory of the device. Otherwise

10 years, 2 months

Check_MK Git: check_mk: manually resolving merge conflicts in ChangeLog

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: 712e3ed8307bea9b7ce5e1608a97697fbb4850cb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=712e3ed8307bea… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Wed Jul 2 10:33:22 2014 +0200 manually resolving merge conflicts in ChangeLog ---

10 years, 2 months

Check_MK Git: check_mk: FIX Avoid sporadic errors when checking event state in Event Console

by Mathias Kettner

Module: check_mk Branch: master Commit: 6dfcbb60e3be64dcd701aa6abbc1378d4f4a1f3e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6dfcbb60e3be64… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Jul 2 10:09:02 2014 +0200 FIX Avoid sporadic errors when checking event state in Event Console When you add the check for checking the current event state of a host in the Event Console than under heavy load it could sometimes happen that the check would run into an error (<tt>Ressource temporarily unavailable</tt>). This has been fixed by switching from the Python version of <tt>check_mkevents</tt> to the C version. This also saves CPU ressources if you have a larger number of hosts. --- .werks/1040 | 14 ++++++++++++++ ChangeLog | 3 +++ mkeventd/lib/.gitignore | 2 +- mkeventd/lib/Makefile | 8 ++++---- mkeventd/lib/{check_mkevents => check_mkevents.py} | 3 +++ 5 files changed, 25 insertions(+), 5 deletions(-) diff --git a/.werks/1040 b/.werks/1040 new file mode 100644 index 0000000..7e294dd --- /dev/null +++ b/.werks/1040 @@ -0,0 +1,14 @@ +Title: Avoid sporadic errors when checking event state in Event Console +Level: 2 +Component: ec +Class: fix +State: unknown +Version: 1.2.5i5 +Date: 1404288443 + +When you add the check for checking the current event state of a host +in the Event Console than under heavy load it could sometimes happen +that the check would run into an error (<tt>Ressource temporarily unavailable</tt>). +This has been fixed by switching from the Python version of <tt>check_mkevents</tt> +to the C version. This also saves CPU ressources if you have a larger +number of hosts. diff --git a/ChangeLog b/ChangeLog index 81f7bad..1d3eb28 100644 --- a/ChangeLog +++ b/ChangeLog @@ -40,6 +40,9 @@ Reporting & Availability: * 0991 FIX: Availability: optionally show time stamps as UNIX epoch time... + Event Console: + * 1040 FIX: Avoid sporadic errors when checking event state in Event Console... + Livestatus: * 0988 FIX: livedump: Fix exception in case no contact groups are defined for a service diff --git a/mkeventd/lib/.gitignore b/mkeventd/lib/.gitignore index eb18566..d921ff9 100644 --- a/mkeventd/lib/.gitignore +++ b/mkeventd/lib/.gitignore @@ -1 +1 @@ -check_mkevents_c +check_mkevents diff --git a/mkeventd/lib/Makefile b/mkeventd/lib/Makefile index fc6cfd7..1b433bc 100644 --- a/mkeventd/lib/Makefile +++ b/mkeventd/lib/Makefile @@ -22,10 +22,10 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. -all: check_mkevents_c +all: check_mkevents -check_mkevents_c: check_mkevents.cc - g++ -O2 -o check_mkevents_c check_mkevents.cc +check_mkevents: check_mkevents.cc + g++ -O2 -s -o check_mkevents check_mkevents.cc clean: - rm -f check_mkevents_c + rm -f check_mkevents diff --git a/mkeventd/lib/check_mkevents b/mkeventd/lib/check_mkevents.py similarity index 98% rename from mkeventd/lib/check_mkevents rename to mkeventd/lib/check_mkevents.py index 8d745d9..08b0b40 100755 --- a/mkeventd/lib/check_mkevents +++ b/mkeventd/lib/check_mkevents.py @@ -1,5 +1,8 @@ #!/usr/bin/python +# Old, outdated Python version of check_mkevents. Do not use +# anymore... + import os, socket, sys try:

10 years, 2 months

Check_MK Git: check_mk: FIX mk_inventory.ps1: increased caching time to 14400, fixed incorrect default cachefile path

by Andreas Boesl

Module: check_mk Branch: master Commit: 9343a5fea42926918f2ddd84667d99e0c10b5273 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9343a5fea42926… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Jul 2 09:49:07 2014 +0200 FIX mk_inventory.ps1: increased caching time to 14400, fixed incorrect default cachefile path --- .werks/948 | 9 +++++++++ ChangeLog | 1 + agents/windows/plugins/mk_inventory.ps1 | 4 ++-- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/.werks/948 b/.werks/948 new file mode 100644 index 0000000..8c68221 --- /dev/null +++ b/.werks/948 @@ -0,0 +1,9 @@ +Title: mk_inventory.ps1: increased caching time to 14400, fixed incorrect default cachefile path +Level: 1 +Component: checks +Class: fix +State: unknown +Version: 1.2.5i5 +Date: 1404287307 + + diff --git a/ChangeLog b/ChangeLog index 5bfe9ed..81f7bad 100644 --- a/ChangeLog +++ b/ChangeLog @@ -22,6 +22,7 @@ * 0996 FIX: apc_symmetra_test: Handle unknown date of last self test as intended... * 0173 FIX: hitachi_hnas_volume: Fixed bug when snmp outputs empty lines * 1037 FIX: bintec_info: support bintec RXL12500 + * 0948 FIX: mk_inventory.ps1: increased caching time to 14400, fixed incorrect default cachefile path Multisite: * 1013 Sort host names naturally, e.g. foobar11 comes after foobar2... diff --git a/agents/windows/plugins/mk_inventory.ps1 b/agents/windows/plugins/mk_inventory.ps1 index 9bcfb8e..4e98d8f 100644 --- a/agents/windows/plugins/mk_inventory.ps1 +++ b/agents/windows/plugins/mk_inventory.ps1 @@ -2,9 +2,9 @@ $name = (Get-Item env:\Computername).Value $separator = "|" # filename for timestamp $remote_host = $env:REMOTE_HOST -$timestamp = "c:\Program Files (x86)\Check_mk\timestamp.$remote_host" +$timestamp = "c:\Program Files (x86)\check_mk\timestamp.$remote_host" # execute agent only every $delay seconds -$delay = 1 +$delay = 14400 # does $timestamp exist? If (Test-Path $timestamp){

10 years, 2 months

Check_MK Git: check_mk: Better error message for empty cmk --donate

by Mathias Kettner

Module: check_mk Branch: master Commit: 1d9f6c501f79959fd387c7df5e2726530f335640 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1d9f6c501f7995… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Jul 2 09:47:36 2014 +0200 Better error message for empty cmk --donate --- modules/check_mk.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/check_mk.py b/modules/check_mk.py index 22b912e..8eb9257 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -5034,6 +5034,10 @@ def do_donation(): for f in cache_files: if f == host or f.startswith("%s." % host): donate.append(f) + if not donate: + sys.stderr.write("No hosts specified. You need to set donation_hosts in main.mk.\n") + sys.exit(1) + if opt_verbose: print "Donating files %s" % " ".join(cache_files) import base64

10 years, 2 months

Check_MK Git: check_mk: FIX: missing laser power information is ignored for service interfaces

by Goetz Golla

Module: check_mk Branch: master Commit: 11575c7db70ddca435f7f92c266cfaa21c8d0ee9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=11575c7db70ddc… Author: Goetz Golla <gg(a)mathias-kettner.de> Date: Tue Jul 1 16:15:26 2014 +0200 FIX: missing laser power information is ignored for service interfaces --- checkman/adva_fsp_if | 4 ++++ checks/adva_fsp_if | 18 ++++++++++-------- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/checkman/adva_fsp_if b/checkman/adva_fsp_if index dac243f..e0c2eca 100644 --- a/checkman/adva_fsp_if +++ b/checkman/adva_fsp_if @@ -15,6 +15,10 @@ description: and output (transmit) power of the laser. Per default, not limits are imposed, since meaningful values depend on the type of interface. + A {WARN} state is triggered if no laser power information can be found. + Service interfaces (item name beginning with "S") do not have laser power + information, so that non-existent laser power information is ignored for these + interfaces. item: There are three allowed ways to specify an interface: {1}: the last component diff --git a/checks/adva_fsp_if b/checks/adva_fsp_if index 8a8c854..a5cdb4c 100644 --- a/checks/adva_fsp_if +++ b/checks/adva_fsp_if @@ -80,9 +80,9 @@ def check_adva_fsp_if(item, params, info): if line[0] == index: state = 0 admintxt, adminstate = adva_fsp_if_adminstates[line[3]] - state = max(adminstate,state) + state = max(adminstate, state) opertxt, operstate = adva_fsp_if_operstates[line[4]] - state = max(operstate,state) + state = max(operstate, state) if state == 2: statesym = "(!!)" elif state == 1: @@ -100,15 +100,16 @@ def check_adva_fsp_if(item, params, info): state = 2 osym = "(!!)" elif owarn and output_power < owarn: - state = max(1,state) + state = max(1, state) osym = "(!)" else: osym = "" infotext += ", Output Power: %.1f%s" % ( output_power, osym ) perfdata.append( ("output_power", str(output_power)+"dBm", str(owarn)+":", str(ocrit)+":") ) except: - infotext += ", Output Power: n.a. (!)" - state = max(1,state) + if not re.match("S", item): # service interface does not have power parameter + infotext += ", Output Power: n.a. (!)" + state = max(1,state) try: @@ -118,15 +119,16 @@ def check_adva_fsp_if(item, params, info): state = 2 isym = "(!!)" elif iwarn and input_power < iwarn: - state = max(1,state) + state = max(1, state) isym = "(!)" else: isym = "" infotext += ", Input Power: %.1f%s" % ( input_power, isym ) perfdata.append( ("input_power", str(input_power)+"dBm", str(iwarn)+":", str(icrit)+":") ) except: - infotext += ", Input Power: n.a. (!)" - state = max(1,state) + if not re.match("S", item): # service interface does not have power parameter + infotext += ", Input Power: n.a. (!)" + state = max(1,state) return(state, infotext, perfdata)

10 years, 2 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits July 2014