[checkmk-commits] inventory: move bios to software

Module: check_mk Branch: master Commit: 6ee6647ca38be5cf47ebd7e5fde2674c1cc64212 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6ee6647ca38be5… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Fri Jan 11 15:34:35 2019 +0100 inventory: move bios to software Change-Id: I02a3b5aac15ef167564c29ff3cce919ee828b255 --- cmk/gui/plugins/views/inventory.py | 8 ++++---- inventory/dell_idrac_info | 2 +- inventory/dmidecode | 2 +- inventory/esx_vsphere_hostsystem | 2 +- inventory/solaris_prtdiag | 2 +- inventory/win_bios | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/cmk/gui/plugins/views/inventory.py b/cmk/gui/plugins/views/inventory.py index f487ab4..8420186 100644 --- a/cmk/gui/plugins/views/inventory.py +++ b/cmk/gui/plugins/views/inventory.py @@ -602,10 +602,6 @@ def inv_titleinfo_long(invpath, node): inventory_displayhints.update({ ".": {"title": _("Inventory")}, ".hardware.": {"title": _("Hardware"), "icon": "hardware"}, - ".hardware.bios.": {"title": _("BIOS")}, - ".hardware.bios.vendor": {"title": _("Vendor")}, - ".hardware.bios.version": {"title": _("Version")}, - ".hardware.bios.date": {"title": _("Date"), "paint": "date"}, ".hardware.chassis.": {"title": _("Chassis")}, ".hardware.cpu.": {"title": _("Processor")}, ".hardware.cpu.model": {"title": _("Model"), "short": _("CPU Model")}, @@ -921,6 +917,10 @@ inventory_displayhints.update({ ".hardware.nwadapter:*.ipv6_subnet": {"title": _("IPv6 Subnet")}, ".hardware.nwadapter:*.gateway": {"title": _("Gateway")}, ".software.": {"title": _("Software"), "icon": "software"}, + ".software.bios.": {"title": _("BIOS")}, + ".software.bios.vendor": {"title": _("Vendor")}, + ".software.bios.version": {"title": _("Version")}, + ".software.bios.date": {"title": _("Date"), "paint": "date"}, ".software.firmware.vendor": {"title": _("Vendor")}, ".software.firmware.version": {"title": _("Version")}, ".software.firmware.platform_level": {"title": _("Platform Firmware level")}, diff --git a/inventory/dell_idrac_info b/inventory/dell_idrac_info index b36c8fc..3d388de 100644 --- a/inventory/dell_idrac_info +++ b/inventory/dell_idrac_info @@ -38,7 +38,7 @@ def inv_dell_idrac_info(info): node['serial'] = serial node['expresscode'] = expresscode - node = inv_tree("hardware.bios.") + node = inv_tree("software.bios.") node['version'] = bios_version node['vendor'] = bios_vendor diff --git a/inventory/dmidecode b/inventory/dmidecode index bb998da..74ed0a4 100644 --- a/inventory/dmidecode +++ b/inventory/dmidecode @@ -119,7 +119,7 @@ def inv_dmidecode_parse_date(value): def inv_dmidecode_parse_bios(lines): inv_dmidecode_parse_generic( - "hardware.bios.", lines, { + "software.bios.", lines, { "Vendor": "vendor", "Version": "version", "Release Date": ("date", inv_dmidecode_parse_date), diff --git a/inventory/esx_vsphere_hostsystem b/inventory/esx_vsphere_hostsystem index cc37715..adde46a 100644 --- a/inventory/esx_vsphere_hostsystem +++ b/inventory/esx_vsphere_hostsystem @@ -103,7 +103,7 @@ def inv_esx_vsphere_hostsystem(info): node["bus_speed"] = float(data["hardware.cpuPkg"]["0"]["busHz"]) if "hardware.biosInfo" in data: - node = inv_tree("hardware.bios.") + node = inv_tree("software.bios.") node["version"] = data["hardware.biosInfo"]["biosVersion"] try: diff --git a/inventory/solaris_prtdiag b/inventory/solaris_prtdiag index 01fb8f1..eb4c28f 100644 --- a/inventory/solaris_prtdiag +++ b/inventory/solaris_prtdiag @@ -89,7 +89,7 @@ def inv_solaris_prtdiag(info): for line in info: if line[0].startswith('OBP'): - node = inv_tree("hardware.bios.") + node = inv_tree("software.bios.") bios_info = line[0].split() node["version"] = "%s %s" % (bios_info[0], bios_info[1]) formated_date = bios_info[2] + bios_info[3] diff --git a/inventory/win_bios b/inventory/win_bios index 1c5bd03..fe15827 100644 --- a/inventory/win_bios +++ b/inventory/win_bios @@ -38,7 +38,7 @@ def inv_win_bios(info): - node = inv_tree("hardware.bios.") + node = inv_tree("software.bios.") smbios_version = "" bios_version = "" for line in info: