fix hostnames in roles and play

Author: LeszekBlazewski

deploy.yml

@@ -29,7 +29,7 @@
         marker: "# {mark} ANSIBLE MANAGED BLOCK {{ item.value }}"
         insertafter: "scrape_configs:"
         block: |2
-            - job_name: "{{ item.key }}-{{ ansible_host | default(inventory_hostname) }}"
+            - job_name: "{{ item.key }}-{{ ansible_host }}"
               scrape_interval: 5s
               static_configs:
                 - targets: ["{{ item.value }}"]
@@ -42,4 +42,5 @@
     - name: Reload prometheus
       uri:
         url: "http://{{ prometheus_address | default(hostvars.central_node.services_endopoints.prometheus) }}/-/reload"
+        follow_redirects: all
         method: POST

roles/central-node/defaults/main.yml

@@ -4,11 +4,11 @@ monitoring_directory: "{{ ansible_env.HOME }}/monitoring-stack"
 reverse_proxy_setup: true
 
 services_endopoints:
-  prometheus: "{{ (reverse_proxy_setup == true) | ternary('prometheus.' + inventory_hostname, 9090) }}"
-  alertmanager: "{{ (reverse_proxy_setup == true) | ternary('alertmanager.' + inventory_hostname, 9093) }}"
-  pushgateway: "{{ (reverse_proxy_setup == true) | ternary('pushgateway.' + inventory_hostname, 9091) }}"
-  grafana: "{{ (reverse_proxy_setup == true) | ternary('grafana.' + inventory_hostname, 3000) }}"
-  loki: "{{ (reverse_proxy_setup == true) | ternary('loki.' + inventory_hostname, 3100) }}"
+  prometheus: "{{ (reverse_proxy_setup == true) | ternary('prometheus.' + ansible_host, 9090) }}"
+  alertmanager: "{{ (reverse_proxy_setup == true) | ternary('alertmanager.' + ansible_host, 9093) }}"
+  pushgateway: "{{ (reverse_proxy_setup == true) | ternary('pushgateway.' + ansible_host, 9091) }}"
+  grafana: "{{ (reverse_proxy_setup == true) | ternary('grafana.' + ansible_host, 3000) }}"
+  loki: "{{ (reverse_proxy_setup == true) | ternary('loki.' + ansible_host, 3100) }}"
 
 # alertmanager config
 slack_api_url: "https://hooks.slack.com/services/<webhook-id>"

roles/exporter-node/defaults/main.yml

@@ -4,5 +4,5 @@ exporters_directory: "{{ ansible_env.HOME }}/exporters"
 reverse_proxy_setup: true
 
 exporters_endpoints:
-  nodeexporter: "{{ (reverse_proxy_setup == true) | ternary('nodeexporter.' + inventory_hostname, 9100) }}"
-  cadvisor: "{{ (reverse_proxy_setup == true) | ternary('cadvisor.' + inventory_hostname, 8080) }}"
+  nodeexporter: "{{ (reverse_proxy_setup == true) | ternary('nodeexporter.' + ansible_host, 9100) }}"
+  cadvisor: "{{ (reverse_proxy_setup == true) | ternary('cadvisor.' + ansible_host, 8080) }}"