Checkmk git commits October 2016

checkmk-commits@lists.checkmk.com

10 participants
276 discussions

Fixed pylint error when parsing hidden files.

by Roland Halbig

Module: check_mk Branch: master Commit: 98fb33da5938af4d67195276abef71932f5fd7e0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=98fb33da5938af… Author: Roland Halbig <rh(a)mathias-kettner.de> Date: Wed Oct 19 10:08:58 2016 +0200 Fixed pylint error when parsing hidden files. --- tests/pylint/test_pylint_web.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/pylint/test_pylint_web.py b/tests/pylint/test_pylint_web.py index 505cc9c..dfb4cab 100755 --- a/tests/pylint/test_pylint_web.py +++ b/tests/pylint/test_pylint_web.py @@ -56,7 +56,9 @@ def test_pylint_web(): for plugin_file, plugin_base in files: plugin_path = plugin_base +"/"+plugin_file - if plugin_dir in ["icons","perfometer"]: + if plugin_file.startswith('.'): + continue + elif plugin_dir in ["icons","perfometer"]: module_name = "views" elif plugin_dir == "pages": module_name = "modules"

8 years

fixed messed up syntax

by Marcel Arentz

Module: check_mk Branch: master Commit: 5bd43d45d4cc31c1f0409fa5e676f19b1a17da3d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5bd43d45d4cc31… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Wed Oct 19 10:03:25 2016 +0200 fixed messed up syntax --- checks/ups_capacity | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/checks/ups_capacity b/checks/ups_capacity index 09a1b90..1008e0a 100644 --- a/checks/ups_capacity +++ b/checks/ups_capacity @@ -70,7 +70,7 @@ check_info["ups_capacity"] = { ".1.3.6.1.4.1.705.1.2", ".1.3.6.1.4.1.818.1.100.1.1", ".1.3.6.1.4.1.818.1.100.1.2", - ".1.3.6.1.4.1.935" ] or - ".1.3.6.1.4.1.5491.6", + ".1.3.6.1.4.1.935", + ".1.3.6.1.4.1.5491.6",] or \ oid(".1.3.6.1.2.1.1.2.0").startswith('.1.3.6.1.2.1.33') }

8 years

minor cleanup better description

by Marcel Arentz

Module: check_mk Branch: master Commit: bdb41896d0662f9f0b544ae2c2f6553570ef9083 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bdb41896d0662f… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Wed Oct 19 09:25:47 2016 +0200 minor cleanup better description --- checks/ups_capacity | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/checks/ups_capacity b/checks/ups_capacity index 94f6c7a..09a1b90 100644 --- a/checks/ups_capacity +++ b/checks/ups_capacity @@ -56,11 +56,21 @@ check_info["ups_capacity"] = { "has_perfdata" : True, "group" : "ups_capacity", "includes" : [ "ups_capacity.include" ], - "snmp_info" : ( ".1.3.6.1.2.1.33.1.2", [ "2.0" , "3.0" ,"4.0" ] ), - "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0") in \ - [ ".1.3.6.1.4.1.534.1", ".1.3.6.1.4.1.705.1", ".1.3.6.1.4.1.818.1.100.1.1", - "1.3.6.1.4.1.705.1.2", ".1.3.6.1.2.1.33.2", ".1.3.6.1.4.1.5491.6", - ".1.3.6.1.4.1.476.1.42", ".1.3.6.1.4.1.818.1.100.1.2", - ".1.3.6.1.4.1.232.165.3", ".1.3.6.1.4.1.935" ] \ - or oid(".1.3.6.1.2.1.1.2.0").startswith('.1.3.6.1.2.1.33') + "snmp_info" : ( ".1.3.6.1.2.1.33.1.2", [ + "2.0", # upsSecondsOnBattery + "3.0", # upsEstimatedMinutesRemaining + "4.0", # upsEstimatedChargeRemaining + ]), + "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0") in [ + ".1.3.6.1.2.1.33.2", + ".1.3.6.1.4.1.232.165.3", + ".1.3.6.1.4.1.476.1.42", + ".1.3.6.1.4.1.534.1", + ".1.3.6.1.4.1.705.1", + ".1.3.6.1.4.1.705.1.2", + ".1.3.6.1.4.1.818.1.100.1.1", + ".1.3.6.1.4.1.818.1.100.1.2", + ".1.3.6.1.4.1.935" ] or + ".1.3.6.1.4.1.5491.6", + oid(".1.3.6.1.2.1.1.2.0").startswith('.1.3.6.1.2.1.33') }

8 years

Removed i18n tag from pure format code

by Mathias Kettner

Module: check_mk Branch: master Commit: 8436a1144f6bb95cb539f9135e09c411b7703168 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8436a1144f6bb9… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Oct 19 09:14:09 2016 +0200 Removed i18n tag from pure format code --- web/plugins/wato/check_parameters.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 71ad7e5..6c484b2 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -8208,8 +8208,8 @@ register_check_parameters( "overwrite the default state set above."), default_value = (0, 0), elements = [ - Float(title = _("Warning at"), unit = _("seconds"), display_format = _("%.3f")), - Float(title = _("Critical at"), unit = _("seconds"), display_format = _("%.3f")), + Float(title = _("Warning at"), unit = _("seconds"), display_format = "%.3f"), + Float(title = _("Critical at"), unit = _("seconds"), display_format = "%.3f"), ] )), ],

8 years

fixed postmulti cmd

by Simon Betz

Module: check_mk Branch: master Commit: c7becc3b3a2521c8331ff1094eaacc29ebf18969 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c7becc3b3a2521… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue Oct 18 17:26:55 2016 +0200 fixed postmulti cmd --- 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 6c2a38c..ffd9455 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -669,7 +669,7 @@ fi if type postmulti >/dev/null ; then echo "<<<postfix_mailq_status:sep(58)>>>" - postmulti -p status + script -c 'postmulti -p status' fi

8 years

3960 FIX if.include: fixed wrong order if interface groups are configured

by Simon Betz

Module: check_mk Branch: master Commit: cbb205f45d38916e75e6661cf749cd269b197c90 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cbb205f45d3891… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue Oct 18 17:35:46 2016 +0200 3960 FIX if.include: fixed wrong order if interface groups are configured --- .werks/3960 | 10 ++++++++++ ChangeLog | 1 + checks/if.include | 47 +++++++++++++++++++++++++---------------------- 3 files changed, 36 insertions(+), 22 deletions(-) diff --git a/.werks/3960 b/.werks/3960 new file mode 100644 index 0000000..2217a88 --- /dev/null +++ b/.werks/3960 @@ -0,0 +1,10 @@ +Title: if.include: fixed wrong order if interface groups are configured +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.4.0i2 +Date: 1476804826 + + diff --git a/ChangeLog b/ChangeLog index 7fdf705..1ad77a9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -30,6 +30,7 @@ * 3826 FIX: netapp_api_connection: now removes duplicate warning messages * 3827 FIX: windows agent: fixed 3 bugs which broke the skype section * 3650 FIX: Fixed bash versionitis, unbreaking cached check results.... + * 3960 FIX: if.include: fixed wrong order if interface groups are configured Multisite: * 3959 Two new filters for the comment view: author and comment text field diff --git a/checks/if.include b/checks/if.include index 5751c22..4a866df 100644 --- a/checks/if.include +++ b/checks/if.include @@ -393,28 +393,26 @@ def check_if_common(item, params, info, has_nodeinfo = False, group_name = "Grou if params.get("aggregate"): group_members = [] matching_interfaces = [] - node_offset = has_nodeinfo and 1 or 0 - - def get_interface_item(line, what): - ifIndex = line[ 0 + node_offset] - if type(ifIndex) == tuple: - ifGroup, ifIndex = ifIndex - - if what == "description": - return line[ 1 + node_offset] - elif what == "alias": - return line[18 + node_offset] - else: # index - pad_portnumbers = item[0] == '0' - return if_pad_with_zeroes(info, ifIndex, has_nodeinfo, pad_portnumbers) for element in info: - ifIndex = element[0 + node_offset] + node, line = if_extract_node(element, has_nodeinfo) + ifIndex, ifDescr, ifType, ifSpeed, ifOperStatus, ifInOctets, \ + inucast, inmcast, inbcast, ifInDiscards, ifInErrors, ifOutOctets, \ + outucast, outmcast, outbcast, ifOutDiscards, ifOutErrors, \ + ifOutQLen, ifAlias, ifPhysAddress = line + ifGroup = None if type(ifIndex) == tuple: ifGroup, ifIndex = ifIndex - if_member_item = get_interface_item(element, params.get("aggr_member_item")) + service_name_type = params.get("aggr_member_item") + if service_name_type == "description": + if_member_item = ifDescr + elif service_name_type == "alias": + if_member_item = ifAlias + else: # index + pad_portnumbers = item[0] == '0' + if_member_item = if_pad_with_zeroes(info, ifIndex, has_nodeinfo, pad_portnumbers) if ifGroup and ifGroup == item: matching_interfaces.append((if_member_item, element)) @@ -425,7 +423,7 @@ def check_if_common(item, params, info, has_nodeinfo = False, group_name = "Grou # tryint -> force "01" and "1" to be identical. if params.get("include_items") != None and tryint(if_member_item) not in map(tryint, params["include_items"]): add_interface = False - elif params.get("iftype") != None and saveint(element[2 + node_offset]) != params["iftype"]: + elif params.get("iftype") != None and saveint(ifType) != params["iftype"]: add_interface = False if add_interface: matching_interfaces.append((if_member_item, element)) @@ -505,14 +503,19 @@ def check_if_common(item, params, info, has_nodeinfo = False, group_name = "Grou group_info["ifType"] = ifType # This is the fallback ifType if none is set in the parameters - - # Append an additional entry to the info table containing the calculated group_info num_up = 0 for (if_member_item, element) in matching_interfaces: - if element[4] == '1' or ( - type(element[4]) == tuple and element[4][0] == '1'): - num_up += 1 + node, line = if_extract_node(element, has_nodeinfo) + ifIndex, ifDescr, ifType, ifSpeed, ifOperStatus, ifInOctets, \ + inucast, inmcast, inbcast, ifInDiscards, ifInErrors, ifOutOctets, \ + outucast, outmcast, outbcast, ifOutDiscards, ifOutErrors, \ + ifOutQLen, ifAlias, ifPhysAddress = line + + if ifOperStatus == '1' or ( + type(ifOperStatus) == tuple and ifOperStatus == '1'): + num_up += 1 + if num_up == len(matching_interfaces): group_operStatus = "1" # up elif num_up > 0:

8 years

3650 FIX Fixed bash versionitis, unbreaking cached check results.

by Sven Panne

Module: check_mk Branch: master Commit: d0fd001c7384e751fad24fce0daa6e0f6114c8d5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d0fd001c7384e7… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Oct 18 15:29:59 2016 +0200 3650 FIX Fixed bash versionitis, unbreaking cached check results. Our shebang lines in scripts explicitly state which bash they want, and the bash instances we start from the script should better use the exact same version. If there is a version mismatch, lots of funny things can happen, the most prominent being that caching check results doesn't work anymore (e.g. when using MRPE). This is caused by the bash fixes for the Shellshock vulnerability which change (among other things) how functions are exported to sub-shells. The consequence is that a pre-Shellshock bash doesn't see the functions exported by a post-Shellshock bash, and vice versa. This setup can happen when the shebang and the user's PATH have different ideas about which bash to use. To fix this, we use the same absolute path for starting the bash sub-processes as the one stated in the corresponding shebang. --- .werks/3650 | 24 ++++++++++++++++++++++++ ChangeLog | 1 + 2 files changed, 25 insertions(+) diff --git a/.werks/3650 b/.werks/3650 new file mode 100644 index 0000000..793a667 --- /dev/null +++ b/.werks/3650 @@ -0,0 +1,24 @@ +Title: Fixed bash versionitis, unbreaking cached check results. +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.4.0i2 +Date: 1476797337 + +Our shebang lines in scripts explicitly state which bash they want, and the +bash instances we start from the script should better use the exact same +version. If there is a version mismatch, lots of funny things can happen, +the most prominent being that caching check results doesn't work anymore +(e.g. when using MRPE). This is caused by the bash fixes for the +Shellshock vulnerability which change (among other things) how functions are +exported to sub-shells. The consequence is that a pre-Shellshock bash +doesn't see the functions exported by a post-Shellshock bash, and vice +versa. This setup can happen when the shebang and the user's PATH have +different ideas about which bash to use. + +To fix this, we use the same absolute path for starting the bash +sub-processes as the one stated in the corresponding shebang. + + diff --git a/ChangeLog b/ChangeLog index 73cba57..7fdf705 100644 --- a/ChangeLog +++ b/ChangeLog @@ -29,6 +29,7 @@ * 3964 FIX: df_zos: Fixed not working filesystemcheck for IBM z/OS... * 3826 FIX: netapp_api_connection: now removes duplicate warning messages * 3827 FIX: windows agent: fixed 3 bugs which broke the skype section + * 3650 FIX: Fixed bash versionitis, unbreaking cached check results.... Multisite: * 3959 Two new filters for the comment view: author and comment text field

8 years

Fixed bash versionitis, unbreaking cached check results.

by Sven Panne

Module: check_mk Branch: master Commit: d1e67c5b628f08a6943d7e9c315accc63d705b10 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d1e67c5b628f08… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Oct 18 15:06:06 2016 +0200 Fixed bash versionitis, unbreaking cached check results. Our shebang lines in scripts explicitly state which bash they want, and the bash instances we start from the script should better use the exact same version. If there is a version mismatch, lots of funny things can happen, the most prominent being that caching check results doesn't work anymore (e.g. when using MRPE). This is caused by the bash fixes for the Shellshock vulnerability which change (among other things) how functions are exported to sub-shells. The consequence is that a pre-Shellshock bash doesn't see the functions exported by a post-Shellshock bash, and vice versa. This setup can happen when the shebang and the user's PATH have different ideas about which bash to use. To fix this, we use the same absolute path for starting the bash sub-processes as the one stated in the corresponding shebang. This is all a bit ugly and fragile, but by far the easiest way to fix this for now. --- agents/check_mk_agent.freebsd | 2 +- agents/check_mk_agent.linux | 4 ++-- agents/check_mk_agent.openwrt | 1 + agents/check_mk_agent.solaris | 4 ++-- agents/plugins/mk_oracle | 4 ++-- agents/plugins/mk_oracle.aix | 4 ++-- agents/plugins/mk_oracle.solaris | 2 +- 7 files changed, 11 insertions(+), 10 deletions(-) diff --git a/agents/check_mk_agent.freebsd b/agents/check_mk_agent.freebsd index 9a00794..a2c7ae2 100755 --- a/agents/check_mk_agent.freebsd +++ b/agents/check_mk_agent.freebsd @@ -100,7 +100,7 @@ function run_cached() { # Cache file outdated and new job not yet running? Start it if [ -z "$USE_CACHEFILE" -a ! -e "$CACHEFILE.new" ] ; then - echo "$CMDLINE" | daemon bash -o noclobber > $CACHEFILE.new && mv $CACHEFILE.new $CACHEFILE || rm -f $CACHEFILE $CACHEFILE.new & + echo "$CMDLINE" | daemon /usr/local/bin/bash -o noclobber > $CACHEFILE.new && mv $CACHEFILE.new $CACHEFILE || rm -f $CACHEFILE $CACHEFILE.new & fi } diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index 6a5eaeb..6c2a38c 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -182,9 +182,9 @@ function run_cached () { if [ -z "$USE_CACHEFILE" ] && [ ! -e "$CACHEFILE.new" ] ; then # When the command fails, the output is throws away ignored if [ $mrpe -eq 1 ] ; then - echo "set -o noclobber ; exec > \"$CACHEFILE.new\" || exit 1 ; run_mrpe $NAME $CMDLINE && mv \"$CACHEFILE.new\" \"$CACHEFILE\" || rm -f \"$CACHEFILE\" \"$CACHEFILE.new\"" | nohup bash >/dev/null 2>&1 & + echo "set -o noclobber ; exec > \"$CACHEFILE.new\" || exit 1 ; run_mrpe $NAME $CMDLINE && mv \"$CACHEFILE.new\" \"$CACHEFILE\" || rm -f \"$CACHEFILE\" \"$CACHEFILE.new\"" | nohup /bin/bash >/dev/null 2>&1 & else - echo "set -o noclobber ; exec > \"$CACHEFILE.new\" || exit 1 ; $CMDLINE && mv \"$CACHEFILE.new\" \"$CACHEFILE\" || rm -f \"$CACHEFILE\" \"$CACHEFILE.new\"" | nohup bash >/dev/null 2>&1 & + echo "set -o noclobber ; exec > \"$CACHEFILE.new\" || exit 1 ; $CMDLINE && mv \"$CACHEFILE.new\" \"$CACHEFILE\" || rm -f \"$CACHEFILE\" \"$CACHEFILE.new\"" | nohup /bin/bash >/dev/null 2>&1 & fi fi } diff --git a/agents/check_mk_agent.openwrt b/agents/check_mk_agent.openwrt index e28e65d..f0670a0 100755 --- a/agents/check_mk_agent.openwrt +++ b/agents/check_mk_agent.openwrt @@ -166,6 +166,7 @@ run_cached () { if [ -z "$USE_CACHEFILE" ] && [ ! -e "$CACHEFILE.new" ] ; then # When the command fails, the output is throws away ignored if [ $mrpe -eq 1 ] ; then + # TODO: This won't work: run_mrpe is not exported. And do we have bash at all? echo "set -o noclobber ; exec > \"$CACHEFILE.new\" || exit 1 ; run_mrpe $NAME $CMDLINE && mv \"$CACHEFILE.new\" \"$CACHEFILE\" || rm -f \"$CACHEFILE\" \"$CACHEFILE.new\"" | nohup bash >/dev/null 2>&1 & else echo "set -o noclobber ; exec > \"$CACHEFILE.new\" || exit 1 ; $CMDLINE && mv \"$CACHEFILE.new\" \"$CACHEFILE\" || rm -f \"$CACHEFILE\" \"$CACHEFILE.new\"" | nohup bash >/dev/null 2>&1 & diff --git a/agents/check_mk_agent.solaris b/agents/check_mk_agent.solaris index c071fbf..8a6f1fd 100755 --- a/agents/check_mk_agent.solaris +++ b/agents/check_mk_agent.solaris @@ -115,9 +115,9 @@ function run_cached () { # Cache file outdated and new job not yet running? Start it if [ -z "$USE_CACHEFILE" ] && [ ! -e "$CACHEFILE.new" ] ; then if [ $mrpe -eq 1 ] ; then - echo "set -o noclobber ; exec > \"$CACHEFILE.new\" || exit 1 ; run_mrpe $NAME $CMDLINE && mv \"$CACHEFILE.new\" \"$CACHEFILE\" || rm -f \"$CACHEFILE\" \"$CACHEFILE.new\"" | nohup bash >/dev/null 2>&1 & + echo "set -o noclobber ; exec > \"$CACHEFILE.new\" || exit 1 ; run_mrpe $NAME $CMDLINE && mv \"$CACHEFILE.new\" \"$CACHEFILE\" || rm -f \"$CACHEFILE\" \"$CACHEFILE.new\"" | nohup /usr/bin/bash >/dev/null 2>&1 & else - echo "set -o noclobber ; exec > \"$CACHEFILE.new\" || exit 1 ; $CMDLINE && mv \"$CACHEFILE.new\" \"$CACHEFILE\" || rm -f \"$CACHEFILE\" \"$CACHEFILE.new\"" | nohup bash >/dev/null 2>&1 & + echo "set -o noclobber ; exec > \"$CACHEFILE.new\" || exit 1 ; $CMDLINE && mv \"$CACHEFILE.new\" \"$CACHEFILE\" || rm -f \"$CACHEFILE\" \"$CACHEFILE.new\"" | nohup /usr/bin/bash >/dev/null 2>&1 & fi fi } diff --git a/agents/plugins/mk_oracle b/agents/plugins/mk_oracle index f873d02..1cc30ae 100755 --- a/agents/plugins/mk_oracle +++ b/agents/plugins/mk_oracle @@ -1104,10 +1104,10 @@ function run_cached () { # Cache file outdated and new job not yet running? Start it if [ -z "$USE_CACHEFILE" -a ! -e "$CACHEFILE.new" ] ; then if [ "$DEBUG" ] ; then - echo "set -o noclobber ; exec > \"$CACHEFILE.new\" || exit 1 ; $CMDLINE && mv \"$CACHEFILE.new\" \"$CACHEFILE\" || rm -f \"$CACHEFILE\" \"$CACHEFILE.new\"" | bash + echo "set -o noclobber ; exec > \"$CACHEFILE.new\" || exit 1 ; $CMDLINE && mv \"$CACHEFILE.new\" \"$CACHEFILE\" || rm -f \"$CACHEFILE\" \"$CACHEFILE.new\"" | /bin/bash else # When the command fails, the output is throws away ignored - echo "set -o noclobber ; exec > \"$CACHEFILE.new\" || exit 1 ; $CMDLINE && mv \"$CACHEFILE.new\" \"$CACHEFILE\" || rm -f \"$CACHEFILE\" \"$CACHEFILE.new\"" | nohup bash >/dev/null 2>&1 & + echo "set -o noclobber ; exec > \"$CACHEFILE.new\" || exit 1 ; $CMDLINE && mv \"$CACHEFILE.new\" \"$CACHEFILE\" || rm -f \"$CACHEFILE\" \"$CACHEFILE.new\"" | nohup /bin/bash >/dev/null 2>&1 & fi fi } diff --git a/agents/plugins/mk_oracle.aix b/agents/plugins/mk_oracle.aix index 1259aff..9d30acb 100755 --- a/agents/plugins/mk_oracle.aix +++ b/agents/plugins/mk_oracle.aix @@ -989,10 +989,10 @@ function run_cached_local () { # Cache file outdated and new job not yet running? Start it if [ -z "$USE_CACHEFILE" -a ! -e "$CACHEFILE.new" ] ; then if [ "$DEBUG" ] ; then - echo "set -o noclobber ; exec > \"$CACHEFILE.new\" || exit 1 ; $CMDLINE && mv \"$CACHEFILE.new\" \"$CACHEFILE\" || rm -f \"$CACHEFILE\" \"$CACHEFILE.new\"" | bash + echo "set -o noclobber ; exec > \"$CACHEFILE.new\" || exit 1 ; $CMDLINE && mv \"$CACHEFILE.new\" \"$CACHEFILE\" || rm -f \"$CACHEFILE\" \"$CACHEFILE.new\"" | /bin/bash else # When the command fails, the output is throws away ignored - echo "set -o noclobber ; exec > \"$CACHEFILE.new\" || exit 1 ; $CMDLINE && mv \"$CACHEFILE.new\" \"$CACHEFILE\" || rm -f \"$CACHEFILE\" \"$CACHEFILE.new\"" | nohup bash >/dev/null 2>&1 & + echo "set -o noclobber ; exec > \"$CACHEFILE.new\" || exit 1 ; $CMDLINE && mv \"$CACHEFILE.new\" \"$CACHEFILE\" || rm -f \"$CACHEFILE\" \"$CACHEFILE.new\"" | nohup /bin/bash >/dev/null 2>&1 & fi fi } diff --git a/agents/plugins/mk_oracle.solaris b/agents/plugins/mk_oracle.solaris index 8915a63..2bc2ec8 100755 --- a/agents/plugins/mk_oracle.solaris +++ b/agents/plugins/mk_oracle.solaris @@ -147,7 +147,7 @@ for SID in $SIDS; do # to update the information for this instance. if [ -z "$CACHE_FILE_UPTODATE" -a ! -e "$CACHE_FILE.new" ] then - nohup bash -c " + nohup /bin/bash -c " set -o noclobber function sqlplus () {

8 years

Packing and installing cmk base modules

by Lars Michelsen

Module: check_mk Branch: master Commit: cb6e55e9f486db097b4094f6797ab3d236f45b9b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cb6e55e9f486db… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Oct 13 15:27:03 2016 +0200 Packing and installing cmk base modules --- Makefile | 3 +++ scripts/setup.sh | 1 + 2 files changed, 4 insertions(+) diff --git a/Makefile b/Makefile index 037dc34..2ad28da 100644 --- a/Makefile +++ b/Makefile @@ -107,6 +107,9 @@ dist: mk-livestatus tar czf $(DISTNAME)/lib.tar.gz $(TAROPTS) -C lib \ --transform 's|^|cmk/|g' $$(cd lib ; ls) ; \ rm lib/*.pyc + pycompile cmk_base ; \ + tar czf $(DISTNAME)/base.tar.gz $(TAROPTS) cmk_base/*.py* ; \ + rm cmk_base/*.pyc tar czf $(DISTNAME)/share.tar.gz $(TAROPTS) check_mk_templates.cfg tar czf $(DISTNAME)/werks.tar.gz $(TAROPTS) -C .werks $$(cd .werks ; ls [0-9]*) tar czf $(DISTNAME)/checks.tar.gz $(TAROPTS) -C checks $$(cd checks ; ls) diff --git a/scripts/setup.sh b/scripts/setup.sh index 067ad70..04237f3 100755 --- a/scripts/setup.sh +++ b/scripts/setup.sh @@ -742,6 +742,7 @@ do tar xzf $SRCDIR/share.tar.gz -C $DESTDIR$sharedir && mkdir -p $DESTDIR$python_lib_dir && tar xzf $SRCDIR/lib.tar.gz -C $DESTDIR$python_lib_dir && + tar xzf $SRCDIR/base.tar.gz -C $DESTDIR$python_lib_dir && mkdir -p $DESTDIR$sharedir/werks && tar xzf $SRCDIR/werks.tar.gz -C $DESTDIR$sharedir/werks && mkdir -p $DESTDIR$modulesdir &&

8 years

First steps moving some files from check_mk modules dir to python modules

by Lars Michelsen

Module: check_mk Branch: master Commit: cfda140a233b791faa1ee28730b81a82314a7e5d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cfda140a233b79… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Oct 13 14:19:00 2016 +0200 First steps moving some files from check_mk modules dir to python modules --- cmk_base/.f12 | 7 ++++++ cmk_base/__init__.py | 29 ++++++++++++++++++++++ {modules => cmk_base}/agent_simulator.py | 7 ++++-- .../compresslog.py => cmk_base/compress_history.py | 0 {modules => cmk_base}/localize.py | 0 modules/check_mk.py | 13 ++++++---- modules/check_mk_base.py | 4 ++- modules/nagios.py | 3 --- modules/snmp.py | 4 ++- tests/pylint/test_pylint_misc.py | 1 + tests/testlib/pylint_cmk.py | 3 --- 11 files changed, 56 insertions(+), 15 deletions(-) diff --git a/cmk_base/.f12 b/cmk_base/.f12 new file mode 100644 index 0000000..5372824 --- /dev/null +++ b/cmk_base/.f12 @@ -0,0 +1,7 @@ +#!/bin/bash +SITE=${SITE:-$(cat ../.site 2>/dev/null || true)} +SITE=${SITE:-$(omd sites --bare | head -n 1)} +OMD_ROOT=/omd/sites/${SITE} + +sudo rsync -a *.py $OMD_ROOT/lib/python/cmk_base/ +echo "Installed to $OMD_ROOT/lib/python/cmk_base/" diff --git a/cmk_base/__init__.py b/cmk_base/__init__.py new file mode 100644 index 0000000..66c865c --- /dev/null +++ b/cmk_base/__init__.py @@ -0,0 +1,29 @@ +#!/usr/bin/env python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | 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. + +"""This is the python module hierarchy used by Check_MK's core +components, former called modules. This hosts the checking, +discovery and a lot of other functionality.""" diff --git a/modules/agent_simulator.py b/cmk_base/agent_simulator.py similarity index 97% rename from modules/agent_simulator.py rename to cmk_base/agent_simulator.py index f59eedb..9b63d37 100644 --- a/modules/agent_simulator.py +++ b/cmk_base/agent_simulator.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python # -*- encoding: utf-8; py-indent-offset: 4 -*- # +------------------------------------------------------------------+ # | ____ _ _ __ __ _ __ | @@ -30,7 +30,7 @@ def our_uptime(): return float((file("/proc/uptime").read().split()[0])) # replace simulator tags in output -def agent_simulator_process(output): +def process(output): try: while True: i = output.find('%{') @@ -48,6 +48,7 @@ def agent_simulator_process(output): return output + def agentsim_uptime(rate = 1.0, period = None): # period = sinus wave if period == None: return int(our_uptime() * rate) @@ -56,10 +57,12 @@ def agentsim_uptime(rate = 1.0, period = None): # period = sinus wave u = our_uptime() return int(u * rate + int(a * math.sin(u * 2.0 * math.pi / period))) + def agentsim_enum(values, period = 1): # period is in seconds hit = int(our_uptime()) / period % len(values) return values[hit] + def agentsim_sinus(base = 50, amplitude = 50, period = 300): return int(math.sin(our_uptime() * 2.0 * math.pi / period) * amplitude + base) diff --git a/modules/compresslog.py b/cmk_base/compress_history.py similarity index 100% rename from modules/compresslog.py rename to cmk_base/compress_history.py diff --git a/modules/localize.py b/cmk_base/localize.py similarity index 100% rename from modules/localize.py rename to cmk_base/localize.py diff --git a/modules/check_mk.py b/modules/check_mk.py index 05c2f74..3217d6d 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -266,7 +266,7 @@ config_variable_names = set(vars().keys()).difference(known_vars) # at check time (and many of what is also needed at administration time). try: - modules = [ 'check_mk_base', 'discovery', 'snmp', 'agent_simulator', 'notify', 'events', + modules = [ 'check_mk_base', 'discovery', 'snmp', 'notify', 'events', 'alert_handling', 'prediction', 'cmc', 'inline_snmp', 'agent_bakery', 'cap' ] for module in modules: if module_exists(module): @@ -4777,8 +4777,8 @@ try: do_packaging(args) done = True elif o in ['--localize']: - load_module("localize") - do_localize(args) + import cmk_base.localize + cmk_base.localize.do_localize(args) done = True elif o == '--donate': do_donation() @@ -4868,15 +4868,18 @@ try: load_module("rrd") do_create_rrd(args) done = True + elif o == '--convert-rrds': read_config_files(with_conf_d=True) load_module("rrd") do_convert_rrds(args) done = True + elif o == '--compress-history': - load_module("compresslog") - do_compress_history(args) + import cmk_base.compress_history + cmk_base.compress_history.do_compress_history(args) done = True + elif o in [ '-A', '--bake-agents' ]: if 'do_bake_agents' not in globals(): bail_out("Agent baking is not implemented in your version of Check_MK. Sorry.") diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index d5cf890..3f39a25 100644 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -60,6 +60,8 @@ import cmk.render as render import cmk.crash_reporting as crash_reporting import cmk.paths +import cmk_base.agent_simulator + # PLANNED CLEANUP: # - central functions for outputting verbose information and bailing # out because of errors. Remove all explicit "if cmk.debug.enabled()...". @@ -748,7 +750,7 @@ def get_agent_info(hostname, ipaddress, max_cache_age): write_cache_file(hostname, output) if agent_simulator: - output = agent_simulator_process(output) + output = cmk_base.agent_simulator.process(output) return output diff --git a/modules/nagios.py b/modules/nagios.py index 9865aaa..1b27163 100644 --- a/modules/nagios.py +++ b/modules/nagios.py @@ -1063,9 +1063,6 @@ no_discovery_possible = None else: output.write("has_inline_snmp = False\n") - if agent_simulator: - output.write(stripped_python_file(cmk.paths.modules_dir + "/agent_simulator.py")) - # check info table # We need to include all those plugins that are referenced in the host's # check table diff --git a/modules/snmp.py b/modules/snmp.py index c6d5d4a..5adb37f 100644 --- a/modules/snmp.py +++ b/modules/snmp.py @@ -30,6 +30,8 @@ import subprocess import cmk.tty as tty +import cmk_base.agent_simulator + OID_END = 0 # Suffix-part of OID that was not specified OID_STRING = -1 # Complete OID as string ".1.3.6.1.4.1.343...." OID_BIN = -2 # Complete OID as binary string "\x01\x03\x06\x01..." @@ -516,7 +518,7 @@ def get_stored_snmpwalk(hostname, oid): if o == oid or o.startswith(oid_prefix + "."): if len(parts) > 1: try: - value = agent_simulator_process(parts[1]) + value = cmk_base.agent_simulator.process(parts[1]) except: value = parts[1] # agent simulator missing in precompiled mode else: diff --git a/tests/pylint/test_pylint_misc.py b/tests/pylint/test_pylint_misc.py index 6dc0ebb..8798810 100755 --- a/tests/pylint/test_pylint_misc.py +++ b/tests/pylint/test_pylint_misc.py @@ -9,6 +9,7 @@ import testlib.pylint_cmk as pylint_cmk def test_pylint_misc(): search_paths = [ + "cmk_base", "lib", "bin", "notifications", diff --git a/tests/testlib/pylint_cmk.py b/tests/testlib/pylint_cmk.py index d96ef43..228ca43 100644 --- a/tests/testlib/pylint_cmk.py +++ b/tests/testlib/pylint_cmk.py @@ -21,7 +21,6 @@ def ordered_module_files(): "modules/config.py", "modules/discovery.py", "modules/snmp.py", - "modules/agent_simulator.py", "modules/notify.py", "modules/events.py", "modules/nagios.py", @@ -29,8 +28,6 @@ def ordered_module_files(): "modules/prediction.py", "modules/automation.py", "modules/inventory.py", - "modules/compresslog.py", - "modules/localize.py", "../cmc/modules/real_time_checks.py", "../cmc/modules/alert_handling.py", "../cmc/modules/keepalive.py",

8 years

← Newer
1
...
10
11
12
13
14
15
16
...
28
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits October 2016