cmdbsyncer 4.1.0.dev5__tar.gz → 4.1.0.dev7__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cmdbsyncer
-Version: 4.1.0.dev5
+Version: 4.1.0.dev7
 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.dev5 → cmdbsyncer-4.1.0.dev7}/application/__init__.py

@@ -31,7 +31,6 @@ if os.getcwd() not in sys.path:
     sys.path.insert(0, os.getcwd())
 
 import importlib
-import importlib.util
 import pkgutil
 import warnings
 from logging import config as log_config
@@ -133,21 +132,21 @@ from application import enterprise  # noqa: E402
 from application.enterprise import run_hook as enterprise_hook  # noqa: E402
 
 
-# Load local_config.py via absolute path from cwd, not via ``sys.path``.
-# Pip-installed console scripts (``cmdbsyncer …``) trigger
-# ``application/__init__.py`` through ``from application.cli import main``
-# *before* cli.py's ``sys.path.insert(0, cwd)`` runs — so a plain
-# ``from local_config import config`` would silently fail and leave
-# ``CRYPTOGRAPHY_KEY`` at ``None``, breaking every Account.get_password() call.
-_lc_path = os.path.join(os.getcwd(), 'local_config.py')
-if os.path.isfile(_lc_path):
-    _spec = importlib.util.spec_from_file_location('local_config', _lc_path)
-    _mod = importlib.util.module_from_spec(_spec)
-    _spec.loader.exec_module(_mod)
-    sys.modules.setdefault('local_config', _mod)
-    app.config.update(_mod.config)
-else:
-    logger.warning("local_config.py not found in %s", os.getcwd())
+# Load local_config.py via the standard import path. ``sys.path`` already
+# carries the deployment directory by now: pip console scripts are covered
+# by the cwd-injection at the top of this module, source checkouts get the
+# script directory from Python automatically, and mod_wsgi / gunicorn
+# entries add their own dir from ``app.wsgi``. A missing file is logged
+# (was a silent ``pass``) so a misplaced deployment surfaces immediately
+# instead of leaving CRYPTOGRAPHY_KEY at None.
+try:
+    from local_config import config
+    app.config.update(config)
+except ModuleNotFoundError:
+    logger.warning(
+        "local_config.py not importable — sys.path=%s cwd=%s",
+        sys.path, os.getcwd(),
+    )
 
 
 # REQUIRE_HTTPS is the single switch that controls whether the GUI's

cmdbsyncer-4.1.0.dev7/application/buildinfo.txt

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

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

@@ -53,6 +53,8 @@
 - 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"
 
 ### API
 - FEAT: `/api/v1/objects/<hostname>/relations` reads, adds and removes typed Host relations (CMDB_MODE only)
@@ -83,6 +85,7 @@
 - FEAT: Set Theme, Set 2FA and Change Password pages now keep the admin navigation
 - FIX: Settings → License menu entry is hidden on Community Edition installs (no enterprise package present), so admins are not pointed at a page with no upload form and an empty feature table
 - FIX: PyPI installs ship the bundled theme CSS files (Gruvbox Dark / Light, Nord, Dracula) so the theme picker actually shows themes other than Default
+- FIX: Log details and traceback boxes pick up theme colours so they no longer render as a half-white card on Gruvbox Dark / Nord / Dracula
 
 ### Plugin runtime
 - FIX: HTTP sessions and CA-cert temp files are released even when a plugin's init fails
@@ -90,7 +93,7 @@
 ### Setup
 - FEAT: `cmdbsyncer sys self_configure` now creates a default `app.wsgi` so PyPI installs can be served by Apache/mod_wsgi or uWSGI without writing one by hand
 - FIX: `Edit local_config.py` GUI now writes to the same `local_config.py` Python actually imports. PyPI installs previously wrote into site-packages instead of the deployment directory next to `app.wsgi`
-- FIX: PyPI installs now find `local_config.py` reliably — `CRYPTOGRAPHY_KEY` and friends are no longer silently `None`, so Account passwords decrypt correctly when running `cmdbsyncer …` from the deployment directory
+- FIX: `local_config.py` is now found reliably across PyPI console scripts, mod_wsgi / gunicorn and source checkouts — `CRYPTOGRAPHY_KEY` and friends are no longer silently `None`, so Account passwords decrypt correctly. A misplaced deployment now surfaces as a startup warning instead of failing silently
 - FIX: PyPI installs now ship every plugin's `plugin.json` (was only the `.py` files), and the user `plugins/` directory plus `disabled_plugins.json` next to `app.wsgi` are picked up correctly instead of being looked for inside `site-packages`
 - FEAT: Offline installation bundle always ships base, extras and ansible Python dependencies plus the default Ansible playbook collection, and the bundled `install.sh` deploys the playbooks to `/opt/cmdbsyncer/ansible` (override via `ANSIBLE_TARGET`, skip with `SKIP_ANSIBLE=1`, replace existing target with `FORCE=1`)
 - FEAT: New `make release-pre` target ships sequential pre-release builds (`.devN` / `aN` / `bN` / `rcN`) to PyPI without requiring a hand-edit before each upload; `tools/build_offline_bundle.sh --syncer-version 4.1.0.dev3 --enterprise-version 0.3.9.dev1` pins the offline bundle to those pre-releases so QA can test them on air-gapped systems

{cmdbsyncer-4.1.0.dev5 → cmdbsyncer-4.1.0.dev7}/application/modules/log/views.py

@@ -17,7 +17,8 @@ def format_log(_view, _ctx, model, _path):
     rows = ''.join(
         '<tr>'
         '<th style="width:1%;vertical-align:top;padding:2px 8px 2px 0;'
-        f'white-space:nowrap;color:#666;font-weight:600;">{escape(entry.level)}</th>'
+        'white-space:nowrap;color:var(--surface-muted,#666);'
+        f'font-weight:600;">{escape(entry.level)}</th>'
         '<td style="vertical-align:top;word-break:break-word;'
         f'overflow-wrap:anywhere;white-space:pre-wrap;">{escape(entry.message)}</td>'
         '</tr>'
@@ -34,19 +35,23 @@ def format_traceback(_view, _ctx, model, _path):
     """
     Tracebacks are routinely 30-80 lines and would otherwise blow up the
     detail card. Render them inside a collapsed `<details>` so the row
-    stays scannable and the operator can pop it open on click.
+    stays scannable and the operator can pop it open on click. Colours
+    come from theme tokens so the `<pre>` block doesn't show up as a
+    white card on Gruvbox/Nord/Dracula rows.
     """
     trace = (model.traceback or '').strip()
     if not trace or trace == 'NoneType: None':
         return ''
     return Markup(
         '<details style="margin:0;">'
-        '<summary style="cursor:pointer;color:#2c5d99;'
+        '<summary style="cursor:pointer;color:var(--surface-muted,#2c5d99);'
         'font-family:ui-monospace,monospace;font-size:0.88rem;">'
         'Show traceback</summary>'
         '<pre style="margin-top:6px;padding:8px 10px;'
-        'background:#f6f8fa;border:1px solid #e2e6ea;border-radius:6px;'
-        'font-size:0.82rem;white-space:pre-wrap;'
+        'background:var(--surface-subtle,#f6f8fa);'
+        'border:1px solid var(--surface-border,#e2e6ea);'
+        'color:var(--surface-text,inherit);'
+        'border-radius:6px;font-size:0.82rem;white-space:pre-wrap;'
         f'overflow-x:auto;">{escape(trace)}</pre>'
         '</details>'
     )

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

@@ -6,9 +6,11 @@ import datetime
 import hashlib
 import json
 import multiprocessing
+import traceback
 
 from rich.progress import Progress, SpinnerColumn, TimeElapsedColumn, MofNCompleteColumn
 
+from application import init_db
 from application.models.host import Host, app
 from application.models.host_inventory_tree import (
     HostInventoryTree,
@@ -140,23 +142,47 @@ class InventorizeHosts(CMK2):  # pylint: disable=too-many-instance-attributes
                       *Progress.get_default_columns(),
                       TimeElapsedColumn()) as progress:
             task1 = progress.add_task("Requesting HW/SW Inventory Data from Checkmk", total=total)
-            with multiprocessing.Pool() as pool:
+            # init_db gives each worker a fresh MongoEngine connection;
+            # without it the workers inherit the parent's connection across
+            # fork() and the first _save_inventory_tree() write raises
+            # immediately (matching the "instant timeout" symptom).
+            with multiprocessing.Pool(initializer=init_db) as pool:
+                # Pair every async result with its hostname so error output
+                # can name the failing host. Previously the hostname was
+                # only recoverable from the worker's return tuple, which we
+                # never see when the worker raised or timed out.
                 tasks = []
                 for host_resp in response:
                     hostname = host_resp['extensions']['host_name']
                     self.add_host(hostname)
-                    task = pool.apply_async(self.get_hw_sw_inventory_data, args=(hostname,))
-                    tasks.append(task)
+                    async_result = pool.apply_async(
+                        self.get_hw_sw_inventory_data, args=(hostname,)
+                    )
+                    tasks.append((hostname, async_result))
 
-                for task in tasks:
+                process_timeout = app.config['PROCESS_TIMEOUT']
+                for hostname, task in tasks:
                     try:
-                        hostname, data = task.get(timeout=app.config['PROCESS_TIMEOUT'])
+                        _host, data = task.get(timeout=process_timeout)
                     except multiprocessing.TimeoutError:
-                        progress.console.print("- ERROR: Timeout for a object")
+                        progress.console.print(
+                            f"- {ColorCodes.FAIL}TIMEOUT{ColorCodes.ENDC} "
+                            f"after {process_timeout}s for {hostname}"
+                        )
                     except Exception as error:  # pylint: disable=broad-exception-caught
+                        # apply_async preserves the worker traceback on
+                        # .get(); print it so the operator can see what
+                        # really blew up instead of a misleading
+                        # "Timeout error" label. --debug re-raises to abort
+                        # the run for interactive inspection.
                         if self.debug:
                             raise
-                        progress.console.print(f"- ERROR: Timeout error for object ({error})")
+                        progress.console.print(
+                            f"- {ColorCodes.FAIL}ERROR{ColorCodes.ENDC} "
+                            f"in worker for {hostname}: "
+                            f"{type(error).__name__}: {error}"
+                        )
+                        progress.console.print(traceback.format_exc())
                     else:
                         progress.advance(task1)
                         if data is not None:

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

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

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

@@ -1 +0,0 @@
-BUILD_DATE=2026-05-08T14:17:04Z