Checkmk git commits February 2017

checkmk-commits@lists.checkmk.com

10 participants
452 discussions

Linux/Solaris agent: avoid potential name clash with cache files of MRPE

by Mathias Kettner

Module: check_mk Branch: master Commit: 8056df66e594b3f9383c854c4b7dfb586030d786 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8056df66e594b3… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Feb 16 11:04:51 2017 +0100 Linux/Solaris agent: avoid potential name clash with cache files of MRPE MRPE cache files are now prefixed with mrpe_. Previously you could name a mrpe check for example omd_status and would than use the same cache file as the normal section omd_status. Change-Id: I1e86fbcfd433ed8615b6b2bcb033fb8fa7f57031 --- agents/check_mk_agent.linux | 6 +++++- agents/check_mk_agent.solaris | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index dfde4ba..4d261ab 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -143,7 +143,11 @@ function run_cached () { local CMDLINE="$section$@" if [ ! -d $MK_VARDIR/cache ]; then mkdir -p $MK_VARDIR/cache ; fi - CACHEFILE="$MK_VARDIR/cache/$NAME.cache" + if [ "$mrpe" = 1 ] ; then + CACHEFILE="$MK_VARDIR/cache/mrpe_$NAME.cache" + else + CACHEFILE="$MK_VARDIR/cache/$NAME.cache" + fi # Check if the creation of the cache takes suspiciously long and kill the # process if the age (access time) of $CACHEFILE.new is twice the MAXAGE. diff --git a/agents/check_mk_agent.solaris b/agents/check_mk_agent.solaris index 77c1aa7..250d40f 100755 --- a/agents/check_mk_agent.solaris +++ b/agents/check_mk_agent.solaris @@ -84,7 +84,11 @@ function run_cached () { local CMDLINE="$section$@" if [ ! -d $MK_VARDIR/cache ]; then mkdir -p $MK_VARDIR/cache ; fi - CACHEFILE="$MK_VARDIR/cache/$NAME.cache" + if [ "$mrpe" = 1 ] ; then + CACHEFILE="$MK_VARDIR/cache/mrpe_$NAME.cache" + else + CACHEFILE="$MK_VARDIR/cache/$NAME.cache" + fi # Check if the creation of the cache takes suspiciously long and return # nothing if the age (access time) of $CACHEFILE.new is twice the MAXAGE

7 years, 7 months

4361 FIX if.include: fixed ifGroup handling if agent already sends interface groups

by Simon Betz

Module: check_mk Branch: master Commit: 86f6b067a056b0074e5f6ce687258ad52be9aae3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=86f6b067a056b0… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Feb 16 10:33:23 2017 +0100 4361 FIX if.include: fixed ifGroup handling if agent already sends interface groups Change-Id: I069a8c506d7d2541b85e26c94a0ab8cfe61a0a1b --- .werks/4361 | 10 ++++++++++ checks/if.include | 4 +++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/.werks/4361 b/.werks/4361 new file mode 100644 index 0000000..4e768ac --- /dev/null +++ b/.werks/4361 @@ -0,0 +1,10 @@ +Title: if.include: fixed ifGroup handling if agent already sends interface groups +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.5.0i1 +Date: 1487237526 + + diff --git a/checks/if.include b/checks/if.include index f742e67..1aa0351 100644 --- a/checks/if.include +++ b/checks/if.include @@ -397,7 +397,9 @@ def inventory_if_common(info, has_nodeinfo = False): if ifGroup: have_groups.setdefault(ifGroup, { "interfaces" : [], - "group_patterns" : {g_hostname : {}}, + "group_type" : "single_host", + "group_presence" : "instead", + "group_patterns" : {g_hostname : {"items" : [], "iftype" : ifType}}, }) have_groups[ifGroup]["interfaces"].append( (saveint(ifSpeed), ifOperStatus, ifType))

7 years, 7 months

werks in announcement mails: dont show the version

by Lars Michelsen

Module: check_mk Branch: master Commit: ce1bd39ce3238777390bc8c41edb0779cbc11868 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ce1bd39ce32387… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Feb 16 09:21:55 2017 +0100 werks in announcement mails: dont show the version Change-Id: I20bb31855afb598f160630fe489105e86c1ce21d --- lib/werks.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/werks.py b/lib/werks.py index b4ea681..cb2d201 100644 --- a/lib/werks.py +++ b/lib/werks.py @@ -182,7 +182,7 @@ def write_precompiled_werks(path, werks): # Writhe the given werks to a file object. This is used for creating a textual # change log for the released versions and the announcement mails -def write_as_text(werks, f): +def write_as_text(werks, f, write_version=True): version, component = None, None for werk in sort_by_version_and_component(werks.values()): if version != werk["version"]: @@ -191,7 +191,8 @@ def write_as_text(werks, f): version, component = werk["version"], None - f.write("%s:\n" % werk["version"]) + if write_version: + f.write("%s:\n" % werk["version"]) if component != werk["component"]: if component is not None:

7 years, 7 months

Updated bug entries #2420, #2324, #2425

by Lars Michelsen

Module: check_mk Branch: master Commit: 6b74f27b540916f5bbd27c67aa4e78af284b072c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6b74f27b540916… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Feb 16 09:11:44 2017 +0100 Updated bug entries #2420, #2324, #2425 Change-Id: I0451038c390c028711947014aff3e720ee58e93d --- .bugs/2324 | 10 ++++++++-- .bugs/2420 | 2 +- .bugs/2425 | 4 ++-- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/.bugs/2324 b/.bugs/2324 index c0da0d9..60a15db 100644 --- a/.bugs/2324 +++ b/.bugs/2324 @@ -1,9 +1,9 @@ Title: Generalize file IO handling and catch various issues in a general way Component: core -State: open +Class: bug +State: done Date: 2015-12-02 16:18:27 Targetversion: future -Class: bug Some general errors like: @@ -45,3 +45,9 @@ But how? If the disk is full various other things will also crash. No state files can be written. Funny things can happen. Maybe the safest way would be to immediately shut down the core if there is no space left. Can we actively watch that and if the free space falls below X MB we stop the core? + +2017-02-15 17:14:16: changed state open -> done +This is now handled (at least for the files written by the python code) via the cmk.store +functions which works nice. We are first writing to a temporary file. When this fails, +e.g. because of not enough space, the original file is not affected and the user sees +an error message. diff --git a/.bugs/2420 b/.bugs/2420 index ba174fe..aa9179f 100644 --- a/.bugs/2420 +++ b/.bugs/2420 @@ -2,7 +2,7 @@ Title: Renaming hosts can lead to duplicate host names Component: wato State: open Date: 2016-02-10 12:12:50 -Targetversion: future +Targetversion: 1.4.0 Class: bug You have host A in folder F and host B in folder G. Now you can rename diff --git a/.bugs/2425 b/.bugs/2425 index de6f274..0955eb6 100644 --- a/.bugs/2425 +++ b/.bugs/2425 @@ -2,8 +2,8 @@ Title: Permissions for views and dashboards inconsistent Component: multisite State: open Date: 2016-03-01 09:58:31 -Targetversion: 1.2.9 -Class: bug +Targetversion: 1.5.0 +Class: nastiness 1. Views und Dashboards: In beiden Fällen gibt es die Option, dass Ansicht oder Gesamtübersicht

7 years, 7 months

Moved werk text changelog formating to lib (also needed for relase

by Lars Michelsen

Module: check_mk Branch: master Commit: b247e77bd4d48080ce393ba73c6fdada22278794 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b247e77bd4d480… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Feb 16 09:09:26 2017 +0100 Moved werk text changelog formating to lib (also needed for relase mechanisms) Change-Id: Ie7cf235afb26c48a6c945d231bcbc229aede9f73 --- lib/werks.py | 43 +++++++++++++++++++++++++++++++++++++++++++ scripts/create-changelog.py | 44 +------------------------------------------- 2 files changed, 44 insertions(+), 43 deletions(-) diff --git a/lib/werks.py b/lib/werks.py index fa57d8d..b4ea681 100644 --- a/lib/werks.py +++ b/lib/werks.py @@ -180,6 +180,49 @@ def write_precompiled_werks(path, werks): #store.save_data_to_file(path, werks, pretty=False) +# Writhe the given werks to a file object. This is used for creating a textual +# change log for the released versions and the announcement mails +def write_as_text(werks, f): + version, component = None, None + for werk in sort_by_version_and_component(werks.values()): + if version != werk["version"]: + if version is not None: + f.write("\n\n") + + version, component = werk["version"], None + + f.write("%s:\n" % werk["version"]) + + if component != werk["component"]: + if component is not None: + f.write("\n") + + component = werk["component"] + + f.write(" %s:\n" % \ + werk_components().get(component, component)) + + write_werk_as_text(f, werk) + + +def write_werk_as_text(f, werk): + prefix = "" + if werk["class"] == "fix": + prefix = " FIX:" + elif werk["class"] == "security": + prefix = " SEC:" + + if werk.get("description") and len(werk["description"]) > 3: + omit = "..." + else: + omit = "" + + f.write(" * %04d%s %s%s\n" % + (werk["id"], prefix, werk["title"].encode("utf-8"), omit)) + + if werk["compatible"] == "incomp": + f.write(" NOTE: Please refer to the migration notes!\n") + # sort by version and within one version by component def sort_by_version_and_component(werks): diff --git a/scripts/create-changelog.py b/scripts/create-changelog.py index 56d9fd6..379279c 100755 --- a/scripts/create-changelog.py +++ b/scripts/create-changelog.py @@ -9,7 +9,7 @@ def create_changelog(dest_file, precompiled_werk_files): werks = load_werks(precompiled_werk_files) with open(dest_file, "w") as f: - write_changelog(werks, f) + cmk.werks.write_as_text(werks, f) # Append previous werk changes if os.path.exists(dest_file + ".in"): @@ -24,48 +24,6 @@ def load_werks(precompiled_werk_files): return werks -def write_changelog(werks, f): - version, component = None, None - for werk in cmk.werks.sort_by_version_and_component(werks.values()): - if version != werk["version"]: - if version is not None: - f.write("\n\n") - - version, component = werk["version"], None - - f.write("%s:\n" % werk["version"]) - - if component != werk["component"]: - if component is not None: - f.write("\n") - - component = werk["component"] - - f.write(" %s:\n" % \ - cmk.werks.werk_components().get(component, component)) - - write_changelog_line(f, werk) - - -def write_changelog_line(f, werk): - prefix = "" - if werk["class"] == "fix": - prefix = " FIX:" - elif werk["class"] == "security": - prefix = " SEC:" - - if werk.get("description") and len(werk["description"]) > 3: - omit = "..." - else: - omit = "" - - f.write(" * %04d%s %s%s\n" % - (werk["id"], prefix, werk["title"].encode("utf-8"), omit)) - - if werk["compatible"] == "incomp": - f.write(" NOTE: Please refer to the migration notes!\n") - - # # MAIN #

7 years, 7 months

gb: Fixed "gb commit" with newer(?) git versions

by Lars Michelsen

Module: check_mk Branch: master Commit: 99b85bbf0b0429fe08c73a8238318538b790bacd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=99b85bbf0b0429… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Feb 16 09:12:06 2017 +0100 gb: Fixed "gb commit" with newer(?) git versions Change-Id: Ib55c63352dc25f3518257544c85d80d0ae5edbb3 --- gb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gb b/gb index 166eca9..405371f 100755 --- a/gb +++ b/gb @@ -107,7 +107,7 @@ def check_modified(): global g_modified g_modified = set([]) for line in os.popen("git status --porcelain"): - if line[0] in "AM" and ".bugs/" in line: + if line.lstrip()[0] in "AM" and ".bugs/" in line: try: id = line.rsplit("/", 1)[-1].strip() g_modified.add(int(id))

7 years, 7 months

4346 FIX cisco_cpu_multiitem, cisco_cpu: Make checks mutually exclusive

by Konstantin Büttner

Module: check_mk Branch: master Commit: ba2220c6bbcb0bb914a471a707d467ed10c3c291 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ba2220c6bbcb0b… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Wed Feb 15 18:08:48 2017 +0100 4346 FIX cisco_cpu_multiitem, cisco_cpu: Make checks mutually exclusive Both of these checks being discovered on a device would lead to duplicate services. This has been fixed. Change-Id: Ibcd3ab9e560782f97a84097fc71dcda7b8709878 --- .werks/4346 | 11 +++++++++++ checks/cisco_cpu_multiitem | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/4346 b/.werks/4346 new file mode 100644 index 0000000..f58921c --- /dev/null +++ b/.werks/4346 @@ -0,0 +1,11 @@ +Title: cisco_cpu_multiitem, cisco_cpu: Make checks mutually exclusive +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.5.0i1 +Date: 1487178458 + +Both of these checks being discovered on a device would lead to duplicate +services. This has been fixed. diff --git a/checks/cisco_cpu_multiitem b/checks/cisco_cpu_multiitem index e5aa1ae..471dc47 100644 --- a/checks/cisco_cpu_multiitem +++ b/checks/cisco_cpu_multiitem @@ -87,5 +87,5 @@ check_info["cisco_cpu_multiitem"] = { '1.7', # entPhysicalName ])], 'snmp_scan_function' : lambda oid: 'cisco' in oid('.1.3.6.1.2.1.1.1.0').lower() and \ - oid('.1.3.6.1.4.1.9.9.109.1.1.1.*') != None, + oid('.1.3.6.1.4.1.9.9.109.1.1.1.*') == None, }

7 years, 7 months

Hopefully finally fixed enterprise changelog installation

by Lars Michelsen

Module: check_mk Branch: master Commit: b71a95488843edfa0ba68a04317259f10d3fedf8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b71a95488843ed… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Feb 15 16:15:53 2017 +0100 Hopefully finally fixed enterprise changelog installation Change-Id: I81540b02a6dcfda14009ba75937314e0cab21fac --- Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 9289a51..fa17f03 100644 --- a/Makefile +++ b/Makefile @@ -292,7 +292,8 @@ install: mkdir -p $(DESTDIR)$(OMD_ROOT)/lib/nagios/plugins install -m 755 enterprise/active_checks/check_lql_service $(DESTDIR)$(OMD_ROOT)/lib/nagios/plugins mkdir -p $(DESTDIR)$(OMD_ROOT)/share/doc/check_mk_enterprise - install -m 644 ChangeLog-cmc enterprise/EULA-* $(DESTDIR)$(OMD_ROOT)/share/doc/check_mk_enterprise/ChangeLog + install -m 644 enterprise/EULA-* $(DESTDIR)$(OMD_ROOT)/share/doc/check_mk_enterprise + install -m 644 ChangeLog-cmc $(DESTDIR)$(OMD_ROOT)/share/doc/check_mk_enterprise/ChangeLog mkdir -p $(DESTDIR)$(OMD_ROOT)/share/diskspace install -m 644 enterprise/diskspace $(DESTDIR)$(OMD_ROOT)/share/diskspace/check_mk_enterprise mkdir -p $(DESTDIR)$(OMD_ROOT)/share/check_mk/werks

7 years, 7 months

crawl tests: Also use rename for report file

by Lars Michelsen

Module: check_mk Branch: master Commit: 4c4a5e3cb2e85d87037200f67845b8d0923137fe URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4c4a5e3cb2e85d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Feb 15 15:53:09 2017 +0100 crawl tests: Also use rename for report file Change-Id: I7fb491b8fadd2a0cfbf32122f935e35bb01b4ca1 --- tests/web/test_crawl.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/web/test_crawl.py b/tests/web/test_crawl.py index 228d20c..3d90d61 100644 --- a/tests/web/test_crawl.py +++ b/tests/web/test_crawl.py @@ -354,7 +354,7 @@ class TestCrawler(object): def report(self): - with file(self.report_file(), "w") as f: + with file(self.report_file()+".tmp", "w") as f: f.write("Skipped URLs:\n") for skipped_url in sorted(self.skipped): f.write(" %s\n" % skipped_url) @@ -369,6 +369,8 @@ class TestCrawler(object): f.write("Crawled %d URLs in %d seconds. Failures:\n%s\n" % (len(self.visited), time.time() - self.started, "\n".join(self.errors))) + os.rename(self.report_file()+".tmp", self.report_file()) + if self.errors: pytest.fail("Crawled %d URLs in %d seconds. Failures:\n%s" % (len(self.visited), time.time() - self.started, "\n".join(self.errors)))

7 years, 7 months

Fixed name of cmc changelog

by Lars Michelsen

Module: check_mk Branch: master Commit: f4da577abbd064eb7d168905a9680fe50dff93d7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f4da577abbd064… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Feb 15 15:14:53 2017 +0100 Fixed name of cmc changelog Change-Id: Id7cd1f8de31bf6af918895ed0929c2ed4e44bb5f --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index ce33481..9289a51 100644 --- a/Makefile +++ b/Makefile @@ -292,7 +292,7 @@ install: mkdir -p $(DESTDIR)$(OMD_ROOT)/lib/nagios/plugins install -m 755 enterprise/active_checks/check_lql_service $(DESTDIR)$(OMD_ROOT)/lib/nagios/plugins mkdir -p $(DESTDIR)$(OMD_ROOT)/share/doc/check_mk_enterprise - install -m 644 ChangeLog-cmc enterprise/EULA-* $(DESTDIR)$(OMD_ROOT)/share/doc/check_mk_enterprise/ + install -m 644 ChangeLog-cmc enterprise/EULA-* $(DESTDIR)$(OMD_ROOT)/share/doc/check_mk_enterprise/ChangeLog mkdir -p $(DESTDIR)$(OMD_ROOT)/share/diskspace install -m 644 enterprise/diskspace $(DESTDIR)$(OMD_ROOT)/share/diskspace/check_mk_enterprise mkdir -p $(DESTDIR)$(OMD_ROOT)/share/check_mk/werks

7 years, 7 months

← Newer
1
...
18
19
20
21
22
23
24
...
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