Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64653 discussions

Check_MK Git: check_mk: logwatch.groups: New logwatch subcheck who can be used to group logfiles together.

by Bastian Kuhn

Module: check_mk Branch: master Commit: 7c048b5c3305f90f5b15c46967b64cfec3225c22 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7c048b5c3305f9… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Wed Jul 2 14:57:21 2014 +0200 logwatch.groups: New logwatch subcheck who can be used to group logfiles together. --- .werks/175 | 8 +++ ChangeLog | 5 +- checkman/logwatch.groups | 19 +++++++ checks/logwatch | 103 ++++++++++++++++++++++++++++++---- web/plugins/icons/builtin.py | 2 +- web/plugins/wato/check_parameters.py | 33 +++++++++++ 6 files changed, 156 insertions(+), 14 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=7c048b5c33…

10 years, 3 months

Check_MK Git: check_mk: FIX: removed a print statement

by Goetz Golla

Module: check_mk Branch: master Commit: 0ab1da131c64b124895e5452249db980a121e7b2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0ab1da131c64b1… Author: Goetz Golla <gg(a)mathias-kettner.de> Date: Wed Jul 2 14:29:11 2014 +0200 FIX: removed a print statement --- checks/fc_port | 1 - 1 file changed, 1 deletion(-) diff --git a/checks/fc_port b/checks/fc_port index 07f326e..3bb0963 100644 --- a/checks/fc_port +++ b/checks/fc_port @@ -126,7 +126,6 @@ def inventory_fc_port(info): def check_fc_port(item, params, info): - print params # Accept item, even if port name has changed item_index = int(item.split()[0]) portinfo = [ line for line in info if int(line[0]) == item_index + 1 ]

10 years, 3 months

Check_MK Git: check_mk: Fix version in 64 bit Windows agent

by Mathias Kettner

Module: check_mk Branch: master Commit: ec6cf406d000e35b26a7b60df5ae4590d068306c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ec6cf406d000e3… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Jul 2 11:14:52 2014 +0200 Fix version in 64 bit Windows agent --- Makefile | 2 +- agents/windows/Makefile | 4 ++-- agents/windows/installer-64.nsi | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 442a73a..7ecaf16 100644 --- a/Makefile +++ b/Makefile @@ -169,7 +169,7 @@ setversion: fi ; \ done ; \ sed -i 's/say "Version: .*"/say "Version: $(NEW_VERSION)"/' agents/check_mk_agent.openvms - sed -i 's/!define CHECK_MK_VERSION .*/!define CHECK_MK_VERSION "'$(NEW_VERSION)'"/' agents/windows/installer.nsi ; \ + sed -i 's/!define CHECK_MK_VERSION .*/!define CHECK_MK_VERSION "'$(NEW_VERSION)'"/' agents/windows/installer*.nsi ; \ sed -ri 's/^(VERSION[[:space:]]*= *).*/\1'"$(NEW_VERSION)/" agents/windows/Makefile ; \ sed -i 's/^AC_INIT.*/AC_INIT([MK Livestatus], ['"$(NEW_VERSION)"'], [mk(a)mathias-kettner.de])/' livestatus/configure.ac ; \ sed -i 's/^VERSION=".*/VERSION="$(NEW_VERSION)"/' mkeventd/bin/mkeventd ; \ diff --git a/agents/windows/Makefile b/agents/windows/Makefile index 98a1538..eddaf93 100755 --- a/agents/windows/Makefile +++ b/agents/windows/Makefile @@ -105,10 +105,10 @@ install_agent-64.exe: check_mk_agent-64.exe crash.exe nowin.exe -crash.exe: crash.cc Makefile +crash.exe: crash.cc $(CXX) -o $@ $< -nowin.exe: nowin.cc Makefile +nowin.exe: nowin.cc $(CXX) -o $@ $< clean: diff --git a/agents/windows/installer-64.nsi b/agents/windows/installer-64.nsi index 83b8705..9a2639d 100644 --- a/agents/windows/installer-64.nsi +++ b/agents/windows/installer-64.nsi @@ -4,7 +4,7 @@ ; Useful sources: ; http://nsis.sourceforge.net/Reusable_installer_script -!define CHECK_MK_VERSION "1.2.3i1" +!define CHECK_MK_VERSION "1.2.5i5" !define NAME "Check_MK Agent ${CHECK_MK_VERSION}" XPStyle on

10 years, 3 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits