Remove unnecessary extra variable definitions

The world could do with a bit less YAML!

ansible/roles/forrest/files/grafana/docker-compose.yml

@@ -15,9 +15,9 @@ services:
 
       - GF_SMTP_ENABLED=true
       - GF_SMTP_HOST=smtp.eu.mailgun.org:465
-      - GF_SMTP_USER={{ grafana_smtp_user }}
-      - GF_SMTP_PASSWORD={{ grafana_smtp_password }}
-      - GF_SMTP_FROM_ADDRESS={{ grafana_from_email }}
+      - GF_SMTP_USER={{ vault_grafana_smtp_user }}
+      - GF_SMTP_PASSWORD={{ vault_grafana_smtp_password }}
+      - GF_SMTP_FROM_ADDRESS={{ vault_grafana_from_email }}
       - GF_SMTP_FROM_NAME=grafana
     volumes:
       - "{{ app_data_dir }}/grafana:/var/lib/grafana"

ansible/roles/forrest/files/prometheus/alertmanager.yml

@@ -1,9 +1,9 @@
 global:
   resolve_timeout: 3m
   smtp_smarthost: smtp.eu.mailgun.org:465
-  smtp_from: "{{ alertmanager_from_address }}"
-  smtp_auth_username: "{{ alertmanager_from_address }}"
-  smtp_auth_password: "{{ alertmanager_smtp_password }}"
+  smtp_from: "{{ vault_alertmanager_from_address }}"
+  smtp_auth_username: "{{ vault_alertmanager_from_address }}"
+  smtp_auth_password: "{{ vault_alertmanager_smtp_password }}"
 
 route:
   receiver: default
@@ -11,5 +11,5 @@ route:
 receivers:
   - name: default
     email_configs:
-      - to: "{{ alertmanager_to_address }}"
+      - to: "{{ vault_alertmanager_to_address }}"
         send_resolved: true

ansible/roles/forrest/files/prometheus/docker-compose.yml

@@ -45,7 +45,7 @@ services:
     environment:
       - PVE_USER=prometheus@pve
       - PVE_TOKEN_NAME=prometheus
-      - PVE_TOKEN_VALUE={{ prometheus_api_token }}
+      - PVE_TOKEN_VALUE={{ vault_prometheus_api_token }}
       - PVE_VERIFY_SSL=false
 
   speedtest_exporter:

ansible/roles/forrest/files/prometheus/prometheus.yml

@@ -34,7 +34,7 @@ scrape_configs:
   - job_name: homeassistant
     metrics_path: /api/prometheus
     authorization:
-      credentials: "{{ homeassistant_token }}"
+      credentials: "{{ vault_homeassistant_token }}"
     metric_relabel_configs:
       - source_labels: [__name__]
         regex: python_.+
@@ -121,7 +121,7 @@ scrape_configs:
       module: [http]
     static_configs:
       - targets:
-          - https://hc-ping.com/{{ prometheus_healthcheck_uuid }}
+          - https://hc-ping.com/{{ vault_prometheus_healthcheck_uuid }}
     relabel_configs:
       - source_labels: [__address__]
         target_label: __param_target
@@ -132,7 +132,7 @@ scrape_configs:
 
   - job_name: healthchecks
     scheme: https
-    metrics_path: /projects/{{ healthchecks_project_uuid }}/metrics/{{ healthcheck_api_token }}
+    metrics_path: /projects/{{ vault_healthchecks_project_uuid }}/metrics/{{ vault_healthcheck_api_token }}
     static_configs:
       - targets: [healthchecks.io]