Checkmk git commits July 2017

checkmk-commits@lists.checkmk.com

11 participants
286 discussions

Added special agent api files to permission test

by Lars Michelsen

Module: check_mk Branch: master Commit: cd5690f22288c517647d0ccebf6c19effeabb61d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cd5690f22288c5… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jul 12 15:40:43 2017 +0200 Added special agent api files to permission test Change-Id: I1c86d2c0c5a6fe9ad7c9ebcae1fe8332b5cd6e99 --- tests/git/test_permissions.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/git/test_permissions.py b/tests/git/test_permissions.py index 9923275..099c4e9 100644 --- a/tests/git/test_permissions.py +++ b/tests/git/test_permissions.py @@ -18,7 +18,8 @@ def is_not_executable(path): permissions = [ # globbing pattern check function, excludes ('active_checks/*', is_executable, ['Makefile', 'check_mkevents.cc']), - ('agents/special/*', is_executable, []), + ('agents/special/agent_*', is_executable, []), + ('agents/special/lib/*', is_not_executable, []), ('agents/check_mk_agent.*', is_executable, ['check_mk_agent.spec']), ('agents/plugins/*', is_executable, ['README']), ('checks/*', is_not_executable, []),

6 years, 12 months

Introducing a common library for special agents

by Lars Michelsen

Module: check_mk Branch: master Commit: 9f82b86e056a870ab43660f2f13cdd36718b625e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9f82b86e056a87… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jul 12 15:37:12 2017 +0200 Introducing a common library for special agents Change-Id: I28d8c47ef0f955fa44b5fa3bcad750e673a70189 --- Makefile | 8 +++++++- agents/special/.f12 | 3 ++- agents/special/cmk_special_agent_api.py | 1 + agents/special/lib/cmk_special_agent_api.py | 27 +++++++++++++++++++++++++++ scripts/setup.sh | 1 + 5 files changed, 38 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 0726657..dae19c8 100644 --- a/Makefile +++ b/Makefile @@ -98,7 +98,8 @@ HEAL_SPACES_IN := checkman/* cmk_base/* checks/* notifications/* inventory/* check_mk_templates.cfg \ agents/check_mk_*agent* agents/*.c \ $$(find agents/cfg_examples -type f) \ - agents/special/* \ + agents/special/agent_* \ + agents/special/lib/cmk_special_agents.py \ $$(find agents/plugins -type f) \ $(wildcard enterprise/cmk_base/cee/*.py \ enterprise/modules/*.py \ @@ -187,6 +188,10 @@ $(DISTNAME).tar.gz: mk-livestatus-$(VERSION).tar.gz .werks/werks $(JAVASCRIPT_MI --exclude "cee" \ --exclude "cee.py*" ; \ rm cmk_base/*.pyc + pycompile agents/special/lib ; \ + tar czf $(DISTNAME)/special_agent_api.tar.gz $(TAROPTS) -C agents/special/lib cmk_special_agent_api.py \ + --exclude ".f12" + rm agents/special/lib/*.pyc tar czf $(DISTNAME)/share.tar.gz $(TAROPTS) check_mk_templates.cfg tar czf $(DISTNAME)/werks.tar.gz $(TAROPTS) -C .werks werks tar czf $(DISTNAME)/checks.tar.gz $(TAROPTS) -C checks $$(cd checks ; ls) @@ -228,6 +233,7 @@ $(DISTNAME).tar.gz: mk-livestatus-$(VERSION).tar.gz .werks/werks $(JAVASCRIPT_MI --exclude "windows/openhardwaremonitor" \ --exclude "windows/sections" \ --exclude "windows/frozen_binaries" \ + --exclude "special/lib" \ --exclude .f12 $$(cd agents ; ls) cd $(DISTNAME) ; ../scripts/make_package_info $(VERSION) > package_info install -m 755 scripts/*.{sh,py} $(DISTNAME) diff --git a/agents/special/.f12 b/agents/special/.f12 index 84ed3ba..8a8d30e 100644 --- a/agents/special/.f12 +++ b/agents/special/.f12 @@ -1,4 +1,5 @@ #!/bin/bash SITE=${SITE:-$(cat ../../.site 2>/dev/null || true)} SITE=${SITE:-$(omd sites --bare | head -n 1)} -sudo cp -r * /omd/sites/$SITE/share/check_mk/agents/special +sudo cp agent_* /omd/sites/$SITE/share/check_mk/agents/special/ +sudo cp lib/cmk_special_agent_api.py /omd/sites/$SITE/lib/python/ diff --git a/agents/special/cmk_special_agent_api.py b/agents/special/cmk_special_agent_api.py new file mode 120000 index 0000000..1529cf0 --- /dev/null +++ b/agents/special/cmk_special_agent_api.py @@ -0,0 +1 @@ +lib/cmk_special_agent_api.py \ No newline at end of file diff --git a/agents/special/lib/cmk_special_agent_api.py b/agents/special/lib/cmk_special_agent_api.py new file mode 100644 index 0000000..775e502 --- /dev/null +++ b/agents/special/lib/cmk_special_agent_api.py @@ -0,0 +1,27 @@ +#!/usr/bin/env python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2016 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. + +"""Place for common code shared among different Check_MK special agents""" diff --git a/scripts/setup.sh b/scripts/setup.sh index 7f22973..1d9c2d3 100755 --- a/scripts/setup.sh +++ b/scripts/setup.sh @@ -743,6 +743,7 @@ do mkdir -p $DESTDIR$python_lib_dir && tar xzf $SRCDIR/lib.tar.gz -C $DESTDIR$python_lib_dir && tar xzf $SRCDIR/base.tar.gz -C $DESTDIR$python_lib_dir && + tar xzf $SRCDIR/special_agent_api.tar.gz -C $DESTDIR$python_lib_dir && mkdir -p $DESTDIR$sharedir/werks && tar xzf $SRCDIR/werks.tar.gz -C $DESTDIR$sharedir/werks && mkdir -p $DESTDIR$localedir &&

6 years, 12 months

4917 FIX multipath: Fixed wrong output message if state changed to warn because of to much paths

by Marcel Arentz

Module: check_mk Branch: master Commit: 07db7a15e39ef1da6fb7aead32212837bf322ed4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=07db7a15e39ef1… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Wed Jul 12 15:18:11 2017 +0200 4917 FIX multipath: Fixed wrong output message if state changed to warn because of to much paths The output message suggested, that the state would be CRIT but actually is warn if to much paths are detected. Change-Id: I0a99e1bf48b57c10f88712e328417dd52ba08067 --- .werks/4917 | 11 +++++++++++ checks/multipath | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/4917 b/.werks/4917 new file mode 100644 index 0000000..4efc45c --- /dev/null +++ b/.werks/4917 @@ -0,0 +1,11 @@ +Title: multipath: Fixed wrong output message if state changed to warn because of to much paths +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1499865368 +Class: fix + +The output message suggested, that the state would be CRIT but actually is +warn if to much paths are detected. diff --git a/checks/multipath b/checks/multipath index 4c7615a..fe40d85 100644 --- a/checks/multipath +++ b/checks/multipath @@ -345,7 +345,7 @@ def check_multipath(item, params, parsed): infotext += " (crit below %d)" % expected_paths elif num_active > expected_paths: state = 1 - infotext += " (crit at %d)" % expected_paths + infotext += " (warn at %d)" % expected_paths else: state = 0 yield state, infotext

6 years, 12 months

4969 FIX Service discovery view: Fixed sorting service descriptions

by Simon Betz

Module: check_mk Branch: master Commit: 353735ee44a12c48a42f7de2488972a139a3e513 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=353735ee44a12c… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed Jul 12 14:21:32 2017 +0200 4969 FIX Service discovery view: Fixed sorting service descriptions Service descriptions beginning with capitals were sorted primarily followed by descriptions beginning with small letters. Change-Id: I12dad7fc8097dc9f6c2b6ee3e41f426150651c8f --- .werks/4969 | 12 ++++++++++++ web/htdocs/wato.py | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/.werks/4969 b/.werks/4969 new file mode 100644 index 0000000..87f10f3 --- /dev/null +++ b/.werks/4969 @@ -0,0 +1,12 @@ +Title: Service discovery view: Fixed sorting service descriptions +Level: 1 +Component: multisite +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i1 +Date: 1499861224 + +Service descriptions beginning with capitals were sorted primarily +followed by descriptions beginning with small letters. diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index f81de23..4dd6177 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -3091,7 +3091,7 @@ class ModeDiscovery(WatoMode): if show_bulk_actions and len(checks) > 10: self._bulk_actions(check_source, collect_headers=False) - for check in sorted(checks, key=lambda c: c[6]): + for check in sorted(checks, key=lambda c: c[6].lower()): self._check_row(check, show_bulk_actions) if show_bulk_actions:

6 years, 12 months

Fixed syntax error in if statement

by Simon Betz

Module: check_mk Branch: master Commit: c3d6596e7d3b5e0136a578372e9a75a6ed613648 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c3d6596e7d3b5e… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed Jul 12 12:40:40 2017 +0200 Fixed syntax error in if statement Change-Id: If492b8bf8b20b9664120de29c9706bdb0d79d7d0 --- agents/check_mk_agent.solaris | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/agents/check_mk_agent.solaris b/agents/check_mk_agent.solaris index d95796b..57bd19c 100755 --- a/agents/check_mk_agent.solaris +++ b/agents/check_mk_agent.solaris @@ -309,7 +309,8 @@ fi # Memory # <<<solaris_mem>>> should be used if statgrab is missing and top is available. -if ! type statgrab &>/dev/null +if ! type statgrab &>/dev/null; +then if [ -x /usr/bin/top ] || [ -x /usr/local/top ] then echo "<<<solaris_mem>>>"

6 years, 12 months

4988 FIX LDAP: Improve error handling in case of authentication failures

by Lars Michelsen

Module: check_mk Branch: master Commit: 8f63640815b74ad55516aaa75d9d9b2bbc60579e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8f63640815b74a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jul 12 12:30:41 2017 +0200 4988 FIX LDAP: Improve error handling in case of authentication failures Change-Id: I9a73fcd6fd80d6b007bea0a060c67424c42c912c --- .werks/4988 | 11 +++++++++++ web/plugins/userdb/ldap.py | 6 ++++-- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/.werks/4988 b/.werks/4988 new file mode 100644 index 0000000..12ab097 --- /dev/null +++ b/.werks/4988 @@ -0,0 +1,11 @@ +Title: LDAP: Improve error handling in case of authentication failures +Level: 1 +Component: multisite +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i1 +Date: 1499855423 + + diff --git a/web/plugins/userdb/ldap.py b/web/plugins/userdb/ldap.py index d0776dc..65fd0a6 100644 --- a/web/plugins/userdb/ldap.py +++ b/web/plugins/userdb/ldap.py @@ -305,7 +305,7 @@ class LDAPUserConnector(UserConnector): conn = self._ldap_obj self.log('LDAP_BIND %s' % user_dn) try: - conn.simple_bind_s(user_dn, password) + conn.simple_bind_s(user_dn.encode("utf-8"), password) self.log(' SUCCESS') except ldap.LDAPError, e: self.log(' FAILED (%s: %s)' % (e.__class__.__name__, e)) @@ -468,7 +468,7 @@ class LDAPUserConnector(UserConnector): for key, val in obj.iteritems(): # Convert all keys to lower case! new_obj[key.lower().decode('utf-8')] = [ i.decode('utf-8') for i in val ] - result.append((dn.lower(), new_obj)) + result.append((dn.lower().decode('utf-8'), new_obj)) success = True except ldap.NO_SUCH_OBJECT, e: raise MKLDAPException(_('The given base object "%s" does not exist in LDAP (%s))') % (base, e)) @@ -879,6 +879,8 @@ class LDAPUserConnector(UserConnector): self.bind(user_dn, password) result = username.encode('utf-8') except: + self.log(" Exception during authentication (User: %s): %s" % + (username, traceback.format_exc())) result = False self.default_bind(self._ldap_obj)

6 years, 12 months

Reserved 20 Werk IDS

by Lars Michelsen

Module: check_mk Branch: master Commit: 50b0d26eee4becf6a75be8aebfa4e8c8b8113566 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=50b0d26eee4bec… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jul 12 12:29:26 2017 +0200 Reserved 20 Werk IDS Change-Id: I2629ae9a920dc30723fbc9bebb620536076b3132 --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index 059b3b8..dddb880 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -4988 +5008

6 years, 12 months

akcp_sensor.include: Remove exceeding levels in perfdata

by Konstantin Büttner

Module: check_mk Branch: master Commit: 388c6872289edb34af8d6be50950228d115eb004 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=388c6872289edb… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Wed Jul 12 11:49:14 2017 +0200 akcp_sensor.include: Remove exceeding levels in perfdata Change-Id: I83dd0de804ee81de387f97d9a54de73b7dd909d0 --- checks/akcp_sensor.include | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/checks/akcp_sensor.include b/checks/akcp_sensor.include index d97a65b..dc84be2 100644 --- a/checks/akcp_sensor.include +++ b/checks/akcp_sensor.include @@ -102,8 +102,7 @@ def check_akcp_humidity(item, params, info): belowtext = " (warn/crit at %.1f/%.1f%%)" % (warn_lower, crit_lower) abovetext = " (warn/crit at %.1f/%.1f%%)" % (warn, crit) - # TODO: This is not how the API works! - perfdata = [ ( "humidity", humidity, crit_lower, warn_lower, warn, crit ) ] + perfdata = [ ( "humidity", humidity, warn, crit ) ] if humidity <= crit_lower: return 2, infotext + belowtext, perfdata

6 years, 12 months

4968 FIX f5_bigip_cluster_status_v11_2: Now has its own check plugin file; This updates werk #4819

by Simon Betz

Module: check_mk Branch: master Commit: 6b3a0fc06adf8f569c8f414da11617e1fcfcbd9e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6b3a0fc06adf8f… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed Jul 12 11:40:45 2017 +0200 4968 FIX f5_bigip_cluster_status_v11_2: Now has its own check plugin file; This updates werk #4819 Change-Id: Ice318251bdeb9746bb2ba26ca8865b4b4aea5635 --- .werks/4968 | 21 ++++++ ..._status.v11_2 => f5_bigip_cluster_status_v11_2} | 0 checks/f5_bigip.include | 84 ++++++++++++++++++++++ checks/f5_bigip_cluster_status | 72 +------------------ checks/f5_bigip_cluster_status_v11_2 | 43 +++++++++++ 5 files changed, 150 insertions(+), 70 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=6b3a0fc06a…

6 years, 12 months

Reserved 20 Werk IDS

by Simon Betz

Module: check_mk Branch: master Commit: fe50648d7b0f0f8443e464a2140f8cf0b3ef163b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fe50648d7b0f0f… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed Jul 12 10:28:22 2017 +0200 Reserved 20 Werk IDS Change-Id: I6b48e99113cab8f3fe29594c86f36cce1609474d --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index 8cbe33f..059b3b8 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -4968 +4988

6 years, 12 months

← Newer
1
...
16
17
18
19
20
21
22
...
29
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits July 2017