fix merge conflict

roles/prometheus/README.md

@@ -40,6 +40,7 @@ prometheus_odoo_exporter_basic_auth_username: odoo-exporter
 prometheus_odoo_exporter_basic_auth_password: # default: "{{ vault_prometheus_odoo_exporter_basic_auth_password }}"
 prometheus_n8n_exporter_basic_auth_username: n8n-exporter
 prometheus_n8n_exporter_basic_auth_password: # default: "{{ vault_prometheus_n8n_exporter_basic_auth_password }}"
+prometheus_meilisearch_exporter_api_key: "{{ vault_prometheus_meilisearch_exporter_api_key }}"
 ```
 
 Ensure the nginx proxy includes the exporter config:

roles/prometheus/defaults/main.yml

@@ -16,6 +16,7 @@ prometheus_restic_server_basic_auth_password: "{{ vault_prometheus_restic_server
 prometheus_mysqld_exporter_basic_auth_password: "{{ vault_prometheus_mysqld_exporter_basic_auth_password }}"
 prometheus_odoo_exporter_basic_auth_password: "{{ vault_prometheus_odoo_exporter_basic_auth_password }}"
 prometheus_n8n_exporter_proxy_basic_auth_password: "'{{ vault_prometheus_n8n_exporter_proxy_basic_auth_password }}'"
+prometheus_meilisearch_exporter_api_key: "{{ vault_prometheus_meilisearch_exporter_api_key }}"
 prometheus_alerting: {}
 prometheus_rules: {}
   # system.yml: |

roles/prometheus/templates/prometheus.yml

@@ -139,6 +139,7 @@ scrape_configs:
       - target_label: __address__
         replacement: {{ blackbox_exporter_hostname }}:9115
 {% endif %}
+
 {% if prometheus_n8n_exporter_proxy_basic_auth_username is defined %}
   - job_name: n8n https
     metrics_path: "/n8n-exporter/metrics"
@@ -151,17 +152,17 @@ scrape_configs:
     static_configs:
       - targets: {{ prometheus_hosts | map('extract', hostvars) | json_query('[*].nginx_proxies[?exporter!=null && contains(exporter, `n8n`)].src_hostname') | flatten }}
 {% endif %}
-{% if vault_prometheus_meilisearch_exporter_master_key is defined %}
+{% if prometheus_meilisearch_exporter_api_key is defined %}
   - job_name: meilisearch https
     metrics_path: "/metrics"
     scrape_interval: 30s
     honor_labels: true
     scheme: https
     authorization:
       type: Bearer
-      credentials: {{ vault_prometheus_meilisearch_exporter_master_key }}
+      credentials: {{ prometheus_meilisearch_exporter_api_key }}
     static_configs:
-      - targets: ['meilisearch.sozialinfo.ch']
+      - targets: {{ prometheus_hosts | map('extract', hostvars) | json_query('[*].nginx_proxies[?exporter!=null && contains(exporter, `meilisearch`)].src_hostname') | flatten }}
 {% endif %}
 {% if prometheus_n8n_business_metrics_jobportal_username is defined %}
   - job_name: n8n business metrics jobportal https