Checkmk git commits November 2016

checkmk-commits@lists.checkmk.com

9 participants
299 discussions

Corrected spelling in mq_queues check manpage

by Konstantin Büttner

Module: check_mk Branch: master Commit: 70540c87ba7a0b04d6f0ab0010e0c598eb278845 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=70540c87ba7a0b… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Thu Nov 10 11:39:30 2016 +0100 Corrected spelling in mq_queues check manpage --- checkman/mq_queues | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/checkman/mq_queues b/checkman/mq_queues index 1502681..cd71020 100644 --- a/checkman/mq_queues +++ b/checkman/mq_queues @@ -4,11 +4,11 @@ catalog: app/activemq license: GPL distribution: check_mk description: - This check monitors the lenght of ActiveMQ Ques. ActiveMQ is a - popular and powerful open source messaging and Integration Patterns server. + This check monitors the length of ActiveMQ Queues. ActiveMQ is a + popular and powerful open source messaging and integration patterns server. To get the queue data, you have to configure the special agent: agent_activemq for querying the information from the server. This can be done easily with - wato -> Datasource Programs. Its also possible to run the agent in piggybag mode. + wato -> Datasource Programs. Its also possible to run the agent in piggyback mode. With this mode you can use the piggybag hostname translation to translate the queue names into server names so you can allocate the queues to multipe servers.

7 years, 10 months

3651 FIX Fixed potential segfault with Nagios core when accessing log/ commands table via Livestatus.

by Sven Panne

Module: check_mk Branch: master Commit: 2a128fd5e903f649f8f1e766e5b4baa733ef18d0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2a128fd5e903f6… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Nov 10 10:47:23 2016 +0100 3651 FIX Fixed potential segfault with Nagios core when accessing log/commands table via Livestatus. Under rare circumstances, the Nagios core could crash when the "log" or "commands" table was queried via Livestatus. Sites using the Micro Core were not affected by this bug. --- .werks/3651 | 12 ++++++++++++ ChangeLog | 3 +++ 2 files changed, 15 insertions(+) diff --git a/.werks/3651 b/.werks/3651 new file mode 100644 index 0000000..f27d635 --- /dev/null +++ b/.werks/3651 @@ -0,0 +1,12 @@ +Title: Fixed potential segfault with Nagios core when accessing log/commands table via Livestatus. +Level: 2 +Component: livestatus +Compatible: compat +Version: 1.4.0i3 +Date: 1478771002 +Class: fix + +Under rare circumstances, the Nagios core could crash when the "log" or +"commands" table was queried via Livestatus. Sites using the Micro Core +were not affected by this bug. + diff --git a/ChangeLog b/ChangeLog index 31e78ec..a55c995 100644 --- a/ChangeLog +++ b/ChangeLog @@ -29,6 +29,9 @@ Notifications: * 4042 FIX: Fix missing From address in synchronous SMTP notifications... + Livestatus: + * 3651 FIX: Fixed potential segfault with Nagios core when accessing log/commands table via Livestatus.... + 1.4.0i2: Core & Setup:

7 years, 10 months

Added missing .f12 file

by Lars Michelsen

Module: check_mk Branch: master Commit: 26946a9fca6ea6f86c2d1e35a7c058a885663ac5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=26946a9fca6ea6… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Nov 10 09:11:08 2016 +0100 Added missing .f12 file --- livestatus/api/python/.f12 | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/livestatus/api/python/.f12 b/livestatus/api/python/.f12 new file mode 100644 index 0000000..89826a3 --- /dev/null +++ b/livestatus/api/python/.f12 @@ -0,0 +1,5 @@ +#!/bin/bash +SITE=${SITE:-$(cat ../.site 2>/dev/null || true)} +SITE=${SITE:-$(omd sites --bare | head -n 1)} + +sudo rsync livestatus.py /omd/sites/$SITE/lib/python/

7 years, 10 months

3982 FIX Some MKPs created with WATO could not be uploaded to the Check_MK Exchange

by Lars Michelsen

Module: check_mk Branch: master Commit: 7a71ccfe35379353047d6ec7069fe5d5102b3b45 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7a71ccfe353793… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Nov 10 08:59:55 2016 +0100 3982 FIX Some MKPs created with WATO could not be uploaded to the Check_MK Exchange --- .werks/3982 | 10 ++++++++++ ChangeLog | 1 + 2 files changed, 11 insertions(+) diff --git a/.werks/3982 b/.werks/3982 new file mode 100644 index 0000000..ec53b77 --- /dev/null +++ b/.werks/3982 @@ -0,0 +1,10 @@ +Title: Some MKPs created with WATO could not be uploaded to the Check_MK Exchange +Level: 1 +Component: wato +Class: fix +Compatible: compat +State: unknown +Version: 1.4.0i3 +Date: 1478764745 + + diff --git a/ChangeLog b/ChangeLog index 6bf5246..31e78ec 100644 --- a/ChangeLog +++ b/ChangeLog @@ -24,6 +24,7 @@ * 3975 FIX: Improved error handling when trying to edit not existing global setting * 3976 FIX: Fixed broken link in LDAP automatic sync help text * 3977 FIX: Fixed poping up changes button in sidebar snapin after a change + * 3982 FIX: Some MKPs created with WATO could not be uploaded to the Check_MK Exchange Notifications: * 4042 FIX: Fix missing From address in synchronous SMTP notifications...

7 years, 10 months

Added missing import

by Lars Michelsen

Module: check_mk Branch: master Commit: 8c35dc7d535c484de65f9f6fad29aa750a2a79c6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8c35dc7d535c48… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Nov 10 08:50:35 2016 +0100 Added missing import --- cmk_base/packaging.py | 1 + 1 file changed, 1 insertion(+) diff --git a/cmk_base/packaging.py b/cmk_base/packaging.py index 0fa2770..c556e0b 100644 --- a/cmk_base/packaging.py +++ b/cmk_base/packaging.py @@ -31,6 +31,7 @@ import sys import tarfile import time import subprocess +import json from cStringIO import StringIO import cmk.tty as tty

7 years, 10 months

.f12 during tests: preserve the PATH variable from outside

by Lars Michelsen

Module: check_mk Branch: master Commit: 64b80376964e8c768e2b3dce39acba978103d05a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=64b80376964e8c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Nov 10 08:48:36 2016 +0100 .f12 during tests: preserve the PATH variable from outside --- cmk_base/packaging.py | 15 +++++++++++---- tests/testlib/__init__.py | 3 ++- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/cmk_base/packaging.py b/cmk_base/packaging.py index b7830b0..0fa2770 100644 --- a/cmk_base/packaging.py +++ b/cmk_base/packaging.py @@ -320,8 +320,8 @@ def package_pack(args): def create_mkp_file(package, file_name=None, file_object=None): package["version.packaged"] = cmk.__version__ - def create_info(filename, size): - info = tarfile.TarInfo("info") + def create_tar_info(filename, size): + info = tarfile.TarInfo() info.mtime = time.time() info.uid = 0 info.gid = 0 @@ -332,8 +332,15 @@ def create_mkp_file(package, file_name=None, file_object=None): return info tar = tarfile.open(name=file_name, fileobj=file_object, mode="w:gz") + + # add the regular info file (Python format) info_file = StringIO(pprint.pformat(package)) - info = create_info("info", len(info_file.getvalue())) + info = create_tar_info("info", len(info_file.getvalue())) + tar.addfile(info, info_file) + + # add the info file a second time (JSON format) for external tools + info_file = StringIO(json.dumps(package)) + info = create_tar_info("info.json", len(info_file.getvalue())) tar.addfile(info, info_file) # Now pack the actual files into sub tars @@ -346,7 +353,7 @@ def create_mkp_file(package, file_name=None, file_object=None): subtarname = part + ".tar" subdata = subprocess.check_output(["tar", "cf", "-", "--dereference", "--force-local", "-C", dir] + filenames) - info = create_info(subtarname, len(subdata)) + info = create_tar_info(subtarname, len(subdata)) tar.addfile(info, StringIO(subdata)) tar.close() diff --git a/tests/testlib/__init__.py b/tests/testlib/__init__.py index 7419ffb..6e69283 100644 --- a/tests/testlib/__init__.py +++ b/tests/testlib/__init__.py @@ -257,7 +257,8 @@ class Site(object): if os.path.exists("%s/.f12" % path): print("Executing .f12 in \"%s\"" % path) assert os.system("cd \"%s\" ; " - "sudo ONLY_COPY=1 SITE=%s bash .f12" % (path, self.id)) >> 8 == 0 + "sudo PATH=$PATH ONLY_COPY=1 SITE=%s bash .f12" % + (path, self.id)) >> 8 == 0 def rm_if_not_reusing(self):

7 years, 10 months

Fixed permissions of .f12 call

by Lars Michelsen

Module: check_mk Branch: master Commit: dc4714ec19d58b008584e8133fafe6f62ce4a861 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dc4714ec19d58b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Nov 10 08:31:30 2016 +0100 Fixed permissions of .f12 call --- tests/testlib/__init__.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/testlib/__init__.py b/tests/testlib/__init__.py index 3ec6e7c..7419ffb 100644 --- a/tests/testlib/__init__.py +++ b/tests/testlib/__init__.py @@ -256,7 +256,8 @@ class Site(object): for path in paths: if os.path.exists("%s/.f12" % path): print("Executing .f12 in \"%s\"" % path) - assert os.system("cd \"%s\" ; ONLY_COPY=1 bash .f12" % path) >> 8 == 0 + assert os.system("cd \"%s\" ; " + "sudo ONLY_COPY=1 SITE=%s bash .f12" % (path, self.id)) >> 8 == 0 def rm_if_not_reusing(self):

7 years, 10 months

Nuked dead variable

by Sven Panne

Module: check_mk Branch: master Commit: 05eabb09addd142cfdfe0b6353b230d1fcb60575 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=05eabb09addd14… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Nov 10 08:12:26 2016 +0100 Nuked dead variable --- web/htdocs/js/sidebar.js | 1 - 1 file changed, 1 deletion(-) diff --git a/web/htdocs/js/sidebar.js b/web/htdocs/js/sidebar.js index 3e167fc..8288b11 100644 --- a/web/htdocs/js/sidebar.js +++ b/web/htdocs/js/sidebar.js @@ -403,7 +403,6 @@ function debug(s) { // Set the size of the sidebar_content div to fit the whole screen // but without scrolling. The height of the header and footer divs need // to be treated here. -var g_just_resizing = 0; function set_sidebar_size() { var oHeader = document.getElementById('side_header'); var oContent = document.getElementById('side_content');

7 years, 10 months

Fixed another subprocess call that involves a shell

by Lars Michelsen

Module: check_mk Branch: master Commit: 207151d0732ce8a72237b194361ed3a08f9063ed URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=207151d0732ce8… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Nov 9 17:10:58 2016 +0100 Fixed another subprocess call that involves a shell --- cmk_base/localize.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmk_base/localize.py b/cmk_base/localize.py index a2a3b11..9e1517e 100644 --- a/cmk_base/localize.py +++ b/cmk_base/localize.py @@ -130,7 +130,7 @@ def write_alias(alias): def check_binaries(): # Are the xgettext utils available? for b in [ 'xgettext', 'msgmerge', 'msgfmt' ]: - if os.system('which %s >/dev/null 2>&1' % b): + if subprocess.call(['which', b], stdout=open(os.devnull , "wb")) != 0: raise LocalizeException('%s binary not found in PATH\n' % b)

7 years, 10 months

bandit: also scanning python files in bin dir

by Lars Michelsen

Module: check_mk Branch: master Commit: a9d08f86f9c12a5480f442ed2b191c635ec1f686 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a9d08f86f9c12a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Nov 9 17:16:37 2016 +0100 bandit: also scanning python files in bin dir --- tests/Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/Makefile b/tests/Makefile index 2c1882f..13cb152 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -35,8 +35,10 @@ test-bandit: -lll \ $(OUTPUT_ARGS) \ "$$CMK_DIR" \ + "$$CMK_DIR/bin/*" \ "$$CMK_DIR"/{checks,inventory}/* \ "$$CMC_DIR" \ + "$$CMC_DIR/bin/*" \ "$$CMC_DIR"/agents/{plugins,bakery}/*

7 years, 10 months

← Newer
1
...
15
16
17
18
19
20
21
...
30
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits November 2016