From 3259a7d8e497fed488db668a718e8d1aa15299e3 Mon Sep 17 00:00:00 2001 From: Julien Mailleret Date: Wed, 4 Mar 2020 18:25:38 +0100 Subject: [PATCH 1/2] [7.6.1] bump version --- README.md | 10 +++++----- defaults/main.yml | 2 +- helpers/bumper.py | 8 ++++---- test/integration/standard-6x.yml | 2 +- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index 2ec6799..ae82c86 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,7 @@ This role provides a generic means of installing Elastic supported Beats Create your Ansible playbook with your own tasks, and include the role beats. You will have to have this repository accessible within the context of playbook. ```sh -ansible-galaxy install elastic.beats,7.6.0 +ansible-galaxy install elastic.beats,7.6.1 ``` Then create your playbook yaml adding the role beats. @@ -43,7 +43,7 @@ The simplest configuration therefore consists of: roles: - role: elastic.beats vars: - beats_version: 7.6.0 + beats_version: 7.6.1 beat: filebeat beat_conf: filebeat: @@ -54,11 +54,11 @@ The simplest configuration therefore consists of: - /var/log/*.log ``` -The above installs Filebeat 7.6.0 on the hosts 'localhost'. +The above installs Filebeat 7.6.1 on the hosts 'localhost'. **Notes**: - Beats default version is described in [`beats_version`](https://github.com/elastic/ansible-beats/blob/master/defaults/main.yml#L4). You can override this variable in your playbook to install another version. -While we are testing this role only with one 7.x and one 6.x version (respectively [7.6.0](https://github.com/elastic/ansible-beats/blob/master/defaults/main.yml#L4) and [6.8.6](https://github.com/elastic/ansible-beats/blob/master/test/integration/standard-6x.yml#L7) at the time of writing), this role should work with others version also in most cases. +While we are testing this role only with one 7.x and one 6.x version (respectively [7.6.1](https://github.com/elastic/ansible-beats/blob/master/defaults/main.yml#L4) and [6.8.7](https://github.com/elastic/ansible-beats/blob/master/test/integration/standard-6x.yml#L7) at the time of writing), this role should work with others version also in most cases. - Beat product is described in `beat` variable. While currently tested Beats are Filebeat, Metricbeat & Packetbeat, this role should work also with other member of [The Beats Family](https://www.elastic.co/products/beats) in most cases. ## Testing @@ -164,7 +164,7 @@ Supported variables are as follows: - **beat** (*MANDATORY*): Beat product. Supported values are: "filebeat", "metricbeat" & "packetbeat" (others beats from [The Beats Family](https://www.elastic.co/products/beats) should work in most cases but aren't currently tested). - **beat_conf** (*MANDATORY*): Beat Configuration. Should be defined as a map. -- **beats_version** (*Defaults to `7.6.0`*): Beats version. +- **beats_version** (*Defaults to `7.6.1`*): Beats version. - **version_lock** (*Defaults to `false`*): Locks the installed version if set to true, thus preventing other processes from updating. This will not impact the roles ability to update the beat on subsequent runs (it unlocks and re-locks if required). - **use_repository** (*Defaults to `true`*): Use elastic repo for yum or apt if true. If false, a custom custom_package_url must be provided. - **start_service** (*Defaults to `true`*): service will be started if true, false otherwise. diff --git a/defaults/main.yml b/defaults/main.yml index 9a68a40..3d8165e 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -1,6 +1,6 @@ --- # defaults file for beats -beats_version: 7.6.0 +beats_version: 7.6.1 oss_version: false version_lock: false use_repository: true diff --git a/helpers/bumper.py b/helpers/bumper.py index eec1b59..f3bd000 100755 --- a/helpers/bumper.py +++ b/helpers/bumper.py @@ -14,13 +14,13 @@ os.chdir(os.path.join(os.path.dirname(__file__), '..')) old_versions = { - 6: '6.8.5', - 7: '7.5.2', + 6: '6.8.6', + 7: '7.6.0', } new_versions = { - 6: '6.8.6', - 7: '7.6.0', + 6: '6.8.7', + 7: '7.6.1', } files = [ diff --git a/test/integration/standard-6x.yml b/test/integration/standard-6x.yml index cf6d16d..f4fcf85 100644 --- a/test/integration/standard-6x.yml +++ b/test/integration/standard-6x.yml @@ -12,5 +12,5 @@ input_type: log registry_file: /var/lib/filebeat/registry vars: - beats_version: 6.8.6 + beats_version: 6.8.7 use_repository: "true" From bd5abbf17665cdd531fe17b88ffae1b197640717 Mon Sep 17 00:00:00 2001 From: Julien Mailleret Date: Wed, 4 Mar 2020 18:27:44 +0100 Subject: [PATCH 2/2] [7.6.1] update changelog --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 529f4a1..9d1bf1f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ # Changelog +## 7.6.1 - 2020/03/04 + +* 7.6.1 as default version + + ## 7.6.0 - 2020/02/11 * 7.6.0 as default version