T6949: moves config file to /run

vyos · Dec 26, 2024 · 28bf471 · 28bf471
1 parent 54e2e6b
commit 28bf471
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/data/templates/prometheus/blackbox_exporter.service.j2 b/data/templates/prometheus/blackbox_exporter.service.j2
@@ -16,6 +16,6 @@ ExecStart={{ vrf_command }}/usr/sbin/blackbox_exporter \
 {% else %}
         --web.listen-address=:{{ port }} \
 {% endif %}
-        --config.file=/etc/blackbox_exporter/config.yml
+        --config.file=/run/blackbox_exporter/config.yml
 [Install]
 WantedBy=multi-user.target
diff --git a/data/templates/prometheus/blackbox_exporter.yml.j2 b/data/templates/prometheus/blackbox_exporter.yml.j2
@@ -17,7 +17,7 @@ modules:
     prober: icmp
     timeout: {{ module_config.timeout }}s
     icmp:
-      preferred_ip_protocol: "{{ module_config.preferred_ip_protocol | replace('v', '')  }}"
+      preferred_ip_protocol: "{{ module_config.preferred_ip_protocol | replace('v', '') }}"
       ip_protocol_fallback: {{ 'true' if module_config.ip_protocol_fallback is vyos_defined else 'false' }}
 {%     endfor %}
 {% endif %}
diff --git a/src/conf_mode/service_monitoring_prometheus.py b/src/conf_mode/service_monitoring_prometheus.py
@@ -129,7 +129,7 @@ def generate(monitoring):
         )
         # Render blackbox_exporter config file
         render(
-            '/etc/blackbox_exporter/config.yml',
+            '/run/blackbox_exporter/config.yml',
             'prometheus/blackbox_exporter.yml.j2',
             monitoring['blackbox_exporter'],
         )