Update Ansible role for new logging configuration

jgosmann · Feb 17, 2024 · 644d86a · 644d86a
1 parent 6d1720f
commit 644d86a
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 1 deletion.
diff --git a/roles/README.rst b/roles/README.rst
@@ -55,3 +55,4 @@ Available role variables
 * ``folder_error``: (string, default ``"Invalid"``): IMAP mailbox that emails are moved to that could not be processed.
 * ``poll_interval_seconds`` (number, default ``60``): How often to poll the IMAP server in seconds.
 * ``deduplication_max_seconds`` (number, default ``604800`` which is 7 days): How long individual report IDs will be remembered to avoid counting double delivered reports twice.
+* ``logging_config`` (map, default ``{}``): Logging configuration, see main documentation for details.
diff --git a/roles/dmarc_metrics_exporter/defaults/main.yml b/roles/dmarc_metrics_exporter/defaults/main.yml
@@ -13,6 +13,8 @@ imap_verify_certificate: yes
 poll_interval_seconds: 60
 deduplication_max_seconds: 604800
 
+logging_config: {}
+
 folder_inbox: "INBOX"
 folder_done: "Archive"
 folder_error: "Invalid"
diff --git a/roles/dmarc_metrics_exporter/templates/dmarc-metrics-exporter.json.j2 b/roles/dmarc_metrics_exporter/templates/dmarc-metrics-exporter.json.j2
@@ -16,5 +16,6 @@
     },
     "storage_path": "/var/lib/dmarc-metrics-exporter",
     "poll_interval_seconds": {{ poll_interval_seconds }},
-    "deduplication_max_seconds": {{ deduplication_max_seconds }}
+    "deduplication_max_seconds": {{ deduplication_max_seconds }},
+    "logging": {{ logging_config | to_json }}
 }