Checkmk git commits October 2018

checkmk-commits@lists.checkmk.com

15 participants
308 discussions

by Lars Michelsen

Module: check_mk Branch: master Commit: cc7cafcfe8fa3f8cf0eedd41c6776e2a02845724 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cc7cafcfe8fa3f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed May 30 20:41:05 2018 +0200 Add test for missing monitoring plugins Change-Id: I7a281e1b79114ced338634066eb0e9fef287bd5d --- tests/integration/omd/test_monitoring_plugins.py | 98 ++++++++++++++++++++++++ 1 file changed, 98 insertions(+) diff --git a/tests/integration/omd/test_monitoring_plugins.py b/tests/integration/omd/test_monitoring_plugins.py new file mode 100644 index 0000000..6fb0681 --- /dev/null +++ b/tests/integration/omd/test_monitoring_plugins.py @@ -0,0 +1,98 @@ +#!/usr/bin/env python +# encoding: utf-8 + +import pytest +import os + +(a)pytest.mark.parametrize("plugin", [ + "check_apt", + "check_bi_aggr", + "check_breeze", + "check_by_ssh", + "check_clamd", + "check_cluster", + "check_cpu_peaks", + "check_dhcp", + "check_dig", + "check_disk", + "check_disk_smb", + "check_dns", + "check_dummy", + "check_file_age", + "check_flexlm", + "check_form_submit", + "check_ftp", + "check_host", + "check_hpjd", + "check_http", + "check_icmp", + "check_ide_smart", + "check_ifoperstatus", + "check_ifstatus", + "check_imap", + "check_ircd", + "check_jabber", + "check_jmx4perl", + "check_ldap", + "check_ldaps", + "check_load", + "check_log", + "check_lql_service", + "check_mail", + "check_mailboxes", + "check_mail_loop", + "check_mailq", + "check_mkevents", + "check_mrtg", + "check_mrtgtraf", + "check_multi", + "check_mysql", + "check_mysql_health", + "check_mysql_query", + "check_nagios", + "check_nntp", + "check_nntps", + "check_notify_count", + "check_nrpe", + "check_nt", + "check_ntp", + "check_ntp_peer", + "check_ntp_time", + "check_nwstat", + "check_oracle", + "check_oracle_health", + "check_overcr", + "check_pgsql", + "check_ping", + "check_pop", + "check_procs", + "check_real", + "check_rpc", + "check_sensors", + "check_sftp", + "check_simap", + "check_smtp", + "check_snmp", + "check_spop", + "check_sql", + "check_ssh", + "check_ssmtp", + "check_swap", + "check_tcp", + "check_time", + "check_traceroute", + "check_udp", + "check_uniserv", + "check_ups", + "check_users", + "check_wave", + "check_webinject", + "negate", + "urlize", + "utils.pm", + "utils.sh", +]) +def test_monitoring_plugins(site, plugin): + plugin_path = site.path(os.path.join("lib/nagios/plugins", plugin)) + assert os.path.exists(plugin_path) + assert os.access(plugin_path, os.X_OK)

5 years, 8 months

6188 FIX Dropped fping dependency (Removes check_fping)

by Lars Michelsen

Module: check_mk Branch: master Commit: d503d536d933e7a79a02757714698d9bbbb23c2e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d503d536d933e7… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed May 30 20:52:14 2018 +0200 6188 FIX Dropped fping dependency (Removes check_fping) The external fping package dependency has been removed from Check_MK. It is a utility to send "fast pings". The active check "check_fping" needs this package to work. In Check_MK it is standard and recommended to use "check_icmp" for pinging hosts using ICMP. It is used for the host checks of the Raw Edition and for the active checks named "PING". The Microcore uses it's smart ping feature for the host checks by default and falls back to "check_icmp" in some situations. The check check_fping is not used by default. In case you used it, it is recommended to use one of the options mentioned above. If this is no option for you for some reason, please let us know. Change-Id: Ib16299cc64e5b12fb3f7a3355309dfdb090f0f08 --- .werks/6188 | 22 ++++++++++++++++++++++ omd/distros/CENTOS_5.mk | 2 -- omd/distros/CENTOS_6.mk | 2 -- omd/distros/CENTOS_7.mk | 2 -- omd/distros/DEBIAN_5.mk | 2 -- omd/distros/DEBIAN_6.mk | 2 -- omd/distros/DEBIAN_7.mk | 2 -- omd/distros/DEBIAN_8.mk | 2 -- omd/distros/DEBIAN_9.mk | 2 -- omd/distros/SLES_11SP1.mk | 2 -- omd/distros/SLES_11SP2.mk | 2 -- omd/distros/SLES_11SP3.mk | 2 -- omd/distros/SLES_11SP4.mk | 2 -- omd/distros/SLES_12.mk | 2 -- omd/distros/SLES_12SP1.mk | 2 -- omd/distros/SLES_12SP2.mk | 2 -- omd/distros/SLES_12SP3.mk | 2 -- omd/distros/SLES_15.mk | 2 -- omd/distros/UBUNTU_12.04.mk | 2 -- omd/distros/UBUNTU_13.04.mk | 2 -- omd/distros/UBUNTU_14.04.mk | 2 -- omd/distros/UBUNTU_15.04.mk | 2 -- omd/distros/UBUNTU_16.04.mk | 2 -- omd/distros/UBUNTU_16.10.mk | 2 -- omd/distros/UBUNTU_17.04.mk | 2 -- omd/distros/UBUNTU_17.10.mk | 2 -- omd/distros/UBUNTU_18.04.mk | 2 -- 27 files changed, 22 insertions(+), 52 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=d503d536d9…

5 years, 8 months

Cleaned up HTTP parameter input handling

by Lars Michelsen

Module: check_mk Branch: master Commit: 79bfebbd5be522615b039036ab2ad761fca14d3f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=79bfebbd5be522… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Oct 1 13:57:33 2018 +0200 Cleaned up HTTP parameter input handling * Validation of URL input is now centralized in html() by html.get_url_input() * Added get_ascii_input() function * Added tests for this function * Added tests for get_integer_input() on the way Change-Id: I4d542de71e14d92b4405825957c922b2b57b5dc0 --- cmk/gui/htmllib.py | 40 +++++++++++ cmk/gui/login.py | 19 +++-- cmk/gui/main.py | 11 ++- cmk/gui/utils.py | 22 +++--- cmk/gui/views.py | 5 +- cmk/gui/visuals.py | 25 ++----- tests/unit/cmk/gui/test_htmllib_input_vars.py | 100 ++++++++++++++++++++++++++ tests/unit/cmk/gui/test_index.py | 58 +++++++++++++++ 8 files changed, 230 insertions(+), 50 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=79bfebbd5b…

5 years, 8 months

Fixed unused imports

by Lars Michelsen

Module: check_mk Branch: master Commit: 6aa651cc25cf697f7fd2360421753bc90fc71586 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6aa651cc25cf69… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Oct 9 14:53:08 2018 +0200 Fixed unused imports Change-Id: Ia71e8cd44af4e4cae4bef7e7b44c403c0480a547 --- cmk/gui/plugins/dashboard/builtin.py | 1 - cmk/gui/plugins/dashboard/network_topology.py | 7 ------- 2 files changed, 8 deletions(-) diff --git a/cmk/gui/plugins/dashboard/builtin.py b/cmk/gui/plugins/dashboard/builtin.py index 9e2a2e1..b5a9470 100644 --- a/cmk/gui/plugins/dashboard/builtin.py +++ b/cmk/gui/plugins/dashboard/builtin.py @@ -24,7 +24,6 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. -import cmk.gui.config as config from cmk.gui.i18n import _ from . import ( diff --git a/cmk/gui/plugins/dashboard/network_topology.py b/cmk/gui/plugins/dashboard/network_topology.py index ca037bc..2723639 100644 --- a/cmk/gui/plugins/dashboard/network_topology.py +++ b/cmk/gui/plugins/dashboard/network_topology.py @@ -24,15 +24,8 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. -import cmk.gui.views as views import cmk.gui.config as config -import cmk.gui.bi as bi from cmk.gui.i18n import _ -from cmk.gui.globals import html -from cmk.gui.exceptions import MKUserError -from cmk.gui.valuespec import ( - DropdownChoice, -) from cmk.gui.plugins.dashboard import ( IFrameDashlet,

5 years, 8 months

Fixed network topology dashboard after recent dashboard refactoring

by Lars Michelsen

Module: check_mk Branch: master Commit: 48f756a405d2f066fdf2bff5b129508a9aa4b6d5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=48f756a405d2f0… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Sep 28 14:10:08 2018 +0200 Fixed network topology dashboard after recent dashboard refactoring * The network topology dashlet is not a generic URL dashlet anymore but a specific automap / network topology related dashlet * The site is now configurable for the dashlet to be able to add topology views for other sites. Change-Id: Icc288ff828266252dad17cdc855631a427bd8696 --- cmk/gui/plugins/dashboard/builtin.py | 12 +--- cmk/gui/plugins/dashboard/network_topology.py | 89 +++++++++++++++++++++++++++ cmk/gui/plugins/dashboard/utils.py | 9 ++- tests/unit/cmk/gui/test_dashboard.py | 1 + 4 files changed, 98 insertions(+), 13 deletions(-) diff --git a/cmk/gui/plugins/dashboard/builtin.py b/cmk/gui/plugins/dashboard/builtin.py index 46a4a9e..9e2a2e1 100644 --- a/cmk/gui/plugins/dashboard/builtin.py +++ b/cmk/gui/plugins/dashboard/builtin.py @@ -200,13 +200,6 @@ builtin_dashboards["main"] = { ] } -def topology_url(): - return config.url_prefix() + 'nagvis/frontend/nagvis-js/index.php?' + \ - 'mod=Map&header_template=on-demand-filter&header_menu=1&label_show=1' + \ - '&sources=automap&act=view&backend_id=' + config.omd_site() + \ - '&render_mode=undirected&url_target=main&filter_group=' + \ - (config.topology_default_filter_group or '') - builtin_dashboards["topology"] = { "single_infos": [], "context" : {}, @@ -218,10 +211,7 @@ builtin_dashboards["topology"] = { "hierarchical map."), "dashlets" : [ { - "type" : "url", - "title" : "Topology of Site " + config.omd_site(), - "urlfunc" : 'topology_url', - "reload_on_resize" : True, + "type" : "network_topology", "position" : (1, 1), "size" : (GROW, GROW), "context" : {}, diff --git a/cmk/gui/plugins/dashboard/network_topology.py b/cmk/gui/plugins/dashboard/network_topology.py new file mode 100644 index 0000000..ca037bc --- /dev/null +++ b/cmk/gui/plugins/dashboard/network_topology.py @@ -0,0 +1,89 @@ +#!/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 cmk.gui.views as views +import cmk.gui.config as config +import cmk.gui.bi as bi +from cmk.gui.i18n import _ +from cmk.gui.globals import html +from cmk.gui.exceptions import MKUserError +from cmk.gui.valuespec import ( + DropdownChoice, +) + +from cmk.gui.plugins.dashboard import ( + IFrameDashlet, + dashlet_registry, +) + +(a)dashlet_registry.register +class NetworkTopologyDashlet(IFrameDashlet): + """Dashlet that displays a NagVis automap""" + @classmethod + def type_name(cls): + return "network_topology" + + + @classmethod + def title(cls): + return _("Network topology") + + + @classmethod + def description(cls): + return _("Uses the parent relationships of your hosts to display a hierarchical map.") + + @classmethod + def sort_index(cls): + return 90 + + + @classmethod + def initial_size(cls): + return (30, 10) + + + def reload_on_resize(self): + return True + + + def display_title(self): + return _("Network topology of site %s") % self._site_id() + + + def update(self): + pass # Not called at all. This dashlet always opens configured pages (see below) + + + def _site_id(self): + return self._dashlet_spec["context"].get("site", {"site": config.omd_site()})["site"] + + + def _get_iframe_url(self): + return ('../nagvis/frontend/nagvis-js/index.php?mod=Map&header_template=on-demand-filter' + '&header_menu=1&label_show=1&sources=automap&act=view&backend_id=%s' + '&render_mode=undirected&url_target=main&filter_group=%s' % + (self._site_id(), config.topology_default_filter_group or '')) diff --git a/cmk/gui/plugins/dashboard/utils.py b/cmk/gui/plugins/dashboard/utils.py index c8f3779..7e8deea 100644 --- a/cmk/gui/plugins/dashboard/utils.py +++ b/cmk/gui/plugins/dashboard/utils.py @@ -367,6 +367,11 @@ class IFrameDashlet(Dashlet): self._show_initial_iframe_container() + def reload_on_resize(self): + """Whether or not the page should be reloaded when the dashlet is resized""" + return self._dashlet_spec.get("reload_on_resize", False) + + def _show_initial_iframe_container(self): iframe_url = self._get_iframe_url() if not iframe_url: @@ -376,7 +381,7 @@ class IFrameDashlet(Dashlet): # Fix of iPad >:-P html.open_div(style="width: 100%; height: 100%; -webkit-overflow-scrolling:touch;") - html.iframe('', src="about:blank" if self._dashlet_spec.get("reload_on_resize") else iframe_url, + html.iframe('', src="about:blank" if self.reload_on_resize() else iframe_url, id_="dashlet_iframe_%d" % self._dashlet_id, allowTransparency="true", frameborder="0", @@ -384,7 +389,7 @@ class IFrameDashlet(Dashlet): height="100%") html.close_div() - if self._dashlet_spec.get("reload_on_resize"): + if self.reload_on_resize(): html.javascript('reload_on_resize["%d"] = "%s"' % (self._dashlet_id, iframe_url)) diff --git a/tests/unit/cmk/gui/test_dashboard.py b/tests/unit/cmk/gui/test_dashboard.py index 7a3c16b..48d723c 100644 --- a/tests/unit/cmk/gui/test_dashboard.py +++ b/tests/unit/cmk/gui/test_dashboard.py @@ -34,6 +34,7 @@ def test_dashlet_registry_plugins(): 'hoststats', 'notify_failed_notifications', 'mk_logo', + 'network_topology', 'servicestats', 'url', 'overview',

5 years, 8 months

fix missing

by Óscar Nájera

Module: check_mk Branch: master Commit: 8da061facdd818417a23a4ec553f4a45b81c9340 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8da061facdd818… Author: Óscar Nájera <on(a)mathias-kettner.de> Date: Tue Oct 9 12:46:27 2018 +0200 fix missing Change-Id: Ie2bc5bb5ff94e07e1c5bb37fe2f3244e9a1f66d5 --- cmk/gui/valuespec.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmk/gui/valuespec.py b/cmk/gui/valuespec.py index 7699eeb..434520c 100644 --- a/cmk/gui/valuespec.py +++ b/cmk/gui/valuespec.py @@ -1476,7 +1476,7 @@ class ListOfMultiple(ValueSpec): # Save all selected items html.hidden_field('%s_active' % varprefix, ';'.join([ k for k in value.keys() if k in self._choice_dict]), - id = '%s_active' % varprefix, add_var = True) + id_ = '%s_active' % varprefix, add_var = True) # Actual table of currently existing entries html.open_table(id_="%s_table" % varprefix, class_=["valuespec_listof", extra_css])

5 years, 8 months

6578 Check agent access

by Moritz Kiemer

Module: check_mk Branch: master Commit: e9355e6a114c1fcb2f648a3b6e4eb0a63f620be7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e9355e6a114c1f… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Thu Sep 27 15:25:14 2018 +0200 6578 Check agent access The functionality of the service "Check_MK Agent Access" has been incorporated in the "Check_MK" service. It can be configured using the rule "Allowed IP addresses for agent access". Change-Id: Ic2b569a925d9f7b2d94fe6dc5fbcbf94a55c7ad2 --- .werks/6578 | 18 ++++++ checks/check_mk | 70 ++++-------------------- cmk/gui/plugins/wato/check_mk_configuration.py | 17 ++++++ cmk_base/data_sources/tcp.py | 76 +++++++++++++++++++++++--- tests/unit/cmk_base/test_data_sources_unit.py | 29 ++++++++++ 5 files changed, 144 insertions(+), 66 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=e9355e6a11…

5 years, 8 months

6641 win_license: New check to monitor information about Windows licenses state

by Óscar Nájera

Module: check_mk Branch: master Commit: 1c8f367c1837150624614dfe970bf266463fa502 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1c8f367c183715… Author: Óscar Nájera <on(a)mathias-kettner.de> Date: Tue Sep 25 15:56:39 2018 +0200 6641 win_license: New check to monitor information about Windows licenses state This check parses the information provided by the slmgr.vbs command on a windows host. Information about the License status as well as the time to expiration are shown. As a preparation you need to install the agent plugin {win_license.bat} into your agent's plugins directory. The check can be configure via the corresponding WATO rule {Windows License} CMK-1072 Change-Id: I3e3064d78f780c7e62449c1c436d0db52577138d --- .werks/6641 | 17 ++++ agents/windows/plugins/win_license.bat | 7 ++ checkman/win_license | 20 +++++ checks/win_license | 110 +++++++++++++++++++++++ cmk/gui/plugins/wato/check_parameters.py | 28 ++++++ tests/unit/checks/test_win_license.py | 150 +++++++++++++++++++++++++++++++ 6 files changed, 332 insertions(+) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=1c8f367c18…

5 years, 8 months

Nuke unused section.

by Sven Panne

Module: check_mk Branch: master Commit: c7ecdcb040b133e7066215b710058e28ac7952dc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c7ecdcb040b133… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Oct 9 09:58:08 2018 +0200 Nuke unused section. Change-Id: I63566e28997785760642308c51160628d2832b64 --- .pylintrc | 5 ----- 1 file changed, 5 deletions(-) diff --git a/.pylintrc b/.pylintrc index f217aa1..54a8788 100644 --- a/.pylintrc +++ b/.pylintrc @@ -56,11 +56,6 @@ disable= # 400 warnings in about 60 modules, but this can be fixed step by step. redefined-outer-name, #--------------------------------------------------------------------------- - # Enabling this would be nice, but not crucial. At the moment, we have quite - # a few violations (about 200 in roughly 50 modules), so we postpone fixing - # this. - # redefined-builtin, - #--------------------------------------------------------------------------- # Enabling this would be nice, but not crucial. Nevertheless, this would # improve readability and involve some cleanups in our class hierarchy, so # we should do this some day.

5 years, 8 months

systemd_units: minor change in check output (CMK-982)

by Kenneth Okoh

Module: check_mk Branch: master Commit: 893cc4e544566bd4241879850affae2a49dbeefb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=893cc4e544566b… Author: Kenneth Okoh <ko(a)mathias-kettner.de> Date: Mon Oct 8 08:36:22 2018 +0200 systemd_units: minor change in check output (CMK-982) Change-Id: If2f271db52693c5a4b8132e1af676c8b1f24cc21 --- checks/systemd_units | 2 +- .../checks/generictests/datasets/systemd_units_services_1_regression.py | 2 +- .../generictests/datasets/systemd_units_services_2_failed_regression.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/checks/systemd_units b/checks/systemd_units index beb5397..29250ca 100644 --- a/checks/systemd_units +++ b/checks/systemd_units @@ -192,7 +192,7 @@ def check_systemd_units_services_summary(_no_item, params, parsed): service_names = [s.name for s in services if s.active == active_state] cnt = len(service_names) service_names = ", ".join(service_names) - yield state, "%d service%s %s: %s" % (cnt, '' if cnt == 1 else 's', active_state, service_names) + yield state, "%d service%s %s (%s)" % (cnt, '' if cnt == 1 else 's', active_state, service_names) check_info['systemd_units.services_summary'] = { diff --git a/tests/unit/checks/generictests/datasets/systemd_units_services_1_regression.py b/tests/unit/checks/generictests/datasets/systemd_units_services_1_regression.py index 8798fec..3abfae6 100644 --- a/tests/unit/checks/generictests/datasets/systemd_units_services_1_regression.py +++ b/tests/unit/checks/generictests/datasets/systemd_units_services_1_regression.py @@ -428,7 +428,7 @@ checks = { 'services_summary': [ ('Summary', 'default', [(0, '32 services in total', []), - (2, '1 service failed: systemd-cryptsetup@cryptswap1', []), + (2, '1 service failed (systemd-cryptsetup@cryptswap1)', []), ]), ] } diff --git a/tests/unit/checks/generictests/datasets/systemd_units_services_2_failed_regression.py b/tests/unit/checks/generictests/datasets/systemd_units_services_2_failed_regression.py index 05b35ad..e51badd 100644 --- a/tests/unit/checks/generictests/datasets/systemd_units_services_2_failed_regression.py +++ b/tests/unit/checks/generictests/datasets/systemd_units_services_2_failed_regression.py @@ -27,4 +27,4 @@ discovery = {'services': [], 'services_summary': [('Summary', {})]} checks = {'services_summary': [('Summary', 'default', [(0, '2 services in total', []), - (2, '2 services failed: foo, bar', [])])]} + (2, '2 services failed (foo, bar)', [])])]}

5 years, 8 months

← Newer
1
...
22
23
24
25
26
27
28
...
31
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits October 2018