cmdbsyncer 4.1.0.dev10__tar.gz → 4.1.0.dev11__tar.gz

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

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

@@ -0,0 +1 @@
+BUILD_DATE=2026-05-11T11:52:21Z

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

@@ -53,7 +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: 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
+- FIX: HW/SW inventorize fetches the inventory tree via the REST API's `host_mk_inventory` Livestatus column instead of the legacy `host_inv_api.py` endpoint — works behind OIDC/SSO proxies that block the Multisite path. Each multiprocessing worker also gets its own MongoDB connection, and on failure the failing hostname, exception type and full traceback are reported instead of a misleading "Timeout error"
 
 ### API
 - FEAT: `/api/v1/objects/<hostname>/relations` reads, adds and removes typed Host relations (CMDB_MODE only)

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

@@ -2,6 +2,9 @@
 Checkmk Inventorize
 """
 # pylint: disable=too-many-locals,too-many-branches,too-many-nested-blocks,duplicate-code
+import ast
+import base64
+import binascii
 import datetime
 import hashlib
 import json
@@ -79,27 +82,42 @@ 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.
         """
-        # host_inv_api.py is the legacy Multisite endpoint, not the REST
-        # 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] + '…'
+        # Pull the inventory tree via the Livestatus column
+        # ``host_mk_inventory`` on the REST API. host_inv_api.py is the
+        # legacy Multisite endpoint and is unreachable behind OIDC/SSO
+        # proxies (they intercept it before Checkmk sees the Bearer
+        # token). The REST API stays Bearer-auth'd, so this path works
+        # behind any auth proxy the GUI is normally fronted by. The blob
+        # comes back base64-encoded as a Python ``repr()`` of the
+        # inventory tree — same key casing (Attributes/Nodes/Pairs/…) as
+        # host_inv_api.py, so flatten_inventory below works unchanged.
+        url = "domain-types/service/collections/all"
+        query = {
+            "op": "and",
+            "expr": [
+                {"op": "=", "left": "description", "right": "Check_MK"},
+                {"op": "=", "left": "host_name", "right": hostname},
+            ],
+        }
+        params = {
+            "query": json.dumps(query),
+            "columns": ['host_mk_inventory'],
+        }
+        api_response = self.request(url, params=params, method="GET")
+        rows = api_response[0].get('value') or []
+        if not rows:
+            return hostname, None
+        raw = rows[0].get('extensions', {}).get('host_mk_inventory') or {}
+        encoded = raw.get('value') if isinstance(raw, dict) else None
+        if not encoded:
+            return hostname, None
+        try:
+            text = base64.b64decode(encoded).decode('utf-8', 'replace')
+            dict_inventory = ast.literal_eval(text) if text else None
+        except (binascii.Error, ValueError, SyntaxError) as exc:
             raise CmkException(
-                f"HTTP {response.status_code} GET {url}?host={hostname}: "
-                f"{body or '<empty response body>'}"
-            )
-        dict_inventory = response.json()['result'][hostname]
+                f"host_mk_inventory parse failed for {hostname}: {exc}"
+            ) from exc
         if not dict_inventory:
             return hostname, None
 

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

@@ -2,10 +2,11 @@
 Unit tests for checkmk inventorize module
 """
 # pylint: disable=missing-function-docstring,protected-access,unused-argument,no-value-for-parameter
+import base64
 import hashlib
 import json
 import unittest
-from unittest.mock import MagicMock, Mock, patch
+from unittest.mock import Mock, patch
 
 from application.plugins.checkmk.inventorize import (
     InventorizeHosts,
@@ -23,9 +24,7 @@ class TestInventorizeHosts(unittest.TestCase):
         def mock_init(self_param, account=False):
             base_mock_init(self_param,
                            account_name='Test Account', debug=False,
-                           config={'address': 'https://cmk.test',
-                                   'username': 'u', 'password': 'p',
-                                   'settings': {}},
+                           config={'settings': {}},
                            fields={}, found_hosts=set(),
                            status_inventory={}, hw_sw_inventory={},
                            service_label_inventory={}, config_inventory={},
@@ -99,28 +98,26 @@ 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_payload = {
-            'result': {
-                'host1': {
-                    'Attributes': {
-                        'Pairs': {'model': 'PowerEdge'}
-                    },
-                    'Nodes': {
-                        'hardware': {
-                            'Attributes': {
-                                'Pairs': {'cpu_model': 'Xeon'}
-                            }
-                        }
-                    }
+        inventory_tree = {
+            'Attributes': {'Pairs': {'model': 'PowerEdge'}},
+            'Nodes': {
+                'hardware': {
+                    'Attributes': {'Pairs': {'cpu_model': 'Xeon'}}
                 }
-            }
+            },
         }
-        mock_response = MagicMock(status_code=200)
-        mock_response.json.return_value = api_payload
+        encoded = base64.b64encode(repr(inventory_tree).encode('utf-8')).decode('ascii')
+        api_response = ({
+            'value': [{
+                'extensions': {
+                    'host_mk_inventory': {'value': encoded}
+                }
+            }]
+        }, {})
 
         self.inv.fields = {'cmk_inventory': ['model*', 'hardware*']}
 
-        with patch.object(self.inv, 'inner_request', return_value=mock_response), \
+        with patch.object(self.inv, 'request', return_value=api_response), \
              patch.object(self.inv, '_save_inventory_tree') as save_tree:
             hostname, data = self.inv.get_hw_sw_inventory_data('host1')
 
@@ -196,12 +193,18 @@ class TestInventorizeHosts(unittest.TestCase):
         validate_mongo_keys(self.inv.config_inventory['host1'], 'inventory')
 
     def test_get_hw_sw_inventory_data_empty(self):
-        mock_response = MagicMock(status_code=200)
-        mock_response.json.return_value = {'result': {'host1': None}}
+        # Host known but no inventory column populated yet — empty value
+        # string. The new REST path returns (hostname, None) without
+        # touching the side-doc.
+        api_response = ({
+            'value': [{
+                'extensions': {'host_mk_inventory': {'value': ''}}
+            }]
+        }, {})
 
         self.inv.fields = {'cmk_inventory': ['model']}
 
-        with patch.object(self.inv, 'inner_request', return_value=mock_response), \
+        with patch.object(self.inv, 'request', return_value=api_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.dev10 → cmdbsyncer-4.1.0.dev11}/cmdbsyncer.egg-info/PKG-INFO

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

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

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