diff --git a/group_vars/pulsar_mel2/pulsar-mel2.yml b/group_vars/pulsar_mel2/pulsar-mel2.yml index edf266db5..8fcd19c92 100644 --- a/group_vars/pulsar_mel2/pulsar-mel2.yml +++ b/group_vars/pulsar_mel2/pulsar-mel2.yml @@ -6,10 +6,16 @@ use_internal_ips: false # cvmfs cvmfs_cache_base: /mnt/var/lib/cvmfs +#Monitoring for Staging. Once all VM monitoring has moved to stats.usegalaxy.org.au, this can be put in all.yml and removed here. +influx_url: stats.usegalaxy.org.au +grafana_server_url: "https://{{ influx_url }}:8086" + # Monitoring telegraf_agent_output: - type: influxdb config: - urls = ["{{ grafana_server_url }}"] - database = "pulsar-mel2" - - precision = "s" \ No newline at end of file + - precision = "s" + - username = "node" + - password = "{{ vault_influx_node_password }}" \ No newline at end of file diff --git a/group_vars/pulsar_mel3/pulsar-mel3.yml b/group_vars/pulsar_mel3/pulsar-mel3.yml index fe663e6e3..82f8e7d2b 100644 --- a/group_vars/pulsar_mel3/pulsar-mel3.yml +++ b/group_vars/pulsar_mel3/pulsar-mel3.yml @@ -6,10 +6,16 @@ use_internal_ips: false # cvmfs cvmfs_cache_base: /mnt/var/lib/cvmfs +#Monitoring for Staging. Once all VM monitoring has moved to stats.usegalaxy.org.au, this can be put in all.yml and removed here. +influx_url: stats.usegalaxy.org.au +grafana_server_url: "https://{{ influx_url }}:8086" + # Monitoring telegraf_agent_output: - type: influxdb config: - urls = ["{{ grafana_server_url }}"] - database = "pulsar-mel3" - - precision = "s" \ No newline at end of file + - precision = "s" + - username = "node" + - password = "{{ vault_influx_node_password }}" \ No newline at end of file diff --git a/group_vars/pulsar_nci_training/pulsar-nci-training.yml b/group_vars/pulsar_nci_training/pulsar-nci-training.yml index c40ffa92a..e22691dc8 100644 --- a/group_vars/pulsar_nci_training/pulsar-nci-training.yml +++ b/group_vars/pulsar_nci_training/pulsar-nci-training.yml @@ -6,10 +6,16 @@ use_internal_ips: true # cvmfs cvmfs_cache_base: /mnt/var/lib/cvmfs +#Monitoring for Staging. Once all VM monitoring has moved to stats.usegalaxy.org.au, this can be put in all.yml and removed here. +influx_url: stats.usegalaxy.org.au +grafana_server_url: "https://{{ influx_url }}:8086" + # Monitoring telegraf_agent_output: - type: influxdb config: - urls = ["{{ grafana_server_url }}"] - database = "pulsar-nci-training" - - precision = "s" \ No newline at end of file + - precision = "s" + - username = "node" + - password = "{{ vault_influx_node_password }}" \ No newline at end of file diff --git a/group_vars/pulsar_paw/pulsar-paw.yml b/group_vars/pulsar_paw/pulsar-paw.yml index a5c816c0c..c698daca8 100644 --- a/group_vars/pulsar_paw/pulsar-paw.yml +++ b/group_vars/pulsar_paw/pulsar-paw.yml @@ -6,10 +6,16 @@ use_internal_ips: true # cvmfs cvmfs_cache_base: /mnt/var/lib/cvmfs +#Monitoring for Staging. Once all VM monitoring has moved to stats.usegalaxy.org.au, this can be put in all.yml and removed here. +influx_url: stats.usegalaxy.org.au +grafana_server_url: "https://{{ influx_url }}:8086" + # Monitoring telegraf_agent_output: - type: influxdb config: - urls = ["{{ grafana_server_url }}"] - database = "pulsar-paw" - - precision = "s" \ No newline at end of file + - precision = "s" + - username = "node" + - password = "{{ vault_influx_node_password }}" \ No newline at end of file diff --git a/pulsar-mel2_playbook.yml b/pulsar-mel2_playbook.yml index 7294cfc45..71679b79e 100644 --- a/pulsar-mel2_playbook.yml +++ b/pulsar-mel2_playbook.yml @@ -7,6 +7,7 @@ - group_vars/pulsar_mel2/pulsar-mel2_slurm.yml - group_vars/VAULT - host_vars/pulsar-mel2/pulsar-mel2.genome.edu.au.yml + - secret_group_vars/stats_server_vault pre_tasks: - name: apt update apt: diff --git a/pulsar-mel2_worker_playbook.yml b/pulsar-mel2_worker_playbook.yml index 78a3d80c6..2f1f762f6 100644 --- a/pulsar-mel2_worker_playbook.yml +++ b/pulsar-mel2_worker_playbook.yml @@ -7,6 +7,7 @@ - group_vars/pulsar_mel2/pulsar-mel2_workers.yml - group_vars/pulsar_mel2/pulsar-mel2_slurm.yml - group_vars/VAULT + - secret_group_vars/stats_server_vault pre_tasks: - name: Attach volume to instance include_role: diff --git a/pulsar-mel3_playbook.yml b/pulsar-mel3_playbook.yml index f1213022a..db40619b9 100644 --- a/pulsar-mel3_playbook.yml +++ b/pulsar-mel3_playbook.yml @@ -7,6 +7,7 @@ - group_vars/pulsar_mel3/pulsar-mel3_slurm.yml - group_vars/VAULT - host_vars/pulsar-mel3/pulsar-mel3.genome.edu.au.yml + - secret_group_vars/stats_server_vault pre_tasks: - name: apt update apt: diff --git a/pulsar-mel3_worker_playbook.yml b/pulsar-mel3_worker_playbook.yml index 381dca1b0..a3c48e3d8 100644 --- a/pulsar-mel3_worker_playbook.yml +++ b/pulsar-mel3_worker_playbook.yml @@ -7,6 +7,7 @@ - group_vars/pulsar_mel3/pulsar-mel3_workers.yml - group_vars/pulsar_mel3/pulsar-mel3_slurm.yml - group_vars/VAULT + - secret_group_vars/stats_server_vault pre_tasks: - name: Attach volume to instance include_role: diff --git a/pulsar-nci-training_playbook.yml b/pulsar-nci-training_playbook.yml index a8a306f3c..010bbddb1 100644 --- a/pulsar-nci-training_playbook.yml +++ b/pulsar-nci-training_playbook.yml @@ -12,6 +12,7 @@ - group_vars/pulsar_nci_training/pulsar-nci-training_slurm.yml - group_vars/VAULT - host_vars/pulsar-nci-training/pulsar-nci-training.usegalaxy.org.au.yml + - secret_group_vars/stats_server_vault roles: - common - insspb.hostname diff --git a/pulsar-nci-training_workers_playbook.yml b/pulsar-nci-training_workers_playbook.yml index 3e86a3aeb..53bcbba4b 100644 --- a/pulsar-nci-training_workers_playbook.yml +++ b/pulsar-nci-training_workers_playbook.yml @@ -7,6 +7,7 @@ - group_vars/pulsar_nci_training/pulsar-nci-training_workers.yml - group_vars/pulsar_nci_training/pulsar-nci-training_slurm.yml - group_vars/VAULT + - secret_group_vars/stats_server_vault pre_tasks: - name: Create worker extra disk mount point on /mnt file: diff --git a/pulsar-paw_playbook.yml b/pulsar-paw_playbook.yml index facd7912f..8746ea980 100644 --- a/pulsar-paw_playbook.yml +++ b/pulsar-paw_playbook.yml @@ -7,6 +7,7 @@ - group_vars/pulsar_paw/pulsar-paw_slurm.yml - group_vars/VAULT - host_vars/pulsar-paw/pulsar-paw.genome.edu.au.yml + - secret_group_vars/stats_server_vault pre_tasks: - name: apt update apt: diff --git a/pulsar-paw_worker_playbook.yml b/pulsar-paw_worker_playbook.yml index d6319d2dc..752dbdbee 100644 --- a/pulsar-paw_worker_playbook.yml +++ b/pulsar-paw_worker_playbook.yml @@ -7,6 +7,7 @@ - group_vars/pulsar_paw/pulsar-paw_workers.yml - group_vars/pulsar_paw/pulsar-paw_slurm.yml - group_vars/VAULT + - secret_group_vars/stats_server_vault roles: - common - insspb.hostname