diff --git a/playbooks/filter_plugins/gatus.py b/playbooks/filter_plugins/gatus.py index 08e8568..1eb3ceb 100644 --- a/playbooks/filter_plugins/gatus.py +++ b/playbooks/filter_plugins/gatus.py @@ -75,6 +75,7 @@ class FilterModule(object): "group": mon.get("group"), "url": url, "conditions": conditions, + "interval": mon.get("interval"), "alerts": self.default_alerts, "ui": { "hide-url": True diff --git a/playbooks/roles/forgejo/templates/footer.tmpl.j2 b/playbooks/roles/forgejo/templates/footer.tmpl.j2 index 53fcdad..6a06196 100644 --- a/playbooks/roles/forgejo/templates/footer.tmpl.j2 +++ b/playbooks/roles/forgejo/templates/footer.tmpl.j2 @@ -1 +1,2 @@ + diff --git a/playbooks/roles/forgejo_runner/vars/main.yml b/playbooks/roles/forgejo_runner/vars/main.yml index 19705d3..6fd207d 100644 --- a/playbooks/roles/forgejo_runner/vars/main.yml +++ b/playbooks/roles/forgejo_runner/vars/main.yml @@ -22,6 +22,7 @@ forgejo_runner_compose: docker-in-docker: image: docker:dind privileged: true + dns: 1.1.1.1 restart: always command: dockerd -H tcp://0.0.0.0:2375 --tls=false networks: diff --git a/playbooks/roles/umami/vars/main.yml b/playbooks/roles/umami/vars/main.yml index 092e8c4..48d906d 100644 --- a/playbooks/roles/umami/vars/main.yml +++ b/playbooks/roles/umami/vars/main.yml @@ -10,6 +10,21 @@ umami_docker_image: docker.umami.dev/umami-software/umami:postgresql-latest umami_svc: domain: "{{ all_services | service_get_domain(role_name) }}" + caddy_extra: | + handle /track-external.js { + header Content-Type text/javascript + respond < { + const name = 'outbound-link-click'; + document.querySelectorAll('a').forEach(a => { + if (a.host !== window.location.host && !a.getAttribute('data-umami-event')) { + a.setAttribute('data-umami-event', name); + a.setAttribute('data-umami-event-url', a.href); + } + }); + })(); + JS 200 + } port: 3000 umami_env: diff --git a/variables.tf b/variables.tf index d49b584..acaf01e 100644 --- a/variables.tf +++ b/variables.tf @@ -148,6 +148,7 @@ variable "services" { monitoring = optional(object({ url = optional(string) group = optional(string) + interval = optional(string) conditions = optional(list(string)) })) ports = optional(list(object({