From b0812023abe387c7d7fac861215e554706e7e23a Mon Sep 17 00:00:00 2001 From: "th.l" <thl-cmk@outlook.com> Date: Wed, 30 Nov 2022 21:05:07 +0100 Subject: [PATCH] update project --- agent_based/inv_checkpoint_support.py | 32 +++++++++----------- inv_checkpoint_support.mkp | Bin 2385 -> 2376 bytes packages/inv_checkpoint_support | 4 +-- web/plugins/views/inv_checkpoint_support.py | 2 +- 4 files changed, 18 insertions(+), 20 deletions(-) diff --git a/agent_based/inv_checkpoint_support.py b/agent_based/inv_checkpoint_support.py index 70f3305..c6ba091 100644 --- a/agent_based/inv_checkpoint_support.py +++ b/agent_based/inv_checkpoint_support.py @@ -52,9 +52,9 @@ class CheckpointLicensing(NamedTuple): activationstatus: str -def parse_inv_checkpoint_support(string_table: List[StringTable]) -> List: +def parse_inv_checkpoint_support(string_table: StringTable) -> List: section = [] - for license in string_table[0]: + for license in string_table: license = CheckpointLicensing(*license) if not license.containerck == '': section.append(license) @@ -93,21 +93,19 @@ def inventory_checkpoint_support(section: List) -> InventoryResult: register.snmp_section( name='inv_checkpoint_support', parse_function=parse_inv_checkpoint_support, - fetch=[ - SNMPTree( - base='.1.3.6.1.4.1.2620.1.6.18.2', # CHECKPOINT-MIB::licensingAssetInfo - oids=[ - '1', # licensingAssetAccountId - '2', # licensingAssetPackageDescription - '3', # licensingAssetContainerCK - '4', # Signature key - '5', # licensingAssetContainerSKU - '6', # licensingAssetSupportLevel - '7', # licensingAssetSupportExpiration - '8', # licensingAssetActivationStatus - ] - ), - ], + fetch=SNMPTree( + base='.1.3.6.1.4.1.2620.1.6.18.2', # CHECKPOINT-MIB::licensingAssetInfo + oids=[ + '1', # licensingAssetAccountId + '2', # licensingAssetPackageDescription + '3', # licensingAssetContainerCK + '4', # Signature key + '5', # licensingAssetContainerSKU + '6', # licensingAssetSupportLevel + '7', # licensingAssetSupportExpiration + '8', # licensingAssetActivationStatus + ] + ), detect=any_of( startswith('.1.3.6.1.2.1.1.2.0', '.1.3.6.1.4.1.2620'), # sysObjectID == CheckPoint all_of( diff --git a/inv_checkpoint_support.mkp b/inv_checkpoint_support.mkp index 893e3a9e9fcd52a01647e1a3698998abc10faded..35d4a3b5aa759bf389254c294b8b0e53e1ef4e8a 100644 GIT binary patch delta 2320 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 delta 2325 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 diff --git a/packages/inv_checkpoint_support b/packages/inv_checkpoint_support index 046d126..ed08c2c 100644 --- a/packages/inv_checkpoint_support +++ b/packages/inv_checkpoint_support @@ -8,6 +8,6 @@ 'num_files': 2, 'title': 'Check Point appliance support inventory plugin', 'version': '20210208.v.0.1', - 'version.min_required': '2.0.0b8', - 'version.packaged': '2021.07.14', + 'version.min_required': '2.0.0', + 'version.packaged': '2021.09.20', 'version.usable_until': None} \ No newline at end of file diff --git a/web/plugins/views/inv_checkpoint_support.py b/web/plugins/views/inv_checkpoint_support.py index e9969f0..40a1077 100644 --- a/web/plugins/views/inv_checkpoint_support.py +++ b/web/plugins/views/inv_checkpoint_support.py @@ -29,4 +29,4 @@ declare_invtable_view( '.software.check_point.support:', _('Check Point support'), _('Check Point support'), -) \ No newline at end of file +) -- GitLab