Remove 'instance' from description and fix typos

roles/prometheus/templates/prometheus/alert.rules.yml.j2

@@ -5,8 +5,6 @@
 {{ "{{" }} {{ string }} {{ "}}" }}
 {%- endmacro %}
 
-{% set instance = "[{{ $labels.instance }}]" %}
-
 groups:
   - name: alert.rules
     rules:
@@ -18,7 +16,7 @@ groups:
           severity: critical
         annotations:
           summary: >-
-            {{ instance }} Invisible depuis plus de 3 minutes
+            Invisible depuis plus de 3 minutes
 
       - alert: OutOfMemory
         expr: >-
@@ -32,7 +30,7 @@ groups:
           severity: warning
         annotations:
           summary: >-
-            {{ instance }} {{ raw('$value | printf "%.1f"') }}% de mémoire
+            {{ raw('$value | printf "%.1f"') }}% de mémoire
             libre
 
       - alert: OutOfDiskSpace
@@ -43,7 +41,7 @@ groups:
           severity: warning
         annotations:
           summary: >-
-            {{ instance }} Espace libre de {{ raw('$labels.mountpoint') }} sur
+            Espace libre de {{ raw('$labels.mountpoint') }} sur
             à {{ raw('$value | printf "%.1f"') }}%
 
       - alert: OutOfInodes
@@ -53,7 +51,7 @@ groups:
           severity: warning
         annotations:
           summary: >-
-            {{ instance }} {{ raw('$value | printf "%.1f"') }}% d'inodes
+            {{ raw('$value | printf "%.1f"') }}% d'inodes
             restants pour {{ raw('$labels.mountpoint') }}
 
       - alert: CpuUsage
@@ -68,7 +66,7 @@ groups:
           severity: warning
         annotations:
           summary: >-
-            {{ instance }} CPU à {{ raw('$value | printf "%.1f"') }}%
+            CPU à {{ raw('$value | printf "%.1f"') }}%
 
       - alert: SystemdServiceFailed
         expr: node_systemd_unit_state{state="failed"} == 1
@@ -77,7 +75,7 @@ groups:
           severity: warning
         annotations:
           summary: >-
-            {{ instance }} {{ raw('$labels.name') }} a échoué
+            {{ raw('$labels.name') }} a échoué
 
       - alert: LoadUsage
         expr: node_load1 > 5
@@ -86,7 +84,7 @@ groups:
           severity: warning
         annotations:
           summary: >
-            {{ instance }} Charge à {{ raw('$value') }}
+            Charge à {{ raw('$value') }}
       
       - alert: UpsOutputSourceChanged
         expr: upsOutputSource != 3
@@ -95,25 +93,25 @@ groups:
           severity: critical
         annotations:
           summary: >-
-            {{ instance }} Source d'alimentation changée
+            Source d'alimentation changée
 
-      - alert: UpsBatteryStatusWarning
+      - alert: UpsBatteryStatus
         expr: upsBatteryStatus == 3
         for: 2m
         labels:
           severity: warning
         annotations:
           summary: >-
-            {{ instance }} État de la batterie faible
+            État de la batterie faible
 
-      - alert: UpsBatteryStatusCritical
+      - alert: UpsBatteryStatus
         expr: upsBatteryStatus == 4
         for: 10m
         labels:
           severity: critical
         annotations:
           summary: >-
-            {{ instance }} État de la batterie critique
+            État de la batterie critique
 
       - alert: UpsHighLoad
         expr: upsOutputPercentLoad > 70
@@ -122,7 +120,7 @@ groups:
           severity: critical
         annotations:
           summary: >-
-            {{ instance }} Charge de {{ raw('$value | printf "%.1f"') }}%
+            Charge de {{ raw('$value | printf "%.1f"') }}%
 
       - alert: UpsWrongInputVoltage
         expr: (upsInputVoltage < 210) or (upsInputVoltage > 250)
@@ -131,7 +129,7 @@ groups:
           severity: warning
         annotations:
           summary: >-
-            {{ instance }} Tension d'entrée de {{ raw('$value') }}V
+            Tension d'entrée de {{ raw('$value') }}V
 
       - alert: UpsWrongOutputVoltage
         expr: (upsOutputVoltage < 220) or (upsOutputVoltage > 240)
@@ -140,23 +138,23 @@ groups:
           severity: warning
         annotations:
           summary: >-
-            {{ instance }} Tension de sortie de {{ raw('$value') }}V
+            Tension de sortie de {{ raw('$value') }}V
 
-      - alert: UpsTimeRemainingWarning
+      - alert: UpsTimeRemaining
         expr: upsEstimatedMinutesRemaining < 8
         for: 1m
         labels:
           severity: warning
         annotations:
           summary: >-
-            {{ instance }} Autonomie restante de {{ raw('$value') }} min
+            Autonomie restante de {{ raw('$value') }} min
 
-      - alert: UpsTimeRemainingCritical
+      - alert: UpsTimeRemaining
         expr: upsEstimatedMinutesRemaining < 5
         for: 1m
         labels:
           severity: critical
         annotations:
           summary: >-
-            {{ instance }} Autonomie restante de {{ raw('$value') }} min
+            Autonomie restante de {{ raw('$value') }} min
 ...

roles/prometheus_federate/templates/prometheus/alert.rules.yml.j2

@@ -5,8 +5,6 @@
 {{ "{{" }} {{ string }} {{ "}}" }}
 {%- endmacro %}
 
-{% set instance = "[{{ $labels.instance }}]" %}
-
 groups:
   - name: alert.rules
     rules:
@@ -17,5 +15,5 @@ groups:
           severity: critical
         annotations:
           summary: >-
-            {{ instance }} Invisible depuis plus de 3 minutes
+            Invisible depuis plus de 3 minutes
 ...