From e1df21f8694ee6538f190f7c3b8266efb01505dd Mon Sep 17 00:00:00 2001 From: Marsell Kukuljevic Date: Fri, 9 May 2025 11:23:42 +0200 Subject: [PATCH] Catch an additional networking case when attempting to detect wedges. --- .../check_mk/agents/special/agent_triton_wedge | 5 +++-- wedge/triton_wedge-0.1.0.mkp | Bin 4234 -> 0 bytes wedge/triton_wedge-0.1.1.mkp | Bin 0 -> 4256 bytes 3 files changed, 3 insertions(+), 2 deletions(-) delete mode 100755 wedge/triton_wedge-0.1.0.mkp create mode 100755 wedge/triton_wedge-0.1.1.mkp diff --git a/wedge/local/share/check_mk/agents/special/agent_triton_wedge b/wedge/local/share/check_mk/agents/special/agent_triton_wedge index 3d7cbb2..bbd593b 100755 --- a/wedge/local/share/check_mk/agents/special/agent_triton_wedge +++ b/wedge/local/share/check_mk/agents/special/agent_triton_wedge @@ -63,8 +63,9 @@ async def async_connect(src, dest): # If we hit here, a packet might have been lost, so try again. pass except OSError as e: - if e.errno == errno.EHOSTUNREACH: - # If there is no route, no point retrying either. + if e.errno == errno.EHOSTUNREACH or e.errno == errno.ENETUNREACH: + # If there is no route, or we're dealing with firewall, + # no point retrying either. break else: raise diff --git a/wedge/triton_wedge-0.1.0.mkp b/wedge/triton_wedge-0.1.0.mkp deleted file mode 100755 index e6bd1288a0f3e361b62428174958bb732d34d004..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4234 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 diff --git a/wedge/triton_wedge-0.1.1.mkp b/wedge/triton_wedge-0.1.1.mkp new file mode 100755 index 0000000000000000000000000000000000000000..c08515c5f1531745893856358070db05c7230017 GIT binary patch literal 4256 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