cmdbsyncer 4.1.0.dev9__tar.gz → 4.1.0.dev10__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cmdbsyncer
-Version: 4.1.0.dev9
+Version: 4.1.0.dev10
 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.dev10/application/buildinfo.txt

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

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

@@ -53,10 +53,7 @@
 - FEAT: Quick-search on Rule Management matches name and ruleset
 - FIX: Saving a rule with outcomes that target different rulesets is rejected with a flash
 - 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
+- FIX: HW/SW inventorize no longer fails with an instant "Timeout error" — each multiprocessing worker gets its own MongoDB connection, the legacy `host_inv_api.py` endpoint is called directly with HTTP Basic auth instead of the REST API's Bearer wrapper, and on failure the failing hostname, exception type, full traceback and (for non-JSON HTTP errors) the response status and body are reported
 
 ### API
 - FEAT: `/api/v1/objects/<hostname>/relations` reads, adds and removes typed Host relations (CMDB_MODE only)

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

@@ -80,19 +80,26 @@ class InventorizeHosts(CMK2):  # pylint: disable=too-many-instance-attributes
         result pipe was a runtime catastrophe at scale.
         """
         # 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]
+        # API. self.request() adds a Bearer Authorization header and
+        # REST-flavoured error parsing — both useless here and the Bearer
+        # gets the request rejected with an HTML 401 login page on
+        # stricter Checkmk setups. Call inner_request directly with HTTP
+        # Basic so we hit the Multisite endpoint with the auth scheme it
+        # actually understands.
+        address = self.config['address']
+        url = f"{address}/check_mk/host_inv_api.py"
+        auth = (self.config['username'], self.config['password'])
+        params = {'host': hostname, 'output_format': 'json'}
+        response = self.inner_request('GET', url, params=params, auth=auth)
+        if response.status_code != 200:
+            body = (response.text or '').strip().replace('\n', ' ')
+            if len(body) > 300:
+                body = body[:300] + '…'
+            raise CmkException(
+                f"HTTP {response.status_code} GET {url}?host={hostname}: "
+                f"{body or '<empty response body>'}"
+            )
+        dict_inventory = response.json()['result'][hostname]
         if not dict_inventory:
             return hostname, None
 

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

@@ -5,7 +5,7 @@ Unit tests for checkmk inventorize module
 import hashlib
 import json
 import unittest
-from unittest.mock import Mock, patch
+from unittest.mock import MagicMock, Mock, patch
 
 from application.plugins.checkmk.inventorize import (
     InventorizeHosts,
@@ -23,7 +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',
+                           config={'address': 'https://cmk.test',
+                                   'username': 'u', 'password': 'p',
                                    'settings': {}},
                            fields={}, found_hosts=set(),
                            status_inventory={}, hw_sw_inventory={},
@@ -98,7 +99,7 @@ class TestInventorizeHosts(unittest.TestCase):
         mock_host.objects.assert_called_once_with(hostname__in=['unknown_host'])
 
     def test_get_hw_sw_inventory_data_success(self):
-        api_response = ({
+        api_payload = {
             'result': {
                 'host1': {
                     'Attributes': {
@@ -113,11 +114,13 @@ class TestInventorizeHosts(unittest.TestCase):
                     }
                 }
             }
-        }, {})
+        }
+        mock_response = MagicMock(status_code=200)
+        mock_response.json.return_value = api_payload
 
         self.inv.fields = {'cmk_inventory': ['model*', 'hardware*']}
 
-        with patch.object(self.inv, 'request', return_value=api_response), \
+        with patch.object(self.inv, 'inner_request', return_value=mock_response), \
              patch.object(self.inv, '_save_inventory_tree') as save_tree:
             hostname, data = self.inv.get_hw_sw_inventory_data('host1')
 
@@ -193,13 +196,12 @@ class TestInventorizeHosts(unittest.TestCase):
         validate_mongo_keys(self.inv.config_inventory['host1'], 'inventory')
 
     def test_get_hw_sw_inventory_data_empty(self):
-        api_response = ({
-            'result': {'host1': None}
-        }, {})
+        mock_response = MagicMock(status_code=200)
+        mock_response.json.return_value = {'result': {'host1': None}}
 
         self.inv.fields = {'cmk_inventory': ['model']}
 
-        with patch.object(self.inv, 'request', return_value=api_response), \
+        with patch.object(self.inv, 'inner_request', return_value=mock_response), \
              patch.object(self.inv, '_save_inventory_tree') as save_tree:
             hostname, data = self.inv.get_hw_sw_inventory_data('host1')
 

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cmdbsyncer
-Version: 4.1.0.dev9
+Version: 4.1.0.dev10
 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 → cmdbsyncer-4.1.0.dev10}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "cmdbsyncer"
-version = "4.1.0.dev9"
+version = "4.1.0.dev10"
 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.dev9/application/buildinfo.txt

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