diff --git a/agent_based/inv_checkpoint_support.py b/agent_based/inv_checkpoint_support.py index 70f3305cce6d4a3a6a96599d0cee695a85160420..c6ba091a0b19349fc192fff0dec920d80d06df1d 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 Binary files a/inv_checkpoint_support.mkp and b/inv_checkpoint_support.mkp differ diff --git a/packages/inv_checkpoint_support b/packages/inv_checkpoint_support index 046d1265b58d3f8886bb4912f0a003bd1cf55b8c..ed08c2ca26e6cdf6ea7a60fd877db505b412cdf0 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 e9969f0ae019d3dc53045072f232a5823a6d265a..40a1077b76b38e6aabca45bdf72ac58cbc5d13d2 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 +)