Checkmk git commits February 2018

checkmk-commits@lists.checkmk.com

11 participants
330 discussions

by Simon Betz

Module: check_mk Branch: master Commit: 533661f8e1c871acf8462b907003c05b98c69cbd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=533661f8e1c871… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue Feb 6 16:37:01 2018 +0100 Fixed typo Change-Id: I9c5e3024be6e5525785a45f41c3f30a6b35ea05a --- cmk/structured_data.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmk/structured_data.py b/cmk/structured_data.py index 76a0701..af36fa2 100644 --- a/cmk/structured_data.py +++ b/cmk/structured_data.py @@ -112,7 +112,7 @@ class StructuredDataTree(object): def _validate_tree_path(self, tree_path): if not tree_path: raise MKGeneralException("Empty tree path or zero.") - if not isinstance(tree_path, str) or not isinstance(tree_path, unicode): + if not (isinstance(tree_path, str) or isinstance(tree_path, unicode)): raise MKGeneralException("Wrong tree path format. Must be of type string.") if not (tree_path.endswith(":") or tree_path.endswith(".")): raise MKGeneralException("No valid tree path.")

6 years, 10 months

Use isinstance, not type

by Simon Betz

Module: check_mk Branch: master Commit: d77176505f8f2923e90a1c45456b8a26fb26da4a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d77176505f8f29… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue Feb 6 16:34:14 2018 +0100 Use isinstance, not type Change-Id: I36d485350c0fab9a7e4e7a3c72e97d6d893283b9 --- cmk/structured_data.py | 16 ++++++++-------- inventory/esx_vsphere_clusters | 1 + 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/cmk/structured_data.py b/cmk/structured_data.py index ddb4eed..76a0701 100644 --- a/cmk/structured_data.py +++ b/cmk/structured_data.py @@ -112,7 +112,7 @@ class StructuredDataTree(object): def _validate_tree_path(self, tree_path): if not tree_path: raise MKGeneralException("Empty tree path or zero.") - if not type(tree_path) in [str, unicode]: + if not isinstance(tree_path, str) or not isinstance(tree_path, unicode): raise MKGeneralException("Wrong tree path format. Must be of type string.") if not (tree_path.endswith(":") or tree_path.endswith(".")): raise MKGeneralException("No valid tree path.") @@ -166,7 +166,7 @@ class StructuredDataTree(object): else: abs_path = tuple() abs_path += (edge,) - if type(attrs) == list: + if isinstance(attrs, list): numeration = Numeration() numeration.set_child_data(attrs) parent.add_child(edge, numeration, abs_path) @@ -185,11 +185,11 @@ class StructuredDataTree(object): leaf_data = {} sub_raw_tree = {} for k, v in raw_entries.iteritems(): - if type(v) == dict: + if isinstance(v, dict): # Dict based values mean that current key # is a node. sub_raw_tree.setdefault(k, v) - elif type(v) == list: + elif isinstance(v, list): # Concerns "a.b:" and "a.b:*.c". # In the second case we have to deal with nested numerations # We take a look at children which may be real numerations @@ -208,7 +208,7 @@ class StructuredDataTree(object): def _is_numeration(self, entries): for entry in entries: for k, v in entry.iteritems(): - if type(v) == list: + if isinstance(v, list): return False return True @@ -459,7 +459,7 @@ class Container(NodeAttribute): def _is_nested_numeration_tree(self, child): if isinstance(child, Container): for key in child._edges.keys(): - if type(key) == int: + if isinstance(key, int): return True return False @@ -489,7 +489,7 @@ numerated nodes ('arrays') containing real numerations ('devices'). def _has_nested_numeration_node(self, node_data): for nr, entry in enumerate(node_data): for k, v in entry.iteritems(): - if type(v) == list: + if isinstance(v, list): return True return False @@ -500,7 +500,7 @@ numerated nodes ('arrays') containing real numerations ('devices'). for nr, entry in enumerate(child_data): attrs = {} for k, v in entry.iteritems(): - if type(v) == list: + if isinstance(v, list): numeration = parent.add_child(nr, Container(), abs_path+(nr,))\ .add_child(k, Numeration(), abs_path+(nr,k)) numeration.set_child_data(v) diff --git a/inventory/esx_vsphere_clusters b/inventory/esx_vsphere_clusters index 71b4637..93b836c 100644 --- a/inventory/esx_vsphere_clusters +++ b/inventory/esx_vsphere_clusters @@ -49,6 +49,7 @@ def inv_esx_vsphere_clusters(info): data["clusters"].append(dict([("name", cluster)] + values.items())) node.append(data) + inv_info['esx_vsphere_clusters'] = { "inv_function" : inv_esx_vsphere_clusters, }

6 years, 10 months

cleanup of bin/mknotifyd

by Tom Baerwinkel

Module: check_mk Branch: master Commit: 3e18649d3feb0d9b021ef073d1b77067defdc7e3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3e18649d3feb0d… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Tue Feb 6 15:14:20 2018 +0100 cleanup of bin/mknotifyd Change-Id: I1420be695a1ee72198c2fe20576739609f920a6c --- bin/mkeventd | 1398 ++++++++++++++++++++++++++-------------------------------- 1 file changed, 634 insertions(+), 764 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=3e18649d3f…

6 years, 10 months

5709 FIX apc_netbotz_sensors, apc_netbotz_other_sensors: Fix discovery for newer models

by Konstantin Büttner

Module: check_mk Branch: master Commit: 34aa55a3b6dd560042dd18bb72df9d2acc82eb5a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=34aa55a3b6dd56… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Tue Feb 6 14:45:17 2018 +0100 5709 FIX apc_netbotz_sensors, apc_netbotz_other_sensors: Fix discovery for newer models An overzealous SNMP scan function prevented discovery for newer models. This has been fixed. Thanks to Mathias Götze for the patch! Change-Id: I64cafe15685d2de055232674d1b6d6a55942469b --- .werks/5709 | 13 +++++++++++++ checks/apc_netbotz_other_sensors | 2 +- checks/apc_netbotz_sensors | 2 +- 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/.werks/5709 b/.werks/5709 new file mode 100644 index 0000000..20af3dc --- /dev/null +++ b/.werks/5709 @@ -0,0 +1,13 @@ +Title: apc_netbotz_sensors, apc_netbotz_other_sensors: Fix discovery for newer models +Level: 1 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i3 +Date: 1517924598 + +An overzealous SNMP scan function prevented discovery for newer models. This has been fixed. + +Thanks to Mathias Götze for the patch! diff --git a/checks/apc_netbotz_other_sensors b/checks/apc_netbotz_other_sensors index 5d2674d..86e5dba 100644 --- a/checks/apc_netbotz_other_sensors +++ b/checks/apc_netbotz_other_sensors @@ -71,5 +71,5 @@ check_info['apc_netbotz_other_sensors'] = { "7", # NETBOTZV2-MIB::otherNumericSensorValueStr ]), 'snmp_scan_function' : lambda oid: \ - oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.5528.100.20.10.2014"), + oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.5528.100.20.10"), } diff --git a/checks/apc_netbotz_sensors b/checks/apc_netbotz_sensors index e22335a..aac99ee 100644 --- a/checks/apc_netbotz_sensors +++ b/checks/apc_netbotz_sensors @@ -166,7 +166,7 @@ check_info['apc_netbotz_sensors'] = { # empty if sensor is not plugged in ]), 'snmp_scan_function' : lambda oid: \ - oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.5528.100.20.10.2014"), + oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.5528.100.20.10"), 'default_levels_variable' : 'apc_netbotz_sensors_temp_default_levels', 'group' : "temperature", 'includes' : [ 'temperature.include' ],

6 years, 10 months

Fixed nfsmounts section

by Simon Betz

Module: check_mk Branch: master Commit: 57c640be720922177e3f34089fb2501e978db4e9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=57c640be720922… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue Feb 6 12:09:25 2018 +0100 Fixed nfsmounts section Change-Id: Iacfb1695b553ef045a1554179e191b33826fdf86 --- agents/check_mk_agent.openwrt | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/agents/check_mk_agent.openwrt b/agents/check_mk_agent.openwrt index 28f15d7..86c2ea0 100755 --- a/agents/check_mk_agent.openwrt +++ b/agents/check_mk_agent.openwrt @@ -278,9 +278,7 @@ then sed 's/\\040/ /g' | while read MP do - if [ ! -r $MP ]; then - echo "$MP Permission denied" - elif [ $STAT_VERSION != $STAT_BROKE ]; then + if [ $STAT_VERSION != $STAT_BROKE ]; then waitmax -s 9 5 stat -f -c "$MP ok %b %f %a %s" "$MP" || \ echo "$MP hanging 0 0 0 0" else

6 years, 10 months

Fixed syntactic breakage caused by werk 5113.

by Sven Panne

Module: check_mk Branch: master Commit: 8b7799023a80a26165fb667eca3b898a37254269 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8b7799023a80a2… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Feb 6 11:57:31 2018 +0100 Fixed syntactic breakage caused by werk 5113. Change-Id: If830fe80d174e360f64c313f44ae31968da43cbc --- agents/check_mk_agent.openwrt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/agents/check_mk_agent.openwrt b/agents/check_mk_agent.openwrt index d9eb644..28f15d7 100755 --- a/agents/check_mk_agent.openwrt +++ b/agents/check_mk_agent.openwrt @@ -280,7 +280,7 @@ then do if [ ! -r $MP ]; then echo "$MP Permission denied" - if [ $STAT_VERSION != $STAT_BROKE ]; then + elif [ $STAT_VERSION != $STAT_BROKE ]; then waitmax -s 9 5 stat -f -c "$MP ok %b %f %a %s" "$MP" || \ echo "$MP hanging 0 0 0 0" else

6 years, 10 months

Fixed ShellCheck problem SC2104

by Sven Panne

Module: check_mk Branch: master Commit: db4e484e07ec29ab8fa85052f510afe1ee98bf3d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=db4e484e07ec29… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Feb 6 11:47:11 2018 +0100 Fixed ShellCheck problem SC2104 In functions, use return instead of continue, see https://github.com/koalaman/shellcheck/wiki/SC2104. This has been broken since f0843d4bfb6, which landed a few years ago. Change-Id: I3c36b977615fcae730379bd3b1a86d2f7193c3a4 --- agents/plugins/mk_oracle | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/agents/plugins/mk_oracle b/agents/plugins/mk_oracle index 26f658b..023caec 100755 --- a/agents/plugins/mk_oracle +++ b/agents/plugins/mk_oracle @@ -1200,13 +1200,10 @@ function do_instance() { if [ "$DEBUGCONNECT" ] ; then do_testmode $SID - # do not execute any check - continue + else + do_sync_checks $SID "$SECTIONS" + run_cached oracle_$SID $CACHE_MAXAGE do_async_checks $SID fi - - do_sync_checks $SID "$SECTIONS" - run_cached oracle_$SID $CACHE_MAXAGE do_async_checks $SID - } #.

6 years, 10 months

Fixed ShellCheck problem SC2068.

by Sven Panne

Module: check_mk Branch: master Commit: 220042de914de3af6050f3f16cb98314c847093c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=220042de914de3… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Feb 6 11:32:53 2018 +0100 Fixed ShellCheck problem SC2068. Double quote array expansions, otherwise they're like $* and break on spaces, see https://github.com/koalaman/shellcheck/wiki/SC2068. Change-Id: Id7e2a8883a73555d214e45ce40727b7bc2e0942c --- agents/mk-job | 2 +- agents/plugins/mk_oracle_asm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/agents/mk-job b/agents/mk-job index 342df2b..5328154 100755 --- a/agents/mk-job +++ b/agents/mk-job @@ -67,7 +67,7 @@ date +"start_time %s" > "$OUTPUT_PATH/$IDENT.running" 2>/dev/null if [ ! -w "$OUTPUT_PATH/$IDENT.running" ] ; then # Looks like we are lacking the permissions to create this file.. # In this scenario no mk-job status file is created. We simply execute the command - $@ + "$@" exit $? fi diff --git a/agents/plugins/mk_oracle_asm b/agents/plugins/mk_oracle_asm index 400d93c..c29b739 100755 --- a/agents/plugins/mk_oracle_asm +++ b/agents/plugins/mk_oracle_asm @@ -31,7 +31,7 @@ if [ ! -e $MK_CONFDIR/asmcmd.sh ]; then fi function asmcmd () { - $MK_CONFDIR/asmcmd.sh $@ + $MK_CONFDIR/asmcmd.sh "$@" } echo "<<<oracle_asm_diskgroup>>>"

6 years, 10 months

Simplification

by Sven Panne

Module: check_mk Branch: master Commit: 29f3fbf19c96e6167e0256f3f7dad4bd9d95b8ea URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=29f3fbf19c96e6… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Feb 6 11:36:35 2018 +0100 Simplification Change-Id: I6b927ff9e69eb8fd6c0f8c09144dd794f16f23a8 --- agents/mk-job | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/agents/mk-job b/agents/mk-job index 5328154..c53b0e0 100755 --- a/agents/mk-job +++ b/agents/mk-job @@ -67,8 +67,7 @@ date +"start_time %s" > "$OUTPUT_PATH/$IDENT.running" 2>/dev/null if [ ! -w "$OUTPUT_PATH/$IDENT.running" ] ; then # Looks like we are lacking the permissions to create this file.. # In this scenario no mk-job status file is created. We simply execute the command - "$@" - exit $? + exec "$@" fi

6 years, 10 months

Windows: fix test for unpacking script plugins

by Jukka Aro

Module: check_mk Branch: master Commit: 7b1ab7cf3bdf96bb0b08619ce6af417c52a3234b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7b1ab7cf3bdf96… Author: Jukka Aro <ja(a)mathias-kettner.de> Date: Tue Feb 6 10:58:28 2018 +0100 Windows: fix test for unpacking script plugins Ensure that files are packed in alphabetical order and verify the content of uninstall_plugins.bat in the same alphabetical order. --- agents/windows/it/test_agent_start_parameters.py | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/agents/windows/it/test_agent_start_parameters.py b/agents/windows/it/test_agent_start_parameters.py index 3fa5651..b1d26bb 100644 --- a/agents/windows/it/test_agent_start_parameters.py +++ b/agents/windows/it/test_agent_start_parameters.py @@ -142,7 +142,7 @@ def pack(install_basedir): old_cwd = os.path.abspath('.') os.chdir(install_basedir) for relative_dir, _unused_dirs, files in os.walk("."): - for filename in files: + for filename in sorted(files): path = (relative_dir + "/" + filename)[2:] cap += _cap_entry(path) os.chdir(old_cwd) @@ -254,15 +254,8 @@ def verify_plugin_output(): def verify_uninstall_batch(script): drive_letter = r'[A-Z]:' - def paircmp(t1, t2): - if t1[0] < t2[0]: - return -1 - elif t2[0] < t1[0]: - return 1 - return 0 - if script: - test_plugins = [t[0] for t in Globals.testfiles[2]] + test_plugins = [t[0] for t in sorted(Globals.testfiles[2])] else: test_plugins = [Globals.binaryplugin] expected_uninstall = [

6 years, 10 months

← Newer
1
...
26
27
28
29
30
31
32
33
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits February 2018