cmdbsyncer 4.1.0.dev7__tar.gz → 4.1.0.dev9__tar.gz

{cmdbsyncer-4.1.0.dev7 → cmdbsyncer-4.1.0.dev9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cmdbsyncer
-Version: 4.1.0.dev7
+Version: 4.1.0.dev9
 Summary: Rule-based modular synchronizer for Checkmk, Netbox, Ansible, I-DOIT, Jira CMDB and 15+ other CMDB/monitoring systems
 Author-email: Kuhn & Ruess GmbH <info@kuhn-ruess.de>
 Maintainer-email: Bastian Kuhn <mail@bastian-kuhn.de>

cmdbsyncer-4.1.0.dev9/application/buildinfo.txt

@@ -0,0 +1 @@
+BUILD_DATE=2026-05-11T11:02:28Z

{cmdbsyncer-4.1.0.dev7 → cmdbsyncer-4.1.0.dev9}/application/changelog/v4.1.md

@@ -55,6 +55,8 @@
 - FEAT: New "Manage Notification Rules" view exports notification rules to Checkmk 2.4 / 2.5 with `cmdbsyncer checkmk export_notifications`; admin edits are detected and corrected on the next run
 - FIX: Checkmk HW/SW inventorize multiprocessing pool initialises a fresh MongoDB connection per worker so writes no longer fail with an instant "Timeout error"
 - FIX: Checkmk HW/SW inventory worker errors show the failing hostname, exception type and full traceback instead of a misleading "Timeout error"
+- FIX: Checkmk API errors with a non-JSON body (HTML error page, auth redirect, disabled endpoint) report status code, URL and body snippet instead of the useless message "None NoneNone"
+- FIX: HW/SW inventorize sends `_username`/`_secret` query auth to the legacy `host_inv_api.py` endpoint so the per-host call no longer 401s with a login HTML page
 
 ### API
 - FEAT: `/api/v1/objects/<hostname>/relations` reads, adds and removes typed Host relations (CMDB_MODE only)

{cmdbsyncer-4.1.0.dev7 → cmdbsyncer-4.1.0.dev9}/application/plugins/checkmk/cmk2.py

@@ -91,7 +91,7 @@ class CMK2(Plugin):
             ) from exc
 
 
-    def request(self, url, method='GET', data=None,  # pylint: disable=too-many-arguments,too-many-positional-arguments,too-many-locals
+    def request(self, url, method='GET', data=None,  # pylint: disable=too-many-arguments,too-many-positional-arguments,too-many-locals,too-many-branches
                 params=None, additional_header=None, api_version="api/1.0/"):
         """
         Handle Request to CMK
@@ -140,9 +140,22 @@ class CMK2(Plugin):
                 return {}, {"error": "Object not found"}
             if response.status_code != 200:
                 if  response_json.get('title') not in error_whitelist:
-                    raise CmkException(f"{response_json.get('title')} "\
-                                       f"{response_json.get('detail')}"\
-                                       f"{response_json.get('fields')}")
+                    title = response_json.get('title')
+                    detail = response_json.get('detail')
+                    fields = response_json.get('fields')
+                    if title is None and detail is None and fields is None:
+                        # Non-JSON error body (HTML error page, auth
+                        # redirect, legacy endpoint disabled, …) — surface
+                        # status + URL + a body snippet so the failure is
+                        # debuggable instead of a useless "None NoneNone".
+                        body = (response.text or '').strip().replace('\n', ' ')
+                        if len(body) > 300:
+                            body = body[:300] + '…'
+                        raise CmkException(
+                            f"HTTP {response.status_code} {method.upper()} "
+                            f"{url}: {body or '<empty response body>'}"
+                        )
+                    raise CmkException(f"{title} {detail}{fields}")
                 return {}, {'status_code': response.status_code}
             resp_header['status_code'] = response.status_code
 

{cmdbsyncer-4.1.0.dev7 → cmdbsyncer-4.1.0.dev9}/application/plugins/checkmk/inventorize.py

@@ -79,8 +79,20 @@ class InventorizeHosts(CMK2):  # pylint: disable=too-many-instance-attributes
         IPC boundary; shipping a 100-500 KB blob per host through the
         result pipe was a runtime catastrophe at scale.
         """
-        url = f"host_inv_api.py?host={hostname}&output_format=json"
-        dict_inventory = self.request(url, method="GET", api_version="/")[0]['result'][hostname]
+        # host_inv_api.py is the legacy Multisite endpoint, not the REST
+        # API — it ignores the Bearer header request() sets and expects
+        # the older ``_username``/``_secret`` query-parameter auth. Without
+        # them the call returns a 401 HTML login page and parsing dies.
+        inv_params = {
+            "host": hostname,
+            "output_format": "json",
+            "_username": self.config["username"],
+            "_secret": self.config["password"],
+        }
+        api_response = self.request(
+            "host_inv_api.py", method="GET", api_version="/", params=inv_params,
+        )
+        dict_inventory = api_response[0]['result'][hostname]
         if not dict_inventory:
             return hostname, None
 

{cmdbsyncer-4.1.0.dev7 → cmdbsyncer-4.1.0.dev9}/application/plugins/checkmk/tests/test_inventorize.py

@@ -23,6 +23,8 @@ class TestInventorizeHosts(unittest.TestCase):
         def mock_init(self_param, account=False):
             base_mock_init(self_param,
                            account_name='Test Account', debug=False,
+                           config={'username': 'u', 'password': 'p',
+                                   'settings': {}},
                            fields={}, found_hosts=set(),
                            status_inventory={}, hw_sw_inventory={},
                            service_label_inventory={}, config_inventory={},

{cmdbsyncer-4.1.0.dev7 → cmdbsyncer-4.1.0.dev9}/cmdbsyncer.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cmdbsyncer
-Version: 4.1.0.dev7
+Version: 4.1.0.dev9
 Summary: Rule-based modular synchronizer for Checkmk, Netbox, Ansible, I-DOIT, Jira CMDB and 15+ other CMDB/monitoring systems
 Author-email: Kuhn & Ruess GmbH <info@kuhn-ruess.de>
 Maintainer-email: Bastian Kuhn <mail@bastian-kuhn.de>

{cmdbsyncer-4.1.0.dev7 → cmdbsyncer-4.1.0.dev9}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "cmdbsyncer"
-version = "4.1.0.dev7"
+version = "4.1.0.dev9"
 description = "Rule-based modular synchronizer for Checkmk, Netbox, Ansible, I-DOIT, Jira CMDB and 15+ other CMDB/monitoring systems"
 readme = "README.md"
 license = { text = "MIT" }

cmdbsyncer-4.1.0.dev7/application/buildinfo.txt

@@ -1 +0,0 @@
-BUILD_DATE=2026-05-11T10:26:20Z