diff --git a/elk_metrics_7x/roles/elastic_auditbeat/tasks/main.yml b/elk_metrics_7x/roles/elastic_auditbeat/tasks/main.yml index 13abcb5d..6805b7aa 100644 --- a/elk_metrics_7x/roles/elastic_auditbeat/tasks/main.yml +++ b/elk_metrics_7x/roles/elastic_auditbeat/tasks/main.yml @@ -33,7 +33,7 @@ when: - ansible_virtualization_type in ["systemd-nspawn", "lxc", "lxd", "podman", "docker", "systemd_container", "container"] -- name: Ensure beat is installed (x86_64) +- name: Ensure beat is installed package: name: "{{ auditbeat_distro_packages }}" state: "{{ elk_package_state | default('present') }}" @@ -42,19 +42,6 @@ until: _package_task is success retries: 3 delay: 2 - when: - - ansible_architecture == 'x86_64' - notify: - - Enable and restart auditbeat - tags: - - package_install - -- name: Ensure beat is installed (aarch64) - apt: - deb: 'https://object-storage-ca-ymq-1.vexxhost.net/swift/v1/8709ca2640344a4ba85cba0a1d6eea69/aarch64/auditbeat-6.5.0-arm64.deb' - when: - - ansible_pkg_mgr == 'apt' - - ansible_architecture == 'aarch64' notify: - Enable and restart auditbeat tags: diff --git a/elk_metrics_7x/roles/elastic_filebeat/tasks/main.yml b/elk_metrics_7x/roles/elastic_filebeat/tasks/main.yml index 2c601a6f..81868110 100644 --- a/elk_metrics_7x/roles/elastic_filebeat/tasks/main.yml +++ b/elk_metrics_7x/roles/elastic_filebeat/tasks/main.yml @@ -34,19 +34,6 @@ until: _package_task is success retries: 3 delay: 2 - when: - - ansible_architecture == 'x86_64' - notify: - - Enable and restart filebeat - tags: - - package_install - -- name: Ensure beat is installed (aarch64) - apt: - deb: 'https://object-storage-ca-ymq-1.vexxhost.net/swift/v1/8709ca2640344a4ba85cba0a1d6eea69/aarch64/filebeat-6.5.0-arm64.deb' - when: - - ansible_pkg_mgr == 'apt' - - ansible_architecture == 'aarch64' notify: - Enable and restart filebeat tags: diff --git a/elk_metrics_7x/roles/elastic_heartbeat/tasks/main.yml b/elk_metrics_7x/roles/elastic_heartbeat/tasks/main.yml index 6c3f7c4a..46ce931d 100644 --- a/elk_metrics_7x/roles/elastic_heartbeat/tasks/main.yml +++ b/elk_metrics_7x/roles/elastic_heartbeat/tasks/main.yml @@ -34,19 +34,6 @@ until: _package_task is success retries: 3 delay: 2 - when: - - ansible_architecture == 'x86_64' - notify: - - Enable and restart heartbeat - tags: - - package_install - -- name: Ensure beat is installed (aarch64) - apt: - deb: 'https://object-storage-ca-ymq-1.vexxhost.net/swift/v1/8709ca2640344a4ba85cba0a1d6eea69/aarch64/heartbeat-6.5.0-arm64.deb' - when: - - ansible_pkg_mgr == 'apt' - - ansible_architecture == 'aarch64' notify: - Enable and restart heartbeat tags: diff --git a/elk_metrics_7x/roles/elastic_journalbeat/tasks/main.yml b/elk_metrics_7x/roles/elastic_journalbeat/tasks/main.yml index dc4a534b..b87da6b3 100644 --- a/elk_metrics_7x/roles/elastic_journalbeat/tasks/main.yml +++ b/elk_metrics_7x/roles/elastic_journalbeat/tasks/main.yml @@ -47,17 +47,6 @@ tags: - package_install -- name: Ensure beat is installed (aarch64) - apt: - deb: 'https://object-storage-ca-ymq-1.vexxhost.net/swift/v1/8709ca2640344a4ba85cba0a1d6eea69/aarch64/journalbeat-6.5.0-arm64.deb' - when: - - ansible_pkg_mgr == 'apt' - - ansible_architecture == 'aarch64' - notify: - - Enable and restart heartbeat - tags: - - package_install - - name: Create journalbeat systemd service config dir file: path: "/etc/systemd/system/journalbeat.service.d" diff --git a/elk_metrics_7x/roles/elastic_metricbeat/tasks/main.yml b/elk_metrics_7x/roles/elastic_metricbeat/tasks/main.yml index d8c1de13..2652f13a 100644 --- a/elk_metrics_7x/roles/elastic_metricbeat/tasks/main.yml +++ b/elk_metrics_7x/roles/elastic_metricbeat/tasks/main.yml @@ -43,19 +43,6 @@ until: _package_task is success retries: 3 delay: 2 - when: - - ansible_architecture == 'x86_64' - notify: - - Enable and restart metricbeat - tags: - - package_install - -- name: Ensure beat is installed (aarch64) - apt: - deb: 'https://object-storage-ca-ymq-1.vexxhost.net/swift/v1/8709ca2640344a4ba85cba0a1d6eea69/aarch64/metricbeat-6.5.0-arm64.deb' - when: - - ansible_pkg_mgr == 'apt' - - ansible_architecture == 'aarch64' notify: - Enable and restart metricbeat tags: