From f5226bb72c9f103e82872a7e31565560e21d56c7 Mon Sep 17 00:00:00 2001 From: "th.l" <thl-cmk@outlook.com> Date: Thu, 16 May 2024 20:20:19 +0200 Subject: [PATCH] update project --- README.md | 2 +- mkp/agent_ssllabs-2.0.3-20240516.mkp | Bin 0 -> 9888 bytes .../python3/cmk/special_agents/agent_ssllabs.py | 11 ++++++----- source/packages/agent_ssllabs | 2 +- source/web/plugins/wato/agent_ssllabs.py | 7 +++++-- 5 files changed, 13 insertions(+), 9 deletions(-) create mode 100644 mkp/agent_ssllabs-2.0.3-20240516.mkp mode change 100644 => 100755 source/lib/python3/cmk/special_agents/agent_ssllabs.py diff --git a/README.md b/README.md index 8f52d51..2ecf442 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -[PACKAGE]: ../../raw/master/mkp/agent_ssllabs-2.0.3-20240507.mkp "agent_ssllabs-2.0.3-20240507.mkp" +[PACKAGE]: ../../raw/master/mkp/agent_ssllabs-2.0.3-20240516.mkp "agent_ssllabs-2.0.3-20240516.mkp" # Qualys SSL Labs REST API special agent This Agent uses die Qualys SSL Labs REST API to scan a list of servers for there SSL status. The plugin will check the given server and all end points reported by the SSL Labs scan. diff --git a/mkp/agent_ssllabs-2.0.3-20240516.mkp b/mkp/agent_ssllabs-2.0.3-20240516.mkp new file mode 100644 index 0000000000000000000000000000000000000000..e30950af4ab5dc7918b6670bfcdff9a96201c30e GIT binary patch literal 9888 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 SEJpLniIE~E1Y->g^S=PG06jVY literal 0 HcmV?d00001 diff --git a/source/lib/python3/cmk/special_agents/agent_ssllabs.py b/source/lib/python3/cmk/special_agents/agent_ssllabs.py old mode 100644 new mode 100755 index 25f68fa..b0709eb --- a/source/lib/python3/cmk/special_agents/agent_ssllabs.py +++ b/source/lib/python3/cmk/special_agents/agent_ssllabs.py @@ -18,6 +18,8 @@ # 2021-05-16: changed arguments to argparse # added options for publish results and max cache age # 2024-05-01: refactoring +# 2024-05-16: fixed proxy usage +# removed check_mk section -> no way to differentiate from checkmk agent section check_mk # sample agent output (formatted) # <<<check_mk>>> @@ -174,8 +176,7 @@ def connect_ssllabs_api(ssl_host_address: str, host_cache: str, args: Args, ) -> ) proxies = {} if args.proxy is not None: - proxies = {'https': args.proxy.split('/')[-1]} # remove 'https://' from proxy string - + proxies = {'https': args.proxy} try: response = get( url=url, @@ -215,9 +216,9 @@ def agent_ssllsbs_main(args: Args) -> int: ssl_hosts = args.ssl_hosts.split(',') # Output general information about the agent - sys_stdout.write('<<<check_mk>>>\n') - sys_stdout.write(f'Version: {VERSION}\n') - sys_stdout.write('AgentOS: linux\n') + # sys_stdout.write('<<<check_mk>>>\n') + # sys_stdout.write(f'Version: {VERSION}\n') + # sys_stdout.write('AgentOS: linux\n') # create cache directory, if it not exists Path(cache_dir).mkdir(parents=True, exist_ok=True) diff --git a/source/packages/agent_ssllabs b/source/packages/agent_ssllabs index 4695af8..8568e66 100644 --- a/source/packages/agent_ssllabs +++ b/source/packages/agent_ssllabs @@ -15,7 +15,7 @@ 'web': ['plugins/wato/agent_ssllabs.py']}, 'name': 'agent_ssllabs', 'title': 'ssllabs api check', - 'version': '2.0.3-20240507', + 'version': '2.0.3-20240516', 'version.min_required': '2.2.0b1', 'version.packaged': '2.2.0p24', 'version.usable_until': '2.3.0b1'} diff --git a/source/web/plugins/wato/agent_ssllabs.py b/source/web/plugins/wato/agent_ssllabs.py index 2673995..8132e90 100644 --- a/source/web/plugins/wato/agent_ssllabs.py +++ b/source/web/plugins/wato/agent_ssllabs.py @@ -59,8 +59,11 @@ def _valuespec_special_agents_ssllabs(): )), ('proxy', TextAscii( - title=_('proxy server, if required'), - help=_('proxy in the format: https://ip-addres|servername:port'), + title=_('proxy server'), + size=100, + help=_( + 'proxy in the format: <protocol>://<ip-address|server-name>:<port>, i.e.: http://192.168.10.10:3128' + ), )), ('publish_results', FixedValue( -- GitLab