Pulsar new stats (usegalaxy-au#524)

* Moved mel2 to new stats * Added mel3 to new stats server * added paw to new stats server * Added nci-training to new stats server
neoformit · Nov 13, 2021 · 9ad5804 · 9ad5804
1 parent 5a9bec8
commit 9ad5804
Show file tree

Hide file tree

Showing 12 changed files with 36 additions and 4 deletions.
diff --git 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"
+      - precision = "s"
+      - username = "node"
+      - password = "{{ vault_influx_node_password }}"
diff --git 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"
+      - precision = "s"
+      - username = "node"
+      - password = "{{ vault_influx_node_password }}"
diff --git 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"
+      - precision = "s"
+      - username = "node"
+      - password = "{{ vault_influx_node_password }}"
diff --git 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"
+      - precision = "s"
+      - username = "node"
+      - password = "{{ vault_influx_node_password }}"
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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