github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity

fix: 修复资产硬件信息收集失败的问题

pull/9651/head
Bai 2023-02-20 17:24:13 +08:00 committed by Jiangjie.Bai
parent 995321cee9
commit d246b9bb35
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/assets/automations/gather_facts/manager.py
View File

@ -24,7 +24,7 @@ class GatherFactsManager(BasePlaybookManager):
asset = self.host_asset_mapper.get(host) asset = self.host_asset_mapper.get(host)
if asset and info: if asset and info:
for k, v in info.items(): for k, v in info.items():
info[k] = v.strip() info[k] = v.strip() if isinstance(v, str) else v
asset.info = info asset.info = info
asset.save() asset.save()
else: else:

3
apps/assets/serializers/asset/host.py
View File

@ -12,8 +12,7 @@ class HostInfoSerializer(serializers.Serializer):
vendor = serializers.CharField(max_length=64, required=False, allow_blank=True, label=_('Vendor')) vendor = serializers.CharField(max_length=64, required=False, allow_blank=True, label=_('Vendor'))
model = serializers.CharField(max_length=54, required=False, allow_blank=True, label=_('Model')) model = serializers.CharField(max_length=54, required=False, allow_blank=True, label=_('Model'))
sn = serializers.CharField(max_length=128, required=False, allow_blank=True, label=_('Serial number')) sn = serializers.CharField(max_length=128, required=False, allow_blank=True, label=_('Serial number'))
cpu_model = serializers.ListField(child=serializers.CharField(max_length=64, allow_blank=True), required=False, label=_('CPU model'))
cpu_model = serializers.CharField(max_length=64, required=False, allow_blank=True, label=_('CPU model'))
cpu_count = serializers.IntegerField(required=False, label=_('CPU count')) cpu_count = serializers.IntegerField(required=False, label=_('CPU count'))
cpu_cores = serializers.IntegerField(required=False, label=_('CPU cores')) cpu_cores = serializers.IntegerField(required=False, label=_('CPU cores'))
cpu_vcpus = serializers.IntegerField(required=False, label=_('CPU vcpus')) cpu_vcpus = serializers.IntegerField(required=False, label=_('CPU vcpus'))