From eb6ae2a8bc2906181a8b8130d9c225f7def7bfa8 Mon Sep 17 00:00:00 2001 From: Date Huang Date: Thu, 16 Jul 2026 19:46:02 +0800 Subject: T9073: frr-exporter: add CLI support for optional collectors and collector options frr_exporter v1.5.0 enables the bgp, ospf, bfd and route collectors by default, while bgpl2vpn, pim and vrrp must be enabled explicitly. Expose bgpl2vpn (CLI: bgp-l2-vpn) and pim under "service monitoring prometheus frr-exporter collector", following the same CLI style as the node-exporter collectors node. The vrrp collector is not exposed since VyOS implements VRRP with keepalived and FRR's vrrpd is never started. Also expose the collector options available in v1.5.0: - collector bgp accept-filtered-prefixes - collector bgp advertised-prefixes - collector bgp peer-description - collector bgp peer-group - collector bgp peer-hostname - collector bgp peer-type - collector ospf-instance - collector detailed-routes The bgp.* options are shared by the bgp, bgp6 and bgpl2vpn collectors upstream. The bgp6 collector remains unconditionally enabled, hence existing configurations render the same ExecStart and no migration is required. Includes code generated by Claude Code --- .../service_monitoring_prometheus.xml.in | 95 ++++++++++++++++++++++ 1 file changed, 95 insertions(+) (limited to 'interface-definitions') diff --git a/interface-definitions/service_monitoring_prometheus.xml.in b/interface-definitions/service_monitoring_prometheus.xml.in index 8bcebf5f3..4443fde3a 100644 --- a/interface-definitions/service_monitoring_prometheus.xml.in +++ b/interface-definitions/service_monitoring_prometheus.xml.in @@ -47,6 +47,101 @@ 9342 #include + + + Collector specific configuration + + + + + BGP collector specific options + + + + + Enable retrieval of accepted and filtered BGP prefix counts + + + + + + Enable count of advertised prefixes to a BGP peer (for FRR versions without PfxSnt field) + + + + + + Add the BGP peer description as a label to peer metrics + + json plain-text + + + json + Use the value of the desc key from the JSON formatted BGP peer description + + + plain-text + Use the full text of the BGP peer description + + + (json|plain-text) + + + json + + + + Add the peer group name of the BGP peer as a label to peer metrics + + + + + + Add the hostname of the BGP peer as a label to peer metrics + + + + + + Enable metrics for the number of established BGP peers per type, defined by the type key in the JSON formatted peer description + + + + + + + + Enable BGP L2VPN collector + + + + + + OSPF instance ID when using multiple OSPF instances + + u32:1-65535 + OSPF instance ID + + + + + + + + + + Enable PIM collector + + + + + + Enable detailed route count of each route type + + + + + -- cgit v1.2.3