From 88e368385f19465b5223fe2cd2d533d626693082 Mon Sep 17 00:00:00 2001
From: "th.l" <thl-cmk@outlook.com>
Date: Sun, 30 Mar 2025 17:07:04 +0200
Subject: [PATCH] modified for check APIv2

---
 README.md                                     |   2 +-
 mkp/huawei_bgp_peer-1.0.1-20250329.mkp        | Bin 0 -> 3321 bytes
 .../bgp_peer}/agent_based/huawei_bgp_peer.py  |  18 +++++++++---------
 source/packages/huawei_bgp_peer               |  10 +++++-----
 4 files changed, 15 insertions(+), 15 deletions(-)
 create mode 100644 mkp/huawei_bgp_peer-1.0.1-20250329.mkp
 rename source/{ => cmk_addons_plugins/bgp_peer}/agent_based/huawei_bgp_peer.py (97%)

diff --git a/README.md b/README.md
index 0e28bcc..1e23994 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-[PACKAGE]: ../../raw/master/mkp/huawei_bgp_peer-1.0.0-20230613.mkp "huawei_bgp_peer-1.0.0-20230613.mkp"
+[PACKAGE]: ../../raw/master/mkp/huawei_bgp_peer-1.0.1-20250329.mkp "huawei_bgp_peer-1.0.1-20250329.mkp"
 # Huawei BGP Peer
 Monitors status of Huawei BGP peers (HUAWEI-BGP-VPN-MIB)
 
diff --git a/mkp/huawei_bgp_peer-1.0.1-20250329.mkp b/mkp/huawei_bgp_peer-1.0.1-20250329.mkp
new file mode 100644
index 0000000000000000000000000000000000000000..c5763b1b75ee5fdb4ba2b30d6ccc39088210dec8
GIT binary patch
literal 3321
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

literal 0
HcmV?d00001

diff --git a/source/agent_based/huawei_bgp_peer.py b/source/cmk_addons_plugins/bgp_peer/agent_based/huawei_bgp_peer.py
similarity index 97%
rename from source/agent_based/huawei_bgp_peer.py
rename to source/cmk_addons_plugins/bgp_peer/agent_based/huawei_bgp_peer.py
index fe920c2..347093f 100644
--- a/source/agent_based/huawei_bgp_peer.py
+++ b/source/cmk_addons_plugins/bgp_peer/agent_based/huawei_bgp_peer.py
@@ -11,13 +11,15 @@
 #
 # Monitor status of Huawei BGP Peers (IPv4 and IPv6)
 #
+
 # 2020-07-20: added BGP prefix counter
 # 2022-04-30: code cleanup/streamlining
 # 2022-05-09: added item to BgpPeer class, this is used in the discovery function
 # 2022-05-11: changed bgp_get_peer_entry to get proper parameters instead of Nontransparent list
 #             added remote_as to BgpPeerItem
 # 2022-05-12: changed IPv6 address format to lower case as required by rfc5952 section-4.3 (this affects IPv6 peers)
-# 2023-06-13: moved metrics definition to to bgp_peer base plugin
+# 2023-06-13: moved metrics definition to bgp_peer base plugin
+# 2025-03-29: moved to check APIv2 to prepare for CMK2.4
 
 # snmpwalk sample
 # .1.3.6.1.4.1.2011.5.25.177.1.1.2.1.1.0.2.1.2.16.32.32.9.200.0.2.0.1.0.0.0.0.31.100.0.7 = Gauge32: 4
@@ -63,19 +65,17 @@
 
 from typing import List, Dict
 
-from cmk.base.plugins.agent_based.agent_based_api.v1 import (
-    register,
+from cmk.agent_based.v2 import (
+    SNMPSection,
     SNMPTree,
+    StringTable,
     OIDEnd,
     startswith,
 )
-from cmk.base.plugins.agent_based.agent_based_api.v1.type_defs import (
-    StringTable,
-)
 
-from cmk.base.plugins.agent_based.utils.bgp_peer import (
-    bgp_get_ip_address_from_oid,
+from cmk_addons.plugins.bgp_peer.lib.bgp_peer import (
     BgpPeer,
+    bgp_get_ip_address_from_oid,
     bgp_get_peer_entry,
 )
 
@@ -181,7 +181,7 @@ def parse_huawei_bgp_peer(string_table: List[StringTable]) -> Dict[str, BgpPeer]
     return peer_table
 
 
-register.snmp_section(
+snmp_section_huawei_bgp_peer = SNMPSection(
     name='huawei_bgp_peer',
     parse_function=parse_huawei_bgp_peer,
     parsed_section_name='bgp_peer',
diff --git a/source/packages/huawei_bgp_peer b/source/packages/huawei_bgp_peer
index 055e66f..ac5fdac 100644
--- a/source/packages/huawei_bgp_peer
+++ b/source/packages/huawei_bgp_peer
@@ -13,10 +13,10 @@
                 '(https://thl-cmk.hopto.org/gitlab/checkmk/vendor-independent/bgp_peer)\n'
                 ' \n',
  'download_url': 'https://thl-cmk.hopto.org/gitlab/checkmk/huawei/huawei_bgp_peer',
- 'files': {'agent_based': ['huawei_bgp_peer.py']},
+ 'files': {'cmk_addons_plugins': ['bgp_peer/agent_based/huawei_bgp_peer.py']},
  'name': 'huawei_bgp_peer',
  'title': 'Huawei BGP Peer',
- 'version': '1.0.0-20230613',
- 'version.min_required': '2.1.0b1',
- 'version.packaged': '2.2.0p24',
- 'version.usable_until': None}
+ 'version': '1.0.1-20250329',
+ 'version.min_required': '2.3.0b1',
+ 'version.packaged': 'cmk-mkp-tool 0.2.0',
+ 'version.usable_until': '2.5.0b1'}
-- 
GitLab