From 42d83983491b6a8a8da0ea885dbfcd9172fe768d Mon Sep 17 00:00:00 2001
From: Sven Ketelsen <sven.ketelsen@netgo.de>
Date: Thu, 3 Nov 2022 08:29:08 +0100
Subject: [PATCH] DEV-664 bugfix use server specific domain

---
 .../config/prometheus/prometheus.yml.j2       | 28 +++++++++----------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/templates/prometheus/config/prometheus/prometheus.yml.j2 b/templates/prometheus/config/prometheus/prometheus.yml.j2
index 737e5f6..32c00bf 100644
--- a/templates/prometheus/config/prometheus/prometheus.yml.j2
+++ b/templates/prometheus/config/prometheus/prometheus.yml.j2
@@ -90,7 +90,7 @@ scrape_configs:
   and hostvars[server_info.name].traefik_enabled)
   or (hostvars[server_info.name].traefik_enabled is not defined)
 %}
-          '{{ server_info.name }}.{{ domain }}:{{ admin_port_service }}',
+          '{{ server_info.name }}.{{ hostvars[server_info.name].domain }}:{{ admin_port_service }}',
 {% endif %}
 {% endfor %}
         ]
@@ -116,7 +116,7 @@ scrape_configs:
       - targets: [
 {% for server_info in stage_server_infos | default([]) %}
 {% if server_info.service == 'harbor' %}
-          '{{ server_info.name }}.{{ domain }}:{{ monitor_port_harbor }}',
+          '{{ server_info.name }}.{{ hostvars[server_info.name].domain }}:{{ monitor_port_harbor }}',
 {% endif %}
 {% endfor %}
         ]
@@ -140,7 +140,7 @@ scrape_configs:
       - targets: [
 {% for server_info in stage_server_infos | default([]) %}
 {% if server_info.service == 'harbor' %}
-          '{{ server_info.name }}.{{ domain }}:{{ monitor_port_harbor }}',
+          '{{ server_info.name }}.{{ hostvars[server_info.name].domain }}:{{ monitor_port_harbor }}',
 {% endif %}
 {% endfor %}
         ]
@@ -164,7 +164,7 @@ scrape_configs:
       - targets: [
 {% for server_info in stage_server_infos | default([]) %}
 {% if server_info.service == 'harbor' %}
-          '{{ server_info.name }}.{{ domain }}:{{ monitor_port_harbor }}',
+          '{{ server_info.name }}.{{ hostvars[server_info.name].domain }}:{{ monitor_port_harbor }}',
 {% endif %}
 {% endfor %}
         ]
@@ -189,7 +189,7 @@ scrape_configs:
       - targets: [
 {% for server_info in stage_server_infos | default([]) %}
 {% if server_info.service == 'connect' %}
-          '{{ server_info.name }}-connect.{{ domain }}:{{ admin_port_service }}',
+          '{{ server_info.name }}-connect.{{ hostvars[server_info.name].domain }}:{{ admin_port_service }}',
 {% endif %}
 {% endfor %}
         ]
@@ -210,7 +210,7 @@ scrape_configs:
       - targets: [
 {% for server_info in stage_server_infos | default([]) %}
 {% if server_info.service == 'iam' %}
-          '{{ server_info.name }}.{{ domain }}:{{ admin_port_service }}',
+          '{{ server_info.name }}.{{ hostvars[server_info.name].domain }}:{{ admin_port_service }}',
 {% endif %}
 {% endfor %}
         ]
@@ -231,7 +231,7 @@ scrape_configs:
       - targets: [
 {% for server_info in stage_server_infos | default([]) %}
 {% if server_info.service == 'webdav' %}
-          '{{ server_info.name }}.{{ domain }}:{{ admin_port_service }}',
+          '{{ server_info.name }}.{{ hostvars[server_info.name].domain }}:{{ admin_port_service }}',
 {% endif %}
 {% endfor %}
         ]
@@ -256,7 +256,7 @@ scrape_configs:
       - targets: [
 {% for server_info in stage_server_infos | default([]) %}
 {% if server_info.service == 'keycloak' %}
-          '{{ server_info.name }}.{{ domain }}',
+          '{{ server_info.name }}.{{ hostvars[server_info.name].domain }}',
 {% endif %}
 {% endfor %}
         ]
@@ -308,7 +308,7 @@ scrape_configs:
       - targets: [
 {% for server_info in stage_server_infos | default([]) %}
 {% if server_info.service == 'gitea' %}
-          '{{ server_info.name }}.{{ domain }}:{{ admin_port_service }}',
+          '{{ server_info.name }}.{{ hostvars[server_info.name].domain }}:{{ admin_port_service }}',
 {% endif %}
 {% endfor %}
         ]
@@ -329,7 +329,7 @@ scrape_configs:
       - targets: [
 {% for server_info in stage_server_infos | default([]) %}
 {% if server_info.service == 'redis' %}
-          '{{ server_info.name }}.{{ domain }}:{{ redis_exporter_service_port | default("9121") }}',
+          '{{ server_info.name }}.{{ hostvars[server_info.name].domain }}:{{ redis_exporter_service_port | default("9121") }}',
 {% endif %}
 {% endfor %}
         ]
@@ -358,7 +358,7 @@ scrape_configs:
   and hostvars[server_info.name].node_exporter_enabled)
   or (hostvars[server_info.name].node_exporter_enabled is not defined)
 %}
-          '{{ server_info.private_ip }}:{{ monitor_port_system }}!{{ server_info.name }}.{{ domain }}',
+          '{{ server_info.private_ip }}:{{ monitor_port_system }}!{{ server_info.name }}.{{ hostvars[server_info.name].domain }}',
 {% endif %}
 {% endfor %}
         ]
@@ -408,7 +408,7 @@ scrape_configs:
       - targets: [
 {% for server_info in stage_server_infos | default([]) %}
 {% if server_info.service == 'elastic' %}
-          '{{ server_info.name }}.{{ domain }}:{{ monitor_port_elastic }}',
+          '{{ server_info.name }}.{{ hostvars[server_info.name].domain }}:{{ monitor_port_elastic }}',
 {% endif %}
 {% endfor %}
         ]
@@ -429,7 +429,7 @@ scrape_configs:
       - targets: [
 {% for server_info in stage_server_infos | default([]) %}
 {% if server_info.service == 'postgres' %}
-          '{{ server_info.private_ip }}:{{ monitor_port_postgres }}!{{ server_info.name }}.{{ domain }}',
+          '{{ server_info.private_ip }}:{{ monitor_port_postgres }}!{{ server_info.name }}.{{ hostvars[server_info.name].domain }}',
 {% endif %}
 {% endfor %}
         ]
@@ -454,7 +454,7 @@ scrape_configs:
       - targets: [
 {% for server_info in stage_server_infos | default([]) %}
 {% if server_info.service == 'maria' %}
-          '{{ server_info.private_ip }}:{{ monitor_port_maria }}!{{ server_info.name }}.{{ domain }}',
+          '{{ server_info.private_ip }}:{{ monitor_port_maria }}!{{ server_info.name }}.{{ hostvars[server_info.name].domain }}',
 {% endif %}
 {% endfor %}
         ]