From 065c47aee2acef4a3cdf52baf6babd9151d49893 Mon Sep 17 00:00:00 2001 From: karpenok Date: Wed, 11 Nov 2026 16:08:38 +0700 Subject: [PATCH] fix(monitoring): copy alerts.yml without jinja2 templating --- .gitea/workflows/ansible-core-mon.yml | 1 + ansible/inventories/prod/host_vars/core-mon.yml | 1 + ansible/roles/core-mon/monitoring/defaults/main.yml | 1 + .../monitoring/{templates/alerts.yml.j2 => files/alerts.yml} | 0 ansible/roles/core-mon/monitoring/tasks/main.yml | 5 +++-- .../roles/core-mon/monitoring/templates/alertmanager.yml.j2 | 1 + ansible/roles/core-mon/monitoring/templates/compose.yaml.j2 | 1 + .../core-mon/monitoring/templates/grafana-datasources.yml.j2 | 1 + .../roles/core-mon/monitoring/templates/prometheus.yml.j2 | 1 + ansible/roles/core-net/traefik/files/dynamic/ntfy.yml | 1 + terraform/netcore/core-mon.tf | 1 + 11 files changed, 12 insertions(+), 2 deletions(-) rename ansible/roles/core-mon/monitoring/{templates/alerts.yml.j2 => files/alerts.yml} (100%) diff --git a/.gitea/workflows/ansible-core-mon.yml b/.gitea/workflows/ansible-core-mon.yml index c7fcf3e..0805ba5 100644 --- a/.gitea/workflows/ansible-core-mon.yml +++ b/.gitea/workflows/ansible-core-mon.yml @@ -38,3 +38,4 @@ jobs: fi chmod -R go-w "${HOME}/homelab-infra" exec bash "${HOME}/homelab-infra/ansible/ci/deploy-machine.sh" core-mon "${{ github.event_name }}" "${{ github.event.before }}" "${{ github.sha }}" + diff --git a/ansible/inventories/prod/host_vars/core-mon.yml b/ansible/inventories/prod/host_vars/core-mon.yml index 71f9b61..01d294b 100644 --- a/ansible/inventories/prod/host_vars/core-mon.yml +++ b/ansible/inventories/prod/host_vars/core-mon.yml @@ -2,3 +2,4 @@ monitoring_dir: /opt/monitoring grafana_domain: "graf.gunihome.ru" ntfy_domain: "ntfy.gunihome.ru" + diff --git a/ansible/roles/core-mon/monitoring/defaults/main.yml b/ansible/roles/core-mon/monitoring/defaults/main.yml index a6ae42d..1b5cfbf 100644 --- a/ansible/roles/core-mon/monitoring/defaults/main.yml +++ b/ansible/roles/core-mon/monitoring/defaults/main.yml @@ -8,3 +8,4 @@ grafana_root_url: "https://graf.gunihome.ru" ntfy_base_url: "https://ntfy.gunihome.ru" ntfy_default_topic: "homelab-alerts" + diff --git a/ansible/roles/core-mon/monitoring/templates/alerts.yml.j2 b/ansible/roles/core-mon/monitoring/files/alerts.yml similarity index 100% rename from ansible/roles/core-mon/monitoring/templates/alerts.yml.j2 rename to ansible/roles/core-mon/monitoring/files/alerts.yml diff --git a/ansible/roles/core-mon/monitoring/tasks/main.yml b/ansible/roles/core-mon/monitoring/tasks/main.yml index 88301db..14ca1cb 100644 --- a/ansible/roles/core-mon/monitoring/tasks/main.yml +++ b/ansible/roles/core-mon/monitoring/tasks/main.yml @@ -27,8 +27,8 @@ mode: "0644" - name: Установить правила алертов Prometheus - ansible.builtin.template: - src: alerts.yml.j2 + ansible.builtin.copy: + src: alerts.yml dest: "{{ monitoring_dir }}/prometheus/alerts.yml" owner: root group: root @@ -62,3 +62,4 @@ ansible.builtin.command: docker compose -f {{ monitoring_dir }}/compose.yaml up -d --remove-orphans register: compose_up changed_when: "'Started' in compose_up.stderr or 'Created' in compose_up.stderr or 'Recreated' in compose_up.stderr or 'Pulled' in compose_up.stderr" + diff --git a/ansible/roles/core-mon/monitoring/templates/alertmanager.yml.j2 b/ansible/roles/core-mon/monitoring/templates/alertmanager.yml.j2 index cd2003a..2def721 100644 --- a/ansible/roles/core-mon/monitoring/templates/alertmanager.yml.j2 +++ b/ansible/roles/core-mon/monitoring/templates/alertmanager.yml.j2 @@ -13,3 +13,4 @@ receivers: webhook_configs: - url: "http://ntfy:80/{{ ntfy_default_topic }}" send_resolved: true + diff --git a/ansible/roles/core-mon/monitoring/templates/compose.yaml.j2 b/ansible/roles/core-mon/monitoring/templates/compose.yaml.j2 index 831253d..4d23e1d 100644 --- a/ansible/roles/core-mon/monitoring/templates/compose.yaml.j2 +++ b/ansible/roles/core-mon/monitoring/templates/compose.yaml.j2 @@ -80,3 +80,4 @@ services: - '--collector.filesystem.mount-points-exclude=^/(sys|proc|dev|host|etc)($$|/)' ports: - "9100:9100" + diff --git a/ansible/roles/core-mon/monitoring/templates/grafana-datasources.yml.j2 b/ansible/roles/core-mon/monitoring/templates/grafana-datasources.yml.j2 index e761ed1..8ef7ddb 100644 --- a/ansible/roles/core-mon/monitoring/templates/grafana-datasources.yml.j2 +++ b/ansible/roles/core-mon/monitoring/templates/grafana-datasources.yml.j2 @@ -8,3 +8,4 @@ datasources: isDefault: true jsonData: timeInterval: 15s + diff --git a/ansible/roles/core-mon/monitoring/templates/prometheus.yml.j2 b/ansible/roles/core-mon/monitoring/templates/prometheus.yml.j2 index abe6268..0227e65 100644 --- a/ansible/roles/core-mon/monitoring/templates/prometheus.yml.j2 +++ b/ansible/roles/core-mon/monitoring/templates/prometheus.yml.j2 @@ -38,3 +38,4 @@ scrape_configs: labels: host: "rus-central" env: "prod" + diff --git a/ansible/roles/core-net/traefik/files/dynamic/ntfy.yml b/ansible/roles/core-net/traefik/files/dynamic/ntfy.yml index 6c1ace7..f1bbf05 100644 --- a/ansible/roles/core-net/traefik/files/dynamic/ntfy.yml +++ b/ansible/roles/core-net/traefik/files/dynamic/ntfy.yml @@ -13,3 +13,4 @@ http: loadBalancer: servers: - url: "http://192.168.1.108:80" + diff --git a/terraform/netcore/core-mon.tf b/terraform/netcore/core-mon.tf index 975016d..020f761 100644 --- a/terraform/netcore/core-mon.tf +++ b/terraform/netcore/core-mon.tf @@ -49,3 +49,4 @@ resource "proxmox_virtual_environment_container" "core_mon" { nesting = true } } +