T6949: adds dns query name option

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

Hide file tree

Showing 4 changed files with 33 additions and 1 deletion.
diff --git a/data/templates/prometheus/blackbox_exporter.yml.j2 b/data/templates/prometheus/blackbox_exporter.yml.j2
@@ -5,7 +5,7 @@ modules:
     prober: dns
     timeout: {{ module_config.timeout }}s
     dns:
-      query_name: "{{ module_name }}"
+      query_name: "{{ module_config.query_name }}"
       query_type: "{{ module_config.query_type }}"
       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' }}

diff --git a/interface-definitions/service_monitoring_prometheus.xml.in b/interface-definitions/service_monitoring_prometheus.xml.in
@@ -62,6 +62,14 @@
                               <help>Name of the dns module</help>
                             </properties>
                             <children>
+                              <leafNode name="query-name">
+                                <properties>
+                                  <help>Name to be queried</help>
+                                  <constraint>
+                                    <validator name="fqdn"/>
+                                  </constraint>
+                                </properties>
+                              </leafNode>
                               <leafNode name="query-type">
                                 <properties>
                                   <help>DNS query type</help>

diff --git a/smoketest/scripts/cli/test_service_monitoring_prometheus.py b/smoketest/scripts/cli/test_service_monitoring_prometheus.py
@@ -103,6 +103,18 @@ def test_04_blackbox_exporter_with_config(self):
                 'ipv4',
             ]
         )
+        self.cli_set(
+            base_path
+            + [
+                'blackbox-exporter',
+                'modules',
+                'dns',
+                'name',
+                'dns_ip4',
+                'query-name',
+                'vyos.io',
+            ]
+        )
         self.cli_set(
             base_path
             + [

diff --git a/src/conf_mode/service_monitoring_prometheus.py b/src/conf_mode/service_monitoring_prometheus.py
@@ -82,6 +82,18 @@ def verify(monitoring):
     if 'blackbox_exporter' in monitoring:
         verify_vrf(monitoring['blackbox_exporter'])
 
+        if (
+            'modules' in monitoring['blackbox_exporter']
+            and 'dns' in monitoring['blackbox_exporter']['modules']
+        ):
+            for mod_name, mod_config in monitoring['blackbox_exporter'][
+                'modules'
+            ].items():
+                if 'query_name' not in mod_config:
+                    raise ConfigError(
+                        f'query name not specified in dns module {mod_name}'
+                    )
+
     return None