cmdbsyncer 4.1.0.dev17__tar.gz → 4.1.0.dev19__tar.gz

{cmdbsyncer-4.1.0.dev17 → cmdbsyncer-4.1.0.dev19}/PKG-INFO

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

@@ -24,9 +24,34 @@ CLI_MODE = os.environ.get('CMDBSYNCER_CLI') == '1'
 # ``from application.cli import main`` and don't put cwd on ``sys.path``
 # beforehand — but ``local_config.py``, the user ``plugins/`` package,
 # ``disabled_plugins.json`` and friends all live in the deployment
-# directory. Inject cwd here, before any import that depends on it,
-# so pip-install behaves like a source checkout (where Python adds the
-# script directory to ``sys.path[0]`` automatically).
+# directory. We need to put the deployment directory on ``sys.path``
+# *before* the ``from local_config import config`` further down runs.
+# Doing this in ``application/cli.py:main()`` is too late: that function
+# only executes after ``from application.cli import main`` has already
+# fully imported this module — including the local_config load.
+#
+# Search in priority order:
+#   1. ``$CMDBSYNCER_CONFIG_DIR`` — operator override (set e.g. by the
+#      ansible inventory shims so ``ansible-playbook`` works from any cwd)
+#   2. cwd — source checkouts running ``./cmdbsyncer …`` from the repo
+#   3. parent of ``sys.prefix`` — pip layout where the venv lives
+#      inside the deployment dir (``/opt/cmdbsyncer/venv`` → ``/opt/cmdbsyncer``)
+#   4. ``/etc/cmdbsyncer`` — packaged-install convention
+# The first candidate that actually contains ``local_config.py`` wins
+# and is prepended to ``sys.path``. cwd is always injected as a fallback
+# so user ``plugins/`` resolution keeps working in source checkouts even
+# when local_config.py lives elsewhere.
+_config_candidates = []
+if _env_dir := os.environ.get("CMDBSYNCER_CONFIG_DIR"):
+    _config_candidates.append(_env_dir)
+_config_candidates.append(os.getcwd())
+_config_candidates.append(os.path.dirname(sys.prefix))
+_config_candidates.append("/etc/cmdbsyncer")
+for _candidate in _config_candidates:
+    if _candidate and os.path.isfile(os.path.join(_candidate, "local_config.py")):
+        if _candidate not in sys.path:
+            sys.path.insert(0, _candidate)
+        break
 if os.getcwd() not in sys.path:
     sys.path.insert(0, os.getcwd())
 

cmdbsyncer-4.1.0.dev19/application/buildinfo.txt

@@ -0,0 +1 @@
+BUILD_DATE=2026-05-13T07:27:17Z

{cmdbsyncer-4.1.0.dev17 → cmdbsyncer-4.1.0.dev19}/application/changelog/v4.1.md

@@ -13,7 +13,7 @@
 - FEAT: Project-centric Ansible workspace with auto-default project
 - FEAT: CLI moved under `cmdbsyncer ansible …` with backward-compat shims
 - FIX: Inventory URL now resolves at `/api/v1/ansible/inventory/<provider>`
-- FIX: `ansible/inventory`, `ansible/inventory_single` and `ansible/cmk_server_inventory` find the pip-installed `cmdbsyncer` on PATH instead of failing with "No such file or directory" when ansible/ lives at `/opt/cmdbsyncer/ansible/`, and they export `CMDBSYNCER_CONFIG_DIR` pointing at the shim's parent directory so the called CLI loads `local_config.py` regardless of ansible-playbook's cwd
+- FIX: `ansible/inventory`, `ansible/inventory_single` and `ansible/cmk_server_inventory` find the pip-installed `cmdbsyncer` on PATH instead of failing with "No such file or directory" when ansible/ lives at `/opt/cmdbsyncer/ansible/`, and they export `CMDBSYNCER_CONFIG_DIR` pointing at the shim's parent directory so the called CLI loads `local_config.py` regardless of ansible-playbook's cwd. The `CMDBSYNCER_CONFIG_DIR` lookup is now honored at package-import time (not only inside the CLI entry point), which is when `local_config.py` is actually loaded — so the shim's env var really does its job and `ansible-playbook` from `/opt/cmdbsyncer/ansible/` no longer fails with "CRYPTOGRAPHY_KEY is not set"
 - FIX: Offline bundle `install.sh` no longer swallows the playbook copy when `pip install` fails — both steps run independently and report their own status, and `ANSIBLE_TARGET` is replaced by default (no more `FORCE=1` dance for re-installs)
 
 ### Hosts
@@ -83,6 +83,7 @@
 - FIX: Host Debug page, Host Relations graph, Host tabs, Ansible Project detail, Ansible Rule list and Ansible Playbook run picker honour the user theme — no more white-on-dark surfaces in Gruvbox Dark / Nord / Dracula
 - FEAT: Host Debug page can preview a Checkmk Setup Rule's outcomes (ruleset, folder, value, condition) against the selected host, with `loop_over_list` expanded per value
 - FEAT: Rule Preview on the Host Debug page now warns when the selected rule would not match the current host, including the first failing condition
+- FEAT: Host Debug page rules table now shows the matching condition for every hit, not just the first failing condition for misses
 - FEAT: Inline list editors gained a visible "remove entry" button on every card
 - FIX: Drag-and-drop reordering of inline list entries works on older Firefox (140+)
 - FEAT: Per-user theme picker under Account → Theme with Default, Gruvbox Dark, Gruvbox Light, Nord and Dracula

cmdbsyncer-4.1.0.dev19/application/cli.py

@@ -0,0 +1,44 @@
+"""Entry point for the ``cmdbsyncer`` console script.
+
+Registered via ``[project.scripts]`` in ``pyproject.toml`` so the command is
+available on ``PATH`` after ``pip install cmdbsyncer``. Delegates to Flask's
+Click CLI on the app instance.
+"""
+import os
+import sys
+import warnings
+
+
+def main():
+    """Run the cmdbsyncer Flask Click CLI."""
+    os.environ.setdefault("config", "prod")
+    # Mark the process as a CLI invocation before importing the app factory.
+    # ``application/__init__.py`` and ``application/enterprise.py`` check this
+    # to suppress their startup banner / ECS JSON log pipeline — none of that
+    # noise belongs in front of command output like ``checkmk export_hosts``.
+    os.environ["CMDBSYNCER_CLI"] = "1"
+    # ``application/__init__.py`` resolves the local_config.py location at
+    # *import* time (it must, because the import line further down runs
+    # before this function does). Nothing to do here.
+    with warnings.catch_warnings():
+        warnings.filterwarnings("ignore", "Fields missing from ruleset", UserWarning)
+        try:
+            from application import app, DISPLAY_VERSION  # pylint: disable=import-outside-toplevel
+            from flask.cli import ScriptInfo  # pylint: disable=import-outside-toplevel
+        except Exception as exp:  # pylint: disable=broad-except
+            print("Cannot load application. Is MongoDB reachable and local_config.py present?")
+            print(exp)
+            sys.exit(1)
+
+        if len(sys.argv) == 1:
+            print(f"CMDB Syncer Version: {DISPLAY_VERSION}")
+            sys.argv.append("--help")
+        # AppGroup commands re-resolve the app via ScriptInfo.load_app(), which
+        # otherwise scans for FLASK_APP / app.py / wsgi.py. PyPI installs have
+        # none of those in the cwd, so hand Click a ScriptInfo that returns the
+        # already-imported app instance directly.
+        app.cli(obj=ScriptInfo(create_app=lambda: app))
+
+
+if __name__ == "__main__":
+    main()

{cmdbsyncer-4.1.0.dev17 → cmdbsyncer-4.1.0.dev19}/application/modules/rule/rule.py

@@ -216,7 +216,7 @@ class Rule():
         self._rule_docs_cache = (current_key, objs, prepared)
         return objs, prepared
 
-    # pylint: disable=too-many-branches
+    # pylint: disable=too-many-branches,too-many-statements
     def check_rules(self, hostname):
         """
         Handle Rule Match logic
@@ -252,11 +252,14 @@ class Rule():
             conditions = rule['conditions']
 
             no_match_reason = None
+            match_reason = None
             if condition_typ == 'any':
                 for condition in conditions:
                     if self.handle_match(condition, hostname):
                         rule_hit = True
                         no_match_reason = None
+                        if self.debug:
+                            match_reason = dict(condition)
                         break # We have a hit, no need to check more
                     if self.debug:
                         no_match_reason = dict(condition)
@@ -269,6 +272,10 @@ class Rule():
                         if self.debug:
                             no_match_reason = dict(condition)
                         break # One was no hit, no need for loop
+                if self.debug and rule_hit and conditions:
+                    # All conditions matched — surface the last one as the
+                    # representative match (mirrors no_match_reason shape).
+                    match_reason = dict(conditions[-1])
 
             elif condition_typ == 'anyway':
                 rule_hit = True
@@ -279,6 +286,7 @@ class Rule():
                     "group": self.name,
                     "hit": rule_hit,
                     'no_match_reason': no_match_reason,
+                    'match_reason': match_reason,
                     "condition_type": _RULE_DESCRIPTIONS[condition_typ],
                     "name": rule['name'],
                     "id": str(rule['_id']),

{cmdbsyncer-4.1.0.dev17 → cmdbsyncer-4.1.0.dev19}/application/templates/debug_host.html

@@ -317,12 +317,30 @@
                   <tr>
                     <th style="width: 280px;">Rule</th>
                     <th style="width: 70px;">Hit</th>
-                    <th>First reason the rule won't match</th>
+                    <th>Matching condition / first reason it won't match</th>
                     <th style="width: 120px;">Condition Type</th>
                     <th style="width: 100px;">Last Match</th>
                   </tr>
                 </thead>
                 <tbody>
+                  {% macro render_condition(cond) %}
+                    {% if cond['match_type'] == 'host' %}
+                      <span class="badge badge-primary">
+                        {{ negate[cond['hostname_match_negate']] }}{{ condition_types[cond['hostname_match']] }}
+                      </span>
+                      <span class="badge badge-info">{{ cond['hostname'] }}</span>
+                    {% else %}
+                      <span class="badge badge-primary">
+                        {{ negate[cond['tag_match_negate']] }}{{ condition_types[cond['tag_match']] }}
+                      </span>
+                      <span class="badge badge-info">{{ cond['tag'] }}</span>
+                      =
+                      <span class="badge badge-primary">
+                        {{ negate[cond['value_match_negate']] }}{{ condition_types[cond['value_match']] }}
+                      </span>
+                      <span class="badge badge-info">{{ cond['value'] }}</span>
+                    {% endif %}
+                  {% endmacro %}
                   {% for rule in rule_raw %}
                     <tr {% if rule['hit'] %} class="rule-hit" {% endif %}>
                       <td>
@@ -340,24 +358,14 @@
                         {% endif %}
                       </td>
                       <td>
-                        {% if rule['no_match_reason'] %}
-                          {% set no_match = rule['no_match_reason'] %}
-                          {% if no_match['match_type'] == 'host' %}
-                            <span class="badge badge-primary">
-                              {{ negate[no_match['hostname_match_negate']] }}{{ condition_types[no_match['hostname_match']] }}
-                            </span>
-                            <span class="badge badge-info">{{ no_match['hostname'] }}</span>
+                        {% if rule['hit'] %}
+                          {% if rule['match_reason'] %}
+                            {{ render_condition(rule['match_reason']) }}
                           {% else %}
-                            <span class="badge badge-primary">
-                              {{ negate[no_match['tag_match_negate']] }}{{ condition_types[no_match['tag_match']] }}
-                            </span>
-                            <span class="badge badge-info">{{ no_match['tag'] }}</span>
-                            =
-                            <span class="badge badge-primary">
-                              {{ negate[no_match['value_match_negate']] }}{{ condition_types[no_match['value_match']] }}
-                            </span>
-                            <span class="badge badge-info">{{ no_match['value'] }}</span>
+                            <span class="text-muted"><i class="fa fa-check"></i> always matches</span>
                           {% endif %}
+                        {% elif rule['no_match_reason'] %}
+                          {{ render_condition(rule['no_match_reason']) }}
                         {% endif %}
                       </td>
                       <td>{{ rule['condition_type'] }}</td>

{cmdbsyncer-4.1.0.dev17 → cmdbsyncer-4.1.0.dev19}/cmdbsyncer.egg-info/PKG-INFO

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

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

@@ -1 +0,0 @@
-BUILD_DATE=2026-05-12T16:21:35Z

cmdbsyncer-4.1.0.dev17/application/cli.py

@@ -1,78 +0,0 @@
-"""Entry point for the ``cmdbsyncer`` console script.
-
-Registered via ``[project.scripts]`` in ``pyproject.toml`` so the command is
-available on ``PATH`` after ``pip install cmdbsyncer``. Delegates to Flask's
-Click CLI on the app instance.
-"""
-import os
-import sys
-import warnings
-
-
-def main():
-    """Run the cmdbsyncer Flask Click CLI."""
-    os.environ.setdefault("config", "prod")
-    # Mark the process as a CLI invocation before importing the app factory.
-    # ``application/__init__.py`` and ``application/enterprise.py`` check this
-    # to suppress their startup banner / ECS JSON log pipeline — none of that
-    # noise belongs in front of command output like ``checkmk export_hosts``.
-    os.environ["CMDBSYNCER_CLI"] = "1"
-    # cmdbsyncer needs to find ``local_config.py`` regardless of the
-    # caller's cwd. Source checkouts have it next to ``./cmdbsyncer`` and
-    # were always covered by the cwd injection below; PyPI installs (and
-    # any cron / systemd unit that doesn't set WorkingDirectory) drop it
-    # into the install root (e.g. ``/opt/cmdbsyncer/``) but invoke the
-    # binary from elsewhere — that previously left ``CRYPTOGRAPHY_KEY``
-    # at ``None`` and exploded much later with a "Fernet(None)" TypeError
-    # that pointed nowhere useful. Search a fixed list of well-known
-    # directories and inject the first one that actually contains the
-    # file; cwd stays in the list so source checkouts still win.
-    _config_candidates = []
-    if env_dir := os.environ.get("CMDBSYNCER_CONFIG_DIR"):
-        _config_candidates.append(env_dir)
-    _config_candidates.append(os.getcwd())
-    # ``sys.prefix`` is the venv root (``/opt/cmdbsyncer/venv``); its
-    # parent is the conventional install dir where local_config.py sits.
-    _config_candidates.append(os.path.dirname(sys.prefix))
-    _config_candidates.append("/etc/cmdbsyncer")
-    for _candidate in _config_candidates:
-        if _candidate and os.path.isfile(os.path.join(_candidate, "local_config.py")):
-            if _candidate not in sys.path:
-                sys.path.insert(0, _candidate)
-            break
-    else:
-        # Nothing found. Keep the legacy cwd injection so the import
-        # still attempts and the warning in ``application/__init__.py``
-        # surfaces the searched paths — but tell the operator upfront.
-        if os.getcwd() not in sys.path:
-            sys.path.insert(0, os.getcwd())
-        print(
-            "cmdbsyncer: local_config.py not found in any of "
-            f"{_config_candidates!r}. Set CMDBSYNCER_CONFIG_DIR to "
-            "its directory or run from there. Continuing — encrypted "
-            "account passwords will fail to decrypt without "
-            "CRYPTOGRAPHY_KEY.",
-            file=sys.stderr,
-        )
-    with warnings.catch_warnings():
-        warnings.filterwarnings("ignore", "Fields missing from ruleset", UserWarning)
-        try:
-            from application import app, DISPLAY_VERSION  # pylint: disable=import-outside-toplevel
-            from flask.cli import ScriptInfo  # pylint: disable=import-outside-toplevel
-        except Exception as exp:  # pylint: disable=broad-except
-            print("Cannot load application. Is MongoDB reachable and local_config.py present?")
-            print(exp)
-            sys.exit(1)
-
-        if len(sys.argv) == 1:
-            print(f"CMDB Syncer Version: {DISPLAY_VERSION}")
-            sys.argv.append("--help")
-        # AppGroup commands re-resolve the app via ScriptInfo.load_app(), which
-        # otherwise scans for FLASK_APP / app.py / wsgi.py. PyPI installs have
-        # none of those in the cwd, so hand Click a ScriptInfo that returns the
-        # already-imported app instance directly.
-        app.cli(obj=ScriptInfo(create_app=lambda: app))
-
-
-if __name__ == "__main__":
-    main()