7x31/cmdb
1
0
Fork 0
mirror of https://github.com/veops/cmdb.git synced 2025-09-18 02:26:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(api): auto discovery rule sync

Browse Source
This commit is contained in:
pycook
2025-09-15 17:33:55 +08:00
parent 4837ac8a35
commit c371f1defe
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cmdb-api/api/lib/cmdb/auto_discovery/auto_discovery.py
View File

@@ -256,8 +256,13 @@ class AutoDiscoveryCITypeCRUD(DBMixin):
db.session.commit() db.session.commit()
rules = cls.cls.get_by(to_dict=True) rules = cls.cls.get_by(to_dict=True)
last_update_at = last_update_at or ""
new_last_update_at = ""
for rule in rules: for rule in rules:
if not rule['enabled']: if not rule['enabled']:
if (rule['created_at'] or '') > last_update_at or (
rule['updated_at'] or '') > last_update_at:
new_last_update_at = max([rule['created_at'] or '', rule['updated_at'] or ''])
continue continue
if isinstance(rule.get("extra_option"), dict): if isinstance(rule.get("extra_option"), dict):
@@ -299,7 +304,6 @@ class AutoDiscoveryCITypeCRUD(DBMixin):
result.append(rule) result.append(rule)
ad_rules_updated_at = (SystemConfigManager.get('ad_rules_updated_at') or {}).get('option', {}).get('v') or "" ad_rules_updated_at = (SystemConfigManager.get('ad_rules_updated_at') or {}).get('option', {}).get('v') or ""
new_last_update_at = ""
for i in result: for i in result:
i['adr'] = AutoDiscoveryRule.get_by_id(i['adr_id']).to_dict() i['adr'] = AutoDiscoveryRule.get_by_id(i['adr_id']).to_dict()
i['adr'].pop("attributes", None) i['adr'].pop("attributes", None)