From 87e271fc5ded9b45324a915d1b1733101ff1a024 Mon Sep 17 00:00:00 2001
From: ale <ale@incal.net>
Date: Tue, 3 Jan 2023 00:08:02 +0000
Subject: [PATCH] Parameterize service-prober probing interval
---
roles/service-prober/defaults/main.yml | 7 +++++++
roles/service-prober/vars/main.yml | 20 ++++++++++----------
2 files changed, 17 insertions(+), 10 deletions(-)
create mode 100644 roles/service-prober/defaults/main.yml
diff --git a/roles/service-prober/defaults/main.yml b/roles/service-prober/defaults/main.yml
new file mode 100644
index 00000000..80bbe952
--- /dev/null
+++ b/roles/service-prober/defaults/main.yml
@@ -0,0 +1,7 @@
+---
+
+# Interval and timeouts for service probes
+service_prober_interval: "180s"
+service_prober_timeout: "2m"
+service_prober_roundtrip_timeout: "10m"
+
diff --git a/roles/service-prober/vars/main.yml b/roles/service-prober/vars/main.yml
index da868a9c..0d3bb945 100644
--- a/roles/service-prober/vars/main.yml
+++ b/roles/service-prober/vars/main.yml
@@ -15,8 +15,8 @@ service_prober_config:
# Deliver email from local user to itself.
- name: "email-roundtrip-local/${credentials.username}/${servers}"
type: imap_roundtrip
- timeout: 5m
- interval: 90s
+ timeout: "{{ service_prober_roundtrip_timeout }}"
+ interval: "{{ service_prober_interval }}"
labels:
probeset: custom
loop:
@@ -40,8 +40,8 @@ service_prober_config:
# Deliver email from an external account to a local one.
- name: "email-roundtrip-incoming/${credentials.username}/${servers}"
type: imap_roundtrip
- timeout: 5m
- interval: 90s
+ timeout: "{{ service_prober_roundtrip_timeout }}"
+ interval: "{{ service_prober_interval }}"
labels:
probeset: custom
loop:
@@ -65,8 +65,8 @@ service_prober_config:
# Deliver email from a local account to an external one.
- name: "email-roundtrip-outgoing/${credentials.username}/${servers}"
type: imap_roundtrip
- interval: 90s
- timeout: 5m
+ timeout: "{{ service_prober_roundtrip_timeout }}"
+ interval: "{{ service_prober_interval }}"
labels:
probeset: custom
loop:
@@ -90,8 +90,8 @@ service_prober_config:
# HTTP interaction to log in to accounts.autistici.org and then the webmail.
- name: "pannello/${credentials.username}"
type: http
- interval: 2m
- timeout: 2m
+ timeout: "{{ service_prober_timeout }}"
+ interval: "{{ service_prober_interval }}"
labels:
probeset: custom
loop:
@@ -115,8 +115,8 @@ service_prober_config:
# Noblogs.org login.
- name: "noblogs-login/${noblogs_credentials.username}"
type: http
- interval: 5m
- timeout: 5m
+ timeout: "{{ service_prober_timeout }}"
+ interval: "{{ service_prober_interval }}"
labels:
probeset: custom
loop:
--
GitLab