From 4a258a37388ee332380f3835a57af1bde40bc1bf Mon Sep 17 00:00:00 2001 From: rafzei Date: Fri, 15 Apr 2022 13:19:57 +0200 Subject: [PATCH 1/5] Filebeat update to 7.12.1 --- .../roles/filebeat/defaults/main.yml | 4 ++-- .../x86_64/debian/ubuntu-20.04/packages.yml | 2 +- .../requirements/x86_64/files.yml | 2 +- .../requirements/x86_64/redhat/packages.yml | 2 +- docs/changelogs/CHANGELOG-2.1.md | 19 +++++++++++++++++++ docs/home/COMPONENTS.md | 4 ++-- 6 files changed, 26 insertions(+), 7 deletions(-) create mode 100644 docs/changelogs/CHANGELOG-2.1.md 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..5b37a7feb2 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,7 +36,7 @@ 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': + 'https://helm.elastic.co/helm/filebeat/filebeat-7.12.1.tgz': sha256: 5140b4c4473ca33a0af4c3f70545dcc89735c0a179d974ebc150f1f28ac229ab 'https://charts.rook.io/release/rook-ceph-v1.8.8.tgz': 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 0b0537d31e..bd4696d4f8 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/docs/changelogs/CHANGELOG-2.1.md b/docs/changelogs/CHANGELOG-2.1.md new file mode 100644 index 0000000000..5caa7e1595 --- /dev/null +++ b/docs/changelogs/CHANGELOG-2.1.md @@ -0,0 +1,19 @@ +# Changelog 2.0 + +## [2.1.0] 2022-MM-DD + +### Added + +### Fixed + +### Updated + +- [#3080](https://github.com/epiphany-platform/epiphany/issues/3080) - update Filebeat to the latest compatible version with OpenSearch + +### Removed + +### Deprecated + +### Breaking changes + +### Known issues 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) | From 14f9366ecd6b9c3e5343d1fef7837992287aa6dc Mon Sep 17 00:00:00 2001 From: rafzei Date: Fri, 15 Apr 2022 13:29:06 +0200 Subject: [PATCH 2/5] Add missing tasks name in upgrade/filebeat.yml --- ansible/playbooks/roles/upgrade/tasks/filebeat.yml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) 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: From c7aed26fee5ec324e9fcf08e5cfa70a05eaa95fc Mon Sep 17 00:00:00 2001 From: rafzei Date: Tue, 26 Apr 2022 15:44:50 +0200 Subject: [PATCH 3/5] Update sha256 --- .../files/download-requirements/requirements/x86_64/files.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 5b37a7feb2..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 @@ -37,7 +37,7 @@ files: sha256: ec586fabb775a4f05510386899cf348391523c89ff5a1d4097b0592e675ade7f 'https://helm.elastic.co/helm/filebeat/filebeat-7.12.1.tgz': - sha256: 5140b4c4473ca33a0af4c3f70545dcc89735c0a179d974ebc150f1f28ac229ab + sha256: 5838058fe06372390dc335900a7707109cc7287a84164ca245d395af1f9c0a79 'https://charts.rook.io/release/rook-ceph-v1.8.8.tgz': sha256: f67e474dedffd4004f3a0b7b40112694a7f1c2b1a0048b03b3083d0a01e86b14 From 23e5c559612b0f5c520769ddebc023cd10d004d6 Mon Sep 17 00:00:00 2001 From: rafzei Date: Tue, 26 Apr 2022 16:00:16 +0200 Subject: [PATCH 4/5] Update changelogs --- CHANGELOG.md | 1 + docs/changelogs/CHANGELOG-2.1.md | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 06e5215615..1837ad15e4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. Reference for actual cluster component versions can be found [here](docs/home/COMPONENTS.md) +- [CHANGELOG-2.1.x](./docs/changelogs/CHANGELOG-2.1.md) - [CHANGELOG-2.0.x](./docs/changelogs/CHANGELOG-2.0.md) - [CHANGELOG-1.3.x](./docs/changelogs/CHANGELOG-1.3.md) - [CHANGELOG-1.2.x](./docs/changelogs/CHANGELOG-1.2.md) diff --git a/docs/changelogs/CHANGELOG-2.1.md b/docs/changelogs/CHANGELOG-2.1.md index 5caa7e1595..9b89bf1e36 100644 --- a/docs/changelogs/CHANGELOG-2.1.md +++ b/docs/changelogs/CHANGELOG-2.1.md @@ -1,4 +1,4 @@ -# Changelog 2.0 +# Changelog 2.1 ## [2.1.0] 2022-MM-DD From 142a04290d85bba21f701e1d59b96e8c3a1468fc Mon Sep 17 00:00:00 2001 From: rafzei Date: Wed, 27 Apr 2022 11:24:10 +0200 Subject: [PATCH 5/5] Changelog change back to 2.0.1 --- CHANGELOG.md | 1 - docs/changelogs/CHANGELOG-2.0.md | 6 ++++++ docs/changelogs/CHANGELOG-2.1.md | 19 ------------------- 3 files changed, 6 insertions(+), 20 deletions(-) delete mode 100644 docs/changelogs/CHANGELOG-2.1.md diff --git a/CHANGELOG.md b/CHANGELOG.md index 1837ad15e4..06e5215615 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,7 +7,6 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. Reference for actual cluster component versions can be found [here](docs/home/COMPONENTS.md) -- [CHANGELOG-2.1.x](./docs/changelogs/CHANGELOG-2.1.md) - [CHANGELOG-2.0.x](./docs/changelogs/CHANGELOG-2.0.md) - [CHANGELOG-1.3.x](./docs/changelogs/CHANGELOG-1.3.md) - [CHANGELOG-1.2.x](./docs/changelogs/CHANGELOG-1.2.md) diff --git a/docs/changelogs/CHANGELOG-2.0.md b/docs/changelogs/CHANGELOG-2.0.md index beafb13177..7aed3d8a40 100644 --- a/docs/changelogs/CHANGELOG-2.0.md +++ b/docs/changelogs/CHANGELOG-2.0.md @@ -1,5 +1,11 @@ # Changelog 2.0 +## [2.0.1] YYYY-MM-DD + +### Updated + +- [#3080](https://github.com/epiphany-platform/epiphany/issues/3080) - update Filebeat to the latest compatible version with OpenSearch + ## [2.0.0] YYYY-MM-DD ### Added diff --git a/docs/changelogs/CHANGELOG-2.1.md b/docs/changelogs/CHANGELOG-2.1.md deleted file mode 100644 index 9b89bf1e36..0000000000 --- a/docs/changelogs/CHANGELOG-2.1.md +++ /dev/null @@ -1,19 +0,0 @@ -# Changelog 2.1 - -## [2.1.0] 2022-MM-DD - -### Added - -### Fixed - -### Updated - -- [#3080](https://github.com/epiphany-platform/epiphany/issues/3080) - update Filebeat to the latest compatible version with OpenSearch - -### Removed - -### Deprecated - -### Breaking changes - -### Known issues