Checkmk git commits December 2017

checkmk-commits@lists.checkmk.com

10 participants
219 discussions

5294 mk_sap_hana: New plugin which monitors SAP HANA instances

by Simon Betz

Module: check_mk Branch: master Commit: b78f9a71e14294fe1b412af101022ef66ff974e3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b78f9a71e14294… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue Sep 19 17:14:24 2017 +0200 5294 mk_sap_hana: New plugin which monitors SAP HANA instances Change-Id: Ia40c3031ae689f4923798f90d552aacdce006d47 --- .werks/5294 | 10 +++ agents/plugins/mk_sap_hana | 143 +++++++++++++++++++++++++++++++++++++++++ checkman/sap_hana_filesystem | 14 ++++ checkman/sap_hana_full_backup | 14 ++++ checkman/sap_hana_mem | 13 ++++ checkman/sap_hana_mem.database | 13 ++++ checkman/sap_hana_process_list | 15 +++++ checkman/sap_hana_version | 10 +++ checks/sap_hana_filesystem | 49 ++++++++++++++ checks/sap_hana_full_backup | 47 ++++++++++++++ checks/sap_hana_mem | 140 ++++++++++++++++++++++++++++++++++++++++ checks/sap_hana_process_list | 66 +++++++++++++++++++ checks/sap_hana_version | 55 ++++++++++++++++ 13 files changed, 589 insertions(+) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=b78f9a71e1…

6 years, 9 months

Bump time limit, allowing builds even on slow embedded systems. (part 2)

by Sven Panne

Module: check_mk Branch: master Commit: d7977133cbec8dc10108f6c6a01557424d3107b1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d7977133cbec8d… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Dec 21 13:51:45 2017 +0100 Bump time limit, allowing builds even on slow embedded systems. (part 2) Change-Id: I72ea6727b79aac72579b9e7a82cce4a1eb2dbfb0 --- omd/packages/perl-modules/lib/BuildHelper.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/omd/packages/perl-modules/lib/BuildHelper.pm b/omd/packages/perl-modules/lib/BuildHelper.pm index 9633f3c..5c6b6fe 100644 --- a/omd/packages/perl-modules/lib/BuildHelper.pm +++ b/omd/packages/perl-modules/lib/BuildHelper.pm @@ -466,7 +466,7 @@ sub install_module { system("grep 'is installed, but we need version' $LOG | grep ' ! ' | $grepv"); # or die('dependency error'); system("grep 'is not a known MakeMaker parameter' $LOG | grep INSTALL_BASE | $grepv") or die('build error'); chdir($cwd); - if($duration > 60) { + if($duration > 1100) { chomp(my $pwd = `pwd`); print "installation took too long, see $pwd/$dir/$LOG for details\n"; } else { @@ -489,7 +489,7 @@ sub get_meta_for_dir { # create Makefile my $cwd = cwd(); chdir($dir); - alarm(120); + alarm(1200); eval { cmd("yes n | perl Makefile.PL", 1) if -e 'Makefile.PL'; cmd("yes n | perl Build.PL", 1) if -e 'Build.PL';

6 years, 9 months

Handle unsupported architecture (e.g. ARM) gracefully.

by Sven Panne

Module: check_mk Branch: master Commit: 7a84ecb120285cd888a75721706592015a96b8da URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7a84ecb120285c… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Dec 21 13:45:26 2017 +0100 Handle unsupported architecture (e.g. ARM) gracefully. Change-Id: I7ef341167d7a5fa812031307a485fb0ba056e044 --- omd/packages/navicli/Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/omd/packages/navicli/Makefile b/omd/packages/navicli/Makefile index 57ca796..2d80e66 100755 --- a/omd/packages/navicli/Makefile +++ b/omd/packages/navicli/Makefile @@ -11,10 +11,6 @@ ifeq ($(UNAME_M),i686) SOURCE_DIR=navisphere-32 endif -ifeq ($(SOURCE_DIR),) - $(error "Falsche Architektur: $(UNAME_M)") -endif - .PHONY: build install skel clean build: @@ -27,6 +23,9 @@ build: # consequence, we install the libraries to a subdirectory which is not searched # and call the command via a wrapper which sets LD_LIBRARY_PATH. install: +ifeq ($(SOURCE_DIR),) + $(warning unsupported architecture $(UNAME_M)) +else mkdir -p $(DESTDIR)$(OMD_ROOT)/bin install -m 755 $(SOURCE_DIR)/bin/admsnap $(DESTDIR)$(OMD_ROOT)/bin install -m 755 $(SOURCE_DIR)/bin/setlevel_cli.sh $(DESTDIR)$(OMD_ROOT)/bin @@ -38,5 +37,6 @@ install: install -m 755 $(SOURCE_DIR)/lib/seccli/* $(DESTDIR)$(OMD_ROOT)/lib/seccli mkdir -p $(DESTDIR)$(OMD_ROOT)/share/navicli cp -pr $(SOURCE_DIR)/seccli/CST $(DESTDIR)$(OMD_ROOT)/share/navicli +endif skel:

6 years, 9 months

Bump time limit, allowing builds even on slow embedded systems.

by Sven Panne

Module: check_mk Branch: master Commit: 7f65a6c934e8e67147a7472f3b345f8cf554e824 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7f65a6c934e8e6… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Dec 21 13:35:41 2017 +0100 Bump time limit, allowing builds even on slow embedded systems. Change-Id: I7ee6d4633aa35f0e6577a810d8bfc69c0810e4d6 --- omd/packages/perl-modules/lib/BuildHelper.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/omd/packages/perl-modules/lib/BuildHelper.pm b/omd/packages/perl-modules/lib/BuildHelper.pm index 12342df..9633f3c 100644 --- a/omd/packages/perl-modules/lib/BuildHelper.pm +++ b/omd/packages/perl-modules/lib/BuildHelper.pm @@ -430,7 +430,7 @@ sub install_module { eval { local $SIG{ALRM} = sub { die "timeout on: $file\n" }; - alarm(120); # single module should not take longer than 1 minute + alarm(1200); # 20min per module should be enough to build even on e.g. Raspberry Pi if( -f "Build.PL" ) { `$PERL Build.PL >> $LOG 2>&1 && $PERL ./Build >> $LOG 2>&1 && $PERL ./Build install >> $LOG 2>&1`; if($? != 0 ) { die("error: rc $?\n".`cat $LOG`."\n"); }

6 years, 9 months

5476 FIX Fixed notification numbering of periodic notifications

by Sven Panne

Module: check_mk Branch: master Commit: dc1d705cdb253137ec84176dc69b16be8e5551ad URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dc1d705cdb2531… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Dec 21 11:46:40 2017 +0100 5476 FIX Fixed notification numbering of periodic notifications Previously, non-OK state changes during periodic notifications resetted the notification number back to 1, in effect restarting escalations. This was inconsistent with Nagios and is not what one wants: If e.g. a service is in WARN state for quite some time, and then goes to CRIT, one surely wants to continue escalation, not reset it. This problem has been fixed, so problems correctly escalate now. Change-Id: Ie4a6430619d1cb3548fa63349b4dc27e39d3e303 --- .werks/5476 | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/.werks/5476 b/.werks/5476 new file mode 100644 index 0000000..8346747 --- /dev/null +++ b/.werks/5476 @@ -0,0 +1,16 @@ +Title: Fixed notification numbering of periodic notifications +Level: 2 +Component: cmc +Compatible: incomp +Edition: cee +Version: 1.5.0i3 +Date: 1513852752 +Class: fix + +Previously, non-OK state changes during periodic notifications resetted the +notification number back to 1, in effect restarting escalations. This was +inconsistent with Nagios and is not what one wants: If e.g. a service is in +WARN state for quite some time, and then goes to CRIT, one surely wants to +continue escalation, not reset it. + +This problem has been fixed, so problems correctly escalate now.

6 years, 9 months

Another attempt to check manual pages via Gerrit.

by Sven Panne

Module: check_mk Branch: master Commit: 1bb69eccc3f625f5cab4e661561d4df5811c9012 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1bb69eccc3f625… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Dec 21 11:08:10 2017 +0100 Another attempt to check manual pages via Gerrit. Change-Id: Ibd32ed64fb43a78fc748628dc3aa616ec4ad383a --- tests/Makefile | 3 +-- tests/checkman/test_manpages.py | 3 +++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/tests/Makefile b/tests/Makefile index f84d49f..3b239cc 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -22,8 +22,7 @@ test-pylint: test-pylint-ci: export TERM="linux" ; \ export PYLINT_ARGS="--output-format=cmk_parseable" ; \ - $(MAKE) test-pylint ; \ - py.test -m checkman + $(MAKE) test-pylint test-bandit: diff --git a/tests/checkman/test_manpages.py b/tests/checkman/test_manpages.py index 4e639c3..2ab3e19 100644 --- a/tests/checkman/test_manpages.py +++ b/tests/checkman/test_manpages.py @@ -2,10 +2,13 @@ # encoding: utf-8 import os +import pytest import sys import subprocess from testlib import cmk_path +# HACK: Mark all tests in this file to be pylint checks +pytestmark = pytest.mark.pylint def test_manpage_files(): os.chdir(cmk_path())

6 years, 9 months

Fixed help text.

by Sven Panne

Module: check_mk Branch: master Commit: a5992d8c1a5eda882f23c0f34d893cba458622fb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a5992d8c1a5eda… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Dec 21 10:46:22 2017 +0100 Fixed help text. Change-Id: I6da806ff5a38d1e5fbc894f746814fd592e99e7a --- web/htdocs/wato.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 79518d0..7fed6de 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -8239,7 +8239,7 @@ def notification_rule_match_conditions(): "a certain number of notifications have been created by the monitoring " "core. If you for example select 10 as the beginning and 5 as the rate " "then you will receive the notification 1 through 10 and then 15, 20, " - "25.. and so on."), + "25... and so on. Note that recovery notifications are not affected by throttling."), orientation = "float", elements = [ Integer(

6 years, 9 months

Tentative hack to check manual pages via Gerrit, too.

by Sven Panne

Module: check_mk Branch: master Commit: e57163bd3f7b53a7c3ca7ee3e3221e948e019c7d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e57163bd3f7b53… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Dec 21 10:23:52 2017 +0100 Tentative hack to check manual pages via Gerrit, too. Change-Id: Ifc67f69e5005b78df081f553b1b3cb2994c1e2d8 --- tests/Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/Makefile b/tests/Makefile index 8f481db..f84d49f 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -18,10 +18,12 @@ test-pylint: py.test -m pylint +# HACK: We check the manual pages here, too... test-pylint-ci: export TERM="linux" ; \ export PYLINT_ARGS="--output-format=cmk_parseable" ; \ - $(MAKE) test-pylint + $(MAKE) test-pylint ; \ + py.test -m checkman test-bandit:

6 years, 9 months

Added missing manpage

by Simon Betz

Module: check_mk Branch: master Commit: 3ee1e6062fcd08926350b4785b38d13bbc271653 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3ee1e6062fcd08… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Dec 21 10:05:02 2017 +0100 Added missing manpage Change-Id: Ic1e9b180435ef6aa8cb1bbfb1a97247b9c384c46 --- checkman/check_by_ssh | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/checkman/check_by_ssh b/checkman/check_by_ssh new file mode 100644 index 0000000..f96deeb --- /dev/null +++ b/checkman/check_by_ssh @@ -0,0 +1,7 @@ +title: SSH connection to execute commands on a remote host +agents: active +catalog: agentless +license: GPL +distribution: check_mk +description: + This is an active check which uses SSH to execute commands on a remote host.

6 years, 9 months

5604 check_by_ssh: This active check is now configurable via WATO

by Simon Betz

Module: check_mk Branch: master Commit: 24a9cd7f382d4d51df6affc9e4d6503040c4b340 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=24a9cd7f382d4d… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed Dec 20 16:06:30 2017 +0100 5604 check_by_ssh: This active check is now configurable via WATO Change-Id: Ifed0b58dca032a48c732780ae27e9585045d959a --- .werks/5604 | 10 ++++++ checks/check_by_ssh | 66 ++++++++++++++++++++++++++++++++++ web/plugins/wato/active_checks.py | 76 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 152 insertions(+) diff --git a/.werks/5604 b/.werks/5604 new file mode 100644 index 0000000..7744bcc --- /dev/null +++ b/.werks/5604 @@ -0,0 +1,10 @@ +Title: check_by_ssh: This active check is now configurable via WATO +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.5.0i3 +Date: 1513782368 +Class: feature + + diff --git a/checks/check_by_ssh b/checks/check_by_ssh new file mode 100644 index 0000000..3b7ce17 --- /dev/null +++ b/checks/check_by_ssh @@ -0,0 +1,66 @@ +#!/usr/bin/python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2017 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- +# tails. 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 check_by_ssh_arguments(params): + settings = params[1] + if 'hostname' in settings: + args = "-H %s" % quote_shell_string(settings['hostname']) + else: + args = "-H $HOSTADDRESS$" + + args += " -C \"%s\"" % params[0] + if "port" in settings: + args += " -p %d" % settings["port"] + if "ip_version" in settings: + if settings['ip_version'] == 'ipv4': + args += ' -4' + else: + args += ' -6' + + if "timeout" in settings: + args += ' -t %d' % settings["timeout"] + if "logname" in settings: + args += ' -l %s' % quote_shell_string(settings["logname"]) + if "identity" in settings: + args += ' -i %s' % settings["identity"] + + return args + + +def check_by_ssh_description(params): + settings = params[1] + if 'description' in settings: + return settings['description'] + return "check_by_ssh %s" % params[0] + + +active_check_info['by_ssh'] = { + "command_line" : '$USER1$/check_by_ssh $ARG1$', + "argument_function" : check_by_ssh_arguments, + "service_description" : check_by_ssh_description , + "has_perfdata" : True, +} diff --git a/web/plugins/wato/active_checks.py b/web/plugins/wato/active_checks.py index 7a6d2e8..4a0f532 100644 --- a/web/plugins/wato/active_checks.py +++ b/web/plugins/wato/active_checks.py @@ -2190,3 +2190,79 @@ register_rule(group, ), match = 'all' ) + +register_rule(group, + "active_checks:by_ssh", + Tuple( + title = _("Check via SSH service"), + help = _("Checks via SSH. "), + elements = [ + TextAscii( + title = _("Command"), + help = _("Command to execute on remote host."), + allow_empty = False, + ), + Dictionary( + title = _("Optional parameters"), + elements = [ + ( "description", + TextAscii( + title = _("Service Description"), + help = _("Must be unique for every host. Defaults to command that is executed."), + size = 30) + ), + ( "hostname", + TextAscii( + title = _("DNS Hostname or IP address"), + default_value = "$HOSTADDRESS$", + allow_empty = False, + help = _("You can specify a hostname or IP address different from IP address " + "of the host as configured in your host properties."))), + ( 'port', + Integer( + title = _("SSH Port"), + help = _("Default is 22."), + minvalue = 1, + maxvalue = 65535, + default_value = 22)), + ( "ip_version", + Alternative( + title = _("IP-Version"), + elements = [ + FixedValue( + "ipv4", + totext = "", + title = _("IPv4") + ), + FixedValue( + "ipv6", + totext = "", + title = _("IPv6") + ), + ], + )), + ( "timeout", + Integer( + title = _("Seconds before connection times out"), + unit = _("sec"), + default_value = 10, + ) + ), + ( "logname", + TextAscii( + title = _("Username"), + help = _("SSH user name on remote host"), + size = 30) + ), + ( "identity", + TextAscii( + title = _("Keyfile"), + help = _("Identity of an authorized key"), + size = 30) + ), + ] + ) + ] + ), + match = 'all' +)

6 years, 9 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits December 2017