From d1fcabcf732103767f726cfbff3ff197b9beae36 Mon Sep 17 00:00:00 2001
From: OMD site cmk16x <thl-cmk@outlook.com>
Date: Thu, 2 Mar 2023 20:05:05 +0100
Subject: [PATCH] update project
---
CHANGELOG | 2 ++
agent_based/if64name.py | 16 ++++++++++------
if64name.mkp | Bin 1701 -> 1684 bytes
packages/if64name | 7 +++----
4 files changed, 15 insertions(+), 10 deletions(-)
diff --git a/CHANGELOG b/CHANGELOG
index 37ad84a..42097ea 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1 +1,3 @@
2021-07-01: extended if64 to use ifName instead of ifDescr
+2021-09-29: fixed empty interface name handling
+2023-03-02: changed for CMK 2.1.x
diff --git a/agent_based/if64name.py b/agent_based/if64name.py
index 7d43239..4e8eaa1 100644
--- a/agent_based/if64name.py
+++ b/agent_based/if64name.py
@@ -9,7 +9,8 @@
#
# extended if64 to use ifNAme instead of ifDescr
#
-# 2021-0929: fixed empty interface name handling
+# 2021-09-29: fixed empty interface name handling
+# 2023-03-02: changed for CMK 2.1.x
#
from typing import (
@@ -21,6 +22,11 @@ from cmk.base.plugins.agent_based.agent_based_api.v1 import (
SNMPTree,
type_defs,
)
+
+from cmk.base.plugins.agent_based.agent_based_api.v1.type_defs import (
+ StringByteTable,
+)
+
from cmk.base.plugins.agent_based.utils import if64, interfaces
_interface_displayhints = {
@@ -54,8 +60,8 @@ def _get_short_if_name(ifname: str) -> str:
return ifname
-def parse_if64name(string_table: List[type_defs.StringByteTable]) -> interfaces.Section:
- for interface in string_table[0]:
+def parse_if64name(string_table: StringByteTable) -> interfaces.Section:
+ for interface in string_table:
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)
@@ -67,12 +73,10 @@ register.snmp_section(
name='if64name',
parsed_section_name='if64',
parse_function=parse_if64name,
- fetch=[
- SNMPTree(
+ fetch= SNMPTree(
base=if64.BASE_OID,
oids=if64.END_OIDS + ['31.1.1.1.1'] # IF-MIB::ifName,
),
- ],
detect=if64.HAS_ifHCInOctets,
supersedes=['if64', 'interfaces', 'if', 'statgrab_net'],
)
diff --git a/if64name.mkp b/if64name.mkp
index 79a70c620aa33e3724203e5a29f0e012a7e6585f..fdc43713dcd039be9de28dc6eb5d12426841419b 100644
GIT binary patch
literal 1684
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
arPzntuN)fwAAJg^BHeLS(gH350{;Qt^g_k}
literal 1701
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
diff --git a/packages/if64name b/packages/if64name
index e5134e5..5fda380 100644
--- a/packages/if64name
+++ b/packages/if64name
@@ -9,9 +9,8 @@
'download_url': 'https://thl-cmk.hopto.org',
'files': {'agent_based': ['if64name.py']},
'name': 'if64name',
- 'num_files': 1,
'title': 'ifName extension for if64',
- 'version': '20210929.v0.0.1a',
- 'version.min_required': '2.0.0',
- 'version.packaged': '2021.09.20',
+ 'version': '20230302.v0.0.2',
+ 'version.min_required': '2.1.0',
+ 'version.packaged': '2.1.0p22',
'version.usable_until': None}
\ No newline at end of file
--
GitLab