diff --git a/README.md b/README.md index 3bcfddad53750d36c71134bd581006cbca23c779..cde409d7ee8574085b5edc7cb826154dbf739911 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,4 @@ +[PACKAGE]: ../../raw/master/mkp/cisco_cellular_lte-0.0.3-20240615.mkp "cisco_cellular_lte-0.0.3-20240615.mkp" # Cisco 2G/3G/4G wireless connection This package contains the two plugins. The check plugin **_cisco_cellular_lte_** and the inventory plugin **_inv_cisco_cellular_lte_**. diff --git a/cisco_cellular_lte.mkp b/cisco_cellular_lte.mkp deleted file mode 100644 index 63ce79a563dbe8c4d118c0ec9a9b4ea20d466688..0000000000000000000000000000000000000000 Binary files a/cisco_cellular_lte.mkp and /dev/null differ diff --git a/doc/.gitkeep b/img/.gitkeep similarity index 100% rename from doc/.gitkeep rename to img/.gitkeep diff --git a/doc/sample-details.png b/img/sample-details.png similarity index 100% rename from doc/sample-details.png rename to img/sample-details.png diff --git a/doc/sample-inventory.png b/img/sample-inventory.png similarity index 100% rename from doc/sample-inventory.png rename to img/sample-inventory.png diff --git a/doc/sample.png b/img/sample.png similarity index 100% rename from doc/sample.png rename to img/sample.png diff --git a/mkp/cisco_cellular_lte-0.0.3-20240615.mkp b/mkp/cisco_cellular_lte-0.0.3-20240615.mkp new file mode 100644 index 0000000000000000000000000000000000000000..ca13abfcedd4013a871982c29d4c86a49c3a5a65 Binary files /dev/null and b/mkp/cisco_cellular_lte-0.0.3-20240615.mkp differ diff --git a/agent_based/cisco_cellular_lte.py b/source/agent_based/cisco_cellular_lte.py similarity index 100% rename from agent_based/cisco_cellular_lte.py rename to source/agent_based/cisco_cellular_lte.py diff --git a/agent_based/inv_cisco_cellular_lte.py b/source/agent_based/inv_cisco_cellular_lte.py similarity index 100% rename from agent_based/inv_cisco_cellular_lte.py rename to source/agent_based/inv_cisco_cellular_lte.py diff --git a/checkman/cisco_cellular_lte b/source/checkman/cisco_cellular_lte similarity index 100% rename from checkman/cisco_cellular_lte rename to source/checkman/cisco_cellular_lte diff --git a/gui/metrics/cisco_cellular_lte.py b/source/gui/metrics/cisco_cellular_lte.py similarity index 100% rename from gui/metrics/cisco_cellular_lte.py rename to source/gui/metrics/cisco_cellular_lte.py diff --git a/gui/wato/cisco_cellular_lte.py b/source/gui/wato/cisco_cellular_lte.py similarity index 100% rename from gui/wato/cisco_cellular_lte.py rename to source/gui/wato/cisco_cellular_lte.py diff --git a/packages/cisco_cellular_lte b/source/packages/cisco_cellular_lte similarity index 65% rename from packages/cisco_cellular_lte rename to source/packages/cisco_cellular_lte index 7c4dad60af0c426ecec93bbeb74760bd02fbc60b..e2336a9445ea269daf1fe89245e5034d122d7090 100644 --- a/packages/cisco_cellular_lte +++ b/source/packages/cisco_cellular_lte @@ -6,11 +6,11 @@ 'inv_cisco_cellular_lte.py'], 'checkman': ['cisco_cellular_lte'], 'gui': ['metrics/cisco_cellular_lte.py', - 'views/inv_cisco_cellular_lte.py', - 'wato/cisco_cellular_lte.py']}, + 'wato/cisco_cellular_lte.py'], + 'web': ['plugins/views/inv_cisco_cellular_lte.py']}, 'name': 'cisco_cellular_lte', 'title': 'Cisco cellular LTE', - 'version': '20230220.v0.0.2a', - 'version.min_required': '2.1.0', - 'version.packaged': '2.1.0p21', - 'version.usable_until': None} \ No newline at end of file + 'version': '0.0.3-20240615', + 'version.min_required': '2.2.0b1', + 'version.packaged': '2.2.0p24', + 'version.usable_until': '2.3.0b1'} diff --git a/gui/views/inv_cisco_cellular_lte.py b/source/web/plugins/views/inv_cisco_cellular_lte.py similarity index 87% rename from gui/views/inv_cisco_cellular_lte.py rename to source/web/plugins/views/inv_cisco_cellular_lte.py index 59063587f9dc16a8616841dba86d197e4b74c4f7..0120aa77a27d2368a7e6ea2237ee6e6801751ec7 100644 --- a/gui/views/inv_cisco_cellular_lte.py +++ b/source/web/plugins/views/inv_cisco_cellular_lte.py @@ -9,13 +9,11 @@ # File : view/inv_cisco_cellular_lte.py # # 2023-02-20: moved from ~/local/share/check_mk/... to ~/local/lib/check_mk... -# +# 2024-06-15: modified imports for cmk 2.2 +# moved back to ~/local/share/check_mk/web/plugins/views 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({ '.networking.cellular:': { @@ -47,5 +45,3 @@ inventory_displayhints.update({ '.networking.cellular:*.apn': {'short': _('APN'), 'title': _('Access Point Name (APN)')}, '.networking.cellular:*.service_type': {'title': _('Service type'), }, }) - -declare_invtable_view('invcellularlte', '.networking.cellular:', _('Cellular (LTE)'), _('Cellular (LTE)'))