Checkmk git commits December 2017

checkmk-commits@lists.checkmk.com

10 participants
219 discussions

5582 FIX hr_cpu: Fixed displaying of "per core CPU utilization" in raw edition graphs

by Lars Michelsen

Module: check_mk Branch: master Commit: b8c79e12e3e2b744db1a9eb2207d0e67c041c3aa URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b8c79e12e3e2b7… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Dec 19 13:48:23 2017 +0100 5582 FIX hr_cpu: Fixed displaying of "per core CPU utilization" in raw edition graphs Change-Id: Ie4d25040e1422eb1aa5894fe1176eccbb496b06a --- .werks/5582 | 11 +++++++++++ pnp-templates/check_mk-hr_cpu.php | 39 --------------------------------------- 2 files changed, 11 insertions(+), 39 deletions(-) diff --git a/.werks/5582 b/.werks/5582 new file mode 100644 index 0000000..6210a8f --- /dev/null +++ b/.werks/5582 @@ -0,0 +1,11 @@ +Title: hr_cpu: Fixed displaying of "per core CPU utilization" in raw edition graphs +Level: 1 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i2 +Date: 1513687681 + + diff --git a/pnp-templates/check_mk-hr_cpu.php b/pnp-templates/check_mk-hr_cpu.php deleted file mode 100644 index 0a548ed..0000000 --- a/pnp-templates/check_mk-hr_cpu.php +++ /dev/null @@ -1,39 +0,0 @@ -<?php -# +------------------------------------------------------------------+ -# | ____ _ _ __ __ _ __ | -# | / ___| |__ ___ ___| | __ | \/ | |/ / | -# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | -# | | |___| | | | __/ (__| < | | | | . \ | -# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | -# | | -# | 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. - -$opt[1] = "--vertical-label 'CPU utilization %' -l0 -u 100 --title \"CPU Utilization for $hostname\" "; -# -$def[1] = "DEF:util=$RRDFILE[1]:$DS[1]:AVERAGE " ; -$def[1] .= "CDEF:idle=100,util,- "; - -$def[1] .= "AREA:util#60f020:\"Utilization\":STACK " ; -$def[1] .= "GPRINT:util:MIN:\"Min\: %2.1lf%%\" " ; -$def[1] .= "GPRINT:util:MAX:\"Max\: %2.1lf%%\" " ; -$def[1] .= "GPRINT:util:LAST:\"Last\: %2.1lf%%\" " ; - -$def[1] .= "LINE:idle#ffffff:\"Idle\" " ; -$def[1] .= "GPRINT:idle:LAST:\"%2.1lf%%\" " ; - -?>

6 years, 6 months

5584 FIX Fixed exception when " Export List of Software packages as CSV file" is enabled

by Lars Michelsen

Module: check_mk Branch: master Commit: e57d794db916eab33d71889d3b25b93a53c7d5b5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e57d794db916ea… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Dec 19 15:01:37 2017 +0100 5584 FIX Fixed exception when "Export List of Software packages as CSV file" is enabled When having the export of the software packages list via CSV enabled while execution of the HW/SW inventory, an exception could happen in case the inventory data contained special characters. The exception looked like this on the command line: Traceback (most recent call last): File "/omd/sites/stable/share/check_mk/modules/check_mk.py", line 4811, in <module> do_inv(hostnames) File "/omd/sites/stable/share/check_mk/modules/inventory.py", line 180, in do_inv do_inv_for(hostname) File "/omd/sites/stable/share/check_mk/modules/inventory.py", line 267, in do_inv_for run_inv_export_hooks(hostname, g_inv_tree) File "/omd/sites/stable/share/check_mk/modules/inventory.py", line 383, in run_inv_export_hooks inv_export[hookname]["export_function"](hostname, params, tree) File "/omd/sites/stable/share/check_mk/inventory/export_software_csv", line 67, in inv_export_software_csv out.write("%s\n" % separator.join(line)) UnicodeEncodeError: 'ascii' codec can't encode character u'\xf6' in position 1: ordinal not in range(128) Change-Id: I961f759a2048198038a46dd345be96c96c051259 --- .werks/5584 | 27 +++++++++++++++++++++++++++ inventory/export_software_csv | 2 +- 2 files changed, 28 insertions(+), 1 deletion(-) diff --git a/.werks/5584 b/.werks/5584 new file mode 100644 index 0000000..35a49f1 --- /dev/null +++ b/.werks/5584 @@ -0,0 +1,27 @@ +Title: Fixed exception when "Export List of Software packages as CSV file" is enabled +Level: 1 +Component: inv +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i2 +Date: 1513692003 + +When having the export of the software packages list via CSV enabled while execution +of the HW/SW inventory, an exception could happen in case the inventory data contained +special characters. The exception looked like this on the command line: + +Traceback (most recent call last): + File "/omd/sites/stable/share/check_mk/modules/check_mk.py", line 4811, in <module> + do_inv(hostnames) + File "/omd/sites/stable/share/check_mk/modules/inventory.py", line 180, in do_inv + do_inv_for(hostname) + File "/omd/sites/stable/share/check_mk/modules/inventory.py", line 267, in do_inv_for + run_inv_export_hooks(hostname, g_inv_tree) + File "/omd/sites/stable/share/check_mk/modules/inventory.py", line 383, in run_inv_export_hooks + inv_export[hookname]["export_function"](hostname, params, tree) + File "/omd/sites/stable/share/check_mk/inventory/export_software_csv", line 67, in inv_export_software_csv + out.write("%s\n" % separator.join(line)) +UnicodeEncodeError: 'ascii' codec can't encode character u'\xf6' in position 1: ordinal not in range(128) + diff --git a/inventory/export_software_csv b/inventory/export_software_csv index fdc59b7..068866f 100644 --- a/inventory/export_software_csv +++ b/inventory/export_software_csv @@ -64,7 +64,7 @@ def inv_export_software_csv(hostname, params, tree): line = [] for key in keys: line.append(quote(package.get(key, ""))) - out.write("%s\n" % separator.join(line)) + out.write(("%s\n" % separator.join(line)).encode("utf-8")) inv_export['software_csv'] = {

6 years, 6 months

Refactoring: Simplified IPv4Address/Network validation

by Lars Michelsen

Module: check_mk Branch: master Commit: 15df95883ca1c6a0f91be57f5b6d488f2edf0007 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=15df95883ca1c6… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Dec 19 14:34:40 2017 +0100 Refactoring: Simplified IPv4Address/Network validation Change-Id: I70b7cb8f6a984684c7b6b975c77d1809d87522b5 --- web/htdocs/valuespec.py | 56 +++++++++++++------------------------------------ 1 file changed, 14 insertions(+), 42 deletions(-) diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index d2c6090..d9cf42a 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -39,6 +39,7 @@ import math, os, time, re, sre_constants, urlparse, forms, tempfile, types import base64 import hashlib import socket +import ipaddress from lib import * import cmk.defines as defines from Crypto.PublicKey import RSA @@ -664,56 +665,27 @@ class IPv4Network(TextAscii): TextAscii.__init__(self, **kwargs) def validate_value(self, value, varprefix): - if "/" in value: - try: - network, bits = value.split("/") - bits = int(bits) - except: - raise MKUserError(varprefix, _("Please use the syntax X.X.X.X/YY")) - else: - network = value - bits = 32 - - if bits < 0 or bits > 32: - raise MKUserError(varprefix, _("Invalid number of bits. Must be in range 1 ... 32")) + super(IPv4Network, self).validate_value(value, varprefix) - if value.count(".") != 3: - raise MKUserError(varprefix, _("The network must contain three dots")) - - octets = self.validate_ipaddress(network, varprefix) - - # Make sure that non-network bits are zero - l = (octets[0] << 24) + (octets[1] << 16) + (octets[2] << 8) + (octets[3]) - for b in range(bits, 32): - if l & (2 ** (31-b)) != 0: - raise MKUserError(varprefix, _("Please make sure that only the %d non-network bits are non-zero") % bits) - - ValueSpec.custom_validate(self, value, varprefix) - - - def validate_ipaddress(self, value, varprefix): try: - octets = map(int, value.split(".")) - if len(octets) != 4: - raise MKUserError(varprefix, _("Please specify four octets (X.X.X.X/YY)")) - for o in octets: - if o < 0 or o > 255: - raise MKUserError(varprefix, _("Invalid octet %d (must be in range 1 ... 255)") % o) - return octets - except MKUserError: - raise - except: - raise MKUserError(varprefix, _("Invalid IP address syntax")) + ipaddress.IPv4Interface(value.decode("utf-8")) + except ValueError, e: + raise MKUserError(varprefix, _("Invalid IP network address: %s") % e) + -class IPv4Address(IPv4Network): +class IPv4Address(TextAscii): def __init__(self, **kwargs): kwargs.setdefault("size", 16) - IPv4Network.__init__(self, **kwargs) + super(IPv4Address, self).__init__(**kwargs) def validate_value(self, value, varprefix): - self.validate_ipaddress(value, varprefix) - ValueSpec.custom_validate(self, value, varprefix) + super(IPv4Address, self).validate_value(value, varprefix) + try: + ipaddress.IPv4Address(value.decode("utf-8")) + except ValueError, e: + raise MKUserError(varprefix, _("Invalid IP address: %s") % e) + class TextAsciiAutocomplete(TextAscii):

6 years, 6 months

Add IPNetwork valuespec to configure either IPv4/IPv6 addresses/networks

by Lars Michelsen

Module: check_mk Branch: master Commit: 5c8a161a28e60452e5a61409f3f903d3e82fbce2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5c8a161a28e604… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Dec 19 14:41:14 2017 +0100 Add IPNetwork valuespec to configure either IPv4/IPv6 addresses/networks Change-Id: I1d0befcb2f7b2066fb1e132966fd310a3e0f03c1 --- web/htdocs/valuespec.py | 43 ++++++++++++++++++++++++++++--------------- 1 file changed, 28 insertions(+), 15 deletions(-) diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index d9cf42a..559a995 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -657,34 +657,47 @@ class EmailAddressUnicode(TextUnicode, EmailAddress): ValueSpec.custom_validate(self, value, varprefix) -# Network as used in routing configuration, such as -# "10.0.0.0/8" or "192.168.56.1" -class IPv4Network(TextAscii): +# Same as IPv4Network, but allowing both IPv4 and IPv6 +class IPNetwork(TextAscii): def __init__(self, **kwargs): - kwargs.setdefault("size", 18) - TextAscii.__init__(self, **kwargs) + kwargs.setdefault("size", 34) + super(IPNetwork, self).__init__(**kwargs) + + + def _ip_class(self): + return ipaddress.IPInterface + def validate_value(self, value, varprefix): - super(IPv4Network, self).validate_value(value, varprefix) + super(IPNetwork, self).validate_value(value, varprefix) try: - ipaddress.IPv4Interface(value.decode("utf-8")) + self._ip_class()(value.decode("utf-8")) except ValueError, e: - raise MKUserError(varprefix, _("Invalid IP network address: %s") % e) + raise MKUserError(varprefix, _("Invalid address: %s") % e) -class IPv4Address(TextAscii): +# Network as used in routing configuration, such as +# "10.0.0.0/8" or "192.168.56.1" +class IPv4Network(IPNetwork): + def __init__(self, **kwargs): + kwargs.setdefault("size", 18) + super(IPv4Network, self).__init__(**kwargs) + + + def _ip_class(self): + return ipaddress.IPv4Interface + + + +class IPv4Address(IPNetwork): def __init__(self, **kwargs): kwargs.setdefault("size", 16) super(IPv4Address, self).__init__(**kwargs) - def validate_value(self, value, varprefix): - super(IPv4Address, self).validate_value(value, varprefix) - try: - ipaddress.IPv4Address(value.decode("utf-8")) - except ValueError, e: - raise MKUserError(varprefix, _("Invalid IP address: %s") % e) + def _ip_class(self): + return ipaddress.IPv4Address

6 years, 6 months

5583 Restrict agent access via IP address: IPv6 addresses/

by Lars Michelsen

networks can now be configured Message-ID: <5a391932.pCFzzE5BbO0E2ed2%lm(a)mathias-kettner.de> User-Agent: Heirloom mailx 12.5 6/20/10 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Module: check_mk Branch: master Commit: 7a67bc11b760994ace7eee92ebfdf9fb241deee3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7a67bc11b76099… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Dec 19 14:43:44 2017 +0100 5583 Restrict agent access via IP address: IPv6 addresses/networks can now be configured Change-Id: Iba9b006f55d6f2cc57c744154a59b73bbb55967e --- .werks/5583 | 10 ++++++++++ web/htdocs/valuespec.py | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.werks/5583 b/.werks/5583 new file mode 100644 index 0000000..a1df9e0 --- /dev/null +++ b/.werks/5583 @@ -0,0 +1,10 @@ +Title: Restrict agent access via IP address: IPv6 addresses/networks can now be configured +Level: 1 +Component: wato +Compatible: compat +Edition: cre +Version: 1.5.0i2 +Date: 1513691001 +Class: feature + + diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index 559a995..23a9f59 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -665,7 +665,7 @@ class IPNetwork(TextAscii): def _ip_class(self): - return ipaddress.IPInterface + return ipaddress.ip_interface def validate_value(self, value, varprefix):

6 years, 6 months

Reserved 10 Werk IDS

by Simon Betz

Module: check_mk Branch: master Commit: 3c0925ccab57786d16470845f80b9eafcb5c198d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3c0925ccab5778… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue Dec 19 13:24:01 2017 +0100 Reserved 10 Werk IDS Change-Id: I2f41a8c471c58e61cded68aa9c33660ab819955f --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index 5b1b197..d837ea7 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -5598 +5608

6 years, 6 months

5457 EventConsole: Keyword search is now possible in rule packs and rules dialogues

by Simon Betz

Module: check_mk Branch: master Commit: eb7fd53cb64b11a0c3addbcd6af448b63eafe2b4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=eb7fd53cb64b11… Author: Simon Betz <si(a)mathias-kettner.de> Date: Mon Dec 18 16:47:51 2017 +0100 5457 EventConsole: Keyword search is now possible in rule packs and rules dialogues Change-Id: I71769a063bf6706961884b3484efbe6b4398335c --- .werks/5457 | 10 + web/plugins/wato/mkeventd.py | 447 ++++++++++++++++++++++++------------------- 2 files changed, 261 insertions(+), 196 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=eb7fd53cb6…

6 years, 6 months

5527 FIX ucd_mem, hr_mem: Prefer ucd_mem check for certain Cisco IronPort models

by Konstantin Büttner

Module: check_mk Branch: master Commit: 5e91689e66cd56bcd3d7145e250dd700cdc649f1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5e91689e66cd56… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Tue Dec 19 11:04:44 2017 +0100 5527 FIX ucd_mem, hr_mem: Prefer ucd_mem check for certain Cisco IronPort models For certain Cisco IronPort devices, the OIDs defined in the Host Resources MIB provide bogus data. This can be avoided by using the ucd_mem check instead for these devices. To benefit from this fix, the affected devices need to be rediscovered. Change-Id: I21f023a14f0c8c420b57549fb1a033b22f727575 --- .werks/5527 | 15 +++++++++++++++ checks/ucd.include | 1 + 2 files changed, 16 insertions(+) diff --git a/.werks/5527 b/.werks/5527 new file mode 100644 index 0000000..c468161 --- /dev/null +++ b/.werks/5527 @@ -0,0 +1,15 @@ +Title: ucd_mem, hr_mem: Prefer ucd_mem check for certain Cisco IronPort models +Level: 1 +Component: checks +Class: fix +Compatible: incomp +Edition: cre +State: unknown +Version: 1.5.0i2 +Date: 1513677694 + +For certain Cisco IronPort devices, the OIDs defined in the Host Resources MIB +provide bogus data. This can be avoided by using the ucd_mem check instead for +these devices. + +To benefit from this fix, the affected devices need to be rediscovered. diff --git a/checks/ucd.include b/checks/ucd.include index cffa43d..e205a4b 100644 --- a/checks/ucd.include +++ b/checks/ucd.include @@ -57,6 +57,7 @@ def hr_mem_scan_function(oid): # of devices, which are known to report incorrect information # about mem usage return (not "pfsense" in oid(".1.3.6.1.2.1.1.1.0").lower() and \ + not "ironport model c3" in oid(".1.3.6.1.2.1.1.1.0").lower() and \ ignore_ucd_and_hr(oid)) or \ (oid(".1.3.6.1.2.1.25.1.1.0") and \ not ucd_scan_function(oid))

6 years, 6 months

Prefer C++ strings.

by Sven Panne

Module: check_mk Branch: master Commit: 5107eddc5cecf9adce9930efdfa76e209b3d25b3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5107eddc5cecf9… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Dec 19 08:53:48 2017 +0100 Prefer C++ strings. Change-Id: Ibe2cbdbb054591cbc507660331bc6f8deb10328c --- livestatus/src/Query.cc | 2 +- livestatus/src/TableStateHistory.cc | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/livestatus/src/Query.cc b/livestatus/src/Query.cc index 7e748be..b9adbcd 100644 --- a/livestatus/src/Query.cc +++ b/livestatus/src/Query.cc @@ -635,7 +635,7 @@ void Query::start(QueryRenderer &q) { // Output dummy headers for stats columns for (size_t col = 1; col <= _stats_columns.size(); ++col) { - r.output(std::string("stats_") + std::to_string(col)); + r.output("stats_" + std::to_string(col)); } } } diff --git a/livestatus/src/TableStateHistory.cc b/livestatus/src/TableStateHistory.cc index b4a1621..bab2d05 100644 --- a/livestatus/src/TableStateHistory.cc +++ b/livestatus/src/TableStateHistory.cc @@ -248,9 +248,9 @@ public: void visit(const ColumnFilter &f) override { if (_value) { auto column_name = f.columnName(); - _value = mk::starts_with(column_name, std::string("current_")) || - mk::starts_with(column_name, std::string("host_")) || - mk::starts_with(column_name, std::string("service_")); + _value = mk::starts_with(column_name, "current_") || + mk::starts_with(column_name, "host_") || + mk::starts_with(column_name, "service_"); } } void visit(const AndingFilter & /*unused*/) override {}

6 years, 6 months

checktestlib: New class for representing a perf value

by Konstantin Büttner

Module: check_mk Branch: master Commit: 4b19fbf6cb76da219945a6a2efe2d40fee85f17d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4b19fbf6cb76da… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Mon Dec 18 17:21:18 2017 +0100 checktestlib: New class for representing a perf value Change-Id: If2930fe7890cc457cbb4aa386b39a8eeb55e28e5 --- tests/checks/checktestlib.py | 43 ++++++++++++++++++++++++++++++++----------- 1 file changed, 32 insertions(+), 11 deletions(-) diff --git a/tests/checks/checktestlib.py b/tests/checks/checktestlib.py index d785241..8bae61c 100644 --- a/tests/checks/checktestlib.py +++ b/tests/checks/checktestlib.py @@ -1,3 +1,31 @@ +class PerfValue(object): + """Represents a single perf value""" + + def __init__(self, key, value, warn=None, crit=None, minimum=None, maximum=None): + # TODO: This is very basic. There is more way more magic involved + # in what kind of values are allowed as metric names. + # I'm not too sure unicode should be allowed, either. + assert type(key) in [str, unicode] + self.key = key + + # NOTE: The CMC as well as all other Nagios-compatible cores do accept a + # string value that may contain a unit, which is in turn available + # for use in PNP4Nagios templates. Check_MK defines its own semantic + # context for performance values using Check_MK metrics. It is therefore + # preferred to return a "naked" scalar. + assert type(value) in [int, float] + self.value = value + + assert type(warn) in [int, float, type(None)] + self.warn = warn + assert type(crit) in [int, float, type(None)] + self.crit = crit + assert type(minimum) in [int, float, type(None)] + self.minimum = minimum + assert type(maximum) in [int, float, type(None)] + self.maximum = maximum + + class BasicCheckResult(object): """A basic check result @@ -15,20 +43,13 @@ class BasicCheckResult(object): self.infotext = infotext if perfdata is not None: assert type(perfdata) == list - assert all([len(entry) >= 2 for entry in perfdata]) + self.perfdata = [] for entry in perfdata: assert type(entry) == tuple - assert len(entry) >= 2 - - # TODO: This is very basic. There is more way more magic involved - # in what kind of values are allowed as metric names. - # I'm not too sure unicode should be allowed, either. - assert type(entry[0]) in [str, unicode] - - assert type(entry[1]) in [int, float] - assert all(type(value) in [int, float, type(None)] for value in entry[2:]) - self.perfdata = perfdata + self.perfdata.append(PerfValue(*entry)) + else: + self.perfdata = None def match_status(self, expected_status): """Check if this result's status matches a given value. Exact match."""

6 years, 6 months

← Newer
1
2
3
4
5
6
7
8
9
...
22
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits December 2017