Checkmk git commits November 2018

checkmk-commits@lists.checkmk.com

15 participants
465 discussions

WK6676: WATO API get_hosttags now also returns the builtin tags

by Andreas Boesl

Module: check_mk Branch: master Commit: 4b669935011e0ceb84a4d38404fd568e6223bc6a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4b669935011e0c… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Nov 8 11:29:40 2018 +0100 WK6676: WATO API get_hosttags now also returns the builtin tags Change-Id: If1ef247f6952fc52ee941c6b3b015013ad9f26e7 --- .werks/6676 | 13 +++++++++++++ cmk/gui/plugins/webapi/webapi.py | 16 ++++++++++++---- cmk/gui/watolib.py | 18 +++++++++++++++++- 3 files changed, 42 insertions(+), 5 deletions(-) diff --git a/.werks/6676 b/.werks/6676 new file mode 100644 index 0000000..e83aa62 --- /dev/null +++ b/.werks/6676 @@ -0,0 +1,13 @@ +Title: WATO API get_hosttags now also returns the builtin tags +Level: 1 +Component: wato +Class: feature +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1541587658 + +In addition to the already returned keys <tt>aux_tags</tt>, <tt>tag_groups</tt> and <tt>configuration_hash</tt>, +the API call now also returns key <tt>builtin</tt> which includes the unmodifiable tags. +This <tt>builtin</tt> key is not part of the configuration_hash checksum, since you cannot change these settings anyway. diff --git a/cmk/gui/plugins/webapi/webapi.py b/cmk/gui/plugins/webapi/webapi.py index 6af1172..eaa4c54 100644 --- a/cmk/gui/plugins/webapi/webapi.py +++ b/cmk/gui/plugins/webapi/webapi.py @@ -772,14 +772,22 @@ class APICallHosttags(APICallCollection): hosttags_config = watolib.HosttagsConfiguration() hosttags_config.load() - response = hosttags_config.get_dict_format() - add_configuration_hash(response, response) # Looks strange, but is OK + hosttags_dict = hosttags_config.get_dict_format() - return response + # The configuration hash is computed for the configurable hosttags + add_configuration_hash(hosttags_dict, hosttags_dict) # Looks strange, but is OK + + hosttags_dict["builtin"] = self._get_builtin_tags_configuration() + return hosttags_dict + + def _get_builtin_tags_configuration(self): + builtin_tags_config = watolib.BuiltinHosttagsConfiguration() + builtin_tags_config.parse_config((watolib.builtin_host_tags, watolib.builtin_aux_tags)) + return builtin_tags_config.get_dict_format() def _set(self, request): validate_request_keys( - request, required_keys=["tag_groups", "aux_tags"], optional_keys=["configuration_hash"]) + request, required_keys=["tag_groups", "aux_tags"], optional_keys=["configuration_hash", "builtin"]) hosttags_config = watolib.HosttagsConfiguration() hosttags_config.load() diff --git a/cmk/gui/watolib.py b/cmk/gui/watolib.py index d36fa7d..aa77d87 100644 --- a/cmk/gui/watolib.py +++ b/cmk/gui/watolib.py @@ -6928,7 +6928,10 @@ class AuxtagList(object): def append(self, aux_tag): if is_builtin_aux_tag(aux_tag.id): raise MKUserError("tag_id", _("You can not override a builtin auxiliary tag.")) + self._append(aux_tag) + + def _append(self, aux_tag): if self.has_aux_tag(aux_tag): raise MKUserError("tag_id", _("This tag id does already exist in the list " "of auxiliary tags.")) @@ -6973,6 +6976,10 @@ class AuxtagList(object): return response +class BuiltinAuxtagList(AuxtagList): + def append(self, aux_tag): + self._append(aux_tag) + class GroupedHosttag(Hosttag): def __init__(self, data = None): @@ -7031,7 +7038,7 @@ class HosttagGroup(object): def _parse_legacy_format(self, group_info): self._initialize() - group_id, group_title, tag_list = group_info + group_id, group_title, tag_list = group_info[:3] self.id = group_id self.topic, self.title = HosttagsConfiguration.parse_hosttag_title(group_title) @@ -7164,7 +7171,10 @@ class HosttagsConfiguration(object): def insert_tag_group(self, tag_group): if is_builtin_host_tag_group(tag_group.id): raise MKUserError("tag_id", _("You can not override a builtin tag group.")) + self._insert_tag_group(tag_group) + + def _insert_tag_group(self, tag_group): self.tag_groups.append(tag_group) self._validate_group(tag_group) @@ -7299,7 +7309,13 @@ class HosttagsConfiguration(object): return result +class BuiltinHosttagsConfiguration(HosttagsConfiguration): + def _initialize(self): + self.tag_groups = [] + self.aux_tag_list = BuiltinAuxtagList() + def insert_tag_group(self, tag_group): + self._insert_tag_group(tag_group) #. # .--Hooks---------------------------------------------------------------.

5 years, 7 months

moved get_omd_config to cmk_base.config

by Andreas Boesl

Module: check_mk Branch: master Commit: d4f837b3d371b2658a95b880a8273a8629b116c3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d4f837b3d371b2… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Nov 8 08:47:17 2018 +0100 moved get_omd_config to cmk_base.config Change-Id: I283e32a2c2ad74344f6eec03ad0d8fa1a1a2df7a --- cmk/notification_plugins/mail.py | 19 +++---------------- cmk/site.py | 40 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 43 insertions(+), 16 deletions(-) diff --git a/cmk/notification_plugins/mail.py b/cmk/notification_plugins/mail.py index a25a07b..376660b 100644 --- a/cmk/notification_plugins/mail.py +++ b/cmk/notification_plugins/mail.py @@ -44,6 +44,7 @@ from email.mime.multipart import MIMEMultipart from email.mime.text import MIMEText from cmk.notification_plugins import utils +import cmk.site as site def tmpl_head_html(html_section): @@ -711,7 +712,7 @@ def render_cmk_graphs(context): svc_desc = context["SERVICEDESC"] url = "http://localhost:%d/%s/check_mk/ajax_graph_images.py?host=%s&service=%s" % \ - (get_apache_port(), os.environ["OMD_SITE"], + (site.get_apache_port(), os.environ["OMD_SITE"], urllib.quote(context["HOSTNAME"]), urllib.quote(svc_desc)) try: @@ -734,22 +735,8 @@ def render_cmk_graphs(context): return map(base64.b64decode, base64_strings) -def get_omd_config(key): - for l in file(os.environ["OMD_ROOT"] + "/etc/omd/site.conf"): - if l.startswith(key + "="): - return l.split("=")[-1].strip("'\n") - return None - - -def get_apache_port(): - port = get_omd_config("CONFIG_APACHE_TCP_PORT") - if port is None: - return 80 - return int(port) - - def use_cmk_graphs(): - return get_omd_config("CONFIG_CORE") == "cmc" + return site.get_omd_config("CONFIG_CORE") == "cmc" def render_performance_graphs(context): diff --git a/cmk/site.py b/cmk/site.py new file mode 100644 index 0000000..7a62211 --- /dev/null +++ b/cmk/site.py @@ -0,0 +1,40 @@ +#!/usr/bin/env python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2014 mk(a)mathias-kettner.de | +# +------------------------------------------------------------------+ +# +# This file is part of Check_MK. +# The official homepage is at http://mathias-kettner.de/check_mk. +# +# check_mk is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation in version 2. check_mk is distributed +# in the hope that it will be useful, but WITHOUT ANY WARRANTY; with- +# out even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. See the GNU General Public License for more de- +# tails. You should have received a copy of the GNU General Public +# License along with GNU Make; see the file COPYING. If not, write +# to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, +# Boston, MA 02110-1301 USA. + +import os + +def get_omd_config(key): + for l in file(os.environ["OMD_ROOT"] + "/etc/omd/site.conf"): + if l.startswith(key + "="): + return l.split("=")[-1].strip("'\n") + return None + + +def get_apache_port(): + port = get_omd_config("CONFIG_APACHE_TCP_PORT") + if port is None: + return 80 + return int(port)

5 years, 7 months

6677 It is now possible to hide annotations in PDF reports

by Andreas Boesl

Module: check_mk Branch: master Commit: 0abeb5bc186d7b8ad59ca4a4ef6bdd63f81b5580 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0abeb5bc186d7b… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Nov 7 19:16:47 2018 +0100 6677 It is now possible to hide annotations in PDF reports A new option <tt>Hide annotation in report</tt> is now available when editing an annotation. CMK-997 Change-Id: If62ca691ea8496b6820c88b72c7d12ac3bb44e52 --- .werks/6677 | 10 ++++++++++ cmk/gui/plugins/views/availability.py | 10 +++++++++- 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/.werks/6677 b/.werks/6677 new file mode 100644 index 0000000..bb96540 --- /dev/null +++ b/.werks/6677 @@ -0,0 +1,10 @@ +Title: It is now possible to hide specific annotations in PDF reports +Level: 1 +Component: reporting +Compatible: compat +Edition: cee +Version: 1.6.0i1 +Date: 1541614522 +Class: feature + +A new option <tt>Hide annotation in report</tt> is now available when editing an annotation. diff --git a/cmk/gui/plugins/views/availability.py b/cmk/gui/plugins/views/availability.py index 8d72240..0cef148 100644 --- a/cmk/gui/plugins/views/availability.py +++ b/cmk/gui/plugins/views/availability.py @@ -26,6 +26,7 @@ import time +import cmk import cmk.gui.config as config import cmk.gui.availability as availability import cmk.gui.table as table @@ -34,6 +35,7 @@ from cmk.gui.i18n import _ from cmk.gui.globals import html from cmk.gui.exceptions import MKUserError from cmk.gui.valuespec import ( + Checkbox, TextAreaUnicode, TextAscii, Dictionary, @@ -767,6 +769,8 @@ def show_annotations(annotations, av_rawdata, what, avoptions, omit_service): table.cell(_("Annotation"), html.render_text(annotation["text"])) table.cell(_("Author"), annotation["author"]) table.cell(_("Entry"), render_date(annotation["date"]), css="nobr narrow") + if not cmk.is_raw_edition(): + table.cell(_("Hide in report"), _("Yes") if annotation.get("hide_from_report") else _("No")) table.end() @@ -837,6 +841,10 @@ def edit_annotation(): def _vs_annotation(): + extra_elements = [] + if not cmk.is_raw_edition(): + extra_elements.append(("hide_from_report", Checkbox(title = _("Hide annotation in report")))) + return Dictionary( elements = [ ("site", TextAscii(title = _("Site")) ), @@ -855,7 +863,7 @@ def _vs_annotation(): label = _("Reclassify downtime of this period"), )), ("text", TextAreaUnicode(title = _("Annotation"), allow_empty = False) ), - ], + ] + extra_elements, title = _("Edit annotation"), optional_keys = [], )

5 years, 7 months

Patch is not aplied because of diff instead of dif. Fixup for: Change-Id: Ibb7a2fefd3b1f866b8f7bae82cf8db7f00931a5a: 6238 FIX check_http: fixed proxy authentification problem when using NTLM

by Alex Zurhake

Module: check_mk Branch: master Commit: ada7a4a6971817378d8c24d73f377305ea518171 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ada7a4a6971817… Author: Alex Zurhake <az(a)mathias-kettner.de> Date: Thu Nov 8 10:03:34 2018 +0100 Patch is not aplied because of diff instead of dif. Fixup for: Change-Id: Ibb7a2fefd3b1f866b8f7bae82cf8db7f00931a5a: 6238 FIX check_http: fixed proxy authentification problem when using NTLM Change-Id: I6ecb3a89f169664f8d6363fe9c5681596037d883 --- .../{0005-check_http_proxy_usage.diff => 0005-check_http_proxy_usage.dif} | 0 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/omd/packages/monitoring-plugins/patches/0005-check_http_proxy_usage.diff b/omd/packages/monitoring-plugins/patches/0005-check_http_proxy_usage.dif similarity index 100% rename from omd/packages/monitoring-plugins/patches/0005-check_http_proxy_usage.diff rename to omd/packages/monitoring-plugins/patches/0005-check_http_proxy_usage.dif

5 years, 7 months

Added a workaround for a g++/libstdc++ bug.

by Sven Panne

Module: check_mk Branch: master Commit: 63ed249feb481a20132407e23fd51d82417a7646 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=63ed249feb481a… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Nov 8 10:57:49 2018 +0100 Added a workaround for a g++/libstdc++ bug. Change-Id: I1d0aa7e5f104aa35bf353f19155b4fd44f221b08 --- livestatus/src/IntFilter.cc | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/livestatus/src/IntFilter.cc b/livestatus/src/IntFilter.cc index aaf8358..fce79a4 100644 --- a/livestatus/src/IntFilter.cc +++ b/livestatus/src/IntFilter.cc @@ -92,9 +92,12 @@ std::optional<int32_t> IntFilter::greatestLowerBoundFor( case RelationalOperator::doesnt_match_icase: // contains none of case RelationalOperator::less: case RelationalOperator::less_or_equal: - return {}; + // NOTE: If we use the equivalent 'return {}' here and the other + // std::nullopt occurences below, we run into g++/libstdc++ bug + // https://gcc.gnu.org/bugzilla/show_bug.cgi?id=86465. :-/ + return std::nullopt; } - return {}; // unreachable + return std::nullopt; // unreachable } std::optional<int32_t> IntFilter::leastUpperBoundFor( @@ -118,9 +121,9 @@ std::optional<int32_t> IntFilter::leastUpperBoundFor( case RelationalOperator::doesnt_match_icase: // contains none of case RelationalOperator::greater_or_equal: case RelationalOperator::greater: - return {}; + return std::nullopt; } - return {}; // unreachable + return std::nullopt; // unreachable } std::optional<std::bitset<32>> IntFilter::valueSetLeastUpperBoundFor(

5 years, 7 months

6675 Datasource programs are now able to receive their configuration from stdin

by Andreas Boesl

Module: check_mk Branch: master Commit: d4576e482a9a680b73efaf3748183013b9bc4531 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d4576e482a9a68… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Oct 29 13:24:43 2018 +0100 6675 Datasource programs are now able to receive their configuration from stdin Change-Id: I24e91aa3f581a453124f9a09189f7cf8f93d1798 --- .werks/6675 | 10 ++++++ cmk_base/data_sources/programs.py | 44 +++++++++++++++-------- tests/unit/cmk_base/test_data_sources_unit.py | 52 +++++++++++++++++++++++++-- 3 files changed, 89 insertions(+), 17 deletions(-) diff --git a/.werks/6675 b/.werks/6675 new file mode 100644 index 0000000..a58da37 --- /dev/null +++ b/.werks/6675 @@ -0,0 +1,10 @@ +Title: Datasource programs may also receive their configuration through stdin +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1541508999 +Class: feature + + diff --git a/cmk_base/data_sources/programs.py b/cmk_base/data_sources/programs.py index 73d0955..f197547 100644 --- a/cmk_base/data_sources/programs.py +++ b/cmk_base/data_sources/programs.py @@ -27,6 +27,7 @@ import os import signal import subprocess +import collections import cmk.paths @@ -56,10 +57,10 @@ class ProgramDataSource(CheckMKAgentDataSource): return "ds" def _execute(self): - command_line = self._get_command_line() - return self._get_agent_info_program(command_line) + command_line, command_stdin = self._get_command_line_and_stdin() + return self._get_agent_info_program(command_line, command_stdin) - def _get_agent_info_program(self, commandline): + def _get_agent_info_program(self, commandline, command_stdin): exepath = commandline.split()[0] # for error message, hide options! self._logger.debug("Calling external program %r" % (commandline)) @@ -69,7 +70,7 @@ class ProgramDataSource(CheckMKAgentDataSource): p = subprocess.Popen( # nosec commandline, shell=True, - stdin=open(os.devnull), + stdin=subprocess.PIPE if command_stdin else open(os.devnull), stdout=subprocess.PIPE, stderr=subprocess.PIPE, preexec_fn=os.setsid, @@ -81,11 +82,11 @@ class ProgramDataSource(CheckMKAgentDataSource): p = subprocess.Popen( # nosec commandline, shell=True, - stdin=open(os.devnull), + stdin=subprocess.PIPE if command_stdin else open(os.devnull), stdout=subprocess.PIPE, stderr=subprocess.PIPE, close_fds=True) - stdout, stderr = p.communicate() + stdout, stderr = p.communicate(input=command_stdin) exitstatus = p.returncode except MKTimeout: # On timeout exception try to stop the process to prevent child process "leakage" @@ -109,13 +110,18 @@ class ProgramDataSource(CheckMKAgentDataSource): return stdout - def _get_command_line(self): + def _get_command_line_and_stdin(self): """Returns the final command line to be executed""" raise NotImplementedError() def describe(self): """Return a short textual description of the agent""" - return "Program: %s" % self._get_command_line() + command_line, command_stdin = self._get_command_line_and_stdin() + response = ["Program: %s" % command_line] + if command_stdin: + response.extend([" Program stdin:", command_stdin]) + return "\n".join(response) + class DSProgramDataSource(ProgramDataSource): @@ -128,16 +134,17 @@ class DSProgramDataSource(ProgramDataSource): def name(self): """Return a unique (per host) textual identification of the data source""" - program = self._get_command_line().split(" ")[0] + command_line, _command_stdin = self._get_command_line_and_stdin() + program = command_line.split(" ")[0] return os.path.basename(program) - def _get_command_line(self): + def _get_command_line_and_stdin(self): cmd = self._command_template cmd = self._translate_legacy_macros(cmd) cmd = self._translate_host_macros(cmd) - return cmd + return cmd, None def _translate_legacy_macros(self, cmd): # Make "legacy" translation. The users should use the $...$ macros in future @@ -155,6 +162,8 @@ class DSProgramDataSource(ProgramDataSource): return core_config.replace_macros(cmd, macros) +SpecialAgentConfiguration = collections.namedtuple("SpecialAgentConfiguration", ["args", "stdin"]) + class SpecialAgentDataSource(ProgramDataSource): def __init__(self, hostname, ipaddress, special_agent_id, params): self._special_agent_id = special_agent_id @@ -175,10 +184,17 @@ class SpecialAgentDataSource(ProgramDataSource): def _gather_check_plugin_names(self): return config.discoverable_tcp_checks() - def _get_command_line(self): + def _get_command_line_and_stdin(self): """Create command line using the special_agent_info""" info_func = config.special_agent_info[self._special_agent_id] - cmd_arguments = info_func(self._params, self._hostname, self._ipaddress) + agent_configuration = info_func(self._params, self._hostname, self._ipaddress) + if isinstance(agent_configuration, SpecialAgentConfiguration): + cmd_arguments = agent_configuration.args + command_stdin = agent_configuration.stdin + else: + cmd_arguments = agent_configuration + command_stdin = None + final_arguments = config.prepare_check_command( cmd_arguments, self._hostname, service_description=None) @@ -190,4 +206,4 @@ class SpecialAgentDataSource(ProgramDataSource): else: path = special_agents_dir + "/agent_" + self._special_agent_id - return path + " " + final_arguments + return path + " " + final_arguments, command_stdin diff --git a/tests/unit/cmk_base/test_data_sources_unit.py b/tests/unit/cmk_base/test_data_sources_unit.py index d1a06bd..a97572f 100644 --- a/tests/unit/cmk_base/test_data_sources_unit.py +++ b/tests/unit/cmk_base/test_data_sources_unit.py @@ -1,12 +1,14 @@ import pytest import cmk_base.data_sources.abstract +import cmk_base.data_sources.programs import cmk_base.data_sources.snmp import cmk_base.data_sources.tcp import cmk_base.ip_lookup as ip_lookup import cmk_base.config as config import cmk_base.exceptions + def test_data_source_cache_default(): source = cmk_base.data_sources.snmp.SNMPDataSource("hostname", "ipaddress") assert not source.is_agent_cache_disabled() @@ -57,14 +59,17 @@ def test_mgmt_board_data_source_is_ip_address(): ("127.0.1.1", "lolo", True), (None, "lolo", False), ]) -def test_mgmt_board_data_source_management_board_ipaddress(monkeypatch, result, address, resolvable): +def test_mgmt_board_data_source_management_board_ipaddress(monkeypatch, result, address, + resolvable): source = cmk_base.data_sources.snmp.SNMPManagementBoardDataSource("hostname", "ipaddress") if resolvable: monkeypatch.setattr(ip_lookup, "lookup_ip_address", lambda h: "127.0.1.1") else: + def raise_exc(h): raise cmk_base.exceptions.MKIPAddressLookupError("Failed to...") + monkeypatch.setattr(ip_lookup, "lookup_ip_address", raise_exc) monkeypatch.setattr(config, "management_address_of", lambda h: address) @@ -85,9 +90,9 @@ def test_normalize_ip(ip_in, ips_out): ((0, ''), None, "127.0.0.1"), ((0, ', allowed IP ranges: 1.2.3.4'), "1.2.3.4", "1.2.3.4"), ((1, ', invalid access configuration:' - ' agent allows extra: 1.2.4.6 1.2.5.6(!)'), "1.2.{3,4,5}.6", "1.2.3.6"), + ' agent allows extra: 1.2.4.6 1.2.5.6(!)'), "1.2.{3,4,5}.6", "1.2.3.6"), ((1, ', invalid access configuration:' - ' agent blocks: 1.2.3.5 1.2.3.4(!)'), "1.2.3.6", "1.2.3.{4,5,6}"), + ' agent blocks: 1.2.3.5 1.2.3.4(!)'), "1.2.3.6", "1.2.3.{4,5,6}"), ]) def test_tcpdatasource_only_from(monkeypatch, result, reported, rule): source = cmk_base.data_sources.tcp.TCPDataSource("hostname", "ipaddress") @@ -97,3 +102,44 @@ def test_tcpdatasource_only_from(monkeypatch, result, reported, rule): assert source._sub_result_only_from({"onlyfrom": reported}) == result + +(a)pytest.mark.parametrize("info_func_result,expected", [ + ( + "arg0 arg1", + ("arg0 arg1", None), + ), + ( + ["arg0", "arg1"], + ("'arg0' 'arg1'", None), + ), + ( + cmk_base.data_sources.programs.SpecialAgentConfiguration("arg0", None), + ("arg0", None), + ), + ( + cmk_base.data_sources.programs.SpecialAgentConfiguration("arg0 arg1", None), + ("arg0 arg1", None), + ), + ( + cmk_base.data_sources.programs.SpecialAgentConfiguration(["list0", "list1"], None), + ("'list0' 'list1'", None), + ), + ( + cmk_base.data_sources.programs.SpecialAgentConfiguration("arg0 arg1", "stdin_blob"), + ("arg0 arg1", "stdin_blob"), + ), + ( + cmk_base.data_sources.programs.SpecialAgentConfiguration(["list0", "list1"], "stdin_blob"), + ("'list0' 'list1'", "stdin_blob"), + ), +]) +def test_get_command_line_and_stdin(monkeypatch, info_func_result, expected): + special_agent_id = "bi" + agent_prefix = "share/check_mk/agents/special/agent_%s " % special_agent_id + ds = cmk_base.data_sources.programs.SpecialAgentDataSource("testhost", "127.0.0.1", + special_agent_id, None) + monkeypatch.setattr(config, "special_agent_info", + {special_agent_id: lambda a, b, c: info_func_result}) + command_line, command_stdin = ds._get_command_line_and_stdin() + assert command_line == agent_prefix + expected[0] + assert command_stdin == expected[1]

5 years, 7 months

Semi-automatic yapf for cmk/gui/wato/utils

by Óscar Nájera

Module: check_mk Branch: master Commit: 196e0acc08b95a1e2a3fe13a4be3a11e0b122443 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=196e0acc08b95a… Author: Óscar Nájera <on(a)mathias-kettner.de> Date: Mon Nov 5 16:23:59 2018 +0100 Semi-automatic yapf for cmk/gui/wato/utils CMK-1180 Change-Id: I20aaf326b690dabc4f5b5f46d6050b005eb86610 --- cmk/gui/plugins/wato/utils/__init__.py | 250 ++++++++++++++------------ cmk/gui/plugins/wato/utils/base_modes.py | 20 +-- cmk/gui/plugins/wato/utils/context_buttons.py | 6 +- cmk/gui/plugins/wato/utils/html_elements.py | 5 +- cmk/gui/plugins/wato/utils/main_menu.py | 9 +- 5 files changed, 147 insertions(+), 143 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=196e0acc08…

5 years, 7 months

Automatic yapf for cmk/gui/plugins/dashboard

by Óscar Nájera

Module: check_mk Branch: master Commit: f02ad8ea187811360eed63adbfba3d1490f48064 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f02ad8ea187811… Author: Óscar Nájera <on(a)mathias-kettner.de> Date: Mon Nov 5 17:03:53 2018 +0100 Automatic yapf for cmk/gui/plugins/dashboard CMK-1180 Change-Id: I28eb5acf53cbe15a69a403ddfd175b0b8692b73a --- cmk/gui/plugins/dashboard/custom_url.py | 10 +-- cmk/gui/plugins/dashboard/failed_notifications.py | 16 ++--- cmk/gui/plugins/dashboard/graph.py | 44 +++++------- cmk/gui/plugins/dashboard/logo.py | 9 +-- cmk/gui/plugins/dashboard/network_topology.py | 12 +--- cmk/gui/plugins/dashboard/notify_users.py | 12 ++-- cmk/gui/plugins/dashboard/overview.py | 18 +++-- cmk/gui/plugins/dashboard/snapin.py | 15 ++-- cmk/gui/plugins/dashboard/static_text.py | 8 +-- cmk/gui/plugins/dashboard/stats.py | 79 ++++++++++---------- cmk/gui/plugins/dashboard/utils.py | 88 ++++++----------------- cmk/gui/plugins/dashboard/view.py | 10 +-- 12 files changed, 113 insertions(+), 208 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=f02ad8ea18…

5 years, 7 months

Semi-automatic yapf cmk/gui/plugins/visuals/

by Óscar Nájera

Module: check_mk Branch: master Commit: 39a2b9d571fc0c259602caa5d3e3f8ed4dc59c54 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=39a2b9d571fc0c… Author: Óscar Nájera <on(a)mathias-kettner.de> Date: Mon Nov 5 17:16:31 2018 +0100 Semi-automatic yapf cmk/gui/plugins/visuals/ CMK-1180 Change-Id: If2e12d70150bbb84cc6ac1409ee823e152f939dd --- cmk/gui/plugins/visuals/filters.py | 372 +++++++++++++++++++---------------- cmk/gui/plugins/visuals/inventory.py | 53 +++-- cmk/gui/plugins/visuals/utils.py | 33 ++-- cmk/gui/plugins/visuals/wato.py | 24 ++- 4 files changed, 249 insertions(+), 233 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=39a2b9d571…

5 years, 7 months

Update nagios core from 3.5.0 to 3.5.1

by Alex Zurhake

Module: check_mk Branch: master Commit: d67f9fb6d7f4a5cdbc7813cc55988d5c210ea076 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d67f9fb6d7f4a5… Author: Alex Zurhake <az(a)mathias-kettner.de> Date: Wed Nov 7 11:03:31 2018 +0100 Update nagios core from 3.5.0 to 3.5.1 Change-Id: I6a5384f8e228c1b80bcd2d72e47201b6725093e2 --- omd/packages/nagios/Makefile | 4 +- omd/packages/nagios/nagios-3.5.0.tar.gz | Bin 1789376 -> 0 bytes omd/packages/nagios/nagios-3.5.1.tar.gz | Bin 0 -> 1798614 bytes .../patches/0004-remove-updateversioninfo.dif | 6 +-- .../patches/0008-fix-encoding-after-2-reloads.dif | 10 ---- ...-comparison-operator-in-service-freshness-c.dif | 13 ----- ...-445-Adding-triggered-downtime-for-child-ho.dif | 58 --------------------- 7 files changed, 4 insertions(+), 87 deletions(-) diff --git a/omd/packages/nagios/Makefile b/omd/packages/nagios/Makefile index ad664de..df03dd7 100644 --- a/omd/packages/nagios/Makefile +++ b/omd/packages/nagios/Makefile @@ -1,7 +1,7 @@ include ../../Makefile.omd NAME = nagios -VERSION = 3.5.0 +VERSION = 3.5.1 DIR = $(NAME)-$(VERSION) # Configure options for Nagios. Since we want to compile @@ -31,8 +31,6 @@ compile: unpack: rm -rf $(DIR) tar xzf $(DIR).tar.gz - mv nagios $(DIR) - patch: set -e ; for p in patches/*.dif ; do \ diff --git a/omd/packages/nagios/nagios-3.5.0.tar.gz b/omd/packages/nagios/nagios-3.5.0.tar.gz deleted file mode 100644 index 4f1a996..0000000 Binary files a/omd/packages/nagios/nagios-3.5.0.tar.gz and /dev/null differ diff --git a/omd/packages/nagios/nagios-3.5.1.tar.gz b/omd/packages/nagios/nagios-3.5.1.tar.gz new file mode 100644 index 0000000..5142fe4 Binary files /dev/null and b/omd/packages/nagios/nagios-3.5.1.tar.gz differ diff --git a/omd/packages/nagios/patches/0004-remove-updateversioninfo.dif b/omd/packages/nagios/patches/0004-remove-updateversioninfo.dif index f3c7316..0ec9604 100644 --- a/omd/packages/nagios/patches/0004-remove-updateversioninfo.dif +++ b/omd/packages/nagios/patches/0004-remove-updateversioninfo.dif @@ -2,9 +2,9 @@ +++ nagios.b/html/main.php 2013-03-24 13:55:49.000000000 +0100 @@ -40,38 +40,10 @@ <div class="product">Nagios<sup><span style="font-size: small;">®</span></sup> Core<sup><span style="font-size: small;">™</span></sup></div> - <div class="version">Version 3.5.0</div> - <div class="releasedate">March 15, 2013</div> --<div class="checkforupdates"><a href="http://www.nagios.org/checkforupdates/?version=3.5.0&product=nagioscore" target="_blank">Check for updates</a></div> + <div class="version">Version 3.5.1</div> + <div class="releasedate">August 30, 2013</div> +-<div class="checkforupdates"><a href="http://www.nagios.org/checkforupdates/?version=3.5.1&product=nagioscore" target="_blank">Check for updates</a></div>  </div> diff --git a/omd/packages/nagios/patches/0008-fix-encoding-after-2-reloads.dif b/omd/packages/nagios/patches/0008-fix-encoding-after-2-reloads.dif deleted file mode 100644 index 45ee157..0000000 --- a/omd/packages/nagios/patches/0008-fix-encoding-after-2-reloads.dif +++ /dev/null @@ -1,10 +0,0 @@ ---- nagios-3.5.0/common/macros.c.orig 2013-06-07 15:11:04.327006405 +0200 -+++ nagios-3.5.0/common/macros.c 2013-06-07 15:11:23.603004838 +0200 -@@ -2585,6 +2585,7 @@ - for(x = 0; x < MACRO_X_COUNT; x++) { - macro_keys[x].code = x; - macro_keys[x].name = macro_x_names[x]; -+ macro_keys[x].clean_options = 0; - - /* host/service output/perfdata and author/comment macros should get cleaned */ - if((x >= 16 && x <= 19) || (x >= 49 && x <= 52) || (x >= 99 && x <= 100) || (x >= 124 && x <= 127)) { diff --git a/omd/packages/nagios/patches/0009-Corrected-comparison-operator-in-service-freshness-c.dif b/omd/packages/nagios/patches/0009-Corrected-comparison-operator-in-service-freshness-c.dif deleted file mode 100644 index 5d529f0..0000000 --- a/omd/packages/nagios/patches/0009-Corrected-comparison-operator-in-service-freshness-c.dif +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/base/checks.c b/base/checks.c ---- a/base/checks.c -+++ b/base/checks.c -@@ -2086,7 +2086,7 @@ int is_service_result_fresh(service *temp_service, time_t current_time, int log_ - */ - if(temp_service->check_type == SERVICE_CHECK_PASSIVE) { - if(temp_service->last_check < event_start && -- event_start - last_program_stop < freshness_threshold * 0.618) { -+ event_start - last_program_stop > freshness_threshold * 0.618) { - expiration_time = event_start + freshness_threshold; - } - } - diff --git a/omd/packages/nagios/patches/0010-Fixed-bug-445-Adding-triggered-downtime-for-child-ho.dif b/omd/packages/nagios/patches/0010-Fixed-bug-445-Adding-triggered-downtime-for-child-ho.dif deleted file mode 100644 index 1f683f4..0000000 --- a/omd/packages/nagios/patches/0010-Fixed-bug-445-Adding-triggered-downtime-for-child-ho.dif +++ /dev/null @@ -1,58 +0,0 @@ -diff --git a/common/downtime.c b/common/downtime.c ---- a/common/downtime.c -+++ b/common/downtime.c -@@ -360,6 +360,14 @@ int register_downtime(int type, unsigned long downtime_id) { - } - } - -+ /* If the downtime is triggered and was in effect, mark it as not in -+ effect so it gets scheduled correctly */ -+ if((temp_downtime->triggered_by != 0) && -+ (TRUE == temp_downtime->is_in_effect)) { -+ was_in_effect = temp_downtime->is_in_effect; -+ temp_downtime->is_in_effect = FALSE; -+ } -+ - if((FALSE == temp_downtime->fixed) && (FALSE == was_in_effect)) { - /* increment pending flex downtime counter */ - if(temp_downtime->type == HOST_DOWNTIME) -@@ -1111,6 +1119,39 @@ int add_downtime(int downtime_type, char *host_name, char *svc_description, time - static int downtime_compar(const void *p1, const void *p2) { - scheduled_downtime *d1 = *(scheduled_downtime **)p1; - scheduled_downtime *d2 = *(scheduled_downtime **)p2; -+ -+ /* -+ If the start times of two downtimes are equal and one is triggered but -+ but the other is not, the triggered downtime should be later in the -+ list than the untriggered one. This is so they are written to the -+ retention.dat and status.dat in the correct order. -+ -+ Previously the triggered downtime always appeared before its -+ triggering downtime in those files. When the downtimes were read -+ from those files, either on a core restart or by the CGIs, the -+ triggered downtime would be discarded because the triggering -+ downtime did not yet exist. -+ -+ The most common case for this is when a downtime is created and -+ the option is selected to create triggered downtimes on all child -+ objects. This change in the sort order does NOT resolve the -+ case where a manually created, triggered downtime is created with -+ a start time earlier than the triggering downtime. -+ -+ This would need to be resolved by comparing the triggered_by value -+ with the downtime ID regardless of the start time. However, this -+ should be a relatively rare case and only caused by intentional -+ scheduling by a human. This change was not implemented because it -+ would cause the downtime list to be out of time order and the -+ implications of this were not well understood. -+ */ -+ -+ if(d1->start_time == d2->start_time) { -+ if(( d1->triggered_by == 0 && d2->triggered_by != 0) || -+ ( d1->triggered_by != 0 && d2->triggered_by == 0)) { -+ return d1->triggered_by == 0 ? -1 : 1; -+ } -+ } - return (d1->start_time < d2->start_time) ? -1 : (d1->start_time - d2->start_time); - } -

5 years, 7 months

← Newer
1
...
39
40
41
42
43
44
45
46
47
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits November 2018