diff --git a/mkp/bgp_topology-0.0.2-20241223.mkp b/mkp/bgp_topology-0.0.2-20241223.mkp index aab7e559ec5897b550f05275b7ade84e77783b3a..bcc2601d6dce4ea0e58a7d9c142f54a9ea44b328 100644 Binary files a/mkp/bgp_topology-0.0.2-20241223.mkp and b/mkp/bgp_topology-0.0.2-20241223.mkp differ diff --git a/source/cmk_addons_plugins/bgp_topology/constants.py b/source/cmk_addons_plugins/bgp_topology/constants.py index 98a65eea645a59296b89ab89e883c80a1785eb7b..9bffb3eae109f114cf46bc75cfcf7e10a37c1bd1 100644 --- a/source/cmk_addons_plugins/bgp_topology/constants.py +++ b/source/cmk_addons_plugins/bgp_topology/constants.py @@ -12,7 +12,7 @@ __AUTHOR__ = 'thl-cmk[at]outlook[dot]com' __URL__ = 'https://thl-cmk.hopto.org/gitlab/checkmk/vendor-independent/bgp_topology' -__USAGE__ = '~/local/lib/python3/cmk_addons/plugins/bgp_topology/libexec/check_bgp_topology --make-default' +__USAGE__ = '~/local/lib/python3/cmk_addons/plugins/bgp_topology/libexec/check_bgp_topology --make-default --host bgp1' __VERSION__ = '0.0.2-20241223' from typing import Final diff --git a/source/cmk_addons_plugins/bgp_topology/lib/bgp_topology.py b/source/cmk_addons_plugins/bgp_topology/lib/bgp_topology.py index 9b5f42d286eae67a0a6519936f681fa866a2c440..fef9111f913df2811d600119cf37eec1beca6cf8 100644 --- a/source/cmk_addons_plugins/bgp_topology/lib/bgp_topology.py +++ b/source/cmk_addons_plugins/bgp_topology/lib/bgp_topology.py @@ -11,6 +11,7 @@ # 2024-07-20: moved to lib -> is now an active check # 2024-12-23: moved arg parser to lib/args.py # fixed handling of anchors +# changed topology name to be always BGP_{host} from collections.abc import MutableMapping, MutableSequence, Sequence from dataclasses import dataclass @@ -18,6 +19,7 @@ from time import time_ns from cmk.agent_based.v2 import render from cmk_addons.plugins.bgp_topology.constants import ( + __VERSION__, BGP_PEER_LOCAL_ADDR, BGP_PEER_LOCAL_AS, BGP_PEER_LOCAL_ID, @@ -151,19 +153,17 @@ def create_bgp_topology(params: Params | None) -> int: objects = TopoObjects() connections = TopoConnections() - sub_directory = TOPOLOGY_NAME + sub_directory = f'{TOPOLOGY_NAME}_{params.host}' ls_connection = LiveStatusConnection() if params.include_sites is not None: ls_connection.filter_sites(include=True, sites=params.include_sites) sites_str: str = ', '.join(params.include_sites) details.append(f'Site(s) included: {sites_str}') - sub_directory = f'{TOPOLOGY_NAME}_{params.host}' elif params.exclude_sites is not None: ls_connection.filter_sites(include=False, sites=params.exclude_sites) sites_str: str = ', '.join(params.exclude_sites) details.append(f'Site(s) excluded: {sites_str}') - sub_directory = f'{TOPOLOGY_NAME}_{params.host}' bgp_anchor = get_anchor(params.bgp_anchor) emblem_as = get_emblem(params.bgp_emblem_as) @@ -263,6 +263,8 @@ def create_bgp_topology(params: Params | None) -> int: summary.append(f'Time taken: {render.timespan(value)}') details.append(f'Time taken: {render.timespan(value)}') + details.append(f'Plugin version: {__VERSION__}') + perf_data = Metric( name=METRIC_TIME_TAKEN, value=value,