Checkmk git commits December 2018

checkmk-commits@lists.checkmk.com

15 participants
342 discussions

added WK6697: Fix incorrect warning message when checking for unique title

by Andreas Boesl

Module: check_mk Branch: master Commit: dbb26f4b94ea2251cf49376cf7780278e6d3e772 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dbb26f4b94ea22… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Dec 10 14:44:47 2018 +0100 added WK6697: Fix incorrect warning message when checking for unique title Change-Id: Ib93782ba98dbf6816fc4e389ff450d87818c3c3c --- .werks/6697 | 12 ++++++++++++ cmk/gui/bi.py | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/.werks/6697 b/.werks/6697 new file mode 100644 index 0000000..561a66d --- /dev/null +++ b/.werks/6697 @@ -0,0 +1,12 @@ +Title: BI aggregations: Fix incorrect warning message when checking for unique title +Level: 1 +Component: bi +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1544431938 + +It was not possible to configure two identical BI aggregations with different aggregation groups. +You had to configure one aggregation, which includes both groups. diff --git a/cmk/gui/bi.py b/cmk/gui/bi.py index f73d08b..c5fdadf 100644 --- a/cmk/gui/bi.py +++ b/cmk/gui/bi.py @@ -441,7 +441,7 @@ class JobWorker(multiprocessing.Process): # Generates a unique id for the given entry def get_hash(entry): - return hashlib.md5(repr(entry) + repr(job)).hexdigest() + return hashlib.md5(repr(entry)).hexdigest() for group in {g for g in groups}: # Flattened groups new_entries_hash = map(get_hash, new_entries)

5 years, 6 months

6865 FIX Windows Agent's fileinfo section produces correct output

by Sergey Kipnis

Module: check_mk Branch: master Commit: d3c0569f5e2114ff2569af166c508bdf35a3659e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d3c0569f5e2114… Author: Sergey Kipnis <sk(a)mathias-kettner.de> Date: Fri Dec 7 13:26:39 2018 +0100 6865 FIX Windows Agent's fileinfo section produces correct output Previously, fileinfo section may contain invalid data, usually nulls. With the fix this section works as intended and sends to the output correct file information. [CMK-1417] - fixed invalid behavior of the fileinfo section provider in Windows Agent Now the provider writes correct data to section. Change-Id: Idaf41c3ec803edf4671b75642a2c5f733bdc9685 --- .werks/6865 | 13 +++++++++++++ agents/windows/build_version | 2 +- agents/windows/sections/SectionFileinfo.cc | 31 +++++++++++++++++++++++++----- 3 files changed, 40 insertions(+), 6 deletions(-) diff --git a/.werks/6865 b/.werks/6865 new file mode 100644 index 0000000..33e84be --- /dev/null +++ b/.werks/6865 @@ -0,0 +1,13 @@ +Title: Windows Agent's fileinfo section produces correct output +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1544186240 +Class: fix + +Previously, fileinfo section may contain invalid data, usually nulls. +With the fix this section works as intended and sends to the output correct +file information. + diff --git a/agents/windows/build_version b/agents/windows/build_version index 74de7d2..7c85d65 100644 --- a/agents/windows/build_version +++ b/agents/windows/build_version @@ -1 +1 @@ -3264 +3266 diff --git a/agents/windows/sections/SectionFileinfo.cc b/agents/windows/sections/SectionFileinfo.cc index ae298c5..da641b4 100644 --- a/agents/windows/sections/SectionFileinfo.cc +++ b/agents/windows/sections/SectionFileinfo.cc @@ -97,21 +97,42 @@ struct IteratorTraits<false> { * @param[in/out] files The container for storing found files * @param[in/out] dirs The container for storing found dirs */ +// The function works not so good as we are expecting: +// dir traverse doesn't work, symlinks are not processed too, +// unit tests are absent(refactoring is forbidden) +// i.e. pure disaster. Do not reuse without careful testing. +// Or just do not reuse. template <bool recursive> void addFilesAndDirs(const fs::path &searchPath, const fs::path &filePattern, const fs::path &dirPattern, PathsT &files, PathsT &dirs) { using IteratorT = typename IteratorTraits<recursive>::iterator_type; for (const auto &p : IteratorT(searchPath)) { // Found files must match the entire path pattern. - if (auto status = p.symlink_status(); - fs::is_regular_file(status) && + + // ******************************************* + // we have to check status, not symlink_status + // if you are not sure, test behavior before + // putting the code into production + auto status = p.status(); // CMK-1417, to be confirmed in ticket + + // Logic below is a bit crazy and ineffective(we check status twice) + // correct is "double if", not logical AND. + + // normal file + if (fs::is_regular_file(status) && globmatch(filePattern.wstring(), p.path().wstring())) { files.push_back(p.path()); // Only consider dirs if not iterating recursively. - // Found dirs must match the pattern only on the next subdir level. - } else if (!recursive && fs::is_directory(status) && - globmatch(dirPattern.wstring(), p.path().wstring())) { + // Found dirs must match the pattern only on the next subdir + // level. + continue; + } + + // directory + if (!recursive && fs::is_directory(status) && + globmatch(dirPattern.wstring(), p.path().wstring())) { dirs.push_back(p.path()); + continue; } } }

5 years, 6 months

Formatted if64.include

by Simon Betz

Module: check_mk Branch: master Commit: 785b8b3e71f9f49af733d18f0cc8b9bbe49e1b26 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=785b8b3e71f9f4… Author: Simon Betz <si(a)mathias-kettner.de> Date: Mon Dec 10 11:43:27 2018 +0100 Formatted if64.include Change-Id: I7fba7bd7a8d6f3a0f1cd0c02dcc8e35bc377a0ab --- checks/if64.include | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/checks/if64.include b/checks/if64.include index 93a90c8..2c17192 100644 --- a/checks/if64.include +++ b/checks/if64.include @@ -79,18 +79,18 @@ def if64_scan_function(oid, use_if64adm=False): sys_descr = oid(".1.3.6.1.2.1.1.1.0") for ignored_sys_descr in [ - "LANCOM", - "ELSA", - "T-Systems", - "Brocade VDX Switch", + "LANCOM", + "ELSA", + "T-Systems", + "Brocade VDX Switch", ]: if ignored_sys_descr in sys_descr: return False sys_obj_id = oid(".1.3.6.1.2.1.1.2.0") for ignored_sys_obj_id in [ - ".4.1.11863.", - ".1.3.6.1.4.1.12356", + ".4.1.11863.", + ".1.3.6.1.4.1.12356", ]: if ignored_sys_obj_id in sys_obj_id: return False

5 years, 6 months

Silence mypy (we have no pytest.pyi). Added forgotten assert and fix test.

by Sven Panne

Module: check_mk Branch: master Commit: 8dc94f44d99a441902ebf17ef6f689636da8b072 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8dc94f44d99a44… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon Dec 10 11:34:59 2018 +0100 Silence mypy (we have no pytest.pyi). Added forgotten assert and fix test. Change-Id: I17686c5f897a22ef6f1af2821951bd6c45f0d87c --- tests/unit/cmk/gui/test_htmllib_OutputFunnel.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/unit/cmk/gui/test_htmllib_OutputFunnel.py b/tests/unit/cmk/gui/test_htmllib_OutputFunnel.py index b6fea41..a02b5f4 100644 --- a/tests/unit/cmk/gui/test_htmllib_OutputFunnel.py +++ b/tests/unit/cmk/gui/test_htmllib_OutputFunnel.py @@ -1,6 +1,6 @@ #!/usr/bin/env python -import pytest +import pytest # type: ignore from cmk.gui.htmllib import OutputFunnel @@ -62,7 +62,7 @@ def test_output_funnel_drain(html): def test_output_funnel_flush(html): html.plug() html.write("A") - html.plug_text == ["A"] + assert html.plug_text == [["A"]] html.flush() assert html.written == "A" assert html.plug_text == [[]]

5 years, 6 months

if64.include: Minor cleanup

by Simon Betz

Module: check_mk Branch: master Commit: 43069abcd4f7e8263910064368b1b7544c293c6c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=43069abcd4f7e8… Author: Simon Betz <si(a)mathias-kettner.de> Date: Mon Dec 10 11:22:17 2018 +0100 if64.include: Minor cleanup Change-Id: I8f4a0b679de6325189db46c97df20a33f8ed01d2 --- checks/if64.include | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/checks/if64.include b/checks/if64.include index bf8cd93..93a90c8 100644 --- a/checks/if64.include +++ b/checks/if64.include @@ -77,23 +77,21 @@ def if64_scan_function(oid, use_if64adm=False): if if64_disabled(host_name()): return False - ignored_sys_descrs = [ + sys_descr = oid(".1.3.6.1.2.1.1.1.0") + for ignored_sys_descr in [ "LANCOM", "ELSA", "T-Systems", "Brocade VDX Switch", - ] - sys_descr = oid(".1.3.6.1.2.1.1.1.0") - for ignored_sys_descr in ignored_sys_descrs: + ]: if ignored_sys_descr in sys_descr: return False - ignored_sys_obj_ids = [ + sys_obj_id = oid(".1.3.6.1.2.1.1.2.0") + for ignored_sys_obj_id in [ ".4.1.11863.", ".1.3.6.1.4.1.12356", - ] - sys_obj_id = oid(".1.3.6.1.2.1.1.2.0") - for ignored_sys_obj_id in ignored_sys_obj_ids: + ]: if ignored_sys_obj_id in sys_obj_id: return False

5 years, 6 months

6822 FIX fsc_if64: Remove this check plugin in order to improve performance

by Simon Betz

Module: check_mk Branch: master Commit: 47fbdd80b8ab1dc8b4f02071bcab9b267ee0c870 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=47fbdd80b8ab1d… Author: Simon Betz <si(a)mathias-kettner.de> Date: Mon Dec 10 11:19:45 2018 +0100 6822 FIX fsc_if64: Remove this check plugin in order to improve performance Change-Id: Ia214953937320f90821b02a24d5770602ea68726 --- .werks/6822 | 22 ++++ checks/fsc_if64 | 282 +--------------------------------------------------- checks/if64.include | 282 ++++++++++++++++++++++++++++++++++++++++++++++++++-- 3 files changed, 302 insertions(+), 284 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=47fbdd80b8…

5 years, 6 months

6927 FIX MAC OS X agent: Fixed missing root filesystem when using apfs

by Lars Michelsen

Module: check_mk Branch: master Commit: 7a26118ea46ebbd5ef2e176b0ff6237041601204 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7a26118ea46ebb… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Dec 10 08:26:00 2018 +0100 6927 FIX MAC OS X agent: Fixed missing root filesystem when using apfs OS X systems since 10.13 High Sierra can format disks using APFS. The OS X agent was only reporting hfs filesystems in the past. This lead to e.g. a missing root filesystem on newer OS X installations. FEED-3094 Change-Id: Ib7a5138251011df617f24b1e9737abd01b7ac090 --- .werks/6927 | 13 +++++++++++++ agents/check_mk_agent.macosx | 14 ++++++++++---- 2 files changed, 23 insertions(+), 4 deletions(-) diff --git a/.werks/6927 b/.werks/6927 new file mode 100644 index 0000000..0bc9318 --- /dev/null +++ b/.werks/6927 @@ -0,0 +1,13 @@ +Title: MAC OS X agent: Fixed missing root filesystem when using apfs +Level: 1 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1544426643 + +OS X systems since 10.13 High Sierra can format disks using APFS. The +OS X agent was only reporting hfs filesystems in the past. This lead +to e.g. a missing root filesystem on newer OS X installations. diff --git a/agents/check_mk_agent.macosx b/agents/check_mk_agent.macosx index 20bcfcc..d997dce 100755 --- a/agents/check_mk_agent.macosx +++ b/agents/check_mk_agent.macosx @@ -58,8 +58,12 @@ echo "LocalDirectory: $LOCALDIR" osver="$(uname -r)" -echo '<<<df>>>'; -df -kPt hfs | sed -e 's/^$[^ ][^ ]*$ $.*$$/\1 hfs \2/' | sed 1d +echo '<<<df>>>' +df -kPT hfs,apfs | sed 1d | \ +while read DEV REST; do + TYPE=$(diskutil info "$DEV" | grep '^\s*Type' | cut -d: -f2 | tr -d '[:space:]') + echo "$DEV $TYPE $REST" +done echo '<<<cpu>>>'; echo `sysctl -n vm.loadavg | tr -d '{}'` `top -l 1 -n 1 | egrep ^Processes: | @@ -90,8 +94,10 @@ echo '<<<ps>>>' ps ax -o user,vsz,rss,pcpu,command | sed -e 1d -e 's/ *$[^ ]*$ *$[^ ]*$ *$[^ ]*$ *$[^ ]*$ */(\1,\2,\3,\4) /' # NTP seems to be enabled as a default -echo '<<<ntp>>>' -ntpq -np | sed -e 1,2d -e 's/^$.$/\1 /' -e 's/^ /%/' +if which ntpq >/dev/null; then + echo '<<<ntp>>>' + ntpq -np | sed -e 1,2d -e 's/^$.$/\1 /' -e 's/^ /%/' +fi # TCP Conn stats echo '<<<tcp_conn_stats>>>'

5 years, 6 months

Dropped now obsolete interactive progress logic

by Lars Michelsen

Module: check_mk Branch: master Commit: 2176eff7aacfee902b2a82727da2eba1c2092614 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2176eff7aacfee… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Dec 5 16:01:03 2018 +0100 Dropped now obsolete interactive progress logic hooray CMK-1001 Change-Id: I4751167d93cdff716faafe44d6d08f7316c04ee5 --- cmk/gui/wato/pages/progress.py | 120 ------------------ web/htdocs/js/wato.js | 275 ----------------------------------------- 2 files changed, 395 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=2176eff7aa…

5 years, 6 months

6923 Parent scan is now based on the background job logic

by Lars Michelsen

Module: check_mk Branch: master Commit: 803e2b4f5414a8fd09a44d6ce6c46d92c2f65c3d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=803e2b4f5414a8… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Dec 5 12:12:16 2018 +0100 6923 Parent scan is now based on the background job logic The parent scan is no longer affected by GUI timeouts because it is executed in a background job. The progress dialog is now based on the generic background job handling. The execution logic of the parent scan hasn't changed. CMK-1001 Change-Id: I3a8496a3daf9e635885bbbe12fb39033deeaba89 --- .werks/6923 | 12 + cmk/gui/wato/pages/parentscan.py | 478 +++++++++++++++++++++++---------------- 2 files changed, 294 insertions(+), 196 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=803e2b4f54…

5 years, 6 months

Refactoring: Moved all networking check parameters from unsorted.py to dedicated modules (CMK-1393)

by Kenneth Okoh

Module: check_mk Branch: master Commit: d33123a691460129a9c9ee07a5643aecbb2debc1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d33123a6914601… Author: Kenneth Okoh <ko(a)mathias-kettner.de> Date: Thu Dec 6 13:45:58 2018 +0100 Refactoring: Moved all networking check parameters from unsorted.py to dedicated modules (CMK-1393) Change-Id: Ic44a0c457d0e803d68e47c7d0cde802fdb63c311 --- .../wato/check_parameters/cisco_asa_failover.py | 72 +++ .../plugins/wato/check_parameters/cisco_stack.py | 86 ++++ .../wato/check_parameters/cluster_status.py | 63 +++ .../wato/check_parameters/f5_bigip_cluster_v11.py | 53 +++ .../plugins/wato/check_parameters/f5_bigip_snat.py | 128 +++++ .../wato/check_parameters/f5_bigip_vserver.py | 154 ++++++ .../wato/check_parameters/fortigate_node_memory.py | 60 +++ .../check_parameters/fortigate_node_sessions.py | 52 +++ .../wato/check_parameters/fortigate_sessions.py | 48 ++ .../wato/check_parameters/fortisandbox_queues.py | 55 +++ .../wato/check_parameters/hp_hh3c_ext_states.py | 64 +++ cmk/gui/plugins/wato/check_parameters/ipsecvpn.py | 60 +++ .../wato/check_parameters/threepar_ports.py | 67 +++ cmk/gui/plugins/wato/check_parameters/unsorted.py | 520 --------------------- .../plugins/wato/check_parameters/veritas_vcs.py | 67 +++ 15 files changed, 1029 insertions(+), 520 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=d33123a691…

5 years, 6 months

← Newer
1
...
23
24
25
26
27
28
29
...
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