Checkmk git commits February 2017

checkmk-commits@lists.checkmk.com

10 participants
452 discussions

by Lars Michelsen

Module: check_mk Branch: master Commit: 7916281b3c35440a2397737eecc64f72ed4a1757 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7916281b3c3544… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Feb 22 11:16:34 2017 +0100 Fixed path of enterprise werks Change-Id: I05e86d9bc6deb7e9c8106dfaf40b5bcec45eee74 --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index e09a526..86b2870 100644 --- a/Makefile +++ b/Makefile @@ -237,7 +237,7 @@ enterprise/ChangeLog: enterprise/werks dist: cmc-$(VERSION).tar.gz # We currently fake a package for cmc. Ugly... -cmc-$(VERSION).tar.gz: config.h enterprise/.werks/werks enterprise/ChangeLog +cmc-$(VERSION).tar.gz: config.h enterprise/werks enterprise/ChangeLog $(MAKE) -C livestatus distclean $(MAKE) -C enterprise/core distclean rm -rf cmc-$(VERSION) @@ -262,7 +262,7 @@ cmc-$(VERSION).tar.gz: config.h enterprise/.werks/werks enterprise/ChangeLog m4 | tar xf - -C cmc-$(VERSION) mv cmc-$(VERSION)/enterprise/skel{,.permissions} cmc-$(VERSION) mv cmc-$(VERSION)/enterprise/LIVEPROXYD.hook cmc-$(VERSION) - cp enterprise/.werks/werks cmc-$(VERSION)/werks + cp enterprise/werks cmc-$(VERSION)/werks cp enterprise/ChangeLog cmc-$(VERSION)/ChangeLog-cmc sed -i '1 i\include ../../Makefile.omd' cmc-$(VERSION)/Makefile cd cmc-$(VERSION) \

7 years, 8 months

4409 FIX uptime: fixed missing info handling

by Simon Betz

Module: check_mk Branch: master Commit: 5b79f08ad1e2078c7fd8a995331b38adf8b03ce0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5b79f08ad1e207… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed Feb 22 11:02:25 2017 +0100 4409 FIX uptime: fixed missing info handling Change-Id: I956e4ea9e38f777f2ab9e6a7345e6fa1fc24e990 --- .werks/4409 | 11 +++++++++++ ChangeLog | 1 + checks/uptime | 7 +++++-- 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/.werks/4409 b/.werks/4409 new file mode 100644 index 0000000..3254cc5 --- /dev/null +++ b/.werks/4409 @@ -0,0 +1,11 @@ +Title: uptime: fixed missing info handling +Level: 1 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i1 +Date: 1487757735 + + diff --git a/ChangeLog b/ChangeLog index 2e7f321..71f024e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -9,6 +9,7 @@ * 4406 FIX: Fixed some invalid keyword arguments in check_info declarations... * 4408 FIX: checkpoint_temp, checkpoint_fan, checkpoint_voltage: fixed status and value handling * 4349 FIX: cisco_qos: Fix crashing check for some cases where the QoS class cannot be found... + * 4409 FIX: uptime: fixed missing info handling Multisite: * 4365 FIX: Service availability: Host down could not be rewritten to other states like CRIT diff --git a/checks/uptime b/checks/uptime index 921ee40..7769196 100644 --- a/checks/uptime +++ b/checks/uptime @@ -29,13 +29,16 @@ # <<<uptime>>> # 15876.96 187476.72 + def inventory_uptime(info): if info: return [ (None, {}) ] + def check_uptime(_no_item, params, info): - uptime_sec = float(info[0][0]) - return check_uptime_seconds(params, uptime_sec) + if info: + uptime_sec = float(info[0][0]) + return check_uptime_seconds(params, uptime_sec) check_info["uptime"] = {

7 years, 8 months

Moved enterprise edition related werks to top level

by Lars Michelsen

7 years, 8 months

4349 FIX cisco_qos: Fix crashing check for some cases where the QoS class cannot be found

by Konstantin Büttner

Module: check_mk Branch: master Commit: 8684afb55ba7f52fb3b7df174ebf07e184f7a9b3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8684afb55ba7f5… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Wed Feb 22 11:00:54 2017 +0100 4349 FIX cisco_qos: Fix crashing check for some cases where the QoS class cannot be found The check will still return Unknown, but no longer crash. Change-Id: I08562f9f0076458e6e87765e83e9b62dcdc81650 --- .werks/4349 | 10 ++++++++++ ChangeLog | 1 + checks/cisco_qos | 2 +- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/4349 b/.werks/4349 new file mode 100644 index 0000000..28065d4 --- /dev/null +++ b/.werks/4349 @@ -0,0 +1,10 @@ +Title: cisco_qos: Fix crashing check for some cases where the QoS class cannot be found +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.5.0i1 +Date: 1487757577 + +The check will still return Unknown, but no longer crash. diff --git a/ChangeLog b/ChangeLog index 263d440..2e7f321 100644 --- a/ChangeLog +++ b/ChangeLog @@ -8,6 +8,7 @@ * 4375 FIX: check_sql: Fixed reporting configuration issues to monitoring core... * 4406 FIX: Fixed some invalid keyword arguments in check_info declarations... * 4408 FIX: checkpoint_temp, checkpoint_fan, checkpoint_voltage: fixed status and value handling + * 4349 FIX: cisco_qos: Fix crashing check for some cases where the QoS class cannot be found... Multisite: * 4365 FIX: Service availability: Host down could not be rewritten to other states like CRIT diff --git a/checks/cisco_qos b/checks/cisco_qos index 9119cc7..82a20ba 100644 --- a/checks/cisco_qos +++ b/checks/cisco_qos @@ -185,7 +185,7 @@ def check_cisco_qos(item, params, info): # Gather the interface id by class_name if_id = None for iid, iid2 in ifs.iteritems(): - if if_name == if_names[iid2]: + if if_name == if_names.get(iid2): if_id = iid2 break

7 years, 8 months

Fixed building of enterprise changelog

by Lars Michelsen

Module: check_mk Branch: master Commit: 979d251b34cd30ced3c4f7f45a12bccd06236cf7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=979d251b34cd30… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Feb 22 11:06:17 2017 +0100 Fixed building of enterprise changelog Change-Id: Ia92d48476f13f48115cea7111d126fbdb6643f22 --- ChangeLog | 8832 ------------------------------------------------------------- Makefile | 9 +- 2 files changed, 4 insertions(+), 8837 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=979d251b34…

7 years, 8 months

Fixed type-O in htmllib.

by Roland Halbig

Module: check_mk Branch: master Commit: 27eaa0bc175e2f43675e5d1b0b17b02a9e7d813b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=27eaa0bc175e2f… Author: Roland Halbig <rh(a)mathias-kettner.de> Date: Wed Feb 22 11:03:15 2017 +0100 Fixed type-O in htmllib. Change-Id: I5236105545143ecdd64a8bb31f3f0efdc05e82cc --- web/htdocs/htmllib.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index d5374be..82c7417 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -1356,7 +1356,7 @@ class RequestHandler(object): else: # crash report please - raise TypeError(_("Only str and unicode values are allowed, got got %s") % type(value)) + raise TypeError(_("Only str and unicode values are allowed, got %s") % type(value)) def del_var(self, varname):

7 years, 8 months

Top level werks is now handling edition related changes

by Lars Michelsen

Module: check_mk Branch: master Commit: cc4e86d2621d7a8094efa80b5d9f095389c14e64 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cc4e86d2621d7a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Feb 21 16:50:32 2017 +0100 Top level werks is now handling edition related changes Change-Id: I9cc66c65a263c2aed2e828c7ead8c666d476d50e --- .werks/.gitignore | 1 + Makefile | 53 ++++++++++++++++++++++++++++++++++++++++----- lib/werks.py | 6 +++-- scripts/precompile-werks.py | 17 ++++++++++++++- 4 files changed, 68 insertions(+), 9 deletions(-) diff --git a/.werks/.gitignore b/.werks/.gitignore index 1bb40e7..537f371 100644 --- a/.werks/.gitignore +++ b/.werks/.gitignore @@ -1,3 +1,4 @@ werks +*-werks .my_ids .last diff --git a/Makefile b/Makefile index 2363691..e269040 100644 --- a/Makefile +++ b/Makefile @@ -28,6 +28,12 @@ else ENTERPRISE := no endif +ifneq (,$(wildcard managed)) +MANAGED := yes +else +MANAGED := no +endif + SHELL := /bin/bash VERSION := 1.5.0i1 NAME := check_mk @@ -72,7 +78,9 @@ HEAL_SPACES_IN := checkman/* modules/* checks/* notifications/* inventory/* $(wildcard enterprise/cmk_base/cee/*.py \ enterprise/modules/*.py \ enterprise/web/htdocs/*.py \ - enterprise/web/plugins/*/*/*.py) + enterprise/web/plugins/*/*/*.py) \ + $(wildcard managed/web/htdocs/*.py \ + managed/web/plugins/*/*/*.py) FILES_TO_FORMAT := $(wildcard $(addprefix agents/,*.cc *.c *.h)) \ $(wildcard $(addprefix agents/windows/,*.cc *.c *.h)) \ @@ -85,10 +93,10 @@ FILES_TO_FORMAT := $(wildcard $(addprefix agents/,*.cc *.c *.h)) \ WERKS := $(wildcard .werks/[0-9]*) ENTERPRISE_WERKS := $(wildcard enterprise/.werks/[0-9]*) -JAVASCRIPT_SOURCES := $(filter-out %_min.js,$(wildcard $(addsuffix /web/htdocs/js/*.js,. enterprise))) +JAVASCRIPT_SOURCES := $(filter-out %_min.js,$(wildcard $(addsuffix /web/htdocs/js/*.js,. enterprise managed))) JAVASCRIPT_MINI := $(patsubst %.js,%_min.js,$(JAVASCRIPT_SOURCES)) -PNG_FILES := $(wildcard $(addsuffix /*.png,web/htdocs/images web/htdocs/images/icons enterprise/web/htdocs/images enterprise/web/htdocs/images/icons)) +PNG_FILES := $(wildcard $(addsuffix /*.png,web/htdocs/images web/htdocs/images/icons enterprise/web/htdocs/images enterprise/web/htdocs/images/icons managed/web/htdocs/images managed/web/htdocs/images/icons)) .PHONY: all analyze build check check-binaries check-permissions check-spaces \ @@ -203,7 +211,7 @@ $(DISTNAME).tar.gz: mk-livestatus-$(VERSION).tar.gz .werks/werks $(JAVASCRIPT_MI @echo "==============================================================================" .werks/werks: $(WERKS) - PYTHONPATH=. python scripts/precompile-werks.py .werks .werks/werks + PYTHONPATH=. python scripts/precompile-werks.py .werks .werks/werks cre ChangeLog: .werks/werks PYTHONPATH=. python scripts/create-changelog.py ChangeLog .werks/werks @@ -222,7 +230,7 @@ mk-livestatus-$(VERSION).tar.gz: ifeq ($(ENTERPRISE),yes) enterprise/.werks/werks: $(ENTERPRISE_WERKS) - PYTHONPATH=. python scripts/precompile-werks.py enterprise/.werks enterprise/.werks/werks + PYTHONPATH=. python scripts/precompile-werks.py enterprise/.werks enterprise/.werks/werks cee enterprise/ChangeLog: enterprise/.werks/werks PYTHONPATH=. python scripts/create-changelog.py enterprise/ChangeLog enterprise/.werks/werks @@ -305,6 +313,37 @@ install: install -m 644 werks $(DESTDIR)$(OMD_ROOT)/share/check_mk/werks/werks-cmc endif +ifeq ($(MANAGED),yes) + +.werks/cme-werks: $(WERKS) + PYTHONPATH=. python scripts/precompile-werks.py .werks .werks/cme-werks cme + +managed/ChangeLog: .werks/cme-werks + PYTHONPATH=. python scripts/create-changelog.py managed/ChangeLog .werks/cme-werks + +dist: cme-$(VERSION).tar.gz + +cme-$(VERSION).tar.gz: .werks/cme-werks managed/ChangeLog + rm -rf cme-$(VERSION) + mkdir cme-$(VERSION) + tar cf - $(TAROPTS) \ + managed \ + | tar xf - -C cme-$(VERSION) + mv cme-$(VERSION)/managed/skel{,.permissions} cme-$(VERSION) + cp .werks/cme-werks cme-$(VERSION)/werks + cp managed/ChangeLog cme-$(VERSION)/ChangeLog-cme + sed -i '1 i\include ../../Makefile.omd' cme-$(VERSION)/Makefile + rm -rf cme-$(VERSION) + +install: + mkdir -p $(DESTDIR)$(OMD_ROOT)/share/check_mk/web + cp -rv managed/web/* $(DESTDIR)$(OMD_ROOT)/share/check_mk/web + mkdir -p $(DESTDIR)$(OMD_ROOT)/share/doc/check_mk_managed + install -m 644 ChangeLog-cme $(DESTDIR)$(OMD_ROOT)/share/doc/check_mk_managed/ChangeLog + mkdir -p $(DESTDIR)$(OMD_ROOT)/share/check_mk/werks + install -m 644 werks $(DESTDIR)$(OMD_ROOT)/share/check_mk/werks/werks-cme +endif + packages: $(MAKE) -C agents packages @@ -379,9 +418,11 @@ clean: $(NAME)-*.tar.gz *~ counters autochecks \ precompiled cache web/htdocs/js/*_min.js \ .werks/werks \ + .werks/cme-werks \ enterprise/.werks/werks \ ChangeLog \ - enterprise/ChangeLog + enterprise/ChangeLog \ + managed/ChangeLog find -name "*~" | xargs rm -f mrproper: diff --git a/lib/werks.py b/lib/werks.py index 7f215cf..98dbea1 100644 --- a/lib/werks.py +++ b/lib/werks.py @@ -170,8 +170,10 @@ def _load_werk(path): werk[key.lower()] = value else: werk["body"].append(line) - if "compatible" not in werk: # missing in some legacy werks - werk["compatible"] = "compat" + + werk.setdefault("compatible", "compat") + werk.setdefault("edition", "cre") + return werk diff --git a/scripts/precompile-werks.py b/scripts/precompile-werks.py index 694461c..1aaccdd 100755 --- a/scripts/precompile-werks.py +++ b/scripts/precompile-werks.py @@ -4,7 +4,22 @@ import os import sys import cmk.werks -werk_dir, dest_file = sys.argv[1:] +werk_dir, dest_file = sys.argv[1:3] + +if len(sys.argv) > 3: + edition_short = sys.argv[3] +else: + edition_short = None + werks = cmk.werks.load_raw_files(werk_dir) + +if edition_short: + edition_werks = {} + for werk in werks.values(): + if werk["edition"] == edition_short: + edition_werks[werk["id"]] = werk + + werks = edition_werks + cmk.werks.write_precompiled_werks(dest_file, werks)

7 years, 8 months

by Lars Michelsen

Module: check_mk Branch: master Commit: 957e40b258f68d4924626fe98775ca55ca812f70 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=957e40b258f68d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Feb 21 16:06:10 2017 +0100 werk tool: Related edition is now stored in werks Change-Id: I8ddd6264ad9acbc829ea01629b3b2c016c5025dd --- .werks/config | 38 ++++++++++++++++++++++++++++---------- lib/werks.py | 8 ++++---- werk | 33 +++++++++++++++++++++------------ 3 files changed, 53 insertions(+), 26 deletions(-) diff --git a/.werks/config b/.werks/config index 057edee..b464e33 100644 --- a/.werks/config +++ b/.werks/config @@ -1,6 +1,12 @@ +editions = [ + ( "cre", "Raw Edition" ), + ( "cee", "Enterprise Edition" ), + ( "cme", "Managed Service Edition" ), +] + components = [ - ( "core", "Core & Setup" ), - ( "checks", "Checks & Agents" ), + ( "core", "Core & setup" ), + ( "checks", "Checks & agents" ), ( "multisite", "Multisite" ), ( "wato", "WATO" ), ( "notifications", "Notifications" ), @@ -8,20 +14,32 @@ components = [ ( "reporting", "Reporting & Availability" ), ( "ec", "Event Console" ), ( "livestatus", "Livestatus" ), - ( "liveproxy", "Livestatus-Proxy" ), - ( "inv", "HW/SW-Inventory" ), + ( "liveproxy", "Livestatus Proxy" ), + ( "inv", "HW/SW Inventory" ), ] +edition_components = { + "cee": [ + ( "cmc", "The Check_MK Micro Core" ), + ( "setup", "Setup, site management" ), + ( "config", "Configuration generation" ), + ( "inline-snmp", "Inline SNMP" ), + ( "agents", "Agent bakery" ), + ( "metrics", "Metrics system" ), + ( "alerts", "Alert handlers" ), + ], +} + classes = [ - ( "feature", "New Feature", "" ), - ( "fix", "Bug Fix", "FIX" ), - ( "security", "Security Fix", "SEC" ), + ( "feature", "New feature", "" ), + ( "fix", "Bug fix", "FIX" ), + ( "security", "Security fix", "SEC" ), ] levels = [ - ( '1', "Trivial Change" ), - ( '2', "Non-Trivial Change" ), - ( '3', "Major New Feature" ), + ( '1', "Trivial change" ), + ( '2', "Prominent change" ), + ( '3', "Major change" ), ] compatible = [ diff --git a/lib/werks.py b/lib/werks.py index 1d0c41a..7f215cf 100644 --- a/lib/werks.py +++ b/lib/werks.py @@ -46,9 +46,9 @@ except NameError: def werk_classes(): return { - "feature" : _("New Feature"), - "fix" : _("Bug Fix"), - "security" : _("Security Fix"), + "feature" : _("New feature"), + "fix" : _("Bug fix"), + "security" : _("Security fix"), } @@ -68,7 +68,7 @@ def werk_components(): "inv" : _("HW/SW inventory"), # CEE - "cmc" : _("The Check_MK micro core"), + "cmc" : _("The Check_MK Micro Core"), "setup" : _("Setup, site management"), "config" : _("Configuration generation"), "inline-snmp" : _("Inline SNMP"), diff --git a/werk b/werk index 495530f..627749d 100755 --- a/werk +++ b/werk @@ -114,15 +114,6 @@ def load_current_version(): bail_out("Failed to read VERSION from Makefile") -def component_sort_key(comp): - for nr, component in enumerate(components): - if comp == component[0]: - return nr - return len(components) - - - - def check_modified(): global g_modified g_modified = set([]) @@ -145,6 +136,7 @@ def load_werk(werkid): "title" : "unknown", "component" : "general", "compatible" : "compat", + "edition" : "cre", } f = file(str(werkid)) @@ -278,10 +270,11 @@ def list_werk(werk): bold = "" lines, cols = get_tty_size() title = werk["title"][:cols - 45] - sys.stdout.write("#%04d %-9s %s %-13s %-6s %s%s%s %-8s %s%s%s\n" % + sys.stdout.write("#%04d %-9s %s %3s %-13s %-6s %s%s%s %-8s %s%s%s\n" % (int(werk["id"]), time.strftime("%F", time.localtime(int(werk["date"]))), colored_class(werk["class"], 8), + werk["edition"], werk["component"], werk["compatible"], tty_bold, werk["level"], tty_normal, @@ -315,6 +308,7 @@ def main_list(args, format): hit = False for tp, values in [ + ( "edition", editions ), ( "component", components ), ( "level", levels ), ( "class", classes ), @@ -333,7 +327,7 @@ def main_list(args, format): if hit: break if not hit: - bail_out("No such component, state, class or target version: %s" % a) + bail_out("No such edition, component, state, class or target version: %s" % a) # Filter newwerks = [] @@ -473,6 +467,11 @@ def input_choice(what, choices): else: sys.stdout.write("\n") + +def get_edition_components(edition): + return components + edition_components.get(edition, []) + + def main_new(args): werk = {} werk["id"] = next_werk_id() @@ -483,7 +482,8 @@ def main_new(args): sys.stderr.write("Cancelled.\n") sys.exit(0) werk["class"] = input_choice("Class", classes) - werk["component"] = input_choice("Component", components) + werk["edition"] = input_choice("Edition", editions) + werk["component"] = input_choice("Component", get_edition_components(werk["edition"])) werk["level"] = input_choice("Level", levels) werk["compatible"] = input_choice("Compatible", compatible) werk["description"] = u"\n" @@ -761,6 +761,15 @@ def main_fetch_ids(args): # |_| |_| |_|\__,_|_|_| |_| # +# default config +editions = [] +components = [] +edition_components = {} +classes = [] +levels = [] +compatible = [] +online_url = None + versions = set([]) goto_werksdir() load_config()

7 years, 8 months

CME: Fixed packing cme dist tar

by Lars Michelsen

Module: check_mk Branch: master Commit: 28e42efba805f1013c7aaa78189a4ddff91e15aa URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=28e42efba805f1… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Feb 21 17:30:31 2017 +0100 CME: Fixed packing cme dist tar Change-Id: I3fcc6cea6d1bd1c308ee90b69a308409581b9d7d --- .gitignore | 1 + Makefile | 22 ++++++++-------------- 2 files changed, 9 insertions(+), 14 deletions(-) diff --git a/.gitignore b/.gitignore index 4f9f839..735ca95 100644 --- a/.gitignore +++ b/.gitignore @@ -23,6 +23,7 @@ check_mk-*.spec check_mk-*.tar.gz clang-analyzer/ cmc-*.tar.gz +cme-*.tar.gz compile compile_commands.json config.guess diff --git a/Makefile b/Makefile index e269040..055f50d 100644 --- a/Makefile +++ b/Makefile @@ -266,7 +266,8 @@ cmc-$(VERSION).tar.gz: config.h enterprise/.werks/werks enterprise/ChangeLog cp enterprise/.werks/werks cmc-$(VERSION)/werks cp enterprise/ChangeLog cmc-$(VERSION)/ChangeLog-cmc sed -i '1 i\include ../../Makefile.omd' cmc-$(VERSION)/Makefile - cd cmc-$(VERSION) && tar czf ../cmc-$(VERSION).tar.gz $(TAROPTS) .bugs * + cd cmc-$(VERSION) \ + && tar czf ../cmc-$(VERSION).tar.gz $(TAROPTS) .bugs * rm -rf cmc-$(VERSION) build: config.h @@ -326,22 +327,15 @@ dist: cme-$(VERSION).tar.gz cme-$(VERSION).tar.gz: .werks/cme-werks managed/ChangeLog rm -rf cme-$(VERSION) mkdir cme-$(VERSION) - tar cf - $(TAROPTS) \ - managed \ - | tar xf - -C cme-$(VERSION) - mv cme-$(VERSION)/managed/skel{,.permissions} cme-$(VERSION) + cp -pr managed cme-$(VERSION)/managed + mv cme-$(VERSION)/managed/ChangeLog cme-$(VERSION)/ChangeLog-cme + mv cme-$(VERSION)/managed/Makefile.omd cme-$(VERSION)/Makefile cp .werks/cme-werks cme-$(VERSION)/werks - cp managed/ChangeLog cme-$(VERSION)/ChangeLog-cme - sed -i '1 i\include ../../Makefile.omd' cme-$(VERSION)/Makefile + + cd cme-$(VERSION) \ + && tar czf ../cme-$(VERSION).tar.gz $(TAROPTS) * rm -rf cme-$(VERSION) -install: - mkdir -p $(DESTDIR)$(OMD_ROOT)/share/check_mk/web - cp -rv managed/web/* $(DESTDIR)$(OMD_ROOT)/share/check_mk/web - mkdir -p $(DESTDIR)$(OMD_ROOT)/share/doc/check_mk_managed - install -m 644 ChangeLog-cme $(DESTDIR)$(OMD_ROOT)/share/doc/check_mk_managed/ChangeLog - mkdir -p $(DESTDIR)$(OMD_ROOT)/share/check_mk/werks - install -m 644 werks $(DESTDIR)$(OMD_ROOT)/share/check_mk/werks/werks-cme endif packages:

7 years, 8 months

CME: Moved precompiled werks file to managed directory in dist tar

by Lars Michelsen

Module: check_mk Branch: master Commit: 6e92b3cbdf32d0929a6972604a30eccf1cd4c28f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6e92b3cbdf32d0… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Feb 21 17:36:17 2017 +0100 CME: Moved precompiled werks file to managed directory in dist tar Change-Id: Id9a4ce89c5d1b4b84d461eacce486a1f082f814f --- Makefile | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index 055f50d..56e266f 100644 --- a/Makefile +++ b/Makefile @@ -315,22 +315,20 @@ install: endif ifeq ($(MANAGED),yes) +managed/werks: $(WERKS) + PYTHONPATH=. python scripts/precompile-werks.py .werks managed/werks cme -.werks/cme-werks: $(WERKS) - PYTHONPATH=. python scripts/precompile-werks.py .werks .werks/cme-werks cme - -managed/ChangeLog: .werks/cme-werks - PYTHONPATH=. python scripts/create-changelog.py managed/ChangeLog .werks/cme-werks +managed/ChangeLog: managed/werks + PYTHONPATH=. python scripts/create-changelog.py managed/ChangeLog managed/werks dist: cme-$(VERSION).tar.gz -cme-$(VERSION).tar.gz: .werks/cme-werks managed/ChangeLog +cme-$(VERSION).tar.gz: managed/werks managed/ChangeLog rm -rf cme-$(VERSION) mkdir cme-$(VERSION) cp -pr managed cme-$(VERSION)/managed mv cme-$(VERSION)/managed/ChangeLog cme-$(VERSION)/ChangeLog-cme mv cme-$(VERSION)/managed/Makefile.omd cme-$(VERSION)/Makefile - cp .werks/cme-werks cme-$(VERSION)/werks cd cme-$(VERSION) \ && tar czf ../cme-$(VERSION).tar.gz $(TAROPTS) *

7 years, 8 months

← Newer
1
...
8
9
10
11
12
13
14
...
46
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits February 2017