Checkmk git commits June 2017

checkmk-commits@lists.checkmk.com

13 participants
266 discussions

by Sven Panne

Module: check_mk Branch: master Commit: 4211b08b9f0cda33c92e4c40ac8702dfa4a1b1a8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4211b08b9f0cda… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Jun 2 12:10:52 2017 +0200 Added missing local build dependencies. Change-Id: I7bc13e8b277c3ff119cfa5b378365933e430db24 --- Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Makefile b/Makefile index 4cb7e6c..ed82d8a 100644 --- a/Makefile +++ b/Makefile @@ -458,6 +458,8 @@ setup: bear \ build-essential \ figlet \ + libboost1.63-dev \ + libboost-system1.63-dev \ libpcap-dev \ librrd-dev \ pngcrush \

7 years, 6 months

Unbreak verbatim HTML code in werk description.

by Sven Panne

Module: check_mk Branch: master Commit: 3b09d2713698a838b84f8a40132bb6c9b37d5678 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3b09d2713698a8… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Jun 2 12:02:39 2017 +0200 Unbreak verbatim HTML code in werk description. It is a bit unclear what the right fix is, because we have *2* renderers for our own funny markup language: One Python version within Check_MK itself and another, completely different one in PHP5 on our web page. They behave differently... :-/ At least this commit should unbreak our GUI crawler. Change-Id: I5b7ca98ac2f62ce2e59372d18c85b6575bc79069 --- .werks/4733 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.werks/4733 b/.werks/4733 index 23032a3..8163c46 100644 --- a/.werks/4733 +++ b/.werks/4733 @@ -46,7 +46,7 @@ The most common use case will be to add the image generated by this. The following snippets show how it can be embedded: F+: -<img src="http://mycmkserver/mysite/check_mk/graph_image.py?request={%22specification…"> +<img src="http://mycmkserver/mysite/check_mk/graph_image.py?request={%22specification…"> F-: This will try to open the image from the Check_MK site <tt>mysite</tt> on @@ -68,7 +68,7 @@ It is also possible to adapt the rendering attributes of the graph using the title of the graph and sets a custom image size: F+: -<img src="http://mycmkserver/mysite/check_mk/graph_image.py?request={%22specification…"> +<img src="http://mycmkserver/mysite/check_mk/graph_image.py?request={%22specification…"> F-: Again, the human friendly formated request object:

7 years, 6 months

Refactoring: do_all_checks_on_host now returns a dict containing the information from the check_mk section in its entirety

by Konstantin Büttner

Module: check_mk Branch: master Commit: 8b711fabd6a0f1ac3a218542567075ff238094c2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8b711fabd6a0f1… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Fri Jun 2 11:42:24 2017 +0200 Refactoring: do_all_checks_on_host now returns a dict containing the information from the check_mk section in its entirety Change-Id: I48626296e90702a714757926427d04bb320d164b --- modules/check_mk_base.py | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index bba4dc5..b897813 100644 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -1211,9 +1211,11 @@ def do_check(hostname, ipaddress, only_check_types = None): try: load_item_state(hostname) - agent_version, num_success, error_sections, problems = \ + cmk_section_dict, num_success, error_sections, problems = \ do_all_checks_on_host(hostname, ipaddress, only_check_types) + agent_version = cmk_section_dict[u"version"] + num_errors = len(error_sections) save_item_state(hostname) if problems: @@ -1503,23 +1505,24 @@ def do_all_checks_on_host(hostname, ipaddress, only_check_types = None, fetch_ag submit_aggregated_results(hostname) if fetch_agent_version: + cmk_section_dict = { u"version" : "(unknown)" } try: if is_tcp_host(hostname): - version_info = get_info_for_check(hostname, ipaddress, 'check_mk') - agent_version = version_info[0][1] + for line in get_info_for_check(hostname, ipaddress, 'check_mk'): + value = " ".join(line[1:]) if len(line) > 1 else None + cmk_section_dict[line[0][:-1].lower()] = value else: - agent_version = None + cmk_section_dict[u"version"] = None except MKAgentError: g_broken_agent_hosts.add(hostname) - agent_version = "(unknown)" except: - agent_version = "(unknown)" + pass else: - agent_version = None + cmk_section_dict[u"version"] = None error_section_list = sorted(list(error_sections)) - return agent_version, num_success, error_section_list, ", ".join(problems) + return cmk_section_dict, num_success, error_section_list, ", ".join(problems) # Create a crash dump with a backtrace and the agent output.

7 years, 6 months

4704 FIX MSI generation: fixed bug in MSI version number generation which broke the 1.4.0 MSI installer

by Andreas Boesl

Module: check_mk Branch: master Commit: e8e204433ffe990821f8de914f02c7e15a9905ba URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e8e204433ffe99… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Jun 2 11:35:00 2017 +0200 4704 FIX MSI generation: fixed bug in MSI version number generation which broke the 1.4.0 MSI installer Change-Id: Ib544f7a9d527311f67b453667a66e5c94e93db18 --- .werks/4704 | 10 ++++++++++ agents/windows/msibuild/msi-update | 2 ++ 2 files changed, 12 insertions(+) diff --git a/.werks/4704 b/.werks/4704 new file mode 100644 index 0000000..69c6d78 --- /dev/null +++ b/.werks/4704 @@ -0,0 +1,10 @@ +Title: MSI generation: fixed bug in MSI version number generation which broke the 1.4.0 MSI installer +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1496396045 +Class: fix + + diff --git a/agents/windows/msibuild/msi-update b/agents/windows/msibuild/msi-update index cf8656a..54b68d5 100755 --- a/agents/windows/msibuild/msi-update +++ b/agents/windows/msibuild/msi-update @@ -50,6 +50,7 @@ try: # Revision (from build_version) revision = sys.argv[3] + # TODO: complete overhaul of version generation # Official version name, e.g # 1.2.5i4p1 # 2015.04.12 @@ -59,6 +60,7 @@ try: try: major, minor, build = map(lambda x: x.lstrip("0"), new_version_name.split("-")[0].split(".")[:3]) + build = build == "" and "0" or build if len(major) > 3: # Looks like a daily build.. 2015.03.05 major = major[2:].lstrip("0")

7 years, 6 months

Web-API call get_host: effective_attributes did no longer support "True" value

by Andreas Boesl

Module: check_mk Branch: master Commit: 74910dd126e4c73b60d1aaeea6f436d905e0b954 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=74910dd126e4c7… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Jun 2 09:51:02 2017 +0200 Web-API call get_host: effective_attributes did no longer support "True" value Change-Id: I0e3874a3fe735e31bea01c7b8aaa03ab654d60f9 --- web/plugins/webapi/webapi.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/plugins/webapi/webapi.py b/web/plugins/webapi/webapi.py index 717d34d..45a6de2 100644 --- a/web/plugins/webapi/webapi.py +++ b/web/plugins/webapi/webapi.py @@ -400,7 +400,7 @@ class APICallHosts(APICallCollection): host = Host.host(hostname) host.need_permission("read") - if request.get("effective_attributes") == "1": + if bool(int(request.get("effective_attributes", "0"))): attributes = host.effective_attributes() else: attributes = host.attributes()

7 years, 6 months

Reserved 10 Werk IDS

by Marcel Arentz

Module: check_mk Branch: master Commit: f530b48758eac99d66c2ca58517492a638bedbba URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f530b48758eac9… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Thu Jun 1 16:07:01 2017 +0200 Reserved 10 Werk IDS Change-Id: I0b71ff14308612f0d5d4fd6b07728d18bc5b31a6 --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index d6e7d98..09942e1 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -4786 +4796

7 years, 6 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits June 2017