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

[2.0.1] Filebeat upgrade to 7.12.1 #3086

Merged
merged 6 commits into from
May 16, 2022
Merged

[2.0.1] Filebeat upgrade to 7.12.1 #3086

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4a258a3
Filebeat update to 7.12.1
rafzei Apr 15, 2022
14f9366
Add missing tasks name in upgrade/filebeat.yml
rafzei Apr 15, 2022
c7aed26
Update sha256
rafzei Apr 26, 2022
23e5c55
Update changelogs
rafzei Apr 26, 2022
142a042
Changelog change back to 2.0.1
rafzei Apr 27, 2022
b463c37
Merge branch 'develop' into feature/filebeat_upgrade
przemyslavic May 16, 2022
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 ansible/playbooks/roles/filebeat/defaults/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
filebeat_helm_chart_name: filebeat
filebeat_helm_chart_file_name: filebeat-7.9.2.tgz
filebeat_version: "7.9.2"
filebeat_helm_chart_file_name: filebeat-7.12.1.tgz
filebeat_version: "7.12.1"
# Use dedicated namespace for logging charts such as filebeat in case of k8s as cloud service.
logging_chart_namespace: epi-logging
2 changes: 1 addition & 1 deletion ...pository/files/download-requirements/requirements/x86_64/debian/ubuntu-20.04/packages.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ packages:
- 'erlang-tools=1:23.1.5*'
- 'erlang-xmerl=1:23.1.5*'
- 'ethtool'
- 'filebeat=7.9.2*'
- 'filebeat=7.12.1*'
- 'firewalld'
- 'fping'
- 'gnupg2'
Expand Down
4 changes: 2 additions & 2 deletions ansible/playbooks/roles/repository/files/download-requirements/requirements/x86_64/files.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@ files:
'https://charts.bitnami.com/bitnami/node-exporter-2.3.17.tgz':
sha256: ec586fabb775a4f05510386899cf348391523c89ff5a1d4097b0592e675ade7f

'https://helm.elastic.co/helm/filebeat/filebeat-7.9.2.tgz':
sha256: 5140b4c4473ca33a0af4c3f70545dcc89735c0a179d974ebc150f1f28ac229ab
'https://helm.elastic.co/helm/filebeat/filebeat-7.12.1.tgz':
sha256: 5838058fe06372390dc335900a7707109cc7287a84164ca245d395af1f9c0a79

'https://charts.rook.io/release/rook-ceph-v1.8.8.tgz':
sha256: f67e474dedffd4004f3a0b7b40112694a7f1c2b1a0048b03b3083d0a01e86b14
Expand Down
2 changes: 1 addition & 1 deletion ...ooks/roles/repository/files/download-requirements/requirements/x86_64/redhat/packages.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ packages:
- 'elasticsearch-curator-5.8.3'
- 'elasticsearch-oss-7.10.2' # for opendistroforelasticsearch & logging roles
- 'ethtool'
- 'filebeat-7.9.2'
- 'filebeat-7.12.1'
- 'firewalld'
- 'fontconfig' # for grafana
- 'fping'
Expand Down
9 changes: 6 additions & 3 deletions ansible/playbooks/roles/upgrade/tasks/filebeat.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,11 +74,13 @@
dest: /etc/filebeat/filebeat.yml.bak_{{ ansible_facts.packages['filebeat'][0].version }}
mode: u=rw,go=

- import_role:
- name: Install Filebeat as system service
import_role:
name: filebeat
tasks_from: install-filebeat-as-system-service

- import_role:
- name: Configure auditd
import_role:
name: filebeat
tasks_from: configure-auditd

Expand All @@ -93,7 +95,8 @@
_filebeat_existing_config: "{{ _filebeat_config_yml.content | b64decode | from_yaml }}"
no_log: true

- import_role:
- name: Configure Filebeat
import_role:
name: filebeat
tasks_from: configure-filebeat
vars:
Expand Down
4 changes: 3 additions & 1 deletion docs/changelogs/CHANGELOG-2.0.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@

## [2.0.1] YYYY-MM-DD

### Added
### Updated

- [#3080](https://github.com/epiphany-platform/epiphany/issues/3080) - update Filebeat to the latest compatible version with OpenSearch

## [2.0.0] 2022-05-09

Expand Down
4 changes: 2 additions & 2 deletions docs/home/COMPONENTS.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ Note that versions are default versions and can be changed in certain cases thro
| Elasticsearch Curator OSS | 5.8.3 | https://github.com/elastic/curator | https://github.com/elastic/curator/blob/master/LICENSE.txt |
| Opendistro for Elasticsearch | 1.13.x | https://opendistro.github.io/for-elasticsearch/ | [Apache License 2.0](https://www.apache.org/licenses/LICENSE-2.0) |
| Opendistro for Elasticsearch Kibana | 1.13.1 | https://opendistro.github.io/for-elasticsearch-docs/docs/kibana/ | [Apache License 2.0](https://www.apache.org/licenses/LICENSE-2.0) |
| Filebeat | 7.9.2 | https://github.com/elastic/beats | [Apache License 2.0](https://www.apache.org/licenses/LICENSE-2.0) |
| Filebeat Helm Chart | 7.9.2 | https://github.com/elastic/helm-charts | [Apache License 2.0](https://www.apache.org/licenses/LICENSE-2.0) |
| Filebeat | 7.12.1 | https://github.com/elastic/beats | [Apache License 2.0](https://www.apache.org/licenses/LICENSE-2.0) |
| Filebeat Helm Chart | 7.12.1 | https://github.com/elastic/helm-charts | [Apache License 2.0](https://www.apache.org/licenses/LICENSE-2.0) |
| Prometheus | 2.31.1 | https://github.com/prometheus/prometheus | [Apache License 2.0](https://www.apache.org/licenses/LICENSE-2.0) |
| Grafana | 8.3.2 | https://github.com/grafana/grafana | [Apache License 2.0](https://www.apache.org/licenses/LICENSE-2.0) |
| Node Exporter | 1.3.1 | https://github.com/prometheus/node_exporter | [Apache License 2.0](https://www.apache.org/licenses/LICENSE-2.0) |
Expand Down