diff --git a/README.md b/README.md index 764d0e0417daed75be1dd757ab5c9fa9c67442a1..bc779b97ac786297d8e53545f638f5cc50785307 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,4 @@ +[PACKAGE]: ../../raw/master/inv_cisco_support-0.2.1-20231008.mkp "inv_cisco_support-0.2.1-20231008.mkp" # Cisco support APIs inventory plugin Adds live cycle information for Cisco devices to the inventory. diff --git a/gui/views/inv_cisco_livecycle.py b/gui/views/inv_cisco_livecycle.py index 1a62ad6d1401bbae853885439baebe93f3cb1ac3..c7e8f2cd890ad8606611021db1cf8f2a67d22d3f 100644 --- a/gui/views/inv_cisco_livecycle.py +++ b/gui/views/inv_cisco_livecycle.py @@ -14,22 +14,22 @@ # # 2021-07-25: removed inv_cisco_suggestion # rework painter section +# 2023-10-08: modified imports for cmk 2.2.x +# removed declare_view import time -from cmk.gui.plugins.views.inventory import ( - declare_invtable_view, +from cmk.gui.i18n import _ +from cmk.gui.views.inventory.registry import inventory_displayhints + +from cmk.gui.views.inventory import ( decorate_inv_paint, PaintResult, ) from cmk.gui.plugins.visuals.inventory import ( FilterInvtableText, ) -from cmk.gui.i18n import _ -from cmk.gui.plugins.views.utils import ( - inventory_displayhints, -) -from cmk.gui.htmllib import HTML +from cmk.gui.utils.html import HTML # # to get the status colors and the clickable IDs for EOL, PSIRT and Bug you need to copy the file # ~/lib/check_mk/gui/plugins/views/inventory.py to ~/local/lib/check_mk/gui/plugins/views. @@ -299,9 +299,3 @@ else: '.software.support.cisco_psirt.advisories:*.bugIDs': {'title': _('Bug IDs')}, '.software.support.cisco_psirt.Last_checked': {'title': _('Last checked')}, })) - - -declare_invtable_view('invciscoeox', '.hardware.support.cisco_eox:', _('Cisco EoX status'), _('Cisco EoX status')) -declare_invtable_view('invciscocontract', '.hardware.support.cisco_contract:', _('Cisco contract status'), _('Cisco contract status')) -declare_invtable_view('invciscopsirt', '.software.support.cisco_psirt.advisories:', _('Cisco PSIRT advisories'), _('Cisco PSIRT advisories')) -declare_invtable_view('invciscobugs', '.software.support.cisco_bug.bugs:', _('Cisco BUG IDs'), _('Cisco Bug IDs')) diff --git a/inv_cisco_support-0.2.1-20231008.mkp b/inv_cisco_support-0.2.1-20231008.mkp new file mode 100644 index 0000000000000000000000000000000000000000..4e2fd79cfd1446ab0e4742545eb2854d8ef94761 Binary files /dev/null and b/inv_cisco_support-0.2.1-20231008.mkp differ diff --git a/packages/inv_cisco_support b/packages/inv_cisco_support index 8297136ce2c5937cfde2971b59f0272eb5b1e265..b4cb1c803a1a2f1fa7dc6d72d09e28ea3dfddaef 100644 --- a/packages/inv_cisco_support +++ b/packages/inv_cisco_support @@ -38,7 +38,7 @@ 'name': 'inv_cisco_support', 'title': 'Inventory for Cisco Bug, EoX, contract status, PSIRT advisories and ' 'suggested software', - 'version': '0.2.0-20230619', - 'version.min_required': '2.1.0b1', - 'version.packaged': '2.2.0p2', - 'version.usable_until': '2.2.0b1'} + 'version': '0.2.1-20231008', + 'version.min_required': '2.2.0b1', + 'version.packaged': '2.2.0p11', + 'version.usable_until': '2.3.0b1'}