diff --git a/ansible/playbooks/roles/filebeat/defaults/main.yml b/ansible/playbooks/roles/filebeat/defaults/main.yml index e41e7308f5..fab15e8de1 100644 --- a/ansible/playbooks/roles/filebeat/defaults/main.yml +++ b/ansible/playbooks/roles/filebeat/defaults/main.yml @@ -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 diff --git a/ansible/playbooks/roles/repository/files/download-requirements/requirements/x86_64/debian/ubuntu-20.04/packages.yml b/ansible/playbooks/roles/repository/files/download-requirements/requirements/x86_64/debian/ubuntu-20.04/packages.yml index bac12af123..b392062e2e 100644 --- a/ansible/playbooks/roles/repository/files/download-requirements/requirements/x86_64/debian/ubuntu-20.04/packages.yml +++ b/ansible/playbooks/roles/repository/files/download-requirements/requirements/x86_64/debian/ubuntu-20.04/packages.yml @@ -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' diff --git a/ansible/playbooks/roles/repository/files/download-requirements/requirements/x86_64/files.yml b/ansible/playbooks/roles/repository/files/download-requirements/requirements/x86_64/files.yml index cdd00db475..ec2f266d7a 100644 --- a/ansible/playbooks/roles/repository/files/download-requirements/requirements/x86_64/files.yml +++ b/ansible/playbooks/roles/repository/files/download-requirements/requirements/x86_64/files.yml @@ -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 diff --git a/ansible/playbooks/roles/repository/files/download-requirements/requirements/x86_64/redhat/packages.yml b/ansible/playbooks/roles/repository/files/download-requirements/requirements/x86_64/redhat/packages.yml index 4013c4e9d3..fa1f4cb13c 100644 --- a/ansible/playbooks/roles/repository/files/download-requirements/requirements/x86_64/redhat/packages.yml +++ b/ansible/playbooks/roles/repository/files/download-requirements/requirements/x86_64/redhat/packages.yml @@ -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' diff --git a/ansible/playbooks/roles/upgrade/tasks/filebeat.yml b/ansible/playbooks/roles/upgrade/tasks/filebeat.yml index 978a8e0f3b..33ce0a97e8 100644 --- a/ansible/playbooks/roles/upgrade/tasks/filebeat.yml +++ b/ansible/playbooks/roles/upgrade/tasks/filebeat.yml @@ -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 @@ -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: diff --git a/docs/changelogs/CHANGELOG-2.0.md b/docs/changelogs/CHANGELOG-2.0.md index 4c1042e3c1..9e0d740317 100644 --- a/docs/changelogs/CHANGELOG-2.0.md +++ b/docs/changelogs/CHANGELOG-2.0.md @@ -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 diff --git a/docs/home/COMPONENTS.md b/docs/home/COMPONENTS.md index 4f0edec445..e062dd103f 100644 --- a/docs/home/COMPONENTS.md +++ b/docs/home/COMPONENTS.md @@ -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) |