From 93d76bf41327f81e50b09592e0278c3ca35068be Mon Sep 17 00:00:00 2001 From: Saeid Hassan-Abadi Date: Wed, 5 Mar 2025 09:39:21 +0100 Subject: [PATCH 01/10] Fix package naming --- roles/beats/tasks/auditbeat.yml | 7 +++++-- roles/beats/tasks/filebeat.yml | 7 +++++-- roles/beats/tasks/metricbeat.yml | 7 +++++-- roles/elasticsearch/tasks/main.yml | 8 +++++--- roles/kibana/tasks/main.yml | 7 +++++-- roles/logstash/tasks/main.yml | 15 +++++++-------- 6 files changed, 32 insertions(+), 19 deletions(-) diff --git a/roles/beats/tasks/auditbeat.yml b/roles/beats/tasks/auditbeat.yml index 5a42f385..1049d311 100644 --- a/roles/beats/tasks/auditbeat.yml +++ b/roles/beats/tasks/auditbeat.yml @@ -5,15 +5,16 @@ beats_auditbeat_package: > {{ 'auditbeat' + - (elasticstack_versionseparator + + ((elasticstack_versionseparator + elasticstack_version | - string if elasticstack_version is defined else '') | + string ) if (elasticstack_version is defined and elasticstack_version | length > )| replace(' ', '') }} - name: Install Auditbeat - rpm - full stack ansible.builtin.package: name: "{{ beats_auditbeat_package }}" + state: "{{ 'latest' if elasticstack_version is not defined or elasticstack_version | length == 0 else 'present' }}" enablerepo: - 'elastic-{{ elasticstack_release }}.x' notify: @@ -25,6 +26,7 @@ - name: Install Auditbeat - rpm - standalone ansible.builtin.package: name: "{{ beats_auditbeat_package }}" + state: "{{ 'latest' if elasticstack_version is not defined or elasticstack_version | length == 0 else 'present' }}" notify: - Restart Auditbeat when: @@ -34,6 +36,7 @@ - name: Install Auditbeat - deb ansible.builtin.package: name: "{{ beats_auditbeat_package }}" + state: "{{ 'latest' if elasticstack_version is not defined or elasticstack_version | length == 0 else 'present' }}" notify: - Restart Auditbeat when: diff --git a/roles/beats/tasks/filebeat.yml b/roles/beats/tasks/filebeat.yml index 4c90c9ed..73c2f701 100644 --- a/roles/beats/tasks/filebeat.yml +++ b/roles/beats/tasks/filebeat.yml @@ -5,14 +5,15 @@ beats_filebeat_package: > {{ 'filebeat' + - (elasticstack_versionseparator + + ((elasticstack_versionseparator + elasticstack_version | - string if elasticstack_version is defined else '') | + string ) if (elasticstack_version is defined and elasticstack_version | length > 0)) | replace(' ', '') }} - name: Install Filebeat - rpm - full stack ansible.builtin.package: name: "{{ beats_filebeat_package }}" + state: "{{ 'latest' if elasticstack_version is not defined or elasticstack_version | length == 0 else 'present' }}" enablerepo: - 'elastic-{{ elasticstack_release }}.x' notify: @@ -24,6 +25,7 @@ - name: Install Filebeat - rpm - standalone ansible.builtin.package: name: "{{ beats_filebeat_package }}" + state: "{{ 'latest' if elasticstack_version is not defined or elasticstack_version | length == 0 else 'present' }}" notify: - Restart Filebeat when: @@ -33,6 +35,7 @@ - name: Install Filebeat - deb ansible.builtin.package: name: "{{ beats_filebeat_package }}" + state: "{{ 'latest' if elasticstack_version is not defined or elasticstack_version | length == 0 else 'present' }}" notify: - Restart Filebeat when: diff --git a/roles/beats/tasks/metricbeat.yml b/roles/beats/tasks/metricbeat.yml index c261a962..daf22cbe 100644 --- a/roles/beats/tasks/metricbeat.yml +++ b/roles/beats/tasks/metricbeat.yml @@ -5,15 +5,16 @@ beats_metricbeat_package: > {{ 'metricbeat' + - (elasticstack_versionseparator + + ((elasticstack_versionseparator + elasticstack_version | - string if elasticstack_version is defined else '') | + string ) if (elasticstack_version is defined and elasticstack_version | length > 0)) | replace(' ', '') }} - name: Install Metricbeat - rpm - full stack ansible.builtin.package: name: "{{ beats_metricbeat_package }}" + state: "{{ 'latest' if elasticstack_version is not defined or elasticstack_version | length == 0 else 'present' }}" enablerepo: - 'elastic-{{ elasticstack_release }}.x' notify: @@ -25,6 +26,7 @@ - name: Install Metricbeat - rpm - standalone ansible.builtin.package: name: "{{ beats_metricbeat_package }}" + state: "{{ 'latest' if elasticstack_version is not defined or elasticstack_version | length == 0 else 'present' }}" notify: - Restart Metricbeat when: @@ -34,6 +36,7 @@ - name: Install Metricbeat - deb ansible.builtin.package: name: "{{ beats_metricbeat_package }}" + state: "{{ 'latest' if elasticstack_version is not defined or elasticstack_version | length == 0 else 'present' }}" notify: - Restart Metricbeat when: diff --git a/roles/elasticsearch/tasks/main.yml b/roles/elasticsearch/tasks/main.yml index 71d7342b..e29be027 100644 --- a/roles/elasticsearch/tasks/main.yml +++ b/roles/elasticsearch/tasks/main.yml @@ -131,10 +131,9 @@ elasticsearch_package: > {{ 'elasticsearch' + - ('-oss' if elasticstack_variant == 'oss' else '') + - (elasticstack_versionseparator + + ((elasticstack_versionseparator + elasticstack_version | - string if elasticstack_version is defined else '') | + string ) if (elasticstack_version is defined and elasticstack_version | length > 0)) | replace(' ', '') }} @@ -151,6 +150,7 @@ - name: Install Elasticsearch - rpm - full stack ansible.builtin.package: name: "{{ elasticsearch_package }}" + state: "{{ 'latest' if elasticstack_version is not defined or elasticstack_version | length == 0 else 'present' }}" enablerepo: - 'elastic-{% if elasticstack_variant == "oss" %}oss-{% endif %}{{ elasticstack_release }}.x' when: @@ -160,6 +160,7 @@ - name: Install Elasticsearch - rpm - standalone ansible.builtin.package: name: "{{ elasticsearch_package }}" + state: "{{ 'latest' if elasticstack_version is not defined or elasticstack_version | length == 0 else 'present' }}" when: - ansible_os_family == "RedHat" - not elasticstack_full_stack | bool @@ -167,6 +168,7 @@ - name: Install Elasticsearch - deb ansible.builtin.package: name: "{{ elasticsearch_package }}" + state: "{{ 'latest' if elasticstack_version is not defined or elasticstack_version | length == 0 else 'present' }}" when: - ansible_os_family == "Debian" diff --git a/roles/kibana/tasks/main.yml b/roles/kibana/tasks/main.yml index f33f3deb..078359b8 100644 --- a/roles/kibana/tasks/main.yml +++ b/roles/kibana/tasks/main.yml @@ -45,14 +45,15 @@ {{ 'kibana' + ('-oss' if elasticstack_variant == 'oss' else '') + - (elasticstack_versionseparator + + ((elasticstack_versionseparator + elasticstack_version | - string if elasticstack_version is defined else '') | + string ) if (elasticstack_version is defined and elasticstack_version | length > 0)) | replace(' ', '') }} - name: Install Kibana - rpm - full stack ansible.builtin.package: name: "{{ kibana_package }}" + state: "{{ 'latest' if elasticstack_version is not defined or elasticstack_version | length == 0 else 'present' }}" enablerepo: - 'elastic-{% if elasticstack_variant == "oss" %}oss-{% endif %}{{ elasticstack_release }}.x' notify: @@ -64,6 +65,7 @@ - name: Install Kibana - rpm - standalone ansible.builtin.package: name: "{{ kibana_package }}" + state: "{{ 'latest' if elasticstack_version is not defined or elasticstack_version | length == 0 else 'present' }}" notify: - Restart Kibana when: @@ -73,6 +75,7 @@ - name: Install Kibana - deb ansible.builtin.package: name: "{{ kibana_package }}" + state: "{{ 'latest' if elasticstack_version is not defined or elasticstack_version | length == 0 else 'present' }}" notify: - Restart Kibana when: diff --git a/roles/logstash/tasks/main.yml b/roles/logstash/tasks/main.yml index 00e4a70a..dddf8cd0 100644 --- a/roles/logstash/tasks/main.yml +++ b/roles/logstash/tasks/main.yml @@ -61,10 +61,9 @@ logstash_package: > {{ 'logstash' + - ('-oss' if elasticstack_variant == 'oss' else '') + - (elasticstack_versionseparator + + ((elasticstack_versionseparator + elasticstack_version | - string if elasticstack_version is defined else '') | + string ) if (elasticstack_version is defined and elasticstack_version | length > 0)) | replace(' ', '') }} when: @@ -76,11 +75,8 @@ {{ 'logstash' + ('-oss' if elasticstack_variant == 'oss' else '') + - (elasticstack_versionseparator + - '1:' + - elasticstack_version + - '-1' | - string if elasticstack_version is defined else '') | + ((elasticstack_versionseparator + '1:' + elasticstack_version + '-1') + if (elasticstack_version is defined and elasticstack_version | length > 0) else '') | replace(' ', '') }} when: @@ -89,6 +85,7 @@ - name: Install Logstash - rpm - full stack ansible.builtin.package: name: "{{ logstash_package }}" + state: "{{ 'latest' if elasticstack_version is not defined or elasticstack_version | length == 0 else 'present' }}" enablerepo: - 'elastic-{% if elasticstack_variant == "oss" %}oss-{% endif %}{{ elasticstack_release }}.x' notify: @@ -100,6 +97,7 @@ - name: Install Logstash - rpm - standalone ansible.builtin.package: name: "{{ logstash_package }}" + state: "{{ 'latest' if elasticstack_version is not defined or elasticstack_version | length == 0 else 'present' }}" notify: - Restart Logstash when: @@ -109,6 +107,7 @@ - name: Install Logstash - deb ansible.builtin.package: name: "{{ logstash_package }}" + state: "{{ 'latest' if elasticstack_version is not defined or elasticstack_version | length == 0 else 'present' }}" notify: - Restart Logstash when: From 34e797d81b7f6a950e30bd4c54b1ece62729ac43 Mon Sep 17 00:00:00 2001 From: Saeid Hassan-Abadi Date: Wed, 5 Mar 2025 09:47:24 +0100 Subject: [PATCH 02/10] Removed trailing space --- roles/logstash/tasks/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/logstash/tasks/main.yml b/roles/logstash/tasks/main.yml index dddf8cd0..f7e1d104 100644 --- a/roles/logstash/tasks/main.yml +++ b/roles/logstash/tasks/main.yml @@ -75,7 +75,7 @@ {{ 'logstash' + ('-oss' if elasticstack_variant == 'oss' else '') + - ((elasticstack_versionseparator + '1:' + elasticstack_version + '-1') + ((elasticstack_versionseparator + '1:' + elasticstack_version + '-1') if (elasticstack_version is defined and elasticstack_version | length > 0) else '') | replace(' ', '') }} From 347aa1535ab76ca45e0aea822da51b8c52072d7c Mon Sep 17 00:00:00 2001 From: Saeid Hassan-Abadi Date: Wed, 5 Mar 2025 09:50:41 +0100 Subject: [PATCH 03/10] Typo --- roles/beats/tasks/auditbeat.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/beats/tasks/auditbeat.yml b/roles/beats/tasks/auditbeat.yml index 1049d311..ba0e9006 100644 --- a/roles/beats/tasks/auditbeat.yml +++ b/roles/beats/tasks/auditbeat.yml @@ -7,7 +7,7 @@ 'auditbeat' + ((elasticstack_versionseparator + elasticstack_version | - string ) if (elasticstack_version is defined and elasticstack_version | length > )| + string ) if (elasticstack_version is defined and elasticstack_version | length > 0)| replace(' ', '') }} From 26d108623b1f59e57cb1382388d47eae1c1e064c Mon Sep 17 00:00:00 2001 From: Saeid Hassan-Abadi Date: Wed, 5 Mar 2025 09:57:18 +0100 Subject: [PATCH 04/10] Fix linter error --- roles/beats/tasks/auditbeat.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/beats/tasks/auditbeat.yml b/roles/beats/tasks/auditbeat.yml index ba0e9006..b7b61bbf 100644 --- a/roles/beats/tasks/auditbeat.yml +++ b/roles/beats/tasks/auditbeat.yml @@ -7,7 +7,7 @@ 'auditbeat' + ((elasticstack_versionseparator + elasticstack_version | - string ) if (elasticstack_version is defined and elasticstack_version | length > 0)| + string ) if (elasticstack_version is defined and elasticstack_version | length > 0)) | replace(' ', '') }} From 48b3896ac32622d40eaedcf3aee696823f6be27a Mon Sep 17 00:00:00 2001 From: Saeid Hassan-Abadi <91598706+Saeid-Abadi@users.noreply.github.com> Date: Wed, 5 Mar 2025 14:11:14 +0100 Subject: [PATCH 05/10] Update auditbeat.yml --- roles/beats/tasks/auditbeat.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/roles/beats/tasks/auditbeat.yml b/roles/beats/tasks/auditbeat.yml index b7b61bbf..afc8cd2b 100644 --- a/roles/beats/tasks/auditbeat.yml +++ b/roles/beats/tasks/auditbeat.yml @@ -14,7 +14,6 @@ - name: Install Auditbeat - rpm - full stack ansible.builtin.package: name: "{{ beats_auditbeat_package }}" - state: "{{ 'latest' if elasticstack_version is not defined or elasticstack_version | length == 0 else 'present' }}" enablerepo: - 'elastic-{{ elasticstack_release }}.x' notify: @@ -26,7 +25,6 @@ - name: Install Auditbeat - rpm - standalone ansible.builtin.package: name: "{{ beats_auditbeat_package }}" - state: "{{ 'latest' if elasticstack_version is not defined or elasticstack_version | length == 0 else 'present' }}" notify: - Restart Auditbeat when: @@ -36,7 +34,6 @@ - name: Install Auditbeat - deb ansible.builtin.package: name: "{{ beats_auditbeat_package }}" - state: "{{ 'latest' if elasticstack_version is not defined or elasticstack_version | length == 0 else 'present' }}" notify: - Restart Auditbeat when: From 96430744f42e48fa5aa9756053aa729f77283e18 Mon Sep 17 00:00:00 2001 From: Saeid Hassan-Abadi <91598706+Saeid-Abadi@users.noreply.github.com> Date: Wed, 5 Mar 2025 14:14:05 +0100 Subject: [PATCH 06/10] Update filebeat.yml --- roles/beats/tasks/filebeat.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/roles/beats/tasks/filebeat.yml b/roles/beats/tasks/filebeat.yml index 73c2f701..7ef3c62e 100644 --- a/roles/beats/tasks/filebeat.yml +++ b/roles/beats/tasks/filebeat.yml @@ -13,7 +13,6 @@ - name: Install Filebeat - rpm - full stack ansible.builtin.package: name: "{{ beats_filebeat_package }}" - state: "{{ 'latest' if elasticstack_version is not defined or elasticstack_version | length == 0 else 'present' }}" enablerepo: - 'elastic-{{ elasticstack_release }}.x' notify: @@ -25,7 +24,6 @@ - name: Install Filebeat - rpm - standalone ansible.builtin.package: name: "{{ beats_filebeat_package }}" - state: "{{ 'latest' if elasticstack_version is not defined or elasticstack_version | length == 0 else 'present' }}" notify: - Restart Filebeat when: @@ -35,7 +33,6 @@ - name: Install Filebeat - deb ansible.builtin.package: name: "{{ beats_filebeat_package }}" - state: "{{ 'latest' if elasticstack_version is not defined or elasticstack_version | length == 0 else 'present' }}" notify: - Restart Filebeat when: From bbc1bcc01135140df44c3a130fca7549fc0f8ba6 Mon Sep 17 00:00:00 2001 From: Saeid Hassan-Abadi <91598706+Saeid-Abadi@users.noreply.github.com> Date: Wed, 5 Mar 2025 14:14:35 +0100 Subject: [PATCH 07/10] Update metricbeat.yml --- roles/beats/tasks/metricbeat.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/roles/beats/tasks/metricbeat.yml b/roles/beats/tasks/metricbeat.yml index daf22cbe..337a0fcf 100644 --- a/roles/beats/tasks/metricbeat.yml +++ b/roles/beats/tasks/metricbeat.yml @@ -14,7 +14,6 @@ - name: Install Metricbeat - rpm - full stack ansible.builtin.package: name: "{{ beats_metricbeat_package }}" - state: "{{ 'latest' if elasticstack_version is not defined or elasticstack_version | length == 0 else 'present' }}" enablerepo: - 'elastic-{{ elasticstack_release }}.x' notify: @@ -26,7 +25,6 @@ - name: Install Metricbeat - rpm - standalone ansible.builtin.package: name: "{{ beats_metricbeat_package }}" - state: "{{ 'latest' if elasticstack_version is not defined or elasticstack_version | length == 0 else 'present' }}" notify: - Restart Metricbeat when: @@ -36,7 +34,6 @@ - name: Install Metricbeat - deb ansible.builtin.package: name: "{{ beats_metricbeat_package }}" - state: "{{ 'latest' if elasticstack_version is not defined or elasticstack_version | length == 0 else 'present' }}" notify: - Restart Metricbeat when: From a3595742954218a3534e87d00717989bfc76bc9e Mon Sep 17 00:00:00 2001 From: Saeid Hassan-Abadi <91598706+Saeid-Abadi@users.noreply.github.com> Date: Wed, 5 Mar 2025 14:15:30 +0100 Subject: [PATCH 08/10] Update main.yml --- roles/elasticsearch/tasks/main.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/roles/elasticsearch/tasks/main.yml b/roles/elasticsearch/tasks/main.yml index e29be027..1516e983 100644 --- a/roles/elasticsearch/tasks/main.yml +++ b/roles/elasticsearch/tasks/main.yml @@ -150,7 +150,6 @@ - name: Install Elasticsearch - rpm - full stack ansible.builtin.package: name: "{{ elasticsearch_package }}" - state: "{{ 'latest' if elasticstack_version is not defined or elasticstack_version | length == 0 else 'present' }}" enablerepo: - 'elastic-{% if elasticstack_variant == "oss" %}oss-{% endif %}{{ elasticstack_release }}.x' when: @@ -160,7 +159,6 @@ - name: Install Elasticsearch - rpm - standalone ansible.builtin.package: name: "{{ elasticsearch_package }}" - state: "{{ 'latest' if elasticstack_version is not defined or elasticstack_version | length == 0 else 'present' }}" when: - ansible_os_family == "RedHat" - not elasticstack_full_stack | bool @@ -168,7 +166,6 @@ - name: Install Elasticsearch - deb ansible.builtin.package: name: "{{ elasticsearch_package }}" - state: "{{ 'latest' if elasticstack_version is not defined or elasticstack_version | length == 0 else 'present' }}" when: - ansible_os_family == "Debian" From d2b15a171de1cb3e42836768b7b5a8a3d9466db4 Mon Sep 17 00:00:00 2001 From: Saeid Hassan-Abadi <91598706+Saeid-Abadi@users.noreply.github.com> Date: Wed, 5 Mar 2025 14:16:02 +0100 Subject: [PATCH 09/10] Update main.yml --- roles/kibana/tasks/main.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/roles/kibana/tasks/main.yml b/roles/kibana/tasks/main.yml index 078359b8..396d9eb0 100644 --- a/roles/kibana/tasks/main.yml +++ b/roles/kibana/tasks/main.yml @@ -53,7 +53,6 @@ - name: Install Kibana - rpm - full stack ansible.builtin.package: name: "{{ kibana_package }}" - state: "{{ 'latest' if elasticstack_version is not defined or elasticstack_version | length == 0 else 'present' }}" enablerepo: - 'elastic-{% if elasticstack_variant == "oss" %}oss-{% endif %}{{ elasticstack_release }}.x' notify: @@ -65,7 +64,6 @@ - name: Install Kibana - rpm - standalone ansible.builtin.package: name: "{{ kibana_package }}" - state: "{{ 'latest' if elasticstack_version is not defined or elasticstack_version | length == 0 else 'present' }}" notify: - Restart Kibana when: @@ -75,7 +73,6 @@ - name: Install Kibana - deb ansible.builtin.package: name: "{{ kibana_package }}" - state: "{{ 'latest' if elasticstack_version is not defined or elasticstack_version | length == 0 else 'present' }}" notify: - Restart Kibana when: From 14f7ee8fe7c7a7403064ea42f404763529dca05f Mon Sep 17 00:00:00 2001 From: Saeid Hassan-Abadi <91598706+Saeid-Abadi@users.noreply.github.com> Date: Wed, 5 Mar 2025 14:16:50 +0100 Subject: [PATCH 10/10] Update main.yml --- roles/logstash/tasks/main.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/roles/logstash/tasks/main.yml b/roles/logstash/tasks/main.yml index f7e1d104..c08d377e 100644 --- a/roles/logstash/tasks/main.yml +++ b/roles/logstash/tasks/main.yml @@ -85,7 +85,6 @@ - name: Install Logstash - rpm - full stack ansible.builtin.package: name: "{{ logstash_package }}" - state: "{{ 'latest' if elasticstack_version is not defined or elasticstack_version | length == 0 else 'present' }}" enablerepo: - 'elastic-{% if elasticstack_variant == "oss" %}oss-{% endif %}{{ elasticstack_release }}.x' notify: @@ -97,7 +96,6 @@ - name: Install Logstash - rpm - standalone ansible.builtin.package: name: "{{ logstash_package }}" - state: "{{ 'latest' if elasticstack_version is not defined or elasticstack_version | length == 0 else 'present' }}" notify: - Restart Logstash when: @@ -107,7 +105,6 @@ - name: Install Logstash - deb ansible.builtin.package: name: "{{ logstash_package }}" - state: "{{ 'latest' if elasticstack_version is not defined or elasticstack_version | length == 0 else 'present' }}" notify: - Restart Logstash when: