From 50c1991c6fc7ef0bf401d404ccf47f788135d4da Mon Sep 17 00:00:00 2001
From: "th.l" <thl-cmk@outlook.com>
Date: Wed, 29 Sep 2021 08:06:21 +0200
Subject: [PATCH] update project
---
CONTRIBUTING.md | 19 +++++++++++++++++++
README.md | 3 +++
agent_based/if64name.py | 13 ++++++++++---
if64name.mkp | Bin 1757 -> 1814 bytes
packages/if64name | 4 ++--
5 files changed, 34 insertions(+), 5 deletions(-)
create mode 100644 CONTRIBUTING.md
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
new file mode 100644
index 0000000..ec31a21
--- /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.9.9.147.1.2.1.1.1 >> hostname.snmpwalk
+```
diff --git a/README.md b/README.md
index c373868..e98aeca 100644
--- a/README.md
+++ b/README.md
@@ -6,6 +6,9 @@ This snmp section/parse function extends the if64 check by replacing ifDescr wit
---
+#### Want to contribute?
+Nice ;-) Have a look at the [contribution guidelines](CONTRIBUTING.md "Contributing")
+---
Sample output
| | original if64 | modifiyed if64name |
diff --git a/agent_based/if64name.py b/agent_based/if64name.py
index d5405eb..84f89b9 100644
--- a/agent_based/if64name.py
+++ b/agent_based/if64name.py
@@ -4,7 +4,14 @@
# This file is part of Checkmk (https://checkmk.com). It is subject to the terms and
# conditions defined in the file COPYING, which is part of this source code package.
-# 2021-07-01: extended if64 to use ifNAme instead of ifDescr
+# Author: thl-cmk[at]outlook[dot]com
+# URL : https://thl-cmk.hopto.org
+# Date : 2021-07-01
+
+# extended if64 to use ifNAme instead of ifDescr
+#
+# 2021-0929: fixed empty interface name handling
+#
from typing import (
@@ -50,7 +57,7 @@ def _get_short_if_name(ifname: str) -> str:
def parse_if64name(string_table: List[type_defs.StringByteTable]) -> interfaces.Section:
for interface in string_table[0]:
- if interface[-1] is not '':
+ if interface[-1] != '':
interface[1] = interface[-1] # replace ifDescr with ifName (.1.3.6.1.2.1.31.1.1.1.1)
interface[1] = _get_short_if_name(interface[1]) # ifDescr (.1.3.6.1.2.1.2.2.1.2)
interface.pop() # remove last entry from interfaces (ifName) -> return original if64 format
@@ -68,5 +75,5 @@ register.snmp_section(
),
],
detect=if64.HAS_ifHCInOctets,
- supersedes=['if', 'statgrab_net', 'if64'],
+ supersedes=['if', 'statgrab_net', 'if64', 'interfaces'],
)
diff --git a/if64name.mkp b/if64name.mkp
index 2f0fb20ddbea5e17ae58aaa05ecf3a6a7212af81..5fca8de45829d403b0c59c901700cbe257005add 100644
GIT binary patch
literal 1814
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
literal 1757
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
diff --git a/packages/if64name b/packages/if64name
index 3f7f08f..e5134e5 100644
--- a/packages/if64name
+++ b/packages/if64name
@@ -11,7 +11,7 @@
'name': 'if64name',
'num_files': 1,
'title': 'ifName extension for if64',
- 'version': '20210704_v0.0.1',
+ 'version': '20210929.v0.0.1a',
'version.min_required': '2.0.0',
- 'version.packaged': '2021.04.10',
+ 'version.packaged': '2021.09.20',
'version.usable_until': None}
\ No newline at end of file
--
GitLab