Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix package naming #368

Merged
merged 10 commits into from
Mar 5, 2025
Merged

Fix package naming #368

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
93d76bf
Fix package naming
Mar 5, 2025
34e797d
Removed trailing space
Mar 5, 2025
347aa15
Typo
Mar 5, 2025
26d1086
Fix linter error
Mar 5, 2025
48b3896
Update auditbeat.yml
Saeid-Abadi Mar 5, 2025
9643074
Update filebeat.yml
Saeid-Abadi Mar 5, 2025
bbc1bcc
Update metricbeat.yml
Saeid-Abadi Mar 5, 2025
a359574
Update main.yml
Saeid-Abadi Mar 5, 2025
d2b15a1
Update main.yml
Saeid-Abadi Mar 5, 2025
14f7ee8
Update main.yml
Saeid-Abadi Mar 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions roles/beats/tasks/auditbeat.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
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 > 0)) |
replace(' ', '')
}}

Expand Down Expand Up @@ -59,7 +59,7 @@
- name: Install Auditbeat latest version - rpm - standalone
ansible.builtin.package:
name: auditbeat
state: latest

Check warning on line 62 in roles/beats/tasks/auditbeat.yml

View workflow job for this annotation

GitHub Actions / kics 

Setting state to latest performs an update and installs additional packages possibly resulting in performance degradation or loss of service
notify:
- Restart Auditbeat
when:
Expand All @@ -71,7 +71,7 @@
- name: Install Auditbeat latest version - deb
ansible.builtin.package:
name: auditbeat
state: latest

Check warning on line 74 in roles/beats/tasks/auditbeat.yml

View workflow job for this annotation

GitHub Actions / kics 

Setting state to latest performs an update and installs additional packages possibly resulting in performance degradation or loss of service
notify:
- Restart Auditbeat
when:
Expand Down
4 changes: 2 additions & 2 deletions roles/beats/tasks/filebeat.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
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
Expand Down Expand Up @@ -41,7 +41,7 @@
- name: Install Filebeat latest version - rpm - full stack
ansible.builtin.package:
name: filebeat
state: latest

Check warning on line 44 in roles/beats/tasks/filebeat.yml

View workflow job for this annotation

GitHub Actions / kics 

Setting state to latest performs an update and installs additional packages possibly resulting in performance degradation or loss of service
enablerepo:
- "elastic-{{ elasticstack_release }}.x"
notify:
Expand All @@ -55,7 +55,7 @@
- name: Install Filebeat latest version - rpm - standalone
ansible.builtin.package:
name: filebeat
state: latest

Check warning on line 58 in roles/beats/tasks/filebeat.yml

View workflow job for this annotation

GitHub Actions / kics 

Setting state to latest performs an update and installs additional packages possibly resulting in performance degradation or loss of service
notify:
- Restart Filebeat
when:
Expand All @@ -67,7 +67,7 @@
- name: Install Filebeat latest version - deb
ansible.builtin.package:
name: filebeat
state: latest

Check warning on line 70 in roles/beats/tasks/filebeat.yml

View workflow job for this annotation

GitHub Actions / kics 

Setting state to latest performs an update and installs additional packages possibly resulting in performance degradation or loss of service
notify:
- Restart Filebeat
when:
Expand Down
4 changes: 2 additions & 2 deletions roles/beats/tasks/metricbeat.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
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(' ', '')
}}

Expand Down Expand Up @@ -42,7 +42,7 @@
- name: Install Metricbeat latest version - rpm - full stack
ansible.builtin.package:
name: metricbeat
state: latest

Check warning on line 45 in roles/beats/tasks/metricbeat.yml

View workflow job for this annotation

GitHub Actions / kics 

Setting state to latest performs an update and installs additional packages possibly resulting in performance degradation or loss of service
enablerepo:
- "elastic-{{ elasticstack_release }}.x"
notify:
Expand All @@ -56,7 +56,7 @@
- name: Install Metricbeat latest version - rpm - standalone
ansible.builtin.package:
name: metricbeat
state: latest

Check warning on line 59 in roles/beats/tasks/metricbeat.yml

View workflow job for this annotation

GitHub Actions / kics 

Setting state to latest performs an update and installs additional packages possibly resulting in performance degradation or loss of service
notify:
- Restart Metricbeat
when:
Expand All @@ -69,7 +69,7 @@
- name: Install Metricbeat latest version - deb
ansible.builtin.package:
name: metricbeat
state: latest

Check warning on line 72 in roles/beats/tasks/metricbeat.yml

View workflow job for this annotation

GitHub Actions / kics 

Setting state to latest performs an update and installs additional packages possibly resulting in performance degradation or loss of service
notify:
- Restart Metricbeat
when:
Expand Down
5 changes: 2 additions & 3 deletions roles/elasticsearch/tasks/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(' ', '')
}}

Expand Down Expand Up @@ -275,7 +274,7 @@
- name: Check for cluster status without security
ansible.builtin.uri:
# kics-scan ignore-line
url: "http://{{ elasticsearch_api_host }}:{{ elasticstack_elasticsearch_http_port }}/_cluster/health?pretty"

Check warning on line 277 in roles/elasticsearch/tasks/main.yml

View workflow job for this annotation

GitHub Actions / kics 

Using HTTP URLs (without encryption) could lead to security vulnerabilities and risks
register: elasticsearch_cluster_status
ignore_errors: "{{ ansible_check_mode }}"
until: elasticsearch_cluster_status.json.status == "green"
Expand Down
4 changes: 2 additions & 2 deletions roles/kibana/tasks/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,9 @@
{{
'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
Expand Down
12 changes: 4 additions & 8 deletions roles/logstash/tasks/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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:
Expand Down
Loading