diff --git a/README.md b/README.md index e0516799950087633f1563d09d0f5c870ee93b5f..421dd262a0944135fede3f6c68ab16282d2d0ec9 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -[PACKAGE]: ../../raw/master/mkp/curl-0.3.0-20240623.mkp "curl-0.3.0-20240623.mkp" +[PACKAGE]: ../../raw/master/mkp/curl-0.3.1-20241123.mkp "curl-0.3.1-20241123.mkp" [EXECUTABLE]: ../../raw/master/mkp/curl_executable-20220410.v7.82.0.mkp "curl_executable-20220410.v7.82.0.mkp" # cURL agent plugin for Linux and Windows diff --git a/mkp/curl-0.3.1-20241123.mkp b/mkp/curl-0.3.1-20241123.mkp new file mode 100644 index 0000000000000000000000000000000000000000..b672a630c5fa6a16ff29f3c05951a67601de5e88 Binary files /dev/null and b/mkp/curl-0.3.1-20241123.mkp differ diff --git a/source/agent_based/curl.py b/source/agent_based/curl.py index 3bfa3e1745192756136a7bb2e78f2f52629bd36c..2e7d2a1d782719c6b7324a91ad6701817abb8f3e 100644 --- a/source/agent_based/curl.py +++ b/source/agent_based/curl.py @@ -31,6 +31,7 @@ # 2023-06-07: moved gui files to ~/local/lib/chek_mk/gui/plugins/... # 2024-06-23: modified imports for cmk 2.3 # removed work around for render negative timespan +# 2024-11-23: fixed http_error_code_to_ignore and curl_error_code_to_ignore not working (compare int with str) # Example output from agent: # @@ -315,7 +316,7 @@ def check_curl(item, params, section: Dict[str, Any]) -> CheckResult: yield Result(state=State.OK, notice=f'{label}: {value}') if curl_error_code != 0: - if curl_error_code in params['curl_error_code_to_ignore']: + if str(curl_error_code) in params['curl_error_code_to_ignore']: yield Result( state=State.OK, notice=f'curl error code: {curl_error_code}, {_curl_error_codes.get(curl_error_code, "N/A")}') @@ -329,7 +330,7 @@ def check_curl(item, params, section: Dict[str, Any]) -> CheckResult: if http_return_code < 400: # no connect, Ok, Redirect yield Result(state=State.OK, notice=f'HTTP Return code: {http_return_code}') else: - if http_return_code in params['http_error_code_to_ignore']: + if str(http_return_code) in params['http_error_code_to_ignore']: yield Result( state=State.OK, notice=f'HTTP Return code: {http_return_code}' ) diff --git a/source/packages/curl b/source/packages/curl index 8fa4895ae24b0625037782a105d6b2c304041448..1ee0038e1edb68090097803b951d8a295a23ad20 100644 --- a/source/packages/curl +++ b/source/packages/curl @@ -28,7 +28,7 @@ 'lib': ['python3/cmk/base/cee/plugins/bakery/curl.py']}, 'name': 'curl', 'title': 'cURL agent plugin', - 'version': '0.3.0-20240623', + 'version': '0.3.1-20241123', 'version.min_required': '2.3.0b1', 'version.packaged': 'cmk-mkp-tool 0.2.0', 'version.usable_until': '2.4.0b1'}