vyos-1x.git/src/conf_mode/service_monitoring_prometheus.py, branch nos-task-id

Merge pull request #5324 from tjjh89017/frr-exporter-collectors

2026-07-20T15:05:37+00:00

T9073: frr-exporter: add CLI support for optional collectors and collector options

2026-07-16T11:46:02+00:00

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

T9002: grant CAP_NET_RAW to blackbox-exporter when ICMP modules are configured

2026-07-02T12:34:17+00:00

The blackbox-exporter runs as node_exporter user which cannot create ICMP sockets due to restricted ping_group_range. Add CAP_NET_RAW capability to the systemd service when ICMP modules are configured. In non-VRF mode, use systemd AmbientCapabilities/CapabilityBoundingSet. In VRF mode, replace runuser with setpriv to preserve the capability across the UID change.

T7528: Fix service monitoring prometheus stops services

2025-07-07T17:23:03+00:00

Fix for service monitoring prometheus stops unconfigured services. Check if the service is in active state before stop it.

T7591: remove copyright years from source files

2025-06-28T21:16:52+00:00

The legal team says years are not necessary so we can go ahead with it, since it will simplify backporting. Automatically removed using: git ls-files | grep -v libvyosconfig | xargs sed -i -E \ 's/^# Copyright (19|20)[0-9]{2}(-[0-9]{4})? VyOS maintainers.*/# Copyright VyOS maintainers and contributors /g' In addition we will error-out during "make" if someone re-adds a legacy copyright notice

prometheus: T7435: Ensure only configured prometheus exporters are started

2025-05-07T08:26:38+00:00

T6994: Add textfile collector config option

2025-01-02T15:30:20+00:00

T6949: adds blackbox exporter (#4255)

2024-12-31T15:39:34+00:00

* T6949: adds blackbox exporter * T6949: adds basic config generation * T6949: extract shared module config options * T6949: switch to ipv4/6 literals * T6949: moves config file to /run * T6949: adds dns query name option * T6949: adds dns query type values * T6949: adds blackbox exporter to debian/control

T6953: simplify config handling

2024-12-20T04:58:46+00:00

T6953: merges node and frr exporter under prometheus section

2024-12-19T09:01:02+00:00