Checkmk git commits February 2019

checkmk-commits@lists.checkmk.com

18 participants
457 discussions

agent_aws: Fixed assert statement for checking piggyback hostname type

by Simon Betz

Module: check_mk Branch: master Commit: 9da5efe69a3997a9c9042c72e7cc10ab2c05ea66 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9da5efe69a3997… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed Feb 13 12:22:25 2019 +0100 agent_aws: Fixed assert statement for checking piggyback hostname type Change-Id: I3c7f1de516484ee71143ce28b725283ac2a1c514 --- agents/special/agent_aws | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/agents/special/agent_aws b/agents/special/agent_aws index 9c9053b..4693b61 100755 --- a/agents/special/agent_aws +++ b/agents/special/agent_aws @@ -101,7 +101,7 @@ AWSSectionResults = NamedTuple("AWSSectionResults", [ ]) AWSSectionResult = NamedTuple("AWSSectionResult", [ - ("piggyback_hostname", str), + ("piggyback_hostname", Any), ("content", Any), ]) @@ -198,8 +198,8 @@ class AWSSection(object): continue assert isinstance( - result.piggyback_hostname, - str), "%s: Piggyback hostname of created result must be of type 'str'" % self.name + result.piggyback_hostname, (unicode, str) + ), "%s: Piggyback hostname of created result must be of type 'unicode' or 'str'" % self.name # In the related check plugin aws.include we parse these results and # extend list of json-loaded results. assert isinstance(result.content,

5 years, 7 months

7142 cisco_ip_sla: Now discovers C891F-K9 from Cisco 890 Integrated Services Router series

by Moritz Kiemer

Module: check_mk Branch: master Commit: 8a5a5bcb90ede0a1307ec6371caa4e13ac4cac9c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8a5a5bcb90ede0… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Wed Feb 13 08:57:16 2019 +0100 7142 cisco_ip_sla: Now discovers C891F-K9 from Cisco 890 Integrated Services Router series Change-Id: Idfe8e3a385560adcbabd3bd1b6ce95ebd9799ff5 --- .werks/7142 | 10 ++++++++++ checks/cisco_ip_sla | 1 + 2 files changed, 11 insertions(+) diff --git a/.werks/7142 b/.werks/7142 new file mode 100644 index 0000000..d1936a0 --- /dev/null +++ b/.werks/7142 @@ -0,0 +1,10 @@ +Title: cisco_ip_sla: Now discovers C891F-K9 from Cisco 890 Integrated Services Router series +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1550044552 +Class: feature + + diff --git a/checks/cisco_ip_sla b/checks/cisco_ip_sla index a526ae3..b6c6f7f 100644 --- a/checks/cisco_ip_sla +++ b/checks/cisco_ip_sla @@ -188,6 +188,7 @@ check_info['cisco_ip_sla'] = { 'has_perfdata': True, 'snmp_scan_function': lambda oid: oid('.1.3.6.1.2.1.1.2.0') in [ '.1.3.6.1.4.1.9.1.2068', + '.1.3.6.1.4.1.9.1.1858', ], 'snmp_info': [ (

5 years, 7 months

mk_docker.py: Add a few sentences to docstring / example configs

by Moritz Kiemer

Module: check_mk Branch: master Commit: a53166977722a162eeacb53b173ac0382c27969a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a53166977722a1… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Wed Feb 13 09:16:31 2019 +0100 mk_docker.py: Add a few sentences to docstring / example configs CMK-1660 Change-Id: Ic5b3e07246fdde9c90841bf6034c3557bd610fdc --- agents/cfg_examples/docker.cfg | 5 +++++ agents/cfg_examples/docker.minimal.cfg | 4 +++- .../{docker.perf_tradeof.cfg => docker.perf_tradeoff.cfg} | 4 ++-- agents/plugins/mk_docker.py | 2 ++ tests/unit/plugins/test_mk_docker.py | 2 +- 5 files changed, 13 insertions(+), 4 deletions(-) diff --git a/agents/cfg_examples/docker.cfg b/agents/cfg_examples/docker.cfg index 74125e7..a874c94 100644 --- a/agents/cfg_examples/docker.cfg +++ b/agents/cfg_examples/docker.cfg @@ -2,6 +2,11 @@ # # mk_docker.py # +# It is designed to give you an impression of available +# options. The specific choice in this file is a valid setup, +# but probably not suitable for your use case. +# If you intend to run the plugin with the default options, +# you do not need any configuration file at all. # You must specify one section of the name DOCKER (additional sections are ignored). [DOCKER] diff --git a/agents/cfg_examples/docker.minimal.cfg b/agents/cfg_examples/docker.minimal.cfg index b267e03..27e43bb 100644 --- a/agents/cfg_examples/docker.minimal.cfg +++ b/agents/cfg_examples/docker.minimal.cfg @@ -3,6 +3,8 @@ # mk_docker.py # # This will configure the plugin to produce minimal output: -# Only the section <<<docker_node_info>>> is created: +# Only the section <<<docker_node_info>>> is created. +# It will be assumed the docker daemon is listening on the +# local UNIX domain socket. [DOCKER] skip_sections: docker_node_disk_usage,docker_node_images,docker_node_network,docker_container_client,docker_container_agent diff --git a/agents/cfg_examples/docker.perf_tradeof.cfg b/agents/cfg_examples/docker.perf_tradeoff.cfg similarity index 66% rename from agents/cfg_examples/docker.perf_tradeof.cfg rename to agents/cfg_examples/docker.perf_tradeoff.cfg index a6e224d..09f45ca 100644 --- a/agents/cfg_examples/docker.perf_tradeof.cfg +++ b/agents/cfg_examples/docker.perf_tradeoff.cfg @@ -2,9 +2,9 @@ # # mk_docker.py # -# This example is designed to configure a trade-of between +# This example is designed to configure a trade-off between # information depth and execution time: -# skip the exensive tasks of determining the disk usage +# Skip the extensive tasks of determining the disk usage # and running the agents inside the containers. [DOCKER] skip_sections: docker_node_disk_usage,docker_container_agent diff --git a/agents/plugins/mk_docker.py b/agents/plugins/mk_docker.py index c5113aa..5b0110a 100755 --- a/agents/plugins/mk_docker.py +++ b/agents/plugins/mk_docker.py @@ -31,6 +31,8 @@ At 'agents/cfg_examples/mk_docker.cfg' (relative to the check_mk source code directory ) you should find some example configuration files. For more information on possible configurations refer to the file docker.cfg in said directory. +The docker-py library must be installed on the system executing the +plugin ("pip install docker"). This plugin it will be called by the agent without any arguments. """ diff --git a/tests/unit/plugins/test_mk_docker.py b/tests/unit/plugins/test_mk_docker.py index e71fb56..685de73 100644 --- a/tests/unit/plugins/test_mk_docker.py +++ b/tests/unit/plugins/test_mk_docker.py @@ -11,7 +11,7 @@ sys.path.insert(0, os.path.join(cmk_path(), 'agents', 'plugins')) import mk_docker # pylint: disable=import-error,wrong-import-position PLUGIN_CHECKSUMS = { - '0.1': 'd83056096210caba2068f9849c4811dd', + '0.1': '7e456e69affbebf7b2f070a6d6548e23', }

5 years, 7 months

yapfed abstract.py

by Andreas Boesl

Module: check_mk Branch: master Commit: e7f7677674d6bc367f7f00b7c6c27cda994be21d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e7f7677674d6bc… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Feb 13 11:24:29 2019 +0100 yapfed abstract.py Change-Id: I6dfd090c996a35d055ba5ae4b9da507037f30444 --- cmk_base/data_sources/abstract.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cmk_base/data_sources/abstract.py b/cmk_base/data_sources/abstract.py index 48a4b52..7a9f140 100644 --- a/cmk_base/data_sources/abstract.py +++ b/cmk_base/data_sources/abstract.py @@ -431,7 +431,8 @@ class DataSource(object): store.save_data_to_file(file_path, persisted_sections, pretty=False) self._logger.debug("Stored persisted sections: %s" % (", ".join(persisted_sections.keys()))) - def _update_info_with_persisted_sections(self, persisted_sections_from_disk, host_sections, is_cached_data): + def _update_info_with_persisted_sections(self, persisted_sections_from_disk, host_sections, + is_cached_data): persisted_sections = persisted_sections_from_disk persisted_sections_from_raw = host_sections.persisted_sections

5 years, 7 months

removed needless werk

by Andreas Boesl

Module: check_mk Branch: master Commit: 82ea9a2597644cf2fe82880078cc2f8032f9ca2e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=82ea9a2597644c… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Feb 13 10:42:08 2019 +0100 removed needless werk Change-Id: I6ae5085bf34d987aec428727dee6147eecef98a0 --- .werks/6704 | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/.werks/6704 b/.werks/6704 deleted file mode 100644 index 461e986..0000000 --- a/.werks/6704 +++ /dev/null @@ -1,11 +0,0 @@ -Title: Fixed problem where persistent information of hosts was randomly missing, causing services to go stale -Level: 1 -Component: checks -Class: fix -Compatible: compat -Edition: cre -State: unknown -Version: 1.6.0i1 -Date: 1549970984 - -

5 years, 7 months

6704 FIX Fixed problem where persistent information of hosts was randomly missing , causing services to go stale

by Andreas Boesl

Module: check_mk Branch: master Commit: 51e9971e41ee183ea9fd6f405369488e18f26e0f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=51e9971e41ee18… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Feb 12 12:32:48 2019 +0100 6704 FIX Fixed problem where persistent information of hosts was randomly missing, causing services to go stale CMK-1670 Change-Id: Ib23e6d446761dd1c511060b89adf6c4ad19c6da3 --- .werks/6704 | 11 +++++++++++ cmk_base/data_sources/abstract.py | 10 +++++++--- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/.werks/6704 b/.werks/6704 new file mode 100644 index 0000000..461e986 --- /dev/null +++ b/.werks/6704 @@ -0,0 +1,11 @@ +Title: Fixed problem where persistent information of hosts was randomly missing, causing services to go stale +Level: 1 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1549970984 + + diff --git a/cmk_base/data_sources/abstract.py b/cmk_base/data_sources/abstract.py index 283f9630..48a4b52 100644 --- a/cmk_base/data_sources/abstract.py +++ b/cmk_base/data_sources/abstract.py @@ -122,6 +122,9 @@ class DataSource(object): try: cpu_tracking.push_phase(self._cpu_tracking_id()) + persisted_sections_from_disk = self._load_persisted_sections() + self._persisted_sections = persisted_sections_from_disk + raw_data, is_cached_data = self._get_raw_data() self._host_sections = host_sections = self._convert_to_sections(raw_data) @@ -131,7 +134,8 @@ class DataSource(object): return raw_data # Add information from previous persisted infos - host_sections = self._update_info_with_persisted_sections(host_sections, is_cached_data) + host_sections = self._update_info_with_persisted_sections(persisted_sections_from_disk, + host_sections, is_cached_data) self._persisted_sections = host_sections.persisted_sections return host_sections @@ -427,9 +431,9 @@ class DataSource(object): store.save_data_to_file(file_path, persisted_sections, pretty=False) self._logger.debug("Stored persisted sections: %s" % (", ".join(persisted_sections.keys()))) - def _update_info_with_persisted_sections(self, host_sections, is_cached_data): + def _update_info_with_persisted_sections(self, persisted_sections_from_disk, host_sections, is_cached_data): + persisted_sections = persisted_sections_from_disk persisted_sections_from_raw = host_sections.persisted_sections - persisted_sections = self._load_persisted_sections() if persisted_sections_from_raw and not is_cached_data: persisted_sections.update(persisted_sections_from_raw)

5 years, 7 months

docker_container_network: fix tiny bug

by Moritz Kiemer

Module: check_mk Branch: master Commit: c7a7f19ccf5d7ce5ccf4c47429c05a7d739529e7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c7a7f19ccf5d7c… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Wed Feb 13 09:30:42 2019 +0100 docker_container_network: fix tiny bug Change-Id: Ic18989e5dfd19e109108525079c7f04d5fc2e907 --- inventory/docker_container_network | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/inventory/docker_container_network b/inventory/docker_container_network index 959f07b..70dc702 100644 --- a/inventory/docker_container_network +++ b/inventory/docker_container_network @@ -47,7 +47,7 @@ def inv_docker_container_network_networks(parsed, inventory_tree): def inv_docker_container_network_ports(parsed, inventory_tree): - port_data = parsed.get("Ports") or None + port_data = parsed.get("Ports") or {} ports = inventory_tree.get_list("software.applications.docker.container.ports:")

5 years, 7 months

picked WK6703: Remove SLA painter from default services view

by Andreas Boesl

Module: check_mk Branch: master Commit: 205557063074796a7f827a5c20629bd0bb0871b8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=20555706307479… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Feb 13 09:38:00 2019 +0100 picked WK6703: Remove SLA painter from default services view Change-Id: I8309b5b1fa6a81a092223c955111db32fa8f1640 --- .werks/6703 | 19 +++++++++++++++++++ cmk/gui/plugins/views/builtin.py | 15 --------------- 2 files changed, 19 insertions(+), 15 deletions(-) diff --git a/.werks/6703 b/.werks/6703 new file mode 100644 index 0000000..91dada3 --- /dev/null +++ b/.werks/6703 @@ -0,0 +1,19 @@ +Title: Remove SLA painter from default services view +Level: 1 +Component: multisite +Class: feature +Compatible: compat +Edition: cee +State: unknown +Version: 1.6.0i1 +Date: 1549970622 + +The SLA information is no longer shown per default, since its empty most of the time. +If you want to reenable this painter, just edit the view and add one of the following columns. + +<ul> +<li>Host/Services: SLA column specific</li> +<li>Host/Services: SLA service specific</li> +</ul> + +Keep in mind that you still have to configure a SLA configuration before this column can display any meaningful data. diff --git a/cmk/gui/plugins/views/builtin.py b/cmk/gui/plugins/views/builtin.py index e985fa7..e248fab 100644 --- a/cmk/gui/plugins/views/builtin.py +++ b/cmk/gui/plugins/views/builtin.py @@ -1514,21 +1514,6 @@ multisite_builtin_views.update({ # 2. State and metrics ('service_state', None), - (('sla_specific', { - 'layout_options': { - 'show_elements': ['subresults', 'summary_period'] - }, - 'painter_options': { - 'service_outage_count_painter': { - 'display_type': 'period' - }, - 'service_state_percentage_painter': { - 'display_type': 'period', - 'float_precision': 2 - } - }, - 'timerange_spec': ('sla_period_range', (0, 1)) - }), None), ('svc_plugin_output', None), ('svc_long_plugin_output', None), ('perfometer', None),

5 years, 7 months

legacy_docker.include: final changes for compatibility with new plugin

by Moritz Kiemer

Module: check_mk Branch: master Commit: d338ce14d8980d2317df4b332a2ad6ecec6fd3e1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d338ce14d8980d… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Tue Feb 12 20:11:41 2019 +0100 legacy_docker.include: final changes for compatibility with new plugin * map previously used keys to new keys (used by the docker engine) * introduce some parse functions (to be extended) * simplify keys in disk usage check/data * adjust tests accordingly Change-Id: Ic8d4a52451d6156447478bc7eb0de3090d9b8fab --- checks/docker_node_disk_usage | 19 +- checks/docker_node_info | 7 +- checks/legacy_docker.include | 54 ++- inventory/docker_container_labels | 12 +- inventory/docker_container_network | 9 +- inventory/docker_container_node_name | 14 +- inventory/docker_node_images | 8 +- tests/unit/checks/test_docker_parse_node_images.py | 470 ++++++++++----------- tests/unit/checks/test_docker_parse_system_df.py | 124 +++--- 9 files changed, 385 insertions(+), 332 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=d338ce14d8…

5 years, 7 months

7083 SEC Apache sends out minimal information about the running software and platform to HTTP clients

by Lars Michelsen

Module: check_mk Branch: master Commit: 844e2472a0307fb5215ac8a549b2c2556fff7359 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=844e2472a0307f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Feb 12 18:27:42 2019 +0100 7083 SEC Apache sends out minimal information about the running software and platform to HTTP clients The site apache reports information about the running software and platform to the HTTP clients with each HTTP response using the "Server" HTTP header. It is common practice to minmize this information using the apache configuration option "ServerTokens Prod" which we do now for the site apache by default. We don't modify this setting for the system wide apache. You'll have to configure the system apache on your own in case you want to configure it to work in the same way. Change-Id: Ia70eb2a59ceeb4f2578e551a217abfecae8e9214 --- .werks/7083 | 17 +++++++++++++++++ .../apache-omd/skel/etc/apache/conf.d/security.conf | 3 +++ 2 files changed, 20 insertions(+) diff --git a/.werks/7083 b/.werks/7083 new file mode 100644 index 0000000..89da113 --- /dev/null +++ b/.werks/7083 @@ -0,0 +1,17 @@ +Title: Apache sends out minimal information about the running software and platform to HTTP clients +Level: 1 +Component: omd +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1549992283 +Class: security + +The site apache reports information about the running software and platform to +the HTTP clients with each HTTP response using the "Server" HTTP header. It is +common practice to minmize this information using the apache configuration +option "ServerTokens Prod" which we do now for the site apache by default. + +We don't modify this setting for the system wide apache. You'll have to +configure the system apache on your own in case you want to configure it to +work in the same way. diff --git a/omd/packages/apache-omd/skel/etc/apache/conf.d/security.conf b/omd/packages/apache-omd/skel/etc/apache/conf.d/security.conf index 8f1d5c1..54635fd 100644 --- a/omd/packages/apache-omd/skel/etc/apache/conf.d/security.conf +++ b/omd/packages/apache-omd/skel/etc/apache/conf.d/security.conf @@ -40,3 +40,6 @@ Header always unset Content-Security-Policy </FilesMatch> </IfModule> + +# Provide minimal information about the running software version and platform to clients +ServerTokens Prod

5 years, 7 months

← Newer
1
...
25
26
27
28
29
30
31
...
46
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits February 2019