diff options
| -rw-r--r-- | host_vars/rpi5.local.yml | bin | 1852 -> 1896 bytes | |||
| -rw-r--r-- | roles/prometheus/defaults/main.yml | 4 | ||||
| -rw-r--r-- | roles/prometheus/handlers/main.yml | 6 | ||||
| -rw-r--r-- | roles/prometheus/meta/argument_specs.yml | 6 | ||||
| -rw-r--r-- | roles/prometheus/meta/main.yml | 2 | ||||
| -rw-r--r-- | roles/prometheus/tasks/main.yml | 26 | ||||
| -rw-r--r-- | roles/prometheus/vars/archlinux.yml | 1 | ||||
| -rw-r--r-- | roles/prometheus/vars/debian.yml | 1 |
8 files changed, 7 insertions, 39 deletions
diff --git a/host_vars/rpi5.local.yml b/host_vars/rpi5.local.yml Binary files differindex 60273fbf..ae59bfa1 100644 --- a/host_vars/rpi5.local.yml +++ b/host_vars/rpi5.local.yml diff --git a/roles/prometheus/defaults/main.yml b/roles/prometheus/defaults/main.yml index 52c8da02..7a231b5c 100644 --- a/roles/prometheus/defaults/main.yml +++ b/roles/prometheus/defaults/main.yml @@ -3,10 +3,8 @@ prometheus_host: "localhost" prometheus_port: 9090 prometheus_retention: "15d" prometheus_scrape_interval: "15s" -prometheus_node_exporter_port: 9100 prometheus_targets: - "{{ prometheus_host }}:{{ prometheus_port }}" -prometheus_node_exporter_targets: - - "{{ prometheus_host }}:{{ prometheus_node_exporter_port }}" +prometheus_node_exporter_targets: [] diff --git a/roles/prometheus/handlers/main.yml b/roles/prometheus/handlers/main.yml index 6006956e..d35a8531 100644 --- a/roles/prometheus/handlers/main.yml +++ b/roles/prometheus/handlers/main.yml @@ -4,9 +4,3 @@ ansible.builtin.systemd_service: name: "prometheus" state: "restarted" - -- name: "Restart node-exporter" - become: true - ansible.builtin.systemd_service: - name: "prometheus-node-exporter" - state: "restarted" diff --git a/roles/prometheus/meta/argument_specs.yml b/roles/prometheus/meta/argument_specs.yml index 6a6db4c4..83f8abb2 100644 --- a/roles/prometheus/meta/argument_specs.yml +++ b/roles/prometheus/meta/argument_specs.yml @@ -20,10 +20,6 @@ argument_specs: description: "Global scrape interval for metrics collection" type: "str" default: "15s" - prometheus_node_exporter_port: - description: "Port for node-exporter metrics endpoint" - type: "int" - default: 9100 prometheus_targets: description: "The list of prometheus targets to scrape" type: "list" @@ -33,4 +29,4 @@ argument_specs: description: "The list of node_exporter targets to scrape" type: "list" elements: "str" - default: ["{{ prometheus_host }}:{{ prometheus_node_exporter_port }}"] + default: [] diff --git a/roles/prometheus/meta/main.yml b/roles/prometheus/meta/main.yml index 78240dba..170ae76c 100644 --- a/roles/prometheus/meta/main.yml +++ b/roles/prometheus/meta/main.yml @@ -2,7 +2,7 @@ dependencies: [] galaxy_info: author: "a14m" - description: "Install lightweight Prometheus and Node Exporter for monitoring" + description: "Install and configure Prometheus server" license: "MIT" min_ansible_version: "2.18" platforms: diff --git a/roles/prometheus/tasks/main.yml b/roles/prometheus/tasks/main.yml index e4c8c6f5..1f639c6d 100644 --- a/roles/prometheus/tasks/main.yml +++ b/roles/prometheus/tasks/main.yml @@ -29,12 +29,10 @@ - "/etc/prometheus" - "/var/lib/prometheus" -- name: "Install prometheus packages" +- name: "Install prometheus" become: true ansible.builtin.package: - name: - - "prometheus" - - "prometheus-node-exporter" + name: "prometheus" state: "present" - name: "Create prometheus configuration" @@ -57,25 +55,9 @@ mode: "0644" notify: "Restart prometheus" -# NOTE: show systemd configurations using: systemctl cat prometheus-node-exporter -- name: "Configure node-exporter host/port via environment file" - become: true - ansible.builtin.copy: - content: | - NODE_EXPORTER_ARGS=" - --web.listen-address={{ prometheus_host }}:{{ prometheus_node_exporter_port }} - --collector.systemd - " - dest: "{{ prometheus_node_exporter_env_file }}" - mode: "0644" - notify: "Restart node-exporter" - -- name: "Start and enable prometheus services" +- name: "Start and enable prometheus" become: true ansible.builtin.systemd_service: - name: "{{ item }}" + name: "prometheus" state: "started" enabled: true - loop: - - "prometheus" - - "prometheus-node-exporter" diff --git a/roles/prometheus/vars/archlinux.yml b/roles/prometheus/vars/archlinux.yml index fa3e705f..3aa7b805 100644 --- a/roles/prometheus/vars/archlinux.yml +++ b/roles/prometheus/vars/archlinux.yml @@ -1,3 +1,2 @@ --- prometheus_env_file: "/etc/conf.d/prometheus" -prometheus_node_exporter_env_file: "/etc/conf.d/prometheus-node-exporter" diff --git a/roles/prometheus/vars/debian.yml b/roles/prometheus/vars/debian.yml index 522be2de..615d26db 100644 --- a/roles/prometheus/vars/debian.yml +++ b/roles/prometheus/vars/debian.yml @@ -1,3 +1,2 @@ --- prometheus_env_file: "/etc/default/prometheus" -prometheus_node_exporter_env_file: "/etc/default/prometheus-node-exporter" |