Fixes for node exporter (allows running on arm and x86 and minor merg…

…e drop failure for instance types
redpanda-data · May 24, 2023 · 9d6f62d · 9d6f62d
1 parent c809259
commit 9d6f62d
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/driver-redpanda/deploy/deploy.yaml b/driver-redpanda/deploy/deploy.yaml
@@ -374,7 +374,11 @@
   - geerlingguy.node_exporter
   vars:
   - node_exporter_enabled_collectors: [ntp]
-  when: ansible_architecture = "x86_64"
+  - dist_architecture: {
+      "aarch64": "arm64",
+      "x86_64": "amd64"
+    }
+  - node_exporter_arch: "{{ [ansible_architecture] | map('extract', dist_architecture) | first }}"
   tags:
     - node_exporter
 

diff --git a/driver-redpanda/deploy/hosts_ini.tpl b/driver-redpanda/deploy/hosts_ini.tpl
@@ -14,4 +14,7 @@ ${control_public_ips[0]} ansible_user=${ ssh_user } ansible_become=True private_
 [prometheus]
 %{ for i, ip in prometheus_host_public_ips ~}
 ${ ip } ansible_user=${ ssh_user } ansible_become=True private_ip=${prometheus_host_private_ips[i]} id=${i}
-%{ endfor ~}
+%{ endfor ~}
+
+[all:vars]
+instance_type=${instance_type}
diff --git a/driver-redpanda/deploy/provision-redpanda-aws.tf b/driver-redpanda/deploy/provision-redpanda-aws.tf
@@ -200,6 +200,7 @@ resource "local_file" "hosts_ini" {
       prometheus_host_private_ips  = aws_instance.prometheus.*.private_ip
       control_public_ips   = aws_instance.client.*.public_ip
       control_private_ips  = aws_instance.client.*.private_ip
+      instance_type	   = var.instance_types["redpanda"]
       ssh_user              = "ubuntu"
     }
   )