Checkmk git commits November 2018

checkmk-commits@lists.checkmk.com

15 participants
465 discussions

by Alex Zurhake

Module: check_mk Branch: master Commit: 610dbc7d8f932e227a42fa217ef77d892ff41415 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=610dbc7d8f932e… Author: Alex Zurhake <az(a)mathias-kettner.de> Date: Tue Nov 20 15:33:22 2018 +0100 fix skel and install dependencies Change-Id: I81717763cb6e0364f40d95620ebb7583b6f8ad42 --- omd/Makefile | 29 +++++++++++++++++++---------- 1 file changed, 19 insertions(+), 10 deletions(-) diff --git a/omd/Makefile b/omd/Makefile index f6eb28e..d487f69 100644 --- a/omd/Makefile +++ b/omd/Makefile @@ -70,6 +70,9 @@ SKEL := $(DESTDIR)$(OMD_ROOT)/skel # filenames and sed arguments should not contain '/' NEW_VERSION_STRING := $(subst /,-,$(NEW_VERSION)) +PRE_INSTALL := $(BUILD_HELPER_DIR)/pre-install +PRE_SKEL := $(BUILD_HELPER_DIR)/pre-skel + .PHONY: install-global check-edition: @@ -88,16 +91,19 @@ ifeq ($(EDITION),managed) $(MAKE) -C $(PACKAGE_DIR)/check_mk_managed endif -pack: check-edition skel +pack: check-edition #TODO: Define dependecies here correctly... -pre-install: +$(PRE_INSTALL): rm -rf $(DESTDIR) mkdir -p $(DESTDIR)$(OMD_PHYSICAL_BASE) A="$(OMD_PHYSICAL_BASE)" ; ln -s $${A:1} $(DESTDIR)/omd + touch $@ + +$(addsuffix -install,$(PACKAGES)): $(PRE_INSTALL) -install: $(addsuffix -install,$(PACKAGES)) -# TODO: Add hook install target where needed +install: $(addsuffix -install,$(PACKAGES)) + # TODO: Add hook install target where needed @set -e ; cd packages ; for p in $(PACKAGES) ; do \ if [ -d $$p ]; then \ for hook in $$(cd $$p ; ls *.hook 2>/dev/null) ; do \ @@ -111,7 +117,7 @@ install: $(addsuffix -install,$(PACKAGES)) chmod -R o+Xr $(DESTDIR)$(OMD_ROOT) -pre-skel: install-global +$(PRE_SKEL): # Install skeleton files (subdirs skel/ in packages' directories) mkdir -p $(DESTDIR)$(OMD_ROOT)/skel @set -e ; cd packages ; for p in $(PACKAGES) ; do \ @@ -119,8 +125,11 @@ pre-skel: install-global tar cf - -C $$p/skel --exclude="*~" --exclude=".gitignore" . | tar xvf - -C $(DESTDIR)$(OMD_ROOT)/skel ; \ fi ;\ done + touch $@ + +$(addsuffix -skel,$(PACKAGES)): $(PRE_SKEL) -skel: pre-skel $(addsuffix -skel,$(PACKAGES)) +skel: $(addsuffix -skel,$(PACKAGES)) # Create permissions file for skel mkdir -p $(DESTDIR)$(OMD_ROOT)/share/omd @set -e ; cd packages ; for p in $(PACKAGES) ; do \ @@ -319,7 +328,7 @@ cma-pre: check-edition cma-install: make -C packages/cma install -cma: cma-pre $(PACKAGES) cma-install pack +cma: cma-pre $(PACKAGES) cma-install pack # Create info file to mark minimal cma firmware version requirement @if [ "$(DISTRO_CODE)" = "stretch" ]; then \ @@ -328,14 +337,14 @@ cma: cma-pre $(PACKAGES) cma-install pack MIN_VERSION=1.1.2 ; \ fi ; \ echo -e "MIN_VERSION=$${MIN_VERSION}\n" > $(DESTDIR)/opt/omd/versions/$(OMD_VERSION)/cma.info - + # Mark demo builds in cma.info file @if [ -f packages/nagios/patches/9999-demo-version.dif ]; then \ echo -e "DEMO=1\n" >> $(DESTDIR)/opt/omd/versions/$(OMD_VERSION)/cma.info ; \ fi - + rm check-mk-$(EDITION)-bin-$(OMD_VERSION).tar.gz - + if [ "$(DISTRO_CODE)" = "stretch" ]; then \ CMA_PKG_VERSION_TXT="-2" ; \ else \

5 years, 10 months

Consolidated log level valuespecs to dedicated type

by Lars Michelsen

Module: check_mk Branch: master Commit: 1d16d04d6a4956dee46afab2dfe13b6bc633c311 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1d16d04d6a4956… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Nov 19 20:32:18 2018 +0100 Consolidated log level valuespecs to dedicated type Change-Id: I01447901d11695b00ecbf94dc8008b792f41c2ce --- cmk/gui/plugins/wato/check_mk_configuration.py | 10 ++-------- cmk/gui/valuespec.py | 17 +++++++++++++++++ cmk/gui/wato/mkeventd.py | 19 +++++-------------- 3 files changed, 24 insertions(+), 22 deletions(-) diff --git a/cmk/gui/plugins/wato/check_mk_configuration.py b/cmk/gui/plugins/wato/check_mk_configuration.py index f05dfc4..f8fc72e 100644 --- a/cmk/gui/plugins/wato/check_mk_configuration.py +++ b/cmk/gui/plugins/wato/check_mk_configuration.py @@ -64,6 +64,7 @@ from cmk.gui.valuespec import ( Checkbox, ID, ListOfCAs, + LogLevelChoice, ) from cmk.gui.plugins.wato import ( @@ -114,16 +115,9 @@ def web_log_level_elements(): "details for each executed compilation.")), ]: elements.append((level_id, - DropdownChoice( + LogLevelChoice( title=title, help=help_text, - choices=[ - (logging.CRITICAL, _("Critical")), - (logging.ERROR, _("Error")), - (logging.WARNING, _("Warning")), - (logging.INFO, _("Informational")), - (logging.DEBUG, _("Debug")), - ], default_value=logging.WARNING, ))) diff --git a/cmk/gui/valuespec.py b/cmk/gui/valuespec.py index bdee4a4..2f1bd29 100644 --- a/cmk/gui/valuespec.py +++ b/cmk/gui/valuespec.py @@ -60,6 +60,7 @@ from UserDict import DictMixin from enum import Enum import json +import cmk.log import cmk.paths import cmk.defines as defines @@ -4681,3 +4682,19 @@ class SiteChoice(DropdownChoice): def _site_choices(self): import cmk.gui.config as config # FIXME return config.site_attribute_choices() + + +class LogLevelChoice(DropdownChoice): + def __init__(self, **kwargs): + kwargs.setdefault("default_value", cmk.log.INFO) + kwargs.update({ + "choices": [ + (cmk.log.CRITICAL, _("Critical")), + (cmk.log.ERROR, _("Error")), + (cmk.log.WARNING, _("Warning")), + (cmk.log.INFO, _("Informational")), + (cmk.log.VERBOSE, _("Verbose")), + (cmk.log.DEBUG, _("Debug")), + ], + }) + super(LogLevelChoice, self).__init__(**kwargs) diff --git a/cmk/gui/wato/mkeventd.py b/cmk/gui/wato/mkeventd.py index 787982d..05b334d 100644 --- a/cmk/gui/wato/mkeventd.py +++ b/cmk/gui/wato/mkeventd.py @@ -81,6 +81,7 @@ from cmk.gui.valuespec import ( IPv4Network, Foldable, DualListChoice, + LogLevelChoice, ) from cmk.gui.i18n import _ from cmk.gui.globals import html @@ -3255,20 +3256,10 @@ if mkeventd_enabled: _("Log level for the SNMP trap processing mechanics. Setting this to debug will enable " "detailed log entries for each received SNMP trap.")), ]: - elements.append((component, - DropdownChoice( - title=title, - help=help_txt, - choices=[ - (cmk.log.CRITICAL, _("Critical")), - (cmk.log.ERROR, _("Error")), - (cmk.log.WARNING, _("Warning")), - (cmk.log.INFO, _("Informational")), - (cmk.log.VERBOSE, _("Verbose")), - (cmk.log.DEBUG, _("Debug")), - ], - default_value=cmk.log.INFO, - ))) + elements.append((component, LogLevelChoice( + title=title, + help=help_txt, + ))) return elements register_configvar(

5 years, 10 months

Revert usage of discovery api for kernel.util

by Óscar Nájera

Module: check_mk Branch: master Commit: 7d80fa7c733adb38f3c51c8d15ee60b75ac7ce0d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7d80fa7c733adb… Author: Óscar Nájera <on(a)mathias-kettner.de> Date: Mon Nov 19 13:20:19 2018 +0100 Revert usage of discovery api for kernel.util This check does not expect an item, but the discovery api forces items names to entries. Change-Id: I7cb27bf0d1b942f05c5adddc569e382f7f5a060f --- checks/kernel | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/checks/kernel b/checks/kernel index 0bc3687..233fc5a 100644 --- a/checks/kernel +++ b/checks/kernel @@ -108,9 +108,10 @@ check_info["kernel"] = { # '----------------------------------------------------------------------' -@discover -def inventory_cpu_utilization(line): - return len(line) > 0 and line[0] == 'cpu' +def inventory_cpu_utilization(info): + for x in info: + if len(x) > 0 and x[0] == 'cpu': + return [(None, {})] def transform_cpu_info(element):

5 years, 10 months

fix make skel for mk-livestatus

by Alex Zurhake

Module: check_mk Branch: master Commit: 4674cd642daf25e98b856b05b0aed8e146b8c9ca URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4674cd642daf25… Author: Alex Zurhake <az(a)mathias-kettner.de> Date: Tue Nov 20 13:14:53 2018 +0100 fix make skel for mk-livestatus Change-Id: Ic6e0a7e95e60ae3af3491f3f9adbabbc8f42610d --- omd/packages/mk-livestatus/mk-livestatus.make | 3 --- 1 file changed, 3 deletions(-) diff --git a/omd/packages/mk-livestatus/mk-livestatus.make b/omd/packages/mk-livestatus/mk-livestatus.make index 22cc67f..4d5541e 100644 --- a/omd/packages/mk-livestatus/mk-livestatus.make +++ b/omd/packages/mk-livestatus/mk-livestatus.make @@ -6,7 +6,6 @@ BOOST_OPT := --with-boost=$(PACKAGE_BOOST_DESTDIR) # Attention: copy-n-paste from check_mk/Makefile below... MK_LIVESTATUS_BUILD := $(BUILD_HELPER_DIR)/$(MK_LIVESTATUS)-build MK_LIVESTATUS_INSTALL := $(BUILD_HELPER_DIR)/$(MK_LIVESTATUS)-install -MK_LIVESTATUS_SKEL := $(BUILD_HELPER_DIR)/$(MK_LIVESTATUS)-skel .PHONY: $(MK_LIVESTATUS) $(MK_LIVESTATUS)-install $(MK_LIVESTATUS)-skel $(MK_LIVESTATUS)-clean @@ -14,8 +13,6 @@ $(MK_LIVESTATUS): $(MK_LIVESTATUS_BUILD) $(MK_LIVESTATUS)-install: $(MK_LIVESTATUS_INSTALL) -$(MK_LIVESTATUS)-skel: $(MK_LIVESTATUS_SKEL) - $(REPO_PATH)/$(MK_LIVESTATUS_DIR).tar.gz: $(MAKE) -C $(REPO_PATH) $(MK_LIVESTATUS_DIR).tar.gz

5 years, 10 months

fix make skel for check_mk

by Alex Zurhake

Module: check_mk Branch: master Commit: fed61aff2fb3bf160b36231b68695aed553ad687 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fed61aff2fb3bf… Author: Alex Zurhake <az(a)mathias-kettner.de> Date: Tue Nov 20 10:58:29 2018 +0100 fix make skel for check_mk Change-Id: Id90f696e1dd93b7870cec89c1ebf3acf03b9bc02 --- omd/packages/check_mk/check_mk.make | 3 --- 1 file changed, 3 deletions(-) diff --git a/omd/packages/check_mk/check_mk.make b/omd/packages/check_mk/check_mk.make index db66fae..d527e88 100644 --- a/omd/packages/check_mk/check_mk.make +++ b/omd/packages/check_mk/check_mk.make @@ -4,7 +4,6 @@ DISTNAME := $(CHECK_MK)-$(CMK_VERSION) CHECK_MK_BUILD := $(BUILD_HELPER_DIR)/$(DISTNAME)-build CHECK_MK_INSTALL := $(BUILD_HELPER_DIR)/$(DISTNAME)-install CHECK_MK_PATCHING := $(BUILD_HELPER_DIR)/$(DISTNAME)-patching -CHECK_MK_SKEL := $(BUILD_HELPER_DIR)/$(DISTNAME)-skel .PHONY: $(CHECK_MK) $(CHECK_MK)-install $(CHECK_MK)-skel $(CHECK_MK)-clean @@ -12,8 +11,6 @@ $(CHECK_MK): $(CHECK_MK_BUILD) $(CHECK_MK)-install: $(CHECK_MK_INSTALL) -$(CHECK_MK)-skel: $(CHECK_MK_SKEL) - # This step creates a tar archive containing the sources # which are need for the build step $(REPO_PATH)/$(DISTNAME).tar.gz:

5 years, 10 months

Fixed format

by Lars Michelsen

Module: check_mk Branch: master Commit: 4398fb885e19cb43c3ec4090386e8c6ae85b1303 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4398fb885e19cb… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Nov 20 10:10:51 2018 +0100 Fixed format Change-Id: If138c4bf311a660de38c0e6de873ef3f38118a92 --- omd/packages/omd/omdlib/main.py | 255 ++++++++++++++++++++-------------------- 1 file changed, 129 insertions(+), 126 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=4398fb885e…

5 years, 10 months

agent_azure: change parallelizing mechanism

by Moritz Kiemer

Module: check_mk Branch: master Commit: f24a61e41d7a0fc58cb451af545cbb5e9072f6a9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f24a61e41d7a0f… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Fri Nov 16 09:12:52 2018 +0100 agent_azure: change parallelizing mechanism Change-Id: I969d3c155d451147e06a7919c27a1a128ae62df2 --- agents/special/agent_azure | 150 +++++++++++++++++++++++++++------------------ 1 file changed, 91 insertions(+), 59 deletions(-) diff --git a/agents/special/agent_azure b/agents/special/agent_azure index 59fcae7..b0ea323 100755 --- a/agents/special/agent_azure +++ b/agents/special/agent_azure @@ -42,15 +42,16 @@ import sys import re import argparse import logging -import atexit -from multiprocessing import Process, Lock +from multiprocessing import Process, Lock, Queue +from Queue import Empty as QueueEmpty # We have to set a null handler for logging before importing the azure stuff. # Otherwise a warning will be sent to stderr - and if for some other reason # the agent returns a non-zero exit code this (irrelevant) warning would be # all the user sees. logging.getLogger().addHandler(logging.NullHandler()) +# pylint: disable=wrong-import-position from azure.mgmt.monitor import MonitorManagementClient from azure.mgmt.resource import ResourceManagementClient from azure.common.credentials import ServicePrincipalCredentials @@ -63,6 +64,69 @@ cmk.password_store.replace_passwords() LOG = logging.getLogger(__name__) +class AsyncMapper(object): # pylint: disable=too-few-public-methods + '''Create an async drop-in replacement for builtin 'map' + + which does not require the involved values to be pickle-able, + nor third party modules such as 'multiprocess' or 'dill'. + + Usage: + map_ = AsyncMapper() + + for results in map_(function, arguments_iter): + do_stuff() + + Note that the order of the results does not correspond + to that of the arguments. + + Keywords for initialization: + + * timeout: number of seconds we will wait for the next result + before terminating all remaining jobs (default: None) + * debug: raise exceptions in jobs (default: False) + * fallback: specify a function, called in case an exception occurs in + the mapped function. The fallback function should return + a tuple (err, value). If err is falsey, value will we be + yielded (default: (1, None)). + ''' + + def __init__(self, timeout=None, debug=False, fallback=lambda x: (1, None)): + super(AsyncMapper, self).__init__() + self.timeout = timeout + self.debug = debug + self.fallback = fallback + + def __call__(self, function, args_iter): + queue = Queue() + jobs = {} + + def produce(id_, args): + try: + queue.put((id_, 0, function(args))) + except Exception as _e: # pylint: disable=broad-except + queue.put((id_,) + self.fallback(args)) + if self.debug: + raise + + # start + for id_, args in enumerate(args_iter): + jobs[id_] = Process(target=produce, args=(id_, args)) + jobs[id_].start() + + # consume + while jobs: + try: + id_, err, result = queue.get(block=True, timeout=self.timeout) + except QueueEmpty: + break + if not err: + yield result + jobs.pop(id_) + + for job in jobs.values(): + job.terminate() + + def parse_arguments(argv): parser = argparse.ArgumentParser(description=__doc__) parser.add_argument( @@ -437,7 +501,7 @@ class AzureClient(object): try: # azure-api-call md_list = list(self._monitor_client.metric_definitions.list(rid)) - except ErrorResponseException, exc: + except ErrorResponseException as exc: if "is not a supported platform metric namespace" in exc.message: md_list = [] else: @@ -549,50 +613,8 @@ class AzureClient(object): return metrics -class Threads(object): - def __init__(self, args): - super(Threads, self).__init__() - self.timeout = args.pjoin_timeout - self.sequential = args.sequential - self.debug = args.debug - self.jobs = [] - if not self.sequential: - atexit.register(self.terminate) - - def run(self, resources, client, config): - if self.sequential: - self._run_sequential(resources, client, config) - else: - self._run_parallel(resources, client, config) - - def _run_sequential(self, resources, client, config): - for resource in resources: - process_resource(resource, client, config) - - def _run_parallel(self, resources, client, config): - # start - for resource in resources: - job = Process(target=process_resource, args=(resource, client, config)) - job.start() - self.jobs.append(job) - # join: - for job in self.jobs: - LOG.info("joining: %s", job) - job.join(timeout=self.timeout) - if job.is_alive(): - LOG.info("still alive after %ss: %s", self.timeout, job) - self.timeout = 0.01 - else: - self.jobs.remove(job) - - def terminate(self): - for job in self.jobs: - if job.is_alive(): - LOG.warning("terminating %s", job) - job.terminate() - - -def process_resource(resource, client, config): +def process_resource(args): + resource, client, config = args r_config = config.get_resource_config(resource) @@ -602,18 +624,26 @@ def process_resource(resource, client, config): for metric in client.get_metrics(resource, r_config, err): resource.metrics.append(metric) - section = Section('agent_info') - section.add(('remaining-reads', client.remaining_reads)) - section.write() + sections = [Section('agent_info')] + sections[0].add(('remaining-reads', client.remaining_reads)) for piggytarget in resource.piggytargets: section = Section(resource.section, piggytarget) section.add(resource.dumpinfo()) - section.write() + sections.append(section) if err: err_section = Section('agent_info', piggytarget) err_section.add(err.dumpinfo()) - err_section.write() + sections.append(err_section) + + return sections + + +def write_groups(resources): + groups = sorted(set(r.info['group'] for r in resources)) + section = Section('agent_info') + section.add(('monitored-groups', json.dumps(groups))) + section.write() def main(argv=None): @@ -630,15 +660,17 @@ def main(argv=None): try: client = AzureClient(args) resources = [r for r in client.discover_resources() if config.is_configured(r)] - groups = sorted(set(r.info['group'] for r in resources)) + client.init_specific(resources) - section = Section('agent_info') - section.add(('monitored-groups', json.dumps(groups))) - section.write() + write_groups(resources) - client.init_specific(resources) - Threads(args).run(resources, client, config) - except () if args.debug else Exception, exc: + args = ((resource, client, config) for resource in resources) + map_ = map if args.sequential else AsyncMapper(args.timeout, args.debug) + for sections in map_(process_resource, args): + for section in sections: + section.write() + + except () if args.debug else Exception as exc: sys.stderr.write(_add_hint(str(exc))) return 1 return 0

5 years, 10 months

Reserved 20 Werk IDS

by Lars Michelsen

Module: check_mk Branch: master Commit: 283a71979bb99dfc2e557d4f949750e26b394df9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=283a71979bb99d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Nov 20 08:59:10 2018 +0100 Reserved 20 Werk IDS Change-Id: Id493d675b6a93a3649b59efc9db031bc308cd992 --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index 8d2e9df..a05231e 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -6911 +6931

5 years, 10 months

fix unexpected end of file

by Alex Zurhake

Module: check_mk Branch: master Commit: 4250cd0c2d8238433cdbab582e1ca8fbe2d87b32 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4250cd0c2d8238… Author: Alex Zurhake <az(a)mathias-kettner.de> Date: Tue Nov 20 08:19:00 2018 +0100 fix unexpected end of file Change-Id: Ib40874beed75d45b16edfcc5d747dad4b47c9a4f --- omd/packages/apache-omd/apache-omd.make | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/omd/packages/apache-omd/apache-omd.make b/omd/packages/apache-omd/apache-omd.make index 20ce5e6..6297c29 100644 --- a/omd/packages/apache-omd/apache-omd.make +++ b/omd/packages/apache-omd/apache-omd.make @@ -87,7 +87,7 @@ $(APACHE_INSTALL): $(APACHE_SKEL): $(APACHE_INSTALL) # This file is loaded by php-wrapper on RedHat/CentOS < 7 if [ $(CENTOS_WORKAROUND) -eq 1 ]; then \ - $(MKDIR) $(SKEL)/etc/apache/ + $(MKDIR) $(SKEL)/etc/apache/; \ cp /etc/php.ini $(SKEL)/etc/apache/php.ini; \ echo -e "\n\n; OMD OMD OMD OMD OMD OMD\n\nmemory_limit=64M\n\n[Session]\nsession.save_path=###ROOT###/tmp/php/session\nupload_tmp_dir=###ROOT###/tmp/php/upload\nsoap.wsdl_cache_dir=###ROOT###/tmp/php/wsdl-cache\n" >> $(SKEL)/etc/apache/php.ini; \ fi

5 years, 10 months

add missing skel: to all <packages>.make

by Alex Zurhake

Module: check_mk Branch: master Commit: 8b4135bb45515cdda97136bf673123da53e342b5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8b4135bb45515c… Author: Alex Zurhake <az(a)mathias-kettner.de> Date: Tue Nov 20 07:09:58 2018 +0100 add missing skel: to all <packages>.make Change-Id: I3fd4d0a0e422fce3deb822da7036e6ee644607f5 --- omd/packages/Python/Python.make | 9 +++------ omd/packages/icinga/icinga.make | 2 ++ omd/packages/nagios/nagios.make | 2 ++ omd/packages/nagvis/nagvis.make | 2 ++ omd/packages/pnp4nagios/pnp4nagios.make | 2 ++ omd/packages/re2/re2.make | 4 +++- 6 files changed, 14 insertions(+), 7 deletions(-) diff --git a/omd/packages/Python/Python.make b/omd/packages/Python/Python.make index 0797bcf..9a1d177 100644 --- a/omd/packages/Python/Python.make +++ b/omd/packages/Python/Python.make @@ -11,12 +11,7 @@ PYTHON_INSTALL = $(BUILD_HELPER_DIR)/$(PYTHON_DIR)-install PYTHON_PATCHING = $(BUILD_HELPER_DIR)/$(PYTHON_DIR)-patching -.PHONY: python python-install python-clean upstream - -python-debug: - echo $(PYTHON_BUILD) - echo $(PYTHON) - echo $(PYTHON_VERS) +.PHONY: python python-install python-skel python-clean upstream python: $(PYTHON_BUILD) @@ -116,6 +111,8 @@ bin/g++: install -m 644 $(PACKAGE_DIR)/$(PYTHON)/sitecustomize.py $(PACKAGE_DIR)/$(PYTHON)/sitecustomize.pyc $(DESTDIR)$(OMD_ROOT)/lib/python2.7/ $(TOUCH) $(PYTHON_INSTALL) +pyhton-skel: + python-clean: $(RM) -r $(DIR) $(BUILD_HELPER_DIR)/$(MSITOOLS)* bin build $(PACKAGE_PYTHON_DESTDIR) diff --git a/omd/packages/icinga/icinga.make b/omd/packages/icinga/icinga.make index 5b17c85..6a94945 100644 --- a/omd/packages/icinga/icinga.make +++ b/omd/packages/icinga/icinga.make @@ -64,5 +64,7 @@ $(ICINGA_INSTALL): $(ICINGA_BUILD) $(RM) -r $(DESTDIR)/usr $(TOUCH) $@ +icinga-skel: + icinga-clean: $(RM) -r $(ICINGA_DIR) diff --git a/omd/packages/nagios/nagios.make b/omd/packages/nagios/nagios.make index 0a6222d..e83a3a6 100644 --- a/omd/packages/nagios/nagios.make +++ b/omd/packages/nagios/nagios.make @@ -74,6 +74,8 @@ $(NAGIOS_INSTALL): install -m 644 $(PACKAGE_DIR)/$(NAGIOS)/diskspace $(DESTDIR)$(OMD_ROOT)/share/diskspace/nagios $(TOUCH) $@ +$(NAGIOS)-skel: + $(NAGIOS)-clean: rm -rf $(NAGIOS_DIR) $(BUILD_HELPER_DIR)/$(NAGIOS)* diff --git a/omd/packages/nagvis/nagvis.make b/omd/packages/nagvis/nagvis.make index 1ddedb9..8854dfa 100644 --- a/omd/packages/nagvis/nagvis.make +++ b/omd/packages/nagvis/nagvis.make @@ -53,5 +53,7 @@ $(NAGVIS_INSTALL): $(NAGVIS_BUILD) $(RM) -rf $(DESTDIR)$(OMD_ROOT)/share/nagvis/etc $(TOUCH) $@ +$(NAGVIS)-skel: + $(NAGVIS)-clean: $(RM) -r $(NAGVIS)-*.*.[0-9] $(NAGVIS)-*.*-nightly $(BUILD_HELPER_DIR)/$(NAGVIS)* diff --git a/omd/packages/pnp4nagios/pnp4nagios.make b/omd/packages/pnp4nagios/pnp4nagios.make index 6648054..2cb40c4 100644 --- a/omd/packages/pnp4nagios/pnp4nagios.make +++ b/omd/packages/pnp4nagios/pnp4nagios.make @@ -70,5 +70,7 @@ $(PNP4NAGIOS_INSTALL): $(PNP4NAGIOS_BUILD) install -m 644 $(PACKAGE_DIR)/$(PNP4NAGIOS)/ui-facelift/images/* $(DESTDIR)$(OMD_ROOT)/share/pnp4nagios/htdocs/media/css/ui-facelift/images $(TOUCH) $@ +$(PNP4NAGIOS)-skel: + $(PNP4NAGIOS)-clean: rm -rf $(PNP4NAGIOS_DIR) $(BUILD_HELPER_DIR)/$(PNP4NAGIOS_DIR)* diff --git a/omd/packages/re2/re2.make b/omd/packages/re2/re2.make index 460e210..077683a 100644 --- a/omd/packages/re2/re2.make +++ b/omd/packages/re2/re2.make @@ -8,7 +8,7 @@ RE2_DIR := $(RE2)-$(RE2_VERS) RE2_BUILD := $(BUILD_HELPER_DIR)/$(RE2_DIR)-build RE2_UNPACK := $(BUILD_HELPER_DIR)/$(RE2_DIR)-unpack -.PHONY: $(RE2) $(RE2)-install $(RE2)-clean +.PHONY: $(RE2) $(RE2)-install $(RE2)-skel $(RE2)-clean $(RE2): $(RE2_BUILD) @@ -40,5 +40,7 @@ $(RE2_BUILD): $(RE2_UNPACK) $(RM) $(PACKAGE_RE2_DESTDIR)/lib/*.so* $(TOUCH) $@ +$(RE2)-skel: + $(RE2)-clean: $(RM) -r $(RE2_DIR) $(PACKAGE_RE2_DESTDIR) $(BUILD_HELPER_DIR)/$(RE2)*

5 years, 10 months

← Newer
1
...
12
13
14
15
16
17
18
...
47
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits November 2018