Checkmk git commits March 2019

checkmk-commits@lists.checkmk.com

17 participants
451 discussions

7326 FIX "Update DNS cache" action is now really cleaning up the cache

by Lars Michelsen

Module: check_mk Branch: master Commit: a358a84e64de8b733f5f0907e36a46484a66ffc7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a358a84e64de8b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Mar 21 16:06:25 2019 +0100 7326 FIX "Update DNS cache" action is now really cleaning up the cache As written in the documentation (https://mathias-kettner.com/cms_wato_hosts.html) Check_MK is keeping an internal DNS cache for the hosts that have configured no static IP address in Check_MK: --- With the host name method Check_MK uses cached data in order to minimise repeated DNS requests during an Activate Changes – which is very important for accelerating the activation procedure. Furthermore, the cache ensures that a changed configuration can still be activated if the DNS stops working. The catch is that Check_MK doesn't automatically notice the change to an address in DNS. For this reason, in the host details there is the button which deletes the entire DNS cache and forces a new resolution at the next Activate changes. This file is found under ~/var/check_mk/ipaddresses.cache in your instance, by the way. Deleting this file has the same effect as the button as described above. --- The problem was that previous versions did not really delete the entire cache, but only updated it. We have now changed this to make the cache invalidation work as intended. Change-Id: I603f7ef5f38234f67ce5436082c91b506d516732 --- .werks/7326 | 34 ++++++++++++++++++++++++++ cmk_base/ip_lookup.py | 19 ++++++++++---- tests/integration/cmk_base/test_automations.py | 3 +++ 3 files changed, 51 insertions(+), 5 deletions(-) diff --git a/.werks/7326 b/.werks/7326 new file mode 100644 index 0000000..877f9fc --- /dev/null +++ b/.werks/7326 @@ -0,0 +1,34 @@ +Title: "Update DNS cache" action is now really cleaning up the cache +Level: 2 +Component: wato +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1553180606 +Class: fix + + +As written in the documentation +(https://mathias-kettner.com/cms_wato_hosts.html) Check_MK is keeping an +internal DNS cache for the hosts that have configured no static IP address in +Check_MK: + +--- + +With the host name method Check_MK uses cached data in order to minimise +repeated DNS requests during an Activate Changes – which is very important for +accelerating the activation procedure. Furthermore, the cache ensures that a +changed configuration can still be activated if the DNS stops working. + +The catch is that Check_MK doesn't automatically notice the change to an +address in DNS. For this reason, in the host details there is the button which +deletes the entire DNS cache and forces a new resolution at the next Activate +changes. This file is found under ~/var/check_mk/ipaddresses.cache in your +instance, by the way. Deleting this file has the same effect as the button as +described above. + +--- + +The problem was that previous versions did not really delete the entire cache, +but only updated it. We have now changed this to make the cache invalidation +work as intended. diff --git a/cmk_base/ip_lookup.py b/cmk_base/ip_lookup.py index 513e524..6c3f998 100644 --- a/cmk_base/ip_lookup.py +++ b/cmk_base/ip_lookup.py @@ -25,6 +25,8 @@ # Boston, MA 02110-1301 USA. import socket +import errno +import os import cmk.utils.paths import cmk.utils.debug @@ -189,7 +191,7 @@ def _update_ip_lookup_cache(cache_id, ipa): ip_lookup_cache = cmk_base.config_cache.get_dict("ip_lookup") # Read already known data - cache_path = cmk.utils.paths.var_dir + '/ipaddresses.cache' + cache_path = _cache_path() try: data_from_file = cmk.utils.store.load_data_from_file(cache_path, default={}, lock=True) @@ -206,14 +208,21 @@ def _update_ip_lookup_cache(cache_id, ipa): cmk.utils.store.release_lock(cache_path) +def _cache_path(): + return cmk.utils.paths.var_dir + "/ipaddresses.cache" + + def update_dns_cache(): - # Temporarily disable *use* of cache, we want to force an update - # TODO: Cleanup this hacky config override! Better add some global flag - # that is exactly meant for this situation. - config.use_dns_cache = False updated = 0 failed = [] + console.verbose("Cleaning up existing DNS cache...\n") + try: + os.unlink(_cache_path()) + except OSError as e: + if e.errno != errno.ENOENT: + raise + console.verbose("Updating DNS cache...\n") for hostname in config.all_active_hosts(): # Use intelligent logic. This prevents DNS lookups for hosts diff --git a/tests/integration/cmk_base/test_automations.py b/tests/integration/cmk_base/test_automations.py index 5d37871..b9786a9 100644 --- a/tests/integration/cmk_base/test_automations.py +++ b/tests/integration/cmk_base/test_automations.py @@ -323,6 +323,8 @@ def test_automation_update_dns_cache(test_cfg, site, web): web.add_host("update-dns-cache-host") web.add_host("localhost") + site.write_file(cache_path, "{('bla', 4): '127.0.0.1'}") + data = _execute_automation(site, "update-dns-cache") assert isinstance(data, tuple) assert len(data) == 2 @@ -335,6 +337,7 @@ def test_automation_update_dns_cache(test_cfg, site, web): cache = eval(site.read_file(cache_path)) assert isinstance(cache, dict) assert cache[("localhost", 4)] == "127.0.0.1" + assert ("bla", 4) not in cache finally: web.delete_host("localhost")

5 years, 6 months

Fix bugs in pipeline script:

by Alex Zurhake

Module: check_mk Branch: master Commit: 51a8dc7107589060b447afcc00634665e5866b37 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=51a8dc71075890… Author: Alex Zurhake <az(a)mathias-kettner.de> Date: Fri Mar 22 08:49:39 2019 +0100 Fix bugs in pipeline script: - brackets around if - call signing script with version - use correct version variable in path Change-Id: I15b3e0f9b424fffe1944d2afccb501139ea05c90 --- buildscripts/scripts/nightly-build.jenkins | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/buildscripts/scripts/nightly-build.jenkins b/buildscripts/scripts/nightly-build.jenkins index 321190d..50dfb35 100644 --- a/buildscripts/scripts/nightly-build.jenkins +++ b/buildscripts/scripts/nightly-build.jenkins @@ -193,15 +193,15 @@ node { docker.image(IMAGE).inside("-u 0:0 -v ${DAILY_DATA}:${DAILY_DATA} -v ${PACKAGE_DIR}:${PACKAGE_DIR} -v ${GPG_KEY_DIR}:${GPG_KEY_DIR}:ro -v ${RELEASE_KEY_DIR}:${RELEASE_KEY_DIR}:ro --network ci_local-infra") { stage('Archive artifacts') { // Only master builds should end up on the Website - if ${BRANCH} == 'master' { + if (${BRANCH} == 'master') { dir("/bauwelt/downloads/${CMK_VERS}") { sh "cp ${DAILY_DATA}/*-dest/check-mk-enterprise-*_amd64.deb . || true" sh "cp ${DAILY_DATA}/*-dest/check-mk-enterprise-*.x86_64.rpm . || true" withCredentials([usernamePassword(credentialsId: '9d7aca31-0043-4cd0-abeb-26a249d68261', passwordVariable: 'GPG_PASSPHRASE', usernameVariable: 'GPG_USERNAME')]) { - sh "${DAILY_DATA}/git/buildscripts/scripts/sign-packages.sh" + sh "${DAILY_DATA}/git/buildscripts/scripts/sign-packages.sh ${CMK_VERS}" sh """ rsync -av -e "ssh -i ${RELEASE_KEY_DIR}" \ - ${PACKAGE_DIR}/${CMK_VERSION} \ + ${PACKAGE_DIR}/${CMK_VERS} \ bauwelt@mathias-kettner.de:${PACKAGE_DIR} """ } @@ -212,7 +212,7 @@ node { sh "cp ${DAILY_DATA}/*-dest/check-mk-enterprise-*_amd64.deb . || true" sh "cp ${DAILY_DATA}/*-dest/check-mk-enterprise-*.x86_64.rpm . || true" withCredentials([usernamePassword(credentialsId: '9d7aca31-0043-4cd0-abeb-26a249d68261', passwordVariable: 'GPG_PASSPHRASE', usernameVariable: 'GPG_USERNAME')]) { - sh "${DAILY_DATA}/git/buildscripts/scripts/sign-packages.sh" + sh "${DAILY_DATA}/git/buildscripts/scripts/sign-packages.sh ${CMK_VERS}" } archiveArtifacts "*" }

5 years, 6 months

7354 FIX tsm_storagepools: Fixed missing labels in performance graphs

by Simon Betz

Module: check_mk Branch: master Commit: 67e00781b3540702b2a5b321b19c9f7419d4aae1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=67e00781b35407… Author: Simon Betz <si(a)mathias-kettner.de> Date: Fri Mar 22 08:56:32 2019 +0100 7354 FIX tsm_storagepools: Fixed missing labels in performance graphs Change-Id: Icf6605b512ae2eb6554385dec36ea4b060c73f16 --- .werks/7354 | 10 ++++++++++ checks/tsm_storagepools | 7 +++---- cmk/gui/plugins/metrics/check_mk.py | 6 ++++++ 3 files changed, 19 insertions(+), 4 deletions(-) diff --git a/.werks/7354 b/.werks/7354 new file mode 100644 index 0000000..69dd85c --- /dev/null +++ b/.werks/7354 @@ -0,0 +1,10 @@ +Title: tsm_storagepools: Fixed missing labels in performance graphs +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1553241318 +Class: fix + + diff --git a/checks/tsm_storagepools b/checks/tsm_storagepools index a2fc925..ae6ae34 100644 --- a/checks/tsm_storagepools +++ b/checks/tsm_storagepools @@ -67,10 +67,9 @@ def check_tsm_storagepools(item, _no_params, parsed): data = parsed[item] stype = data["type"] - size = data["size"] - return 0, "Used size: %s, Type: %s" % \ - (get_bytes_human_readable(int(float(size) * 1024 * 1024)), stype), \ - [ ("used", float(size)) ] + size = int(float(data["size"]) * 1024**2) + return 0, "Used size: %s, Type: %s" % (get_bytes_human_readable(size), stype),\ + [("used_space", size)] check_info['tsm_storagepools'] = { diff --git a/cmk/gui/plugins/metrics/check_mk.py b/cmk/gui/plugins/metrics/check_mk.py index aec4b44..794fc92 100644 --- a/cmk/gui/plugins/metrics/check_mk.py +++ b/cmk/gui/plugins/metrics/check_mk.py @@ -7187,6 +7187,12 @@ check_metrics["check_mk-tsm_stagingpools"] = { } } +check_metrics["check_mk-tsm_storagepools"] = { + "used": { + "name": "used_space" + }, +} + check_metrics["check_mk-hpux_tunables.shmseg"] = { "segments": { "name": "shared_memory_segments"

5 years, 6 months

Reserved 20 Werk IDS

by Simon Betz

Module: check_mk Branch: master Commit: 02c0e710089b423496c934adbae323f59de471c7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=02c0e710089b42… Author: Simon Betz <si(a)mathias-kettner.de> Date: Fri Mar 22 08:54:55 2019 +0100 Reserved 20 Werk IDS Change-Id: Ie6909666780a22ed6392fe70c0f963c1534f8cd4 --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index 1b01b6a..cbf8a2e 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -7354 +7374

5 years, 6 months

added WK7247: Fixed incomplete counter cleanup routine

by Andreas Boesl

Module: check_mk Branch: master Commit: c37a0c350f8b667f05aef31c2ebc1fb0b3af2ebf URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c37a0c350f8b66… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Mar 22 08:46:28 2019 +0100 added WK7247: Fixed incomplete counter cleanup routine Change-Id: Ia2565c70e5c80e8d679cfc21c8b223a9f0323105 --- .werks/7247 | 17 +++++++++++++++++ checks/ps | 2 +- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/.werks/7247 b/.werks/7247 new file mode 100644 index 0000000..bb8d295 --- /dev/null +++ b/.werks/7247 @@ -0,0 +1,17 @@ +Title: ps.perf: Fixed incomplete counter cleanup routine, leading to ever-growing counter state files +Level: 1 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1553175847 + +The ps check regularly creates counter values with dyamic names and save them into the counter state file. +There is a cleanup routine which removes outdated counters. + +This cleanup routine failed at cleaning up counter values from the deprecated ps.perf check. +As a result the check counters file did steadily grow. This has been fixed. The cleanup now also +checks for outdated ps.perf counters. + diff --git a/checks/ps b/checks/ps index a0a09cb..5e354c3 100644 --- a/checks/ps +++ b/checks/ps @@ -98,7 +98,7 @@ def ps_cleanup_counters(parsed): def ps_get_counters_to_delete(pids): counters_to_delete = [] for ident in get_all_item_states(): - if isinstance(ident, tuple) and ident[0] == "ps": + if isinstance(ident, tuple) and ident[0] in ["ps", "ps.perf"]: check_ident = ident[2] elif not isinstance(ident, tuple) and (ident.startswith("ps_stat") or ident.startswith("ps_wmic")):

5 years, 6 months

added WK7248: Fixed invalid expected duration on Activate Changes page

by Andreas Boesl

Module: check_mk Branch: master Commit: c1ddf01f1e4ac8ba60f86ce75cb9644133cb6c88 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c1ddf01f1e4ac8… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Mar 22 08:44:12 2019 +0100 added WK7248: Fixed invalid expected duration on Activate Changes page Change-Id: I38a587a45472da4fe3bff0407b381032dc6937fe --- .werks/7248 | 11 +++++++++++ cmk/gui/watolib/activate_changes.py | 3 ++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/.werks/7248 b/.werks/7248 new file mode 100644 index 0000000..c4198be --- /dev/null +++ b/.werks/7248 @@ -0,0 +1,11 @@ +Title: Fixed invalid expected duration on "Activate Changes" page +Level: 1 +Component: wato +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1553179020 + + diff --git a/cmk/gui/watolib/activate_changes.py b/cmk/gui/watolib/activate_changes.py index 753bbe9..4bf9b38 100644 --- a/cmk/gui/watolib/activate_changes.py +++ b/cmk/gui/watolib/activate_changes.py @@ -1155,7 +1155,8 @@ class ActivateChangesSite(multiprocessing.Process, ActivateChanges): if duration == 0.0: duration = 10.0 - return duration + self._expected_duration = duration + def execute_activate_changes(domains):

5 years, 6 months

picked WK7246: Prevent automatic discovery of duplicate services with the same service description

by Andreas Boesl

Module: check_mk Branch: master Commit: 8d2447a293e3830b5880b0a97b062cc487cf1144 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8d2447a293e383… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Mar 22 08:39:25 2019 +0100 picked WK7246: Prevent automatic discovery of duplicate services with the same service description Change-Id: I9cedb1a76839ae8d8310433dbbcfe57d3eb95a23 --- .werks/7246 | 14 ++++++++++++++ cmk_base/check_table.py | 6 +++--- cmk_base/discovery.py | 12 ++++++++++++ 3 files changed, 29 insertions(+), 3 deletions(-) diff --git a/.werks/7246 b/.werks/7246 new file mode 100644 index 0000000..67239c3 --- /dev/null +++ b/.werks/7246 @@ -0,0 +1,14 @@ +Title: Prevent automatic discovery of duplicate services with the same service description +Level: 1 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1552918330 + +Hosts using snmp as well as tcp checks may run into a scenario where discovered snmp checks share the same service description as the tcp based checks. +One example is the service description <tt>Uptime</tt>, which is created by the <tt>snmp_uptime</tt> and <tt>uptime</tt> check. + +In case of identical service descriptions, the tcp based check wins and the snmp based check is ignored. diff --git a/cmk_base/check_table.py b/cmk_base/check_table.py index a96d818..04c6af5 100644 --- a/cmk_base/check_table.py +++ b/cmk_base/check_table.py @@ -67,7 +67,7 @@ def get_check_table(hostname, # needs to be done in all cases since a host can now have a lot of different data # sources. if remove_duplicates and host_config.is_dual_host: - return _remove_duplicate_checks(check_table_cache[table_cache_id]) + return remove_duplicate_checks(check_table_cache[table_cache_id]) return check_table_cache[table_cache_id] check_table = {} @@ -204,7 +204,7 @@ def get_check_table(hostname, check_table_cache[table_cache_id] = check_table if remove_duplicates: - return _remove_duplicate_checks(check_table) + return remove_duplicate_checks(check_table) return check_table @@ -267,7 +267,7 @@ def service_deps(hostname, servicedesc): return deps -def _remove_duplicate_checks(check_table): +def remove_duplicate_checks(check_table): have_with_tcp = {} have_with_snmp = {} without_duplicates = {} diff --git a/cmk_base/discovery.py b/cmk_base/discovery.py index 8a4e6ed..a4729c5 100644 --- a/cmk_base/discovery.py +++ b/cmk_base/discovery.py @@ -713,6 +713,18 @@ def _discover_services(hostname, ipaddress, sources, multi_host_sections, on_err elif on_error == "warn": console.error("Discovery of '%s' failed: %s\n" % (check_plugin_name, e)) + check_table_formatted = {} + for (check_type, item, _paramstring) in discovered_services: + check_table_formatted[(check_type, item)] = (None, + config.service_description( + hostname, check_type, item)) + + check_table_formatted = check_table.remove_duplicate_checks(check_table_formatted) + for entry in discovered_services[:]: + check_type, item = entry[:2] + if (check_type, item) not in check_table_formatted: + discovered_services.remove(entry) + return discovered_services except KeyboardInterrupt:

5 years, 6 months

Remove unnecessary else before return

by Tom Baerwinkel

Module: check_mk Branch: master Commit: d309c72647ef9d02f395718ca3f8a97f03a7286c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d309c72647ef9d… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Thu Mar 21 17:04:29 2019 +0100 Remove unnecessary else before return Change-Id: Id0a6fab84f57318f479b6e025d1723834a533246 --- checks/netstat | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/checks/netstat b/checks/netstat index bb1e55a..87fb21c 100644 --- a/checks/netstat +++ b/checks/netstat @@ -56,12 +56,10 @@ def parse_netstat(info): - def split_ip_address(ip_address): if ":" in ip_address: return ip_address.rsplit(":", 1) - else: - return ip_address.rsplit(".", 1) + return ip_address.rsplit(".", 1) connections = [] for line in info:

5 years, 6 months

Cleaned up two eval calls

by Lars Michelsen

Module: check_mk Branch: master Commit: db06cdb177f5fd3ec1c4bbfe641978a91403970d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=db06cdb177f5fd… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Mar 21 16:19:44 2019 +0100 Cleaned up two eval calls Change-Id: Ibb5a8d2c4c3b6918cc26459ac695d0515c5f7a2c --- active_checks/check_mail | 5 +++-- active_checks/check_mail_loop | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/active_checks/check_mail b/active_checks/check_mail index dc8b481..337bde3 100755 --- a/active_checks/check_mail +++ b/active_checks/check_mail @@ -27,6 +27,7 @@ import os import re import sys +import ast import time import email import base64 @@ -43,7 +44,7 @@ cmk.utils.password_store.replace_passwords() def parse_exception(exc): exc = str(exc) if exc[0] == '{': - exc = "%d - %s" % eval(exc).values()[0] + exc = "%d - %s" % ast.literal_eval(exc).values()[0] return str(exc) @@ -52,7 +53,7 @@ def bail_out(rc, s, perfdata=None): perfdata = [] stxt = ['OK', 'WARN', 'CRIT', 'UNKNOWN'][rc] - sys.stdout.write('%s - %s' % (stxt, parse_exception(s))) + sys.stdout.write('%s - %s' % (stxt, s)) if perfdata: sys.stdout.write( ' | %s' % (' '.join(['%s=%s' % (p[0], ';'.join(map(str, p[1:]))) for p in perfdata]))) diff --git a/active_checks/check_mail_loop b/active_checks/check_mail_loop index 0477bcd..b3356a5 100755 --- a/active_checks/check_mail_loop +++ b/active_checks/check_mail_loop @@ -28,6 +28,7 @@ import email import getopt import imaplib import os +import ast import poplib import random import re @@ -44,13 +45,13 @@ cmk.utils.password_store.replace_passwords() def parse_exception(exc): exc = str(exc) if exc[0] == '{': - exc = "%d - %s" % eval(exc).values()[0] + exc = "%d - %s" % ast.literal_eval(exc).values()[0] return str(exc) def bail_out(rc, s): stxt = ['OK', 'WARN', 'CRIT', 'UNKNOWN'][rc] - sys.stdout.write('%s - %s\n' % (stxt, parse_exception(s))) + sys.stdout.write('%s - %s\n' % (stxt, s)) sys.exit(rc)

5 years, 6 months

6988 FIX netstat: Fix crashing check on AIX 7

by Konstantin Büttner

Module: check_mk Branch: master Commit: cea0cf2da2e6bd26699c3a36a396176710ad54c1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cea0cf2da2e6bd… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Thu Mar 21 15:46:44 2019 +0100 6988 FIX netstat: Fix crashing check on AIX 7 The netstat command separates the port from the IP address with a dot (.) instead of a colon (:) on some AIX versions, which the check previously could not parse correctly. This has been fixed. Change-Id: I600625b8a5f9d4e7725c646ea082330a93643225 --- .werks/6988 | 13 +++++++++++++ checks/netstat | 12 +++++++++++- tests/unit/checks/test_netstat_parse.py | 18 ++++++++++++++++++ 3 files changed, 42 insertions(+), 1 deletion(-) diff --git a/.werks/6988 b/.werks/6988 new file mode 100644 index 0000000..3ab1660 --- /dev/null +++ b/.werks/6988 @@ -0,0 +1,13 @@ +Title: netstat: Fix crashing check on AIX 7 +Level: 1 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1553179510 + +The netstat command separates the port from the IP address with a dot (.) instead +of a colon (:) on some AIX versions, which the check previously could not parse +correctly. This has been fixed. diff --git a/checks/netstat b/checks/netstat index 43e364e..bb1e55a 100644 --- a/checks/netstat +++ b/checks/netstat @@ -51,8 +51,18 @@ # udp 0 0 10.1.2.160:137 0.0.0.0:* # udp 0 0 0.0.0.0:137 0.0.0.0:* +# Example Output for AIX: +# tcp4 0 0 127.0.0.1.1234 127.0.0.1.5678 ESTABLISHED + def parse_netstat(info): + + def split_ip_address(ip_address): + if ":" in ip_address: + return ip_address.rsplit(":", 1) + else: + return ip_address.rsplit(".", 1) + connections = [] for line in info: if len(line) == 6: @@ -71,7 +81,7 @@ def parse_netstat(info): proto = "UDP" connstate = "LISTENING" - connections.append((proto, local.rsplit(":", 1), remote.rsplit(":", 1), connstate)) + connections.append((proto, split_ip_address(local), split_ip_address(remote), connstate)) return connections diff --git a/tests/unit/checks/test_netstat_parse.py b/tests/unit/checks/test_netstat_parse.py new file mode 100644 index 0000000..c3c9c11 --- /dev/null +++ b/tests/unit/checks/test_netstat_parse.py @@ -0,0 +1,18 @@ +import pytest + +pytestmark = pytest.mark.checks + + +(a)pytest.mark.parametrize( + "info,expected_parsed", + [ + ([], []), + ([["tcp", "0", "0", "0.0.0.0:6556", "0.0.0.0:*", "LISTENING"]], + [("TCP", ["0.0.0.0", "6556"], ["0.0.0.0", "*"], "LISTENING")]), + # Some AIX systems separate the port with a dot (.) instead of a colon (:) + ([["tcp4", "0", "0", "127.0.0.1.1234", "127.0.0.1.5678", "ESTABLISHED"]], + [("TCP", ["127.0.0.1", "1234"], ["127.0.0.1", "5678"], "ESTABLISHED")]), + ]) +def test_parse_netstat(check_manager, info, expected_parsed): + parsed = check_manager.get_check('netstat').run_parse(info) + assert parsed == expected_parsed

5 years, 6 months

← Newer
1
...
13
14
15
16
17
18
19
...
46
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits March 2019