diff --git a/roles/prometheus/defaults/main.yml b/roles/prometheus/defaults/main.yml index 9d5a35fc8fb794cfb8787e5be7f47e41bd65cb61..e73cd8391aed1f0e1ac814fd2f640c30ebe67d58 100644 --- a/roles/prometheus/defaults/main.yml +++ b/roles/prometheus/defaults/main.yml @@ -97,8 +97,10 @@ blackbox_targets: - lists.archlinux.org:25 geo_dns_geo.mirror.pkgbuild.com_a: "{{ groups['geo_mirrors'] }}" geo_dns_geo.mirror.pkgbuild.com_aaaa: "{{ groups['geo_mirrors'] }}" + geo_dns_geo.mirror.pkgbuild.com_https: "{{ groups['geo_mirrors'] }}" geo_dns_riscv.mirror.pkgbuild.com_a: "{{ groups['geo_mirrors'] }}" geo_dns_riscv.mirror.pkgbuild.com_aaaa: "{{ groups['geo_mirrors'] }}" + geo_dns_riscv.mirror.pkgbuild.com_https: "{{ groups['geo_mirrors'] }}" matrix_metrics_endpoints: - homeserver - appservice diff --git a/roles/prometheus_exporters/templates/blackbox.yml.j2 b/roles/prometheus_exporters/templates/blackbox.yml.j2 index 06751f5774c892d0c4f8da58e47f73d6669436e3..2704edf3dad2a72a2cf0232b77f0f336977297a5 100644 --- a/roles/prometheus_exporters/templates/blackbox.yml.j2 +++ b/roles/prometheus_exporters/templates/blackbox.yml.j2 @@ -47,4 +47,13 @@ modules: validate_answer_rrs: fail_if_not_matches_regexp: - {{ domain | replace('.', '\.') }}\.\t.*\tIN\tAAAA\t({{ hosts | map('extract', hostvars, ['ipv6_address']) | join('|') }}) + geo_dns_{{ domain }}_https: + prober: dns + timeout: 5s + dns: + query_name: {{ domain }} + query_type: HTTPS + validate_answer_rrs: + fail_if_not_matches_regexp: + - {{ domain | replace('.', '\.') }}\.\t.*\tIN\tHTTPS\t1 \. alpn="h2,h3" ipv4hint="({{ hosts | map('extract', hostvars, ['ipv4_address']) | join('|') | replace('.', '\.') }})" ipv6hint="({{ hosts | map('extract', hostvars, ['ipv6_address']) | join('|') }})" {% endfor %}