diff --git a/README.md b/README.md index 59963dba384bee57675dc0cb54589bb90ccabd2d..52d56f5b22af6dfbb321e401ad00fd35ba5edd4e 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -[PACKAGE]: ../../raw/2.2.x/mkp/curl-0.2.1-20231021.mkp "curl-0.2.1-20231021.mkp" +[PACKAGE]: ../../raw/2.2.x/mkp/curl-0.2.2-20241123.mkp "curl-0.2.2-20241123.mkp" [EXECUTABLE]: ../../raw/2.2.x/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.2.2-20241123.mkp b/mkp/curl-0.2.2-20241123.mkp new file mode 100644 index 0000000000000000000000000000000000000000..e051b3b09fda6c16942e248ce9709907e2ab55ec Binary files /dev/null and b/mkp/curl-0.2.2-20241123.mkp differ diff --git a/source/agent_based/curl.py b/source/agent_based/curl.py index 87881577030e718ffd3303ff825bb69bb8f6e199..87590b591ffac106b75a18fdd853f2321c1ef4d9 100644 --- a/source/agent_based/curl.py +++ b/source/agent_based/curl.py @@ -29,7 +29,7 @@ # 2022-05-15: added workaround for raise ValueError("Cannot render negative timespan") # 2022-05-17: fixed wrong import path for _TIME_UNITS and _gen_timespan_chunks # 2023-06-07: moved gui files to ~/local/lib/chek_mk/gui/plugins/... -# +# 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: # @@ -314,7 +314,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")}') @@ -328,7 +328,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 37ee079cc3de712e91a7b84812d444e0c90a805e..dd8c68357568485b3d275f0d280443213917e7ee 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.2.1-20231021', + 'version': '0.2.2-20241123', 'version.min_required': '2.2.0b1', - 'version.packaged': '2.2.0p24', + 'version.packaged': '2.2.0p36', 'version.usable_until': '2.3.0b1'}