Merge pull request #245 from stfc/small_changes

Small changes to ChatOps

Author: khalford

chatops_deployment/ansible/configure.yml

@@ -19,20 +19,23 @@
 
 - name: Configure load balancer
   hosts: stack
+  gather_facts: false
   roles:
     - role: haproxy
       tags:
         - haproxy
 
 - name: Configure ChatOps
   hosts: stack
+  gather_facts: false
   roles:
     - role: chatops
       tags:
         - chatops
 
 - name: Configure CAdvisor
   hosts: stack
+  gather_facts: false
   remote_user: ubuntu
   roles:
     - role: cadvisor
@@ -41,13 +44,23 @@
 
 - name: Set up systemd exporters
   hosts: stack
+  gather_facts: false
   roles:
     - role: systemd_exporter
       tags:
         - systemd_exporter
 
+- name: Set up node exporters
+  hosts: stack
+  gather_facts: false
+  roles:
+    - role: node_exporter
+      tags:
+        - node_exporter
+
 - name: Configure Grafana
   hosts: stack
+  gather_facts: false
   roles:
     - grafana
   tags:
@@ -63,21 +76,26 @@
 
 - name: Configure Prometheus
   hosts: stack
+  gather_facts: false
   roles:
     - prometheus
   tags:
     - prometheus
 
 - name: Configure Alert Manager
   hosts: stack
+  gather_facts: false
   roles:
     - alertmanager
   tags:
     - alertmanager
 
 - name: Configure Elastic Stack
   hosts: stack
+  gather_facts: false
   remote_user: ubuntu
   force_handlers: true
   roles:
     - elastic
+  tags:
+    - elastic

chatops_deployment/ansible/roles/node_exporter/tasks/main.yml

@@ -0,0 +1,7 @@
+---
+- name: Install Prometheus node exporter
+  become: true
+  ansible.builtin.apt:
+    name: prometheus-node-exporter
+    update_cache: true
+    state: latest # noqa: package-latest

chatops_deployment/ansible/roles/terraform/tasks/destroy.yml

@@ -7,16 +7,20 @@
     group: "{{ ansible_env.USER }}"
     mode: "0774"
 
+- name: Create Terraform variables file
+  ansible.builtin.template:
+    src: terraform.tfvars.j2
+    dest: "{{ playbook_dir }}/../terraform/terraform.tfvars"
+    owner: "{{ ansible_env.USER }}"
+    group: "{{ ansible_env.USER }}"
+    mode: "0774"
+
 - name: Destroy infrastructure
   community.general.terraform:
     project_path: "../terraform"
     state: absent
     complex_vars: true
     workspace: "{{ env }}"
-    variables:
-      deployment: "{{ terraform_deployment }}"
-      external_network_id: "{{ terraform_external_network_id }}"
-      floating_ip: "{{ terraform_floating_ip }}"
 
 - name: Remove generated files
   block: