update project

agent_based/curl.py

@@ -349,7 +349,8 @@ def check_curl(item, params, section: Dict[str, Any]) -> CheckResult:
 
     if params['show_raw_data']:
         yield Result(state=State.OK, notice=f' ')
-        yield Result(state=State.OK, notice=f'RAW data: {_data}')
+        yield Result(state=State.OK, notice=f'RAW data:')
+        yield Result(state=State.OK, notice=f'{_data}')
 
 
 register.agent_section(

agents/bakery/curl.py

@@ -26,7 +26,7 @@
 # 2022-03-01: added options --limit-rate, --max-filesize, --max-time, --speed-limit, --speed-time,
 #             --connect-timeout and --user-agent
 # 2022-03-02: added options --referer -header and api_key_header (header from password store)
-
+# 2022-03-04: fixed Requests headers per url settings
 
 from pathlib import Path
 from typing import List, Tuple, Dict
@@ -123,7 +123,6 @@ def get_curl_files(conf: Tuple[str, Dict[str, List[any]]]) -> FileGenerator:
         url_settings = default_settings.copy()
         # merge per url settings with default settings
         url_settings.update(entry.get('url_settings', {}))
-
         # adjust per url settings with default settings (dictionary)
         for key in [
             'ca_sert',
@@ -137,12 +136,11 @@ def get_curl_files(conf: Tuple[str, Dict[str, List[any]]]) -> FileGenerator:
             'user_agent',
             'referer',
             'connect_timeout',
-            'request_headers'
+            'request_headers',
             'api_key_header',
         ]:
             if type(url_settings.get(key)) == tuple:
                 url_settings.update({key: url_settings[key][1]})
-
         for key in [
             'api_key_header',
         ]:

packages/curl

 {'author': 'Th.L. (thl-cmk[at]outlook[dot]com)',
- 'description': 'cURL CheckMK agent plugin\n'
+ 'description': 'cURL agent plugin\n'
                 '\n'
                 'Monitor URLs from the perspective of your monitored hosts, '
                 'not the monitoring server ;-). Deployment and configuration '
@@ -25,7 +25,7 @@
  'name': 'curl',
  'num_files': 8,
  'title': 'cURL agent plugin',
- 'version': '20220303.v0.0.7',
+ 'version': '20220304.v0.0.7',
  'version.min_required': '2.0.0',
  'version.packaged': '2021.09.20',
  'version.usable_until': None}
\ No newline at end of file