7x31
/
cmdb
mirror of https://github.com/veops/cmdb.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix(api): Dashboard using display attributes

This commit is contained in:
pycook 2024-08-06 19:59:16 +08:00
parent 3aac012ee9
commit 3e4c385d91
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
cmdb-api/api/lib/cmdb/cache.py
View File

@ -5,7 +5,6 @@ from __future__ import unicode_literals
import datetime import datetime
import os import os
import yaml import yaml
from flask import current_app from flask import current_app
from api.extensions import cache from api.extensions import cache
@ -307,16 +306,22 @@ class CMDBCounterCache(object):
from api.lib.cmdb.search.ci import search from api.lib.cmdb.search.ci import search
query = "_type:{}".format(type_id) query = "_type:{}".format(type_id)
if other_filer:
query = "{},{}".format(query, other_filer)
s = search(query, count=1000000) s = search(query, count=1000000)
try: try:
type_names, _, _, _, _, _ = s.search() type_names, _, _, _, _, _ = s.search()
except SearchError as e: except SearchError as e:
current_app.logger.error(e) current_app.logger.error(e)
return return
root_type = CITypeCache.get(type_id)
show_attr_id = root_type and root_type.show_id
show_attr = AttributeCache.get(show_attr_id)
type_id_names = [(str(i.get('_id')), i.get(i.get('unique'))) for i in type_names] type_id_names = [(str(i.get('_id')), i.get(show_attr and show_attr.name) or i.get(i.get('unique')))
for i in type_names]
s = RelSearch([i[0] for i in type_id_names], level, other_filer or '') s = RelSearch([i[0] for i in type_id_names], level)
try: try:
stats = s.statistics(type_ids, need_filter=False) stats = s.statistics(type_ids, need_filter=False)
except SearchError as e: except SearchError as e:
@ -557,7 +562,8 @@ class AutoDiscoveryMappingCache(object):
def get(cls, name): def get(cls, name):
res = cache.get(cls.PREFIX.format(name)) or {} res = cache.get(cls.PREFIX.format(name)) or {}
if not res: if not res:
path = os.path.join(os.path.abspath(os.path.dirname(__file__)), "auto_discovery/mapping/{}.yaml".format(name)) path = os.path.join(os.path.abspath(os.path.dirname(__file__)),
"auto_discovery/mapping/{}.yaml".format(name))
if os.path.exists(path): if os.path.exists(path):
with open(path, 'r') as f: with open(path, 'r') as f:
mapping = yaml.safe_load(f) mapping = yaml.safe_load(f)