From cd7dea8fda004151585107373eaccc6dbb0c3ab2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thorsten=20M=C3=BCller?= Date: Mon, 28 Jun 2021 12:14:31 +0200 Subject: [PATCH] fix: variables hostname telegraf/influx --- roles/cobald/tasks/influxdb.yml | 4 ++-- roles/cobald/tasks/telegraf.yml | 7 ++++--- roles/cobald/vars/main.yml | 3 +-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/roles/cobald/tasks/influxdb.yml b/roles/cobald/tasks/influxdb.yml index 3c58bbe..f9149f8 100644 --- a/roles/cobald/tasks/influxdb.yml +++ b/roles/cobald/tasks/influxdb.yml @@ -2,8 +2,8 @@ docker_container: name: ed-influxdb image: docker.io/library/influxdb:2.0 - hostname: "{{influx_hostname}}" - domainname: "{{influx_domainname}}" + hostname: "{{cobald_influx_hostname}}" + domainname: "{{cobald_domainname}}" networks: - name: "{{ cobald_docker_network }}" networks_cli_compatible: True diff --git a/roles/cobald/tasks/telegraf.yml b/roles/cobald/tasks/telegraf.yml index 0a9b935..cd0eabf 100644 --- a/roles/cobald/tasks/telegraf.yml +++ b/roles/cobald/tasks/telegraf.yml @@ -43,7 +43,7 @@ group: docker vars: influx_token: "{{influx_telegraf_token.token}}" - influx_url: "http://{{influx_hostname}}:8086" + influx_url: "http://{{cobald_influx_hostname}}:8086" register: telegraf_config_gen - name: run telegraf container @@ -51,9 +51,10 @@ name: ed-telegraf image: ed-telegraf hostname: telegraf - domainname: cobald.local + domainname: "{{ cobald_domainname }}" networks: - name: "{{ cobald_docker_network }}" + aliases: ["ed-telegraf"] volumes: - "/container/volumes/telegraf/telegraf.conf:/etc/telegraf/telegraf.conf:ro" state: started @@ -64,5 +65,5 @@ - import_tasks: grafana.yml vars: - influx_url: "http://{{influx_hostname}}:8086" + influx_url: "http://{{cobald_influx_hostname}}:8086" tags: influxdb diff --git a/roles/cobald/vars/main.yml b/roles/cobald/vars/main.yml index f01b788..872dd55 100644 --- a/roles/cobald/vars/main.yml +++ b/roles/cobald/vars/main.yml @@ -1,3 +1,2 @@ cobald_docker_network: "{{docker_network}}" -influx_domainname: "{{ cobald_domainname }}" -influx_hostname: "ed-influxdb" +cobald_influx_hostname: "ed-influxdb"