[checkmk-commits] Introducing a common library for special agents

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 &lt;lm(a)mathias-kettner.de&gt; 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 &&