From 77a450a60db1aa0c5f5c29ebde506f8d16e580af Mon Sep 17 00:00:00 2001
From: ale <ale@incal.net>
Date: Tue, 20 Dec 2022 11:40:39 +0000
Subject: [PATCH] Set all ai3-prober timeouts to 10s
---
roles/ai3-prober/defaults/main.yml | 4 ++++
roles/ai3-prober/templates/blackbox.yml.j2 | 22 +++++++++++-----------
2 files changed, 15 insertions(+), 11 deletions(-)
create mode 100644 roles/ai3-prober/defaults/main.yml
diff --git a/roles/ai3-prober/defaults/main.yml b/roles/ai3-prober/defaults/main.yml
new file mode 100644
index 00000000..754d358b
--- /dev/null
+++ b/roles/ai3-prober/defaults/main.yml
@@ -0,0 +1,4 @@
+---
+
+ai3_prober_timeout: "10s"
+
diff --git a/roles/ai3-prober/templates/blackbox.yml.j2 b/roles/ai3-prober/templates/blackbox.yml.j2
index 23327b14..e6a02b4e 100644
--- a/roles/ai3-prober/templates/blackbox.yml.j2
+++ b/roles/ai3-prober/templates/blackbox.yml.j2
@@ -5,7 +5,7 @@ modules:
{% for custom_probe in ai3_prober_http_probes | default([]) %}
{{ custom_probe.name }}:
prober: http
- timeout: 5s
+ timeout: {{ ai3_prober_timeout }}
http:
valid_status_codes: [200, 301, 302, 307]
method: GET
@@ -27,7 +27,7 @@ modules:
# Generic https probe, not bound to frontends and no SNI/vhost selection.
https:
prober: http
- timeout: 5s
+ timeout: {{ ai3_prober_timeout }}
http:
valid_status_codes: [200, 301, 302, 307, 401]
method: GET
@@ -42,7 +42,7 @@ modules:
# Generic (enforced) http
http:
prober: http
- timeout: 5s
+ timeout: {{ ai3_prober_timeout }}
http:
valid_status_codes: [200, 301, 302, 307]
method: GET
@@ -54,7 +54,7 @@ modules:
# Standard protocol-oriented probes.
imap_starttls:
prober: tcp
- timeout: 5s
+ timeout: {{ ai3_prober_timeout }}
tcp:
preferred_ip_protocol: ip4
query_response:
@@ -69,7 +69,7 @@ modules:
imap_tls:
prober: tcp
- timeout: 5s
+ timeout: {{ ai3_prober_timeout }}
tcp:
tls: true
preferred_ip_protocol: ip4
@@ -80,7 +80,7 @@ modules:
smtp_starttls:
prober: tcp
- timeout: 5s
+ timeout: {{ ai3_prober_timeout }}
tcp:
preferred_ip_protocol: ip4
query_response:
@@ -98,7 +98,7 @@ modules:
smtp_tls:
prober: tcp
- timeout: 5s
+ timeout: {{ ai3_prober_timeout }}
tcp:
tls: true
preferred_ip_protocol: ip4
@@ -110,7 +110,7 @@ modules:
irc_tls:
prober: tcp
- timeout: 5s
+ timeout: {{ ai3_prober_timeout }}
tcp:
tls: true
preferred_ip_protocol: ip4
@@ -122,7 +122,7 @@ modules:
{% set ip4_hosts = services['frontend'].hosts | map('extract', hostvars) | map(attribute='ips') | flatten | ansible.netcommon.ipv4 | list %}
dns_frontend_a:
prober: dns
- timeout: 10s
+ timeout: {{ ai3_prober_timeout }}
dns:
query_name: "autistici.org"
query_type: "A"
@@ -134,7 +134,7 @@ modules:
dns_accounts_cname:
prober: dns
- timeout: 10s
+ timeout: {{ ai3_prober_timeout }}
dns:
query_name: "accounts.autistici.org"
query_type: "CNAME"
@@ -148,7 +148,7 @@ modules:
{% if ip6_hosts %}
dns_frontend_aaaa:
prober: dns
- timeout: 10s
+ timeout: {{ ai3_prober_timeout }}
dns:
query_name: "autistici.org"
query_type: "AAAA"
--
GitLab