From 3fd0d5ae80c772ce6ef95483aa2b18d0137a4753 Mon Sep 17 00:00:00 2001
From: "th.l" <thl-cmk@outlook.com>
Date: Sat, 21 Oct 2023 20:39:12 +0200
Subject: [PATCH] update project
---
README.md | 1 +
agent_based/if64name.py | 27 +++++++++++++--------------
mkp/if64name-0.0.3-20231021.mkp | Bin 0 -> 1727 bytes
packages/if64name | 8 ++++----
4 files changed, 18 insertions(+), 18 deletions(-)
create mode 100644 mkp/if64name-0.0.3-20231021.mkp
diff --git a/README.md b/README.md
index 2ab2b2a..9452262 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,4 @@
+[PACKAGE]: ../../raw/master/mkp/if64name-0.0.3-20231021.mkp "if64name-0.0.3-20231021.mkp"
# if64name
This is a extension for the _if64_ check. It will replace _ifDescr_ with _ifName_ if available.\
diff --git a/agent_based/if64name.py b/agent_based/if64name.py
index 4e8eaa1..6809781 100644
--- a/agent_based/if64name.py
+++ b/agent_based/if64name.py
@@ -11,16 +11,11 @@
#
# 2021-09-29: fixed empty interface name handling
# 2023-03-02: changed for CMK 2.1.x
-#
-
-from typing import (
- List,
-)
+# 2023-10-21: added if_fortigate to supersedes list
from cmk.base.plugins.agent_based.agent_based_api.v1 import (
register,
SNMPTree,
- type_defs,
)
from cmk.base.plugins.agent_based.agent_based_api.v1.type_defs import (
@@ -48,9 +43,13 @@ _interface_displayhints = {
def _get_short_if_name(ifname: str) -> str:
"""
- returns short interface name from long interface name
- ifname: is the long interface name
- :type ifname: str
+ returns a short interface name from a long interface name
+ If no short name is found, the long name (ifname) will be returned
+ Args:
+ ifname: is the long interface name
+
+ Returns:
+ str: the short interface name as string
"""
for ifname_prefix in _interface_displayhints.keys():
@@ -73,10 +72,10 @@ register.snmp_section(
name='if64name',
parsed_section_name='if64',
parse_function=parse_if64name,
- fetch= SNMPTree(
- base=if64.BASE_OID,
- oids=if64.END_OIDS + ['31.1.1.1.1'] # IF-MIB::ifName,
- ),
+ 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'],
+ supersedes=['if64', 'if', 'statgrab_net', 'if_fortigate'],
)
diff --git a/mkp/if64name-0.0.3-20231021.mkp b/mkp/if64name-0.0.3-20231021.mkp
new file mode 100644
index 0000000000000000000000000000000000000000..588db7a3409d5b83751669b208a7cd0567e3c738
GIT binary patch
literal 1727
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
V1qB5K1%-c%KLGqOXD<Ly006eyM8W_7
literal 0
HcmV?d00001
diff --git a/packages/if64name b/packages/if64name
index 3f97a05..274a168 100644
--- a/packages/if64name
+++ b/packages/if64name
@@ -10,7 +10,7 @@
'files': {'agent_based': ['if64name.py']},
'name': 'if64name',
'title': 'ifName extension for if64',
- 'version': '0.0.2-20230603',
- 'version.min_required': '2.1.0',
- 'version.packaged': '2.1.0p21',
- 'version.usable_until': None}
\ No newline at end of file
+ 'version': '0.0.3-20231021',
+ 'version.min_required': '2.1.0b1',
+ 'version.packaged': '2.2.0p11',
+ 'version.usable_until': None}
--
GitLab