From 0f80b54a6b26dc3ad4c841a43fe690af861af5b2 Mon Sep 17 00:00:00 2001
From: "th.l" <thl-cmk@outlook.com>
Date: Fri, 14 Jun 2024 20:03:33 +0200
Subject: [PATCH] update project
---
README.md | 2 +-
mkp/inv_juniper_hw_modules-0.0.3-20240614.mkp | Bin 0 -> 2940 bytes
source/packages/inv_juniper_hw_modules | 10 +++----
.../plugins}/views/inv_juniper_hw_modules.py | 26 ++++++------------
4 files changed, 15 insertions(+), 23 deletions(-)
create mode 100644 mkp/inv_juniper_hw_modules-0.0.3-20240614.mkp
rename source/{gui => web/plugins}/views/inv_juniper_hw_modules.py (65%)
diff --git a/README.md b/README.md
index a587b29..0da6f46 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
GIT binary patch
literal 2940
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
literal 0
HcmV?d00001
diff --git a/source/packages/inv_juniper_hw_modules b/source/packages/inv_juniper_hw_modules
index 4a84ac8..6fd885a 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 f3e92fd..944c40b 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')
-)
--
GitLab