Checkmk git commits September 2018

checkmk-commits@lists.checkmk.com

12 participants
371 discussions

Locking livestatus port opening during tests

by Lars Michelsen

Module: check_mk Branch: master Commit: 32d9fa1f98978a52ba09661bc4d63962fe32320b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=32d9fa1f98978a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Sep 21 18:58:31 2018 +0200 Locking livestatus port opening during tests The integration tests failed from time to time when two integration test jobs (of different branches) were trying to allocate one port at the same time. The new lock should prevent this issue. Change-Id: Ib7fe14aa6da0270bab3c35c703e9344c879444ad --- tests/testlib/__init__.py | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/tests/testlib/__init__.py b/tests/testlib/__init__.py index 2220d1f..8c4f081 100644 --- a/tests/testlib/__init__.py +++ b/tests/testlib/__init__.py @@ -905,12 +905,15 @@ class Site(object): start_again = True self.stop() - self.set_config("LIVESTATUS_TCP", "on") - self._gather_livestatus_port() - self.set_config("LIVESTATUS_TCP_PORT", str(self._livestatus_port)) - - if start_again: - self.start() + sys.stdout.write("Getting livestatus port lock (/tmp/cmk-test-open-livestatus-port)...\n") + with lockfile.FileLock("/tmp/cmk-test-livestatus-port"): + sys.stdout.write("Have livestatus port lock\n") + self.set_config("LIVESTATUS_TCP", "on") + self._gather_livestatus_port() + self.set_config("LIVESTATUS_TCP_PORT", str(self._livestatus_port)) + + if start_again: + self.start() def _gather_livestatus_port(self):

5 years, 12 months

Fixed broken links in werk text

by Lars Michelsen

Module: check_mk Branch: master Commit: e10fa5e0d3bc8e0def0fa07d833f1d35b6741a54 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e10fa5e0d3bc8e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Sep 21 18:52:16 2018 +0200 Fixed broken links in werk text Change-Id: I8ac56f7446ca742be41fd0ce8ab0f9292e3d3c47 --- .werks/6639 | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/.werks/6639 b/.werks/6639 index 0227c3e..d5d3101 100644 --- a/.werks/6639 +++ b/.werks/6639 @@ -11,11 +11,10 @@ It is now possible to for Check_MK to send notifications about state changes of hosts and services into a Slack channel. Slack needs to be first configured to recieve messages from Check_MK. This -can be done by setting up a Webhook <a -href=\"https://my.slack.com/services/new/incoming-webhook/\" -target=\"_blank\"> here </a>, where you specify which channel wil recieve -the notifications. In Check_MK, under WATO->Notifications, create a new -notification rule. And select under Notification Method Slack. Copy the URL -that Slack gives you after completing the configuration into the Slack -Webhook-URL field. Optionally if you want sent messages to include -hyperlinks to Check_MK, enable the field URL prefix for links to Check_MK. +can be done by setting up a Webhook <a href="https://my.slack.com/services/new/incoming-webhook/" target="_blank">here</a>, +where you specify which channel will recieve the notifications. In Check_MK, +under "WATO - Notifications", create a new notification rule. And select under +Notification Method Slack. Copy the URL that Slack gives you after completing +the configuration into the Slack Webhook-URL field. Optionally if you want sent +messages to include hyperlinks to Check_MK, enable the field URL prefix for +links to Check_MK.

5 years, 12 months

rename "Webserver" to "Azure web servers (IIS)"

by Moritz Kiemer

Module: check_mk Branch: master Commit: 7acb120f4c0f1c9c51acac1fd905d533809e73f3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7acb120f4c0f1c… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Fri Sep 21 15:43:13 2018 +0200 rename "Webserver" to "Azure web servers (IIS)" CMK-897 Change-Id: I19675a37dc36a195b23349ac99391059ecf7ef8e --- cmk/gui/plugins/wato/check_parameters.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmk/gui/plugins/wato/check_parameters.py b/cmk/gui/plugins/wato/check_parameters.py index e49f96d..35c2559 100755 --- a/cmk/gui/plugins/wato/check_parameters.py +++ b/cmk/gui/plugins/wato/check_parameters.py @@ -4823,7 +4823,7 @@ register_check_parameters( register_check_parameters( subgroup_applications, "webserver", - _("Webserver"), + _("Azure web servers (IIS)"), Dictionary( elements = [ ("avg_response_time_levels", Tuple(

5 years, 12 months

Reserved 20 Werk IDS

by Lars Michelsen

Module: check_mk Branch: master Commit: be71c36269e3c6518b7626e1bec8c0e707c972c9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=be71c36269e3c6… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Sep 21 15:53:44 2018 +0200 Reserved 20 Werk IDS Change-Id: Idb7e727c58ee9a7b2065a1e76799ed60b2d409e9 --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index 0d1dacb..0e3a845 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -6709 +6729

5 years, 12 months

Deobfuscate SNMPCredentials a little bit.

by Sven Panne

Module: check_mk Branch: master Commit: 4ff6f9412e173ff190b362fd3cf211e476039221 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4ff6f9412e173f… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Sep 21 09:56:52 2018 +0200 Deobfuscate SNMPCredentials a little bit. Change-Id: I684a54da95c8495f51edea83523a2404513a53ff --- cmk/gui/plugins/wato/utils/__init__.py | 24 +++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/cmk/gui/plugins/wato/utils/__init__.py b/cmk/gui/plugins/wato/utils/__init__.py index c5fbb79..cf7dc69 100644 --- a/cmk/gui/plugins/wato/utils/__init__.py +++ b/cmk/gui/plugins/wato/utils/__init__.py @@ -265,11 +265,23 @@ class SNMPCredentials(Alternative): def __init__(self, allow_none=False, **kwargs): def alternative_match(x): if kwargs.get("only_v3"): - return x and (len(x) == 6 and 2 or len(x) == 4 and 1) or 0 + # NOTE: Indices are shifted by 1 due to a only_v3 hack below!! + if x is None or len(x) == 2: + return 0 # noAuthNoPriv + if len(x) == 4: + return 1 # authNoPriv + if len(x) == 6: + return 2 # authPriv else: - return type(x) == tuple and ( \ - len(x) in [1, 2] and 1 or \ - len(x) == 4 and 2 or 3) or 0 + if x is None or isinstance(x, basestring): + return 0 # community only + if len(x) == 1 or len(x) == 2: + return 1 # noAuthNoPriv + if len(x) == 4: + return 2 # authNoPriv + if len(x) == 6: + return 3 # authPriv + raise MKGeneralException("invalid SNMP credential format %s" % x) if allow_none: none_elements = [ @@ -306,7 +318,7 @@ class SNMPCredentials(Alternative): ), ] ), - forth = lambda x: (x and len(x) == 2) and x or ("noAuthNoPriv", "") + forth = lambda x: x if (x and len(x) == 2) else ("noAuthNoPriv", "") ), Tuple( title = _("Credentials for SNMPv3 with authentication but without privacy (authNoPriv)"), @@ -346,6 +358,8 @@ class SNMPCredentials(Alternative): kwargs["default_value"] = "public" if kwargs.get("only_v3"): + # HACK: This shifts the indices in alternative_match above!! + # Furthermore, it doesn't work in conjunction with allow_none. kwargs["elements"].pop(0) kwargs.setdefault("title", _("SNMPv3 credentials")) else:

5 years, 12 months

6573 Azure Monitoring

by Moritz Kiemer

Module: check_mk Branch: master Commit: 161ba336e530da2fd2632c422a69d112f5f48812 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=161ba336e530da… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Fri Sep 21 13:39:56 2018 +0200 6573 Azure Monitoring This werk adds a new datasource program to monitor Microsoft Azure cloud environments. CMK-754 Change-Id: Iad5eaef09cfe5ae2cc60f9c3c4a93589edf0974c --- .werks/6573 | 10 +++ agents/special/agent_azure | 42 +++++----- checks/agent_azure_args | 69 ++++++++++++++++ cmk/gui/plugins/wato/datasource_programs.py | 124 ++++++++++++++++++++++++++++ 4 files changed, 224 insertions(+), 21 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=161ba336e5…

5 years, 12 months

agent_azure: General makeover

by Moritz Kiemer

Module: check_mk Branch: master Commit: 6d5f9f682e3bb74134bee965ceb9e7dc363f42b7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6d5f9f682e3bb7… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Wed Sep 12 15:17:54 2018 +0200 agent_azure: General makeover According to CMK-513 several changes were made. The commandline args have been changed to allow for a more complex configuration. Change-Id: I603cf6ee181b47c25d365afb676406e1348f16be --- agents/special/agent_azure | 1044 ++++++++++++++++++-------------------------- 1 file changed, 415 insertions(+), 629 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=6d5f9f682e…

5 years, 12 months

6570 azure_sites: New Check to monitor Azure web servers

by Moritz Kiemer

Module: check_mk Branch: master Commit: ce8f2f05e76c5487d5416d8a934cd6aab4abb09c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ce8f2f05e76c54… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Thu Sep 13 09:13:42 2018 +0200 6570 azure_sites: New Check to monitor Azure web servers This check reports the state of monitored azure sites (i.e. web server). You can configure levels for CPU time, average response time, and the total count and rate of server errors (HTTP 5xx responses). CMK-897 Change-Id: Ie41f289f809129eac4b4a144031abe32f394be8d --- .werks/6570 | 11 ++ checkman/azure_sites | 16 ++ checks/azure.include | 183 +++++++++++++++++++++ checks/azure_sites | 68 ++++++++ cmk/gui/plugins/metrics/check_mk.py | 12 ++ cmk/gui/plugins/wato/check_parameters.py | 33 ++++ .../checks/generictests/datasets/azure_sites.py | 98 +++++++++++ 7 files changed, 421 insertions(+) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=ce8f2f05e7…

5 years, 12 months

6661 FIX Periodic service discovery/cronjob: Changed loglevel of informational message

by Andreas Boesl

Module: check_mk Branch: master Commit: 0b2c997180ffe9abb44321b2788915733780cbcc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0b2c997180ffe9… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Sep 21 11:36:37 2018 +0200 6661 FIX Periodic service discovery/cronjob: Changed loglevel of informational message The discover-marked-hosts cronjob no longer receives a <tt>Timeout of 120 seconds reached ...</tt> message, in case the discovery takes longer than expected. This logmessage is now only shown in higher log level. Change-Id: I4c4f7231f8637b2999aafb4b0fdbf0a65068a94a --- .werks/6661 | 12 ++++++++++++ cmk_base/discovery.py | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/.werks/6661 b/.werks/6661 new file mode 100644 index 0000000..8cf4751 --- /dev/null +++ b/.werks/6661 @@ -0,0 +1,12 @@ +Title: Periodic service discovery/cronjob: Changed loglevel of informational message +Level: 1 +Component: wato +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1537522601 + +The discover-marked-hosts cronjob no longer receives a <tt>Timeout of 120 seconds reached ...</tt> message, +in case the discovery takes longer than expected. This logmessage is now only shown in higher log level. diff --git a/cmk_base/discovery.py b/cmk_base/discovery.py index e19ddbe..a0069fc 100644 --- a/cmk_base/discovery.py +++ b/cmk_base/discovery.py @@ -484,7 +484,7 @@ def discover_marked_hosts(core): activation_required = True if time.time() > end_time_ts: - console.warning(" Timeout of %d seconds reached. Lets do the remaining hosts next time." % _marked_host_discovery_timeout) + console.verbose(" Timeout of %d seconds reached. Lets do the remaining hosts next time." % _marked_host_discovery_timeout) break except DiscoveryTimeout: pass

5 years, 12 months

6640 FIX Fixed context for HOSTURL and SERVICEURL

by Óscar Nájera

Module: check_mk Branch: master Commit: b6d6e246e6ce76c14eb37bb244a41adc1fb6a454 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b6d6e246e6ce76… Author: Óscar Nájera <on(a)mathias-kettner.de> Date: Wed Sep 19 16:02:38 2018 +0200 6640 FIX Fixed context for HOSTURL and SERVICEURL Links to services and hosts URL missed the site key. Change-Id: I18dadcc47e07c61a24f4bcf384a9193ebdb7cb3f --- .werks/6640 | 13 +++++++++++++ cmk_base/events.py | 6 +++--- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/.werks/6640 b/.werks/6640 new file mode 100644 index 0000000..f971f72 --- /dev/null +++ b/.werks/6640 @@ -0,0 +1,13 @@ +Title: Faster link lookup to Check_MK host or service pages +Level: 1 +Component: notifications +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1537365437 +Class: fix + +Context variables HOSTURL and SERVICEURL now include the site key, this +enables a faster lookup and visualization of pages since Check_MK does not +need to resolve to which site the host belongs. This becomes especialy +relevant in distributed environments with multiple monitoring sites. diff --git a/cmk_base/events.py b/cmk_base/events.py old mode 100644 new mode 100755 index 18bc085..41ac20b --- a/cmk_base/events.py +++ b/cmk_base/events.py @@ -298,11 +298,11 @@ def complete_raw_context(raw_context, with_dump, event_log): raw_context["MICROTIME"] = "%d" % (time.time()*1000000) raw_context['HOSTURL'] = '/check_mk/index.py?start_url=%s' % \ - urllib.quote('view.py?view_name=hoststatus&host=%s' % raw_context['HOSTNAME']) + urllib.quote('view.py?view_name=hoststatus&host=%s&site=%s' % (raw_context['HOSTNAME'], raw_context['OMD_SITE'])) if raw_context['WHAT'] == 'SERVICE': raw_context['SERVICEURL'] = '/check_mk/index.py?start_url=%s' % \ - urllib.quote('view.py?view_name=service&host=%s&service=%s' % - (raw_context['HOSTNAME'], raw_context['SERVICEDESC'])) + urllib.quote('view.py?view_name=service&host=%s&service=%s&site=%s' % + (raw_context['HOSTNAME'], raw_context['SERVICEDESC'], raw_context['OMD_SITE'])) # Relative Timestamps for several macros for macro in [ 'LASTHOSTSTATECHANGE', 'LASTSERVICESTATECHANGE', 'LASTHOSTUP', 'LASTSERVICEOK' ]:

5 years, 12 months

← Newer
1
...
12
13
14
15
16
17
18
...
38
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits September 2018