diff --git a/README.md b/README.md index a587b29564ac88364e6843a98d16d3ac59c28935..0da6f46f5e736bef8d2e82e5b8fe47ea87b706ac 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -[PACKAGE]: ../../raw/master/mkp/inv_juniper_hw_modules*.mkp "inv_juniper_hw_modules*.mkp" +[PACKAGE]: ../../raw/master/mkp/inv_juniper_hw_modules-0.0.3-20240614.mkp "inv_juniper_hw_modules-0.0.3-20240614.mkp" # Hardware inventory This plugin adds the hardware modules of Juniper Networks devices to the CheckMK inventory. diff --git a/mkp/inv_juniper_hw_modules-0.0.3-20240614.mkp b/mkp/inv_juniper_hw_modules-0.0.3-20240614.mkp new file mode 100644 index 0000000000000000000000000000000000000000..0f4880430e551f8936154aee008a35b0d827931a Binary files /dev/null and b/mkp/inv_juniper_hw_modules-0.0.3-20240614.mkp differ diff --git a/source/packages/inv_juniper_hw_modules b/source/packages/inv_juniper_hw_modules index 4a84ac85416ae4ba2a68f22463e38a9c94e59357..6fd885a939d124c1945320e912eef4a1fb6b1797 100644 --- a/source/packages/inv_juniper_hw_modules +++ b/source/packages/inv_juniper_hw_modules @@ -2,11 +2,11 @@ 'description': 'Inventory of Juniper networks hardware modules\n', 'download_url': 'https://thl-cmk.hopto.org', 'files': {'agent_based': ['inv_juniper_hw_modules.py'], - 'gui': ['views/inv_juniper_hw_modules.py', - 'wato/inv_juniper_hw_modules.py']}, + 'gui': ['wato/inv_juniper_hw_modules.py'], + 'web': ['plugins/views/inv_juniper_hw_modules.py']}, 'name': 'inv_juniper_hw_modules', 'title': 'Juniper networks hardware inventory', - 'version': '0.0.2-20230603', - 'version.min_required': '2.1.0b1', + 'version': '0.0.3-20240614', + 'version.min_required': '2.2.0b1', 'version.packaged': '2.2.0p24', - 'version.usable_until': '2.2.0b1'} + 'version.usable_until': '2.3.0b1'} diff --git a/source/gui/views/inv_juniper_hw_modules.py b/source/web/plugins/views/inv_juniper_hw_modules.py similarity index 65% rename from source/gui/views/inv_juniper_hw_modules.py rename to source/web/plugins/views/inv_juniper_hw_modules.py index f3e92fd6fe5bdf291ba513c055822031cdfd1b28..944c40b41dd4420f1ad3e88f3991533afd67d1b7 100644 --- a/source/gui/views/inv_juniper_hw_modules.py +++ b/source/web/plugins/views/inv_juniper_hw_modules.py @@ -8,19 +8,18 @@ # Date : 2022-06-02 # +# 2024-06-14: moved from gui/views to web/views +# modified imports for cmk 2.2 + from cmk.gui.i18n import _ -from cmk.gui.plugins.views.utils import ( - inventory_displayhints, -) -from cmk.gui.plugins.views.inventory import ( - declare_invtable_view, -) +from cmk.gui.views.inventory.registry import inventory_displayhints inventory_displayhints.update({ - '.hardware.juniper-hw-modules:': {'title': _('Modules'), - 'keyorder': ['index', 'description', 'serial_number', 'revision', 'part_no', ], - 'view': 'invmodules_of_host', - }, + '.hardware.juniper-hw-modules:': { + 'title': _('Modules'), + 'keyorder': ['index', 'description', 'serial_number', 'revision', 'part_no', ], + 'view': 'invmodules_of_host', + }, '.hardware.juniper-hw-modules:*.index': {'title': _('Index'), }, '.hardware.juniper-hw-modules:*.serial_number': {'title': _('Serial number')}, '.hardware.juniper-hw-modules:*.description': {'title': _('Description')}, @@ -33,10 +32,3 @@ inventory_displayhints.update({ '.hardware.juniper-hw-modules:*.model': {'title': _('Model'), }, '.hardware.juniper-hw-modules:*.type': {'title': _('Type (OID)'), }, }) - -declare_invtable_view( - 'invmodules', - '.hardware.juniper-hw-modules:', - _('Juniper Hardware Modules'), - _('Juniper Hardware Modules') -)