Checkmk git commits December 2016

checkmk-commits@lists.checkmk.com

10 participants
391 discussions

by Roland Halbig

Module: check_mk Branch: master Commit: 6481efc11ca7b5056aeb81967d5af538d0f94d75 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6481efc11ca7b5… Author: Roland Halbig <rh(a)mathias-kettner.de> Date: Thu Dec 1 16:01:31 2016 +0100 Added testcase for HTML refactoring. --- tests/web/test_html.py | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/web/test_html.py b/tests/web/test_html.py index 7acaf69..f73811b 100644 --- a/tests/web/test_html.py +++ b/tests/web/test_html.py @@ -46,6 +46,7 @@ def test_class_HTML(): assert isinstance(HTML() + "TEST", HTML) assert isinstance("TEST" + HTML() + "TEST" , HTML) + assert "<div>" + HTML("content") + "</div>" == "<div>content</div>" A += B assert isinstance(A, HTML), A

7 years, 6 months

Refactoring htmllib: derived HTML class from unicode. Created Escaper class.

by Roland Halbig

Module: check_mk Branch: master Commit: 10955467f30c95b1ebc8821a9f7ec1f22849d96e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=10955467f30c95… Author: Roland Halbig <rh(a)mathias-kettner.de> Date: Thu Dec 1 16:00:51 2016 +0100 Refactoring htmllib: derived HTML class from unicode. Created Escaper class. Added functionality tests for generator. Adjusted HTML tests. --- tests/web/test_generator.py | 32 ++++ tests/web/test_html.py | 19 +- web/htdocs/htmllib.py | 438 +++++++++++++++++++------------------------- 3 files changed, 234 insertions(+), 255 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=10955467f3…

7 years, 6 months

Fixed new get_graph API tests

by Lars Michelsen

Module: check_mk Branch: master Commit: d7417d25c440636600efecad18481ab8adab4772 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d7417d25c44063… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Dec 5 09:42:34 2016 +0100 Fixed new get_graph API tests --- tests/testlib/__init__.py | 24 ++++++++++++++++++------ tests/web/test_webapi.py | 18 ++++++++++++++++-- 2 files changed, 34 insertions(+), 8 deletions(-) diff --git a/tests/testlib/__init__.py b/tests/testlib/__init__.py index d57c038..454c33a 100644 --- a/tests/testlib/__init__.py +++ b/tests/testlib/__init__.py @@ -52,6 +52,10 @@ def omd(cmd): return os.system(cmdline) >> 8 +class APIError(Exception): + pass + + # It's ok to make it currently only work on debian based distros class CMKVersion(object): DEFAULT = "default" @@ -333,7 +337,8 @@ class Site(object): # Call WATO once for creating the default WATO configuration response = web.get("wato.py").text assert "<title>WATO" in response - assert "<div class=\"title\">Manual Checks</div>" in response + assert "<div class=\"title\">Manual Checks</div>" in response, \ + "WATO does not seem to be initialized: %r" % response missing_files = [ "etc/check_mk/conf.d/wato/rules.mk", @@ -667,14 +672,21 @@ class CMKWebSession(WebSession): } - def _api_request(self, url, data): + def _api_request(self, url, data, expect_error=False): data.update(self._automation_credentials()) req = self.post(url, data=data) response = json.loads(req.text) - assert response["result_code"] == 0, \ - "An error occured: %r" % response + if not expect_error: + assert response["result_code"] == 0, \ + "An error occured: %r" % response + else: + assert response["result_code"] == 1, \ + "No error occured, but was expected: %r" % response + + print repr(response["result"]) + raise APIError(response["result"]) return response["result"] @@ -774,7 +786,7 @@ class CMKWebSession(WebSession): assert status["_time_ended"] > time_started - def get_regular_graph(self, hostname, service_description, graph_index): + def get_regular_graph(self, hostname, service_description, graph_index, expect_error=False): result = self._api_request("webapi.py?action=get_graph", { "request": json.dumps({ "specification": ["template", { @@ -787,7 +799,7 @@ class CMKWebSession(WebSession): "time_range": [time.time()-3600, time.time()] } }), - }) + }, expect_error=expect_error) assert type(result) == dict assert "start_time" in result diff --git a/tests/web/test_webapi.py b/tests/web/test_webapi.py index 5551356..de03f96 100644 --- a/tests/web/test_webapi.py +++ b/tests/web/test_webapi.py @@ -2,7 +2,9 @@ # encoding: utf-8 import pytest -from testlib import web +import time + +from testlib import web, APIError def test_global_settings(site, web): r = web.get("wato.py") @@ -66,15 +68,27 @@ def test_activate_changes(web, site): web.activate_changes() -def test_get_graph(web): +def test_get_graph(web, site): try: + # No graph yet... + with pytest.raises(APIError) as e: + data = web.get_regular_graph("test-host-get-graph", "Check_MK", 0, expect_error=True) + assert "Cannot calculate graph definitions" in "%s" % e + + # Now add the host web.add_host("test-host-get-graph", attributes={ "ipaddress": "127.0.0.1", }) web.discover_services("test-host-get-graph") web.activate_changes() + # Issue a reschedule + site.live.command("SCHEDULE_FORCED_SERVICE_CHECK;test-host-get-graph;Check_MK;%d" % int(time.time())) + time.sleep(1) + + # Now we get a graph data = web.get_regular_graph("test-host-get-graph", "Check_MK", 0) + assert len(data["curves"]) == 4 assert data["curves"][0]["title"] == "CPU time in user space" assert data["curves"][1]["title"] == "CPU time in operating system"

7 years, 6 months

4126 FIX apache_status: Handle https requests lo localhost in case of certificate mismatch

by Sven Rueß

Module: check_mk Branch: master Commit: 16450b99f90151cae670981b27ce98a403cb81e2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=16450b99f90151… Author: Sven Rueß <sr(a)mathias-kettner.de> Date: Sun Dec 4 15:30:50 2016 +0100 4126 FIX apache_status: Handle https requests lo localhost in case of certificate mismatch If the webserver is serving the status site from apache over https and the certificate does not match the server name, the request was ignored. This is fixed now. The request is rewritten to localhost without encryption. --- .werks/4126 | 12 ++++++++++++ ChangeLog | 1 + agents/plugins/apache_status | 9 +++++++++ 3 files changed, 22 insertions(+) diff --git a/.werks/4126 b/.werks/4126 new file mode 100644 index 0000000..c958652 --- /dev/null +++ b/.werks/4126 @@ -0,0 +1,12 @@ +Title: apache_status: Handle https requests lo localhost in case of certificate mismatch +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.4.0i3 +Date: 1480861671 + +If the webserver is serving the status site from apache over https and the certificate +does not match the server name, the request was ignored. This is fixed now. The request +is rewritten to localhost without encryption. diff --git a/ChangeLog b/ChangeLog index 56cec10..45b447f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -42,6 +42,7 @@ * 4081 FIX: dell_powerconnect_cpu: Fixed broken metrics * 3998 FIX: agent_netapp / netapp_api_if: improved mechanism to collect interface infos. fixes invalid if-speed... NOTE: Please refer to the migration notes! + * 4126 FIX: apache_status: Handle https requests lo localhost in case of certificate mismatch... Multisite: * 4070 Added a painter for the service check period diff --git a/agents/plugins/apache_status b/agents/plugins/apache_status index ce44405..2c986f9 100755 --- a/agents/plugins/apache_status +++ b/agents/plugins/apache_status @@ -144,6 +144,15 @@ for server in servers: fd = urllib2.urlopen(url) else: raise + except Exception, e: + if 'doesn\'t match' in str(e): + # HACK: workaround if SSL port is found and localhost is using + # SSL connections but certifiacte is mismatched + portspec = ':80' + url = 'http://%s%s/server-status?auto' % (address, portspec) + fd = urllib2.urlopen(url) + else: + raise for line in fd.read().split('\n'): if not line.strip():

7 years, 6 months

Reserved 1 Werk IDS

by Sven Rueß

Module: check_mk Branch: master Commit: 04e91047224afd53542e982e4f2848297409a440 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=04e91047224afd… Author: Sven Rueß <sr(a)mathias-kettner.de> Date: Sun Dec 4 15:11:06 2016 +0100 Reserved 1 Werk IDS --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index 9c248c8..769b084 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -4126 +4127

7 years, 6 months

4109 websphere_mq_instance, websphere_mq_instance.manager: new checks for Websphere MQ

by Simon Betz

Module: check_mk Branch: master Commit: 4cb299401979391190d754f950b30bd411f0b258 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4cb29940197939… Author: Simon Betz <si(a)mathias-kettner.de> Date: Fri Dec 2 15:06:14 2016 +0100 4109 websphere_mq_instance, websphere_mq_instance.manager: new checks for Websphere MQ --- .werks/4109 | 9 ++ ChangeLog | 1 + agents/plugins/websphere_mq | 8 ++ checkman/websphere_mq_instance | 18 +++ checkman/websphere_mq_instance.manager | 18 +++ checks/websphere_mq_channels | 5 + checks/websphere_mq_instance | 225 +++++++++++++++++++++++++++++++++ checks/websphere_mq_queues | 3 + web/plugins/wato/check_parameters.py | 71 +++++++++++ 9 files changed, 358 insertions(+) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=4cb2994019…

7 years, 7 months

4083 Web API: Always output full traceback in case of non Check_MK unhandled exceptions

by Lars Michelsen

Module: check_mk Branch: master Commit: 6de246d08c5daa649926cdcef006e344e8adc202 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6de246d08c5daa… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Dec 2 11:25:06 2016 +0100 4083 Web API: Always output full traceback in case of non Check_MK unhandled exceptions --- .werks/4083 | 9 +++++++++ ChangeLog | 1 + web/htdocs/webapi.py | 7 ++++++- 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/.werks/4083 b/.werks/4083 new file mode 100644 index 0000000..41cb69b --- /dev/null +++ b/.werks/4083 @@ -0,0 +1,9 @@ +Title: Web API: Always output full traceback in case of non Check_MK unhandled exceptions +Level: 1 +Component: multisite +Compatible: compat +Version: 1.4.0i3 +Date: 1480674286 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index b59d44e..eff54ea 100644 --- a/ChangeLog +++ b/ChangeLog @@ -48,6 +48,7 @@ * 4106 new filter host/service-service-level... * 4107 Now you are able to search for check plugins * 3997 New metric for mrpe/check_icmp... + * 4083 Web API: Always output full traceback in case of non Check_MK unhandled exceptions * 3974 FIX: Sorting comments in hover menu of comments icon by time now * 4040 FIX: Fix error in view about "No WATO folder ..." in case of host imported via cmcdump... * 4046 FIX: Repaired html rendering.... diff --git a/web/htdocs/webapi.py b/web/htdocs/webapi.py index 7b9fedb..edc437c 100644 --- a/web/htdocs/webapi.py +++ b/web/htdocs/webapi.py @@ -24,6 +24,8 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. +import traceback + from lib import * import config @@ -102,7 +104,10 @@ def page_api(): if config.debug: raise log_exception() - response = { "result_code": 1, "result": "%s" % e } + response = { + "result_code" : 1, + "result" : "Unhandled exception: %s" % traceback.format_exc(), + } if html.output_format == "json": html.write(json.dumps(response))

7 years, 7 months

Printing out whole response in case of API errors

by Lars Michelsen

Module: check_mk Branch: master Commit: 6a7dbff6f11493424bcd64a61d642bb9fe682532 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6a7dbff6f11493… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Dec 2 11:06:42 2016 +0100 Printing out whole response in case of API errors --- tests/testlib/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/testlib/__init__.py b/tests/testlib/__init__.py index aeac117..d57c038 100644 --- a/tests/testlib/__init__.py +++ b/tests/testlib/__init__.py @@ -674,7 +674,7 @@ class CMKWebSession(WebSession): response = json.loads(req.text) assert response["result_code"] == 0, \ - "An error occured: %s" % response["result"] + "An error occured: %r" % response return response["result"]

7 years, 7 months

Added test for new get_graph API

by Lars Michelsen

Module: check_mk Branch: master Commit: c5b5f99929a18867aa57e3a69f717989eddcb588 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c5b5f99929a188… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Dec 2 10:33:16 2016 +0100 Added test for new get_graph API --- tests/testlib/__init__.py | 37 ++++++++++++++++++++++- tests/web/{test_wato_webapi.py => test_webapi.py} | 20 ++++++++++++ 2 files changed, 56 insertions(+), 1 deletion(-) diff --git a/tests/testlib/__init__.py b/tests/testlib/__init__.py index 3dd9cd5..aeac117 100644 --- a/tests/testlib/__init__.py +++ b/tests/testlib/__init__.py @@ -749,7 +749,7 @@ class CMKWebSession(WebSession): }) assert type(result) == unicode - assert result.startswith("Service discovery successful") + assert result.startswith("Service discovery successful"), "Failed to discover: %r" % result def activate_changes(self, mode=None, allow_foreign_changes=None): @@ -774,6 +774,41 @@ class CMKWebSession(WebSession): assert status["_time_ended"] > time_started + def get_regular_graph(self, hostname, service_description, graph_index): + result = self._api_request("webapi.py?action=get_graph", { + "request": json.dumps({ + "specification": ["template", { + "service_description" : service_description, + "site" : self.site.id, + "graph_index" : graph_index, + "host_name" : hostname, + }], + "data_range": { + "time_range": [time.time()-3600, time.time()] + } + }), + }) + + assert type(result) == dict + assert "start_time" in result + assert type(result["start_time"]) == int + assert "end_time" in result + assert type(result["end_time"]) == int + assert "step" in result + assert type(result["step"]) == int + assert "curves" in result + assert type(result["curves"]) == list + assert len(result["curves"]) > 0 + + for curve in result["curves"]: + assert "color" in curve + assert "rrddata" in curve + assert "line_type" in curve + assert "title" in curve + + return result + + class CMKEventConsole(CMKWebSession): def __init__(self, site): super(CMKEventConsole, self).__init__(site) diff --git a/tests/web/test_wato_webapi.py b/tests/web/test_webapi.py similarity index 68% rename from tests/web/test_wato_webapi.py rename to tests/web/test_webapi.py index d83c2d4..5551356 100644 --- a/tests/web/test_wato_webapi.py +++ b/tests/web/test_webapi.py @@ -64,3 +64,23 @@ def test_activate_changes(web, site): finally: web.delete_host("test-host-activate") web.activate_changes() + + +def test_get_graph(web): + try: + web.add_host("test-host-get-graph", attributes={ + "ipaddress": "127.0.0.1", + }) + web.discover_services("test-host-get-graph") + web.activate_changes() + + data = web.get_regular_graph("test-host-get-graph", "Check_MK", 0) + assert len(data["curves"]) == 4 + assert data["curves"][0]["title"] == "CPU time in user space" + assert data["curves"][1]["title"] == "CPU time in operating system" + assert data["curves"][2]["title"] == "Time spent waiting for Check_MK agent" + assert data["curves"][3]["title"] == "Total execution time" + + finally: + web.delete_host("test-host-get-graph") + web.activate_changes()

7 years, 7 months

Default automation user is now using english language by default

by Lars Michelsen

Module: check_mk Branch: master Commit: 575a1381166cba70b9a9dc5caf1c39aa1f79e752 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=575a1381166cba… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Dec 2 10:14:31 2016 +0100 Default automation user is now using english language by default --- web/htdocs/userdb.py | 1 + 1 file changed, 1 insertion(+) diff --git a/web/htdocs/userdb.py b/web/htdocs/userdb.py index 734ccf3..27c5fef 100644 --- a/web/htdocs/userdb.py +++ b/web/htdocs/userdb.py @@ -858,6 +858,7 @@ def create_cmk_automation_user(): 'email' : '', 'pager' : '', 'notifications_enabled' : False, + 'language' : 'en', } save_users(users)

7 years, 7 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits December 2016