Skip to content

Commit c371f1d

Browse files
committed
fix(api): auto discovery rule sync
1 parent 4837ac8 commit c371f1d

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

cmdb-api/api/lib/cmdb/auto_discovery/auto_discovery.py

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -255,9 +255,14 @@ def get(cls, ci_id, oneagent_id, oneagent_name, last_update_at=None):
255255
result = []
256256
db.session.commit()
257257
rules = cls.cls.get_by(to_dict=True)
258-
258+
259+
last_update_at = last_update_at or ""
260+
new_last_update_at = ""
259261
for rule in rules:
260262
if not rule['enabled']:
263+
if (rule['created_at'] or '') > last_update_at or (
264+
rule['updated_at'] or '') > last_update_at:
265+
new_last_update_at = max([rule['created_at'] or '', rule['updated_at'] or ''])
261266
continue
262267

263268
if isinstance(rule.get("extra_option"), dict):
@@ -299,7 +304,6 @@ def get(cls, ci_id, oneagent_id, oneagent_name, last_update_at=None):
299304
result.append(rule)
300305

301306
ad_rules_updated_at = (SystemConfigManager.get('ad_rules_updated_at') or {}).get('option', {}).get('v') or ""
302-
new_last_update_at = ""
303307
for i in result:
304308
i['adr'] = AutoDiscoveryRule.get_by_id(i['adr_id']).to_dict()
305309
i['adr'].pop("attributes", None)

0 commit comments

Comments
 (0)