Checkmk git commits December 2018

checkmk-commits@lists.checkmk.com

15 participants
342 discussions

7011 FIX Fixed tt-tag on site connection edit page

by Lars Michelsen

Module: check_mk Branch: master Commit: 16702b00b0fe003cfb758e0d0e8fe031abb52164 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=16702b00b0fe00… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Dec 18 15:45:02 2018 +0100 7011 FIX Fixed tt-tag on site connection edit page Change-Id: I53db4c190026489fb2c3669bf72374a62467bf86 --- .werks/7011 | 11 +++++++++++ cmk/gui/wato/pages/sites.py | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/7011 b/.werks/7011 new file mode 100644 index 0000000..40e4347 --- /dev/null +++ b/.werks/7011 @@ -0,0 +1,11 @@ +Title: Fixed tt-tag on site connection edit page +Level: 1 +Component: wato +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1545141673 + + diff --git a/cmk/gui/wato/pages/sites.py b/cmk/gui/wato/pages/sites.py index 593ee48..03516e5 100644 --- a/cmk/gui/wato/pages/sites.py +++ b/cmk/gui/wato/pages/sites.py @@ -98,7 +98,7 @@ class ModeEditSite(ModeSites): def title(self): if self._new: return _("Create new site connection") - return _("Edit site connection %s") % html.render_tt(self._site_id) + return _("Edit site connection %s") % self._site_id def buttons(self): super(ModeEditSite, self).buttons()

5 years, 6 months

6873 FIX df: made rule being found when searching for "inodes"

by Marcel Schulte

Module: check_mk Branch: master Commit: 084d2e5e2f64bde754e17776e5925953bfe5ccad URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=084d2e5e2f64bd… Author: Marcel Schulte <ms(a)mathias-kettner.de> Date: Tue Dec 18 10:28:07 2018 +0100 6873 FIX df: made rule being found when searching for "inodes" When searching for "inodes" in "host & service parameters" the rule was not found. This has been fixed now, as well as searching the plugin catalogue for the same phrase. Change-Id: I9af97c8b2a000c0164f48996b69d8b89a7c42add --- .werks/6873 | 11 +++++++++++ checkman/df | 6 +++++- cmk/gui/plugins/wato/check_parameters/unsorted.py | 1 + 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/.werks/6873 b/.werks/6873 new file mode 100644 index 0000000..0b9b8ac --- /dev/null +++ b/.werks/6873 @@ -0,0 +1,11 @@ +Title: df: made rule being found when searching for "inodes" +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1545125007 +Class: fix + +When searching for "inodes" in "host & service parameters" the rule was not found. +This has been fixed now, as well as searching the plugin catalogue for the same phrase. diff --git a/checkman/df b/checkman/df index 78488e7..f7b854e 100644 --- a/checkman/df +++ b/checkman/df @@ -1,4 +1,4 @@ -title: Used space in filesystems +title: Used space and inodes in filesystems agents: linux, windows, aix, solaris, openvms, hpux, freebsd, netbsd, openbsd, macosx catalog: os/storage license: GPL @@ -19,6 +19,10 @@ description: shown in Check_MK. From our point of view, the calculation of Check_MK is more accurate. + {Inodes:} if the agent provides a {df} subsection for {inodes}, this check + measures the inodes usage. Thresholds default to (10%, 5%) remaining inodes and + can be set/changed in ruleset {filesystems}. + {Trends:} This checks supports filesystem {trends}. This means that the {df} check is able to compute the {change} of the used space over the time and can make a forecast into the future. It can estimate the time when diff --git a/cmk/gui/plugins/wato/check_parameters/unsorted.py b/cmk/gui/plugins/wato/check_parameters/unsorted.py index 68c197c..48b3ab1 100644 --- a/cmk/gui/plugins/wato/check_parameters/unsorted.py +++ b/cmk/gui/plugins/wato/check_parameters/unsorted.py @@ -5194,6 +5194,7 @@ def vs_filesystem(extra_elements=None): if extra_elements is None: extra_elements = [] return Dictionary( + help=_("This ruleset allows to set parameters for space and inodes usage"), elements=filesystem_elements + extra_elements, hidden_keys=["flex_levels"], ignored_keys=["patterns"],

5 years, 6 months

Fixed wrong comment

by Lars Michelsen

Module: check_mk Branch: master Commit: 74a0cc18d78b8abfb6122018c0b5f8bb5ac29e45 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=74a0cc18d78b8a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Dec 18 15:17:59 2018 +0100 Fixed wrong comment Change-Id: I5d847216d6c5b90f14fca11e7761db9435c81769 --- agents/plugins/mk_ceph | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/agents/plugins/mk_ceph b/agents/plugins/mk_ceph index 3cb167e..f5bdb06 100755 --- a/agents/plugins/mk_ceph +++ b/agents/plugins/mk_ceph @@ -1,5 +1,5 @@ #!/bin/bash -# Check for APT updates (Debian, Ubuntu) +# Check Ceph storage # +------------------------------------------------------------------+ # | ____ _ _ __ __ _ __ | # | / ___| |__ ___ ___| | __ | \/ | |/ / |

5 years, 6 months

Remove check for vestigial MK_IS_PIGGYBACKED flag, as it' s no longer being set anywhere.

by Konstantin Büttner

Module: check_mk Branch: master Commit: 70a613a8d3db9c71d3af688cf998299747943337 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=70a613a8d3db9c… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Tue Dec 18 09:08:44 2018 +0100 Remove check for vestigial MK_IS_PIGGYBACKED flag, as it's no longer being set anywhere. Change-Id: Idd6c517a2ac17c705ec9873b15377a92ae7f1ffa --- agents/check_mk_agent.linux | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index 8b9ffb7..cc94e66 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -1033,7 +1033,7 @@ if type pvecm > /dev/null 2>&1 ; then fi # Iterate all running containers and report piggyback data for them -if type docker > /dev/null 2>&1 && [ -z "$MK_IS_PIGGYBACKED" ]; then +if type docker > /dev/null 2>&1; then echo "<<<docker_node_info:sep(58)>>>" # sed: protect leading whitespace docker info | sed 's/^/|/'

5 years, 6 months

Reserved 20 Werk IDS

by Lars Michelsen

Module: check_mk Branch: master Commit: 2e829a159fe2a074fab59c7cb4dfd697820eb8b7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2e829a159fe2a0… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Dec 18 15:00:57 2018 +0100 Reserved 20 Werk IDS Change-Id: I15a1ab1a864c19fb5dcc4d5c00a090b28abb9ed9 --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index 02e69ee..225a4ef 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -7011 +7031

5 years, 6 months

6995 FIX oracle_undostat: Fixed crash if state in case of positive space error count is set to OK

by Simon Betz

Module: check_mk Branch: master Commit: 19cac2128d18ae1b11970e06a5578383d738ecbb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=19cac2128d18ae… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue Dec 18 14:58:24 2018 +0100 6995 FIX oracle_undostat: Fixed crash if state in case of positive space error count is set to OK Change-Id: I23f294c42be34f8846d16ed194bab9282c63aa66 --- .werks/6995 | 10 ++++++++++ checks/oracle_undostat | 11 ++++------- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/.werks/6995 b/.werks/6995 new file mode 100644 index 0000000..7a41206 --- /dev/null +++ b/.werks/6995 @@ -0,0 +1,10 @@ +Title: oracle_undostat: Fixed crash if state in case of positive space error count is set to OK +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1545141404 +Class: fix + + diff --git a/checks/oracle_undostat b/checks/oracle_undostat index 1145737..8607747 100644 --- a/checks/oracle_undostat +++ b/checks/oracle_undostat @@ -57,13 +57,10 @@ def check_oracle_undostat(item, params, info): else: state = 0 - if nospaceerrcnt == 0: - nospaceerrcntpic = "" - else: - if params.get('nospaceerrcnt_state'): - state_errcnt = params.get('nospaceerrcnt_state') - state = max(state, state_errcnt) - + nospaceerrcntpic = "" + if nospaceerrcnt: + state_errcnt = params['nospaceerrcnt_state'] + state = max(state, state_errcnt) if state_errcnt == 1: nospaceerrcntpic = "(!)" elif state_errcnt == 2:

5 years, 6 months

6930 Service discovery page can now handle long running tasks

by Lars Michelsen

Module: check_mk Branch: master Commit: 5263d429bcd192c825d95d6b5e418c198017d2de URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5263d429bcd192… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Dec 10 07:44:12 2018 +0100 6930 Service discovery page can now handle long running tasks The service discovery page of the configuration GUI could end up in timeouts when working with devices that need a long time to process the discovery process. This mostly affected either large or slow responding SNMP devices. The discovery page is now initially loading almost immediately and then starts fetching the content in the background. The potential long running tasks (full scan or autmatic refresh) are performed in the background. While these actions are performed, the GUI shows the already known check table in a read only mode. Communication with remote pre 1.6 sites is still possible but can still end up in timeouts. CMK-1427 Change-Id: I3895aaa5859e1ba893b19b43e6a6e773313b7253 --- .werks/6930 | 23 + cmk/gui/htmllib.py | 38 +- cmk/gui/plugins/wato/__init__.py | 6 +- cmk/gui/plugins/wato/utils/__init__.py | 6 +- cmk/gui/wato/pages/activate_changes.py | 2 +- cmk/gui/wato/pages/services.py | 1567 ++++++++++++++++++++++---------- cmk_base/automations/check_mk.py | 3 + tests/unit/cmk/gui/test_watolib.py | 1 + web/htdocs/js/wato.js | 341 +++++-- web/htdocs/wato.css | 12 + 10 files changed, 1437 insertions(+), 562 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=5263d429bc…

5 years, 6 months

6993 FIX mk_oracle: Bugfix for missing ORACLE_SID in oratab

by Simon Betz

Module: check_mk Branch: master Commit: 5638faceffb588131bb1c5d859df39193d7e90a7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5638faceffb588… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue Dec 18 14:08:54 2018 +0100 6993 FIX mk_oracle: Bugfix for missing ORACLE_SID in oratab mk_oracle on servers with multiple Instances and missing entries in oratab could result in an early abort of the plugin. The abort leads to missing data from running Instances. This problem has been fixed. Please update the mk_oracle plugin. Change-Id: I4d123a71da85f06b7d622016a49eeab2edbef0b8 --- .werks/6993 | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/.werks/6993 b/.werks/6993 new file mode 100644 index 0000000..fb0b150 --- /dev/null +++ b/.werks/6993 @@ -0,0 +1,14 @@ +Title: mk_oracle: Bugfix for missing ORACLE_SID in oratab +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1545138497 +Class: fix + +mk_oracle on servers with multiple Instances and missing +entries in oratab could result in an early abort of the +plugin. The abort leads to missing data from running Instances. + +This problem has been fixed. Please update the mk_oracle plugin.

5 years, 6 months

Fixed Typo in Description

by Marcel Arentz

Module: check_mk Branch: master Commit: 6972fd3d883f44bd9e3c8b4cd20ec0cd813ca458 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6972fd3d883f44… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Tue Dec 18 14:07:55 2018 +0100 Fixed Typo in Description Change-Id: I1a1c566c1f846cff4de24fed155e6b6fea2e5f14 --- cmk/gui/plugins/wato/check_mk_configuration.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmk/gui/plugins/wato/check_mk_configuration.py b/cmk/gui/plugins/wato/check_mk_configuration.py index 3cee0ad..7a9b0bc 100644 --- a/cmk/gui/plugins/wato/check_mk_configuration.py +++ b/cmk/gui/plugins/wato/check_mk_configuration.py @@ -2018,7 +2018,7 @@ class ConfigVariableUseNewDescriptionsFor(ConfigVariable): ("nullmailer_mailq", _("Nullmailer: Mail Queue")), ("barracuda_mailqueues", _("Barracuda: Mail Queue")), ("qmail_stats", _("Qmail: Mail Queue")), - ("http", _("Check HTTP: Use HTTPS instead of HTTP for SSL/TLS connectoins")), + ("http", _("Check HTTP: Use HTTPS instead of HTTP for SSL/TLS connections")), ("mssql_backup", _("MSSQL Backup")), ("mssql_counters.cache_hits", _("MSSQL Cache Hits")), ("mssql_counters.transactions", _("MSSQL Transactions")),

5 years, 6 months

6898 alcatel_cpu_aos7: Add support for new switches

by Florian Kromer

Module: check_mk Branch: master Commit: 530baaf67c790063c8fc4c77ff0a8b7e03c17ae9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=530baaf67c7900… Author: Florian Kromer <fk(a)mathias-kettner.de> Date: Fri Dec 7 16:56:59 2018 +0100 6898 alcatel_cpu_aos7: Add support for new switches This werk adds cpu usage monitoring (alcatel_cpu) support for the new switch devices running at least AOS7. The check alcatel_cpu_aos7 reuses the default values of check alcatel_cpu for consistent check behaviour. CMK-1188 Change-Id: Ib9e4972a5fc77f5991ae6269c3ab1f5ac4f42af8 --- .werks/6898 | 14 ++++++++ checkman/alcatel_cpu_aos7 | 13 ++++++++ checks/alcatel.include | 13 ++++++++ checks/alcatel_cpu_aos7 | 38 ++++++++++++++++++++++ .../checks/generictests/datasets/alcatel_aos7.py | 7 ++++ 5 files changed, 85 insertions(+) diff --git a/.werks/6898 b/.werks/6898 new file mode 100644 index 0000000..1c16f78 --- /dev/null +++ b/.werks/6898 @@ -0,0 +1,14 @@ +Title: alcatel_cpu_aos7: Add support for new switches +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1544198052 +Class: feature + +This werk adds cpu usage monitoring (alcatel_cpu) support for the new +switch devices running at least AOS7. The check alcatel_cpu_aos7 reuses +the default values of check alcatel_cpu for consistent check behaviour. + +CMK-1188 diff --git a/checkman/alcatel_cpu_aos7 b/checkman/alcatel_cpu_aos7 new file mode 100644 index 0000000..e79d8cf --- /dev/null +++ b/checkman/alcatel_cpu_aos7 @@ -0,0 +1,13 @@ +title: Alcatel switches (>=AOS7): CPU utilization +agents: snmp +catalog: hw/network/alcatel +license: GPL +distribution: check_mk +description: + + This Check Monitors the CPU utilization on new Alcatel switches running at least AOS7 supporting + the ALCATEL-IND1-HEALTH-MIB (version for >=AOS7). The value is a average in percent over the + last hour. This average is calculated by the device. + +inventory: + One check is created diff --git a/checks/alcatel.include b/checks/alcatel.include index fe19844..fc89291 100644 --- a/checks/alcatel.include +++ b/checks/alcatel.include @@ -32,11 +32,24 @@ factory_settings['alcatel_temp'] = { def alcatel_networking_products_scan_function(oid): + """ + Devices running until AOS6 (including). + """ sys_object_id = ".1.3.6.1.2.1.1.2.0" # MIB object "sysObjectID" alcatel_ind_1_base_mib = ".1.3.6.1.4.1.6486.800" # MIB object "alcatelIND1BaseMIB" return oid(sys_object_id).startswith(alcatel_ind_1_base_mib) +def alcatel_new_networking_products_scan_function(oid): + """ + Devices running at least AOS7 (including). + Refer to alcatelENT1BaseMIB for more information. + """ + sys_object_id = ".1.3.6.1.2.1.1.2.0" # MIB object "sysObjectID" + alcatel_ent_1_base_mib = ".1.3.6.1.4.1.6486.801" # MIB object "alcatelENT1BaseMIB" + return oid(sys_object_id).startswith(alcatel_ent_1_base_mib) + + def inventory_alcatel_cpu(info): return [(None, "alcatel_cpu_default_levels")] diff --git a/checks/alcatel_cpu_aos7 b/checks/alcatel_cpu_aos7 new file mode 100644 index 0000000..2af5eb7 --- /dev/null +++ b/checks/alcatel_cpu_aos7 @@ -0,0 +1,38 @@ +#!/usr/bin/python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2018 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. + +check_info["alcatel_cpu_aos7"] = { + "check_function": check_alcatel_cpu, + "inventory_function": inventory_alcatel_cpu, + "service_description": "CPU utilization", + "has_perfdata": True, + "snmp_scan_function": alcatel_new_networking_products_scan_function, + "snmp_info": ( + "1.3.6.1.4.1.6486.801.1.2.1.16.1.1.1.1.1" # MIB object "healthModuleTable" + [15] # MIB object "healthModuleCpuLatest" + ), + "includes": ["alcatel.include"], +} diff --git a/tests/unit/checks/generictests/datasets/alcatel_aos7.py b/tests/unit/checks/generictests/datasets/alcatel_aos7.py new file mode 100644 index 0000000..f0365bb --- /dev/null +++ b/tests/unit/checks/generictests/datasets/alcatel_aos7.py @@ -0,0 +1,7 @@ +checkname = 'alcatel_cpu_aos7' + +info = [['17']] + +discovery = {'': [(None, 'alcatel_cpu_default_levels')]} + +checks = {'': [(None, (90.0, 95.0), [(0, 'total: 17.0%', [('util', 17, 90.0, 95.0, 0, 100)])])]}

5 years, 6 months

← Newer
1
...
8
9
10
11
12
13
14
...
35
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits December 2018