feat(ansible): Tune monitoring of Nomads

Signed-off-by: Peter Mikus <[email protected]>
Change-Id: I4085c9979ffaa922adb5f2b8a97d4029f8b96c20

diff --git a/fdio.infra.ansible/roles/prometheus_exporter/defaults/main.yaml b/fdio.infra.ansible/roles/prometheus_exporter/defaults/main.yaml
index 7291ce0..8f3a1b0 100644 (file)
--- a/fdio.infra.ansible/roles/prometheus_exporter/defaults/main.yaml
+++ b/fdio.infra.ansible/roles/prometheus_exporter/defaults/main.yaml
@@ -1,7 +1,6 @@
 ---
-# file: roles/prometheus_exporter/defaults/main.yaml
+# file: prometheus_exporter/defaults/main.yaml
 
-# Inst - Exporters.
 packages: "{{ packages_base + packages_by_distro[ansible_distribution | lower] + packages_by_arch[ansible_machine] }}"
 
 packages_base:
@@ -21,11 +20,5 @@ packages_by_arch:
 ne_image: "{{ ne_image_by_arch[ansible_machine] }}"
 
 ne_image_by_arch:
-  aarch64: "prom/node-exporter:v1.3.1"
-  x86_64: "prom/node-exporter:v1.3.1"
-
-be_image: "{{ be_image_by_arch[ansible_machine] }}"
-
-be_image_by_arch:
-  aarch64: "prom/blackbox-exporter:v0.21.1"
-  x86_64: "prom/blackbox-exporter:v0.21.1"
+  aarch64: "prom/node-exporter:v1.9.1"
+  x86_64: "prom/node-exporter:v1.9.1"

diff --git a/fdio.infra.ansible/roles/prometheus_exporter/files/blackbox.yml b/fdio.infra.ansible/roles/prometheus_exporter/files/blackbox.yml
deleted file mode 100644 (file)
index 526dcf5..0000000
--- a/fdio.infra.ansible/roles/prometheus_exporter/files/blackbox.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-modules:
-  http_2xx:
-    prober: http
-    timeout: 5s
-    http:
-      valid_http_versions: ["HTTP/1.1", "HTTP/2.0"]
-      no_follow_redirects: false
-      fail_if_ssl: false
-      fail_if_not_ssl: true
-      tls_config:
-        insecure_skip_verify: false
-      preferred_ip_protocol: "ip4"
-  icmp_v4:
-    prober: icmp
-    timeout: 5s
-    icmp:
-      preferred_ip_protocol: "ip4"
-  dns_udp:
-    prober: dns
-    timeout: 5s
-    dns:
-      query_name: "jenkins.fd.io"
-      query_type: "A"
-      valid_rcodes:
-        - NOERROR

diff --git a/fdio.infra.ansible/roles/prometheus_exporter/meta/main.yaml b/fdio.infra.ansible/roles/prometheus_exporter/meta/main.yaml
index 7d8b861..2e77fbf 100644 (file)
--- a/fdio.infra.ansible/roles/prometheus_exporter/meta/main.yaml
+++ b/fdio.infra.ansible/roles/prometheus_exporter/meta/main.yaml
@@ -1,18 +1,19 @@
 ---
-# file: roles/prometheus_exporter/meta/main.yaml
+# file: prometheus_exporter/meta/main.yaml
 
-dependencies: [docker]
+#dependencies: [docker]
 
 galaxy_info:
-  role_name: prometheus_exporter
-  author: fd.io
-  description: Prometheus Exporters.
-  company: none
+  role_name: "prometheus_exporter"
+  author: "fd.io"
+  description: "Prometheus Exporters."
+  company: "none"
   license: "license (Apache)"
   min_ansible_version: 2.9
   platforms:
-    - name: Ubuntu
+    - name: "Ubuntu"
       versions:
-        - jammy
+        - "jammy"
+        - "noble"
   galaxy_tags:
-    - prometheus
+    - "prometheus"

diff --git a/fdio.infra.ansible/roles/prometheus_exporter/tasks/main.yaml b/fdio.infra.ansible/roles/prometheus_exporter/tasks/main.yaml
index ef9da40..294de6c 100644 (file)
--- a/fdio.infra.ansible/roles/prometheus_exporter/tasks/main.yaml
+++ b/fdio.infra.ansible/roles/prometheus_exporter/tasks/main.yaml
@@ -1,7 +1,7 @@
 ---
-# file: roles/prometheus_exporter/tasks/main.yaml
+# file: prometheus_exporter/tasks/main.yaml
 
-- name: Inst - Update Package Cache (APT)
+- name: "Update Package Cache (APT)"
   ansible.builtin.apt:
     update_cache: true
     cache_valid_time: 3600
@@ -10,14 +10,14 @@
   tags:
     - prometheus-inst
 
-- name: Inst - Prerequisites
+- name: "Prerequisites"
   ansible.builtin.package:
     name: "{{ packages | flatten(levels=1) }}"
     state: latest
   tags:
     - prometheus-inst
 
-- name: Inst - Start a NodeExporter container
+- name: "Start a NodeExporter container"
   docker_container:
     name: "NodeExporter"
     image: "{{ ne_image }}"
@@ -36,37 +36,6 @@
       - "/:/rootfs:ro"
       - "/proc:/host/proc:ro"
       - "/sys:/host/sys:ro"
+  when: nomad_node_class.startswith('builder')
   tags:
-    - prometheus-inst
-
-- name: Inst - Create a Config Directory
-  ansible.builtin.file:
-    path: "/etc/prometheus/"
-    state: "directory"
-    mode: "0755"
-  tags:
-    - prometheus-conf-blackbox-exporter
-
-- name: Conf - Prometheus Blackbox Exporter
-  ansible.builtin.copy:
-    src: "files/blackbox.yml"
-    dest: "/etc/prometheus/blackbox.yml"
-  tags:
-    - prometheus-conf-blackbox-exporter
-
-- name: Inst - Start a BlackBoxExporter container
-  docker_container:
-    name: "BlackBoxExporter"
-    image: "{{ be_image }}"
-    state: "started"
-    restart_policy: "unless-stopped"
-    detach: true
-    ports:
-      - "9115:9115"
-    privileged: true
-    command:
-      - "--config.file=/config/blackbox.yml"
-    volumes:
-      - "/etc/prometheus/blackbox.yml:/config/blackbox.yml:ro"
-  tags:
-    - prometheus-inst
+    - prometheus-inst
\ No newline at end of file