From f0baf7f53c643a7eaa0e0bf46788d455d54e9a54 Mon Sep 17 00:00:00 2001
From: auricom <27022259+auricom@users.noreply.github.com>
Date: Mon, 27 Jan 2025 11:48:31 +0100
Subject: [PATCH] fix(validators): penumbra alerts

---
 ansible_collections/validators/galaxy.yml              |  2 +-
 .../validators/roles/chain_penumbra/tasks/main.yml     |  2 +-
 .../roles/chain_penumbra/templates/appd-alerts.yml.j2  | 10 +++++-----
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/ansible_collections/validators/galaxy.yml b/ansible_collections/validators/galaxy.yml
index a380de6..d8c2661 100644
--- a/ansible_collections/validators/galaxy.yml
+++ b/ansible_collections/validators/galaxy.yml
@@ -9,7 +9,7 @@ namespace: binarybuilders
 name: validators
 
 # The version of the collection. Must be compatible with semantic versioning
-version: 1.6.2
+version: 1.6.3
 
 # The path to the Markdown (.md) readme file. This path is relative to the root of the collection
 readme: README.md
diff --git a/ansible_collections/validators/roles/chain_penumbra/tasks/main.yml b/ansible_collections/validators/roles/chain_penumbra/tasks/main.yml
index 400916e..29bffc7 100644
--- a/ansible_collections/validators/roles/chain_penumbra/tasks/main.yml
+++ b/ansible_collections/validators/roles/chain_penumbra/tasks/main.yml
@@ -77,7 +77,7 @@
 - name: Appd | Deploy global alerts
   when: chain_penumbra_alerts is defined and chain_penumbra_alerts | bool
   ansible.builtin.template:
-    src: appd-alerts.yml.yml.j2
+    src: appd-alerts.yml.j2
     dest: "{{ chain_penumbra_vmalert_config_path }}/penumbra-validator-{{ chain_penumbra_chain_id }}.yml"
     mode: "0644"
   delegate_to: observability
diff --git a/ansible_collections/validators/roles/chain_penumbra/templates/appd-alerts.yml.j2 b/ansible_collections/validators/roles/chain_penumbra/templates/appd-alerts.yml.j2
index 267cccf..a8d1163 100644
--- a/ansible_collections/validators/roles/chain_penumbra/templates/appd-alerts.yml.j2
+++ b/ansible_collections/validators/roles/chain_penumbra/templates/appd-alerts.yml.j2
@@ -1,13 +1,13 @@
 groups:
-  - name: penumbra - {{ chain_penumbra_appd_name }} - {{ chain_id }}
+  - name: penumbra - {{ chain_penumbra_appd_name }} - {{ chain_penumbra_chain_id }}
     rules:
 
     - alert: InstanceDown
-      expr: up{job="prometheus.scrape.cosmos_validator_watcher_{{ chain_id | replace('-', '_') }}"} == 0
+      expr: up{job="prometheus.scrape.penumbra_{{ chain_penumbra_appd_name }}_{{ chain_penumbra_chain_id | replace('-', '_') }}"} == 0
       for: 3m
       annotations:
-        title: "Instance prometheus.scrape.cosmos_validator_watcher_{{ chain_id | replace('-', '_') }} down"
-        description: "prometheus.scrape.cosmos_validator_watcher_{{ chain_id | replace('-', '_') }} has been down for more than 3 minutes"
+        title: "Instance prometheus.scrape.penumbra_{{ chain_penumbra_appd_name }}_{{ chain_penumbra_chain_id | replace('-', '_') }} down"
+        description: "Prometheus instance has been down for more than 3 minutes"
       labels:
         severity: critical
         service: validator
@@ -21,4 +21,4 @@ groups:
         service: validator
         component: penumbra-pd
       annotations:
-        description: "Chain `{{ chain_id }}` validator  is missing `{{ $value }}` blocks!{% endraw %}"
+        description: "Chain `{{ chain_penumbra_chain_id }}` validator  is missing {% raw %}`{{ $value }}` blocks!{% endraw %}"