From 289fad3d2efb2284e92ab337574b6c8a5d47f37b Mon Sep 17 00:00:00 2001
From: "th.l" <thl-cmk@outlook.com>
Date: Fri, 23 Jul 2021 16:32:12 +0200
Subject: [PATCH] update project

---
 CONTRIBUTING.md                    |  19 +++++++++++++++++++
 README.md                          |   7 ++++++-
 agent_based/inv_checkpoint_base.py |   6 +++---
 inv_checkpoint_base.mkp            | Bin 2345 -> 2374 bytes
 packages/inv_checkpoint_base       |   2 +-
 5 files changed, 29 insertions(+), 5 deletions(-)
 create mode 100644 CONTRIBUTING.md

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
new file mode 100644
index 0000000..1b83d04
--- /dev/null
+++ b/CONTRIBUTING.md
@@ -0,0 +1,19 @@
+# Contributing
+
+If you have any issues or ideas for improvement you can send me an email to _thl-cmk[at]outlook[dot]com_.
+
+For some fixes/improvements I migth need a _snmpwalk_ fom the device in question.
+This must contain
+
+- .1.3.6.1.2.1.1.1 sysDescr 
+- .1.3.6.1.2.1.1.2 sysObjectID
+
+and all the SNMP OIDs used in the plugin.
+
+If you run the _snmpwalk_ command, please uses these options _**-ObentU**_ in addition to your snmp options like community, version etc.
+For example:
+```
+snmpwalk -v2c -c public -ObentU 10.10.10.10 .1.3.6.1.2.1.1.1 > hostname.snmpwalk
+snmpwalk -v2c -c public -ObentU 10.10.10.10 .1.3.6.1.2.1.1.2 >> hostname.snmpwalk
+snmpwalk -v2c -c public -ObentU 10.10.10.10 .1.3.6.1.4.1.2620.1.6 >> hostname.snmpwalk
+```
diff --git a/README.md b/README.md
index 8f1f44f..9e23f50 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# inventory of Check Point Hardware Appliances
+# inventory of Check Point Hardware Appliances [(Download the MKP package)](/../../../-/raw/master/inv_checkpoint_base.mkp "Download MKP package")
 
 **Note: this package is for CheckMK version 2.x. For other versions see the corresponding branch.**
 
@@ -8,5 +8,10 @@ adds the following to the inventory:
 * Deployment agent version, SVN version, OS name, version and build
 * Hostlabel "checkpoint/device_type:maestro" if its find a Check Point Maestro SMO system
 
+---
+#### Want to contribute?
+Nice ;-) Have a look at the [contribution guidelines](CONTRIBUTING.md "Contributing")
+---
+
 Here is a sample inventory
 ![sample Check point inventory](/doc/sample.png?raw=true "sample Check Point inventory")
diff --git a/agent_based/inv_checkpoint_base.py b/agent_based/inv_checkpoint_base.py
index 53215a7..ceda8da 100644
--- a/agent_based/inv_checkpoint_base.py
+++ b/agent_based/inv_checkpoint_base.py
@@ -29,12 +29,12 @@
 
 from typing import List, NamedTuple
 
-from .agent_based_api.v1.type_defs import (
+from cmk.base.plugins.agent_based.agent_based_api.v1.type_defs import (
     HostLabelGenerator,
     StringTable,
     InventoryResult,
 )
-from .agent_based_api.v1 import (
+from cmk.base.plugins.agent_based.agent_based_api.v1 import (
     Attributes,
     HostLabel,
     register,
@@ -95,7 +95,7 @@ def parse_inv_checkpoint_base(string_table: List[StringTable]) -> List:
 def host_label_inv_checkpoint_base(section: List) -> HostLabelGenerator:
     for invPath, key, value in section:
         if key == 'appliance_series' and value.lower() == 'maestro':
-            yield HostLabel('checkpoint/device_type', 'maestro')
+            yield HostLabel('checkpoint/device_type', 'maestro_security_group')
 
 
 def inventory_checkpoint_base(section: List) -> InventoryResult:
diff --git a/inv_checkpoint_base.mkp b/inv_checkpoint_base.mkp
index e57b660a64ad5e96e37d8730915c1b97b205d479..e31aaddcfce0c4bf175ef0d8df63837a49777426 100644
GIT binary patch
delta 2307
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

delta 2275
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

diff --git a/packages/inv_checkpoint_base b/packages/inv_checkpoint_base
index b357c7a..947af7b 100644
--- a/packages/inv_checkpoint_base
+++ b/packages/inv_checkpoint_base
@@ -13,5 +13,5 @@
  'title': 'Check Point appliance base inventory plugin',
  'version': '20210318.v.0.1a',
  'version.min_required': '2.0.0b8',
- 'version.packaged': '2.0.0p1',
+ 'version.packaged': '2021.07.14',
  'version.usable_until': None}
\ No newline at end of file
-- 
GitLab