diff options
| author | Christian Breunig <christian@breunig.cc> | 2025-09-08 21:54:03 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-09-08 21:54:03 +0200 |
| commit | 8822c569cf151fcc896732fa32acc04ac7193cf0 (patch) | |
| tree | 0273e47547b3749c3d29e3ff69cfb1b737a5712a | |
| parent | a4b72d3839f2ee05456b0677a8f2cc27c04a9423 (diff) | |
| parent | 5663a2d894dd016e5f607d309457b7d48137d42d (diff) | |
| download | vyos-1x-8822c569cf151fcc896732fa32acc04ac7193cf0.tar.gz vyos-1x-8822c569cf151fcc896732fa32acc04ac7193cf0.zip | |
Merge pull request #4701 from ratatoskr-org/T7794-fix-prometheus-exporters-invalid-ipv6-listen-address
Monitoring: T7794: Fixed blackbox_exporter, frr_exporter, node_exporter IPv6 listen-address invalid format
| -rw-r--r-- | data/templates/prometheus/blackbox_exporter.service.j2 | 2 | ||||
| -rw-r--r-- | data/templates/prometheus/frr_exporter.service.j2 | 2 | ||||
| -rw-r--r-- | data/templates/prometheus/node_exporter.service.j2 | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/data/templates/prometheus/blackbox_exporter.service.j2 b/data/templates/prometheus/blackbox_exporter.service.j2 index e93030246..0b846ab73 100644 --- a/data/templates/prometheus/blackbox_exporter.service.j2 +++ b/data/templates/prometheus/blackbox_exporter.service.j2 @@ -11,7 +11,7 @@ User=node_exporter ExecStart={{ vrf_command }}/usr/sbin/blackbox_exporter \ {% if listen_address is vyos_defined %} {% for address in listen_address %} - --web.listen-address={{ address }}:{{ port }} \ + --web.listen-address={{ address | bracketize_ipv6 }}:{{ port }} \ {% endfor %} {% else %} --web.listen-address=:{{ port }} \ diff --git a/data/templates/prometheus/frr_exporter.service.j2 b/data/templates/prometheus/frr_exporter.service.j2 index c3892e42b..e92cfa2dd 100644 --- a/data/templates/prometheus/frr_exporter.service.j2 +++ b/data/templates/prometheus/frr_exporter.service.j2 @@ -11,7 +11,7 @@ User=frr ExecStart={{ vrf_command }}/usr/sbin/frr_exporter \ {% if listen_address is vyos_defined %} {% for address in listen_address %} - --web.listen-address={{ address }}:{{ port }} + --web.listen-address={{ address | bracketize_ipv6 }}:{{ port }} {% endfor %} {% else %} --web.listen-address=:{{ port }} diff --git a/data/templates/prometheus/node_exporter.service.j2 b/data/templates/prometheus/node_exporter.service.j2 index 9a943cd75..ef2f709b6 100644 --- a/data/templates/prometheus/node_exporter.service.j2 +++ b/data/templates/prometheus/node_exporter.service.j2 @@ -16,7 +16,7 @@ ExecStart={{ vrf_command }}/usr/sbin/node_exporter \ {% endif %} {% if listen_address is vyos_defined %} {% for address in listen_address %} - --web.listen-address={{ address }}:{{ port }} + --web.listen-address={{ address | bracketize_ipv6 }}:{{ port }} {% endfor %} {% else %} --web.listen-address=:{{ port }} |