[checkmk-commits] 4984 FIX aix_service_packs: Cleaned up mixture of the latest and all past service packs

Module: check_mk Branch: master Commit: db2d70e34a8f575949412674d21bc3420b04ee7d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=db2d70e34a8f57… Author: Simon Betz &lt;si(a)mathias-kettner.de&gt; Date: Wed Jul 26 10:57:56 2017 +0200 4984 FIX aix_service_packs: Cleaned up mixture of the latest and all past service packs Change-Id: I20eb7c46796dcb72b75f02177de21a5c12a9bcac --- .werks/4984 | 13 +++++++++++++ agents/plugins/mk_inventory.aix | 2 +- inventory/aix_service_packs | 21 ++++++++++++++++++--- web/plugins/views/inventory.py | 2 +- 4 files changed, 33 insertions(+), 5 deletions(-) diff --git a/.werks/4984 b/.werks/4984 new file mode 100644 index 0000000..ecd25a5 --- /dev/null +++ b/.werks/4984 @@ -0,0 +1,13 @@ +Title: aix_service_packs: Cleaned up mixture of the latest and all past service packs +Level: 1 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i1 +Date: 1501058641 + +Previously the latest service pack was displayed as a single row +below {{Service Packs}}. Separated the latest service pack from +all past ones. diff --git a/agents/plugins/mk_inventory.aix b/agents/plugins/mk_inventory.aix index fb79884..602d2ba 100755 --- a/agents/plugins/mk_inventory.aix +++ b/agents/plugins/mk_inventory.aix @@ -55,7 +55,7 @@ then # list the known service packs on a system echo "<<<aix_service_packs:persist($UNTIL)>>>" - oslevel -s + oslevel -sq fi # If you run the prtconf command without any flags, it displays the system model, machine serial, diff --git a/inventory/aix_service_packs b/inventory/aix_service_packs index ee97af7..b0ab5bf 100644 --- a/inventory/aix_service_packs +++ b/inventory/aix_service_packs @@ -24,11 +24,26 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. + def inv_aix_service_packs(info): - node = inv_tree_list("software.os.service_packs:") + latest_service_pack = None + service_packs = [] for line in info: - node.append({ "name" : line[0]}) + if line[0].startswith("----") or line[0].startswith("Known"): + continue + if latest_service_pack is None: + latest_service_pack = line[0] + else: + service_packs.append(line[0]) + + node = inv_tree("software.os.") + node["service_pack"] = latest_service_pack + + node = inv_tree_list("software.os.service_packs:") + for service_pack in service_packs: + node.append({"name" : service_pack}) + inv_info['aix_service_packs'] = { - "inv_function" : inv_aix_service_packs, + "inv_function": inv_aix_service_packs, } diff --git a/web/plugins/views/inventory.py b/web/plugins/views/inventory.py index dca55b4..8ecd1d4 100644 --- a/web/plugins/views/inventory.py +++ b/web/plugins/views/inventory.py @@ -770,7 +770,7 @@ inventory_displayhints.update({ ".software.os.install_date" : { "title" : _("Install Date"), "paint" : "date" }, ".software.os.kernel_version" : { "title" : _("Kernel Version"), "short" : _("Kernel") }, ".software.os.arch" : { "title" : _("Kernel Architecture"), "short" : _("Architecture") }, - ".software.os.service_pack" : { "title" : _("Service Pack"), "short" : _("Service Pack") }, + ".software.os.service_pack" : { "title" : _("Latest Service Pack"), "short" : _("Service Pack") }, ".software.os.service_packs:" : { "title" : _("Service Packs"), "render" : render_inv_dicttable, "keyorder" : [ "name" ] }, ".software.configuration." : { "title" : _("Configuration"), },