From 978875bcd7ca5a9a95596f3cb400976134fd0d7e Mon Sep 17 00:00:00 2001 From: Julien Mailleret Date: Wed, 13 May 2020 20:01:56 +0200 Subject: [PATCH] 7.7.0 release (#85) --- CHANGELOG.md | 87 ++++++++++++++++++-------------- README.md | 10 ++-- defaults/main.yml | 2 +- helpers/bumper.py | 8 +-- test/integration/standard-6x.yml | 2 +- 5 files changed, 60 insertions(+), 49 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 251aea1..6d1de3b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,15 +1,26 @@ # Changelog +## 7.7.0 - 2020/05/13 + +* 7.7.0 as default version +* 6.8.9 as 6.x tested version +* Fix CentOS tests in [#86](https://github.com/elastic/ansible-beats/pull/86) ([@jmlrt](https://github.com/jmlrt)) + +| PR | Author | Title | +|---------------------------------------------------------|------------------------------------------|---------------------------------------------| +| [#84](https://github.com/elastic/ansible-beats/pull/84) | [@kravietz](https://github.com/kravietz) | Minor formatting fixes to pass ansible-lint | + + ## 7.6.2 - 2020/03/31 * 7.6.2 as default version * 6.8.8 as 6.x tested version -| PR | Author | Title | -| ------------------------------------------------------ | ---------------------------------- | ------------------------------------------------------------------------- | -|[#77](https://github.com/elastic/ansible-beats/pull/77) | [@jmlrt](https://github.com/jmlrt) | Add become to individual tasks | -|[#75](https://github.com/elastic/ansible-beats/pull/75) | [@ktibi](https://github.com/ktibi) | Add option to disable the repo installation and lock package installation | -|[#78](https://github.com/elastic/ansible-beats/pull/78) | [@astik](https://github.com/astik) | Aad task to create directory for default policies | +| PR | Author | Title | +|---------------------------------------------------------|------------------------------------|---------------------------------------------------------------------------| +| [#77](https://github.com/elastic/ansible-beats/pull/77) | [@jmlrt](https://github.com/jmlrt) | Add become to individual tasks | +| [#75](https://github.com/elastic/ansible-beats/pull/75) | [@ktibi](https://github.com/ktibi) | Add option to disable the repo installation and lock package installation | +| [#78](https://github.com/elastic/ansible-beats/pull/78) | [@astik](https://github.com/astik) | Aad task to create directory for default policies | ## 7.6.1 - 2020/03/04 @@ -21,21 +32,21 @@ * 7.6.0 as default version -| PR | Author | Title | -| ------------------------------------------------------ | ------------------------------------------------------ | -------------------------------------------------------- | -|[#69](https://github.com/elastic/ansible-beats/pull/69) | [@dependabot[bot]](https://github.com/apps/dependabot) | Bump rubyzip from 1.2.2 to 2.0.0 | -|[#71](https://github.com/elastic/ansible-beats/pull/71) | [@jmlrt](https://github.com/jmlrt) | Fix filebeat example configuration | -|[#72](https://github.com/elastic/ansible-beats/pull/72) | [@beand](https://github.com/beand) | Fixed typo | +| PR | Author | Title | +|---------------------------------------------------------|--------------------------------------------------------|------------------------------------| +| [#69](https://github.com/elastic/ansible-beats/pull/69) | [@dependabot[bot]](https://github.com/apps/dependabot) | Bump rubyzip from 1.2.2 to 2.0.0 | +| [#71](https://github.com/elastic/ansible-beats/pull/71) | [@jmlrt](https://github.com/jmlrt) | Fix filebeat example configuration | +| [#72](https://github.com/elastic/ansible-beats/pull/72) | [@beand](https://github.com/beand) | Fixed typo | ## 7.5.2 - 2020/01/21 * 7.5.2 as default version -| PR | Author | Title | -| ------------------------------------------------------ | ---------------------------------- | -------------------------------------------- | -|[#66](https://github.com/elastic/ansible-beats/pull/66) | [@jmlrt](https://github.com/jmlrt) | [doc] switched relative URLs to absolute URLs| -|[#67](https://github.com/elastic/ansible-beats/pull/67) | [@jmlrt](https://github.com/jmlrt) | [ci] bump ruby to 2.5.7 | +| PR | Author | Title | +|---------------------------------------------------------|------------------------------------|-----------------------------------------------| +| [#66](https://github.com/elastic/ansible-beats/pull/66) | [@jmlrt](https://github.com/jmlrt) | [doc] switched relative URLs to absolute URLs | +| [#67](https://github.com/elastic/ansible-beats/pull/67) | [@jmlrt](https://github.com/jmlrt) | [ci] bump ruby to 2.5.7 | ## 7.5.1 - 2019/12/18 @@ -43,9 +54,9 @@ * 7.5.1 as default version * 6.8.6 as 6.x tested version -| PR | Author | Title | -| ------------------------------------------------------ | -------------------------------------------------- | ------------------------ | -|[#61](https://github.com/elastic/ansible-beats/pull/61) | [@robsonpeixoto](https://github.com/robsonpeixoto) | Allow use oss repository | +| PR | Author | Title | +|---------------------------------------------------------|----------------------------------------------------|--------------------------| +| [#61](https://github.com/elastic/ansible-beats/pull/61) | [@robsonpeixoto](https://github.com/robsonpeixoto) | Allow use oss repository | ## 7.5.0 - 2019/12/02 @@ -53,13 +64,13 @@ * 7.5.0 as default version * 6.8.5 as 6.x tested version in [#57](https://github.com/elastic/ansible-beats/pull/57) [@jmlrt](https://github.com/jmlrt) -| PR | Author | Title | -| ------------------------------------------------------ | ------------------------------------------------ | -------------------------------------------------------------- | -|[#50](https://github.com/elastic/ansible-beats/pull/50) | [@jmlrt](https://github.com/jmlrt) | Add bumper script | -|[#55](https://github.com/elastic/ansible-beats/pull/55) | [@tgadiev](https://github.com/tgadiev) | Update syntax to make it compliant to modern ansible-lint rules| -|[#53](https://github.com/elastic/ansible-beats/pull/53) | [@jmlrt](https://github.com/jmlrt) | Indent yaml for config file | -|[#51](https://github.com/elastic/ansible-beats/pull/51) | [@ktibi](https://github.com/ktibi) | Rename the handlers | -|[#59](https://github.com/elastic/ansible-beats/pull/59) | [@MartinVerges](https://github.com/MartinVerges) | Beat config improvements | +| PR | Author | Title | +|---------------------------------------------------------|--------------------------------------------------|-----------------------------------------------------------------| +| [#50](https://github.com/elastic/ansible-beats/pull/50) | [@jmlrt](https://github.com/jmlrt) | Add bumper script | +| [#55](https://github.com/elastic/ansible-beats/pull/55) | [@tgadiev](https://github.com/tgadiev) | Update syntax to make it compliant to modern ansible-lint rules | +| [#53](https://github.com/elastic/ansible-beats/pull/53) | [@jmlrt](https://github.com/jmlrt) | Indent yaml for config file | +| [#51](https://github.com/elastic/ansible-beats/pull/51) | [@ktibi](https://github.com/ktibi) | Rename the handlers | +| [#59](https://github.com/elastic/ansible-beats/pull/59) | [@MartinVerges](https://github.com/MartinVerges) | Beat config improvements | ## 7.4.1 - 2019/10/23 @@ -67,26 +78,26 @@ * 7.4.1 as default version * 6.8.4 as 6.x tested version -| PR | Author | Title | -| ------------------------------------------------------ | ---------------------------------- | ------------------- | -|[#48](https://github.com/elastic/ansible-beats/pull/48) | [@jmlrt](https://github.com/jmlrt) | Fix probot newlines | +| PR | Author | Title | +|---------------------------------------------------------|------------------------------------|---------------------| +| [#48](https://github.com/elastic/ansible-beats/pull/48) | [@jmlrt](https://github.com/jmlrt) | Fix probot newlines | ## 7.4.0 - 2019/10/01 * 7.4.0 as default version -| PR | Author | Title | -| ------------------------------------------------------- | -------------------------------------- | --------------------------------------------------------- | -|[#25](https://github.com/elastic/ansible-beats/pull/25) | [@jmlrt](https://github.com/jmlrt) | Update kitchen Gem dependencies | -|[#6](https://github.com/elastic/ansible-beats/pull/6) | [@levonet](https://github.com/levonet) | Remove `beat_install` variable | -|[#32](https://github.com/elastic/ansible-beats/pull/32) | [@astik](https://github.com/astik) | Remove unused `es_conf_dir` variable | -|[#33](https://github.com/elastic/ansible-beats/pull/33) | [@astik](https://github.com/astik) | Replace custom filter with yaml handling | -|[#10](https://github.com/elastic/ansible-beats/pull/10) | [@Meecr0b](https://github.com/Meecr0b) | Move the `repo_key` configuration to a variable | -|[#34](https://github.com/elastic/ansible-beats/pull/34) | [@nyetwurk](https://github.com/nyetwurk) | Make sure the right beat service gets restarted | -|[#38](https://github.com/elastic/ansible-beats/pull/38) | [@jmlrt](https://github.com/jmlrt) | Add probot config to manage stale issues/pr + GH issue template | -|[#40](https://github.com/elastic/ansible-beats/pull/40) | [@nyetwurk](https://github.com/nyetwurk) | Make beats `repo_key` variable a unique name less likely to collide | -|[#41](https://github.com/elastic/ansible-beats/pull/41) | [@jmlrt](https://github.com/jmlrt) | Enhance ansible-beats documentation | +| PR | Author | Title | +|---------------------------------------------------------|------------------------------------------|---------------------------------------------------------------------| +| [#25](https://github.com/elastic/ansible-beats/pull/25) | [@jmlrt](https://github.com/jmlrt) | Update kitchen Gem dependencies | +| [#6](https://github.com/elastic/ansible-beats/pull/6) | [@levonet](https://github.com/levonet) | Remove `beat_install` variable | +| [#32](https://github.com/elastic/ansible-beats/pull/32) | [@astik](https://github.com/astik) | Remove unused `es_conf_dir` variable | +| [#33](https://github.com/elastic/ansible-beats/pull/33) | [@astik](https://github.com/astik) | Replace custom filter with yaml handling | +| [#10](https://github.com/elastic/ansible-beats/pull/10) | [@Meecr0b](https://github.com/Meecr0b) | Move the `repo_key` configuration to a variable | +| [#34](https://github.com/elastic/ansible-beats/pull/34) | [@nyetwurk](https://github.com/nyetwurk) | Make sure the right beat service gets restarted | +| [#38](https://github.com/elastic/ansible-beats/pull/38) | [@jmlrt](https://github.com/jmlrt) | Add probot config to manage stale issues/pr + GH issue template | +| [#40](https://github.com/elastic/ansible-beats/pull/40) | [@nyetwurk](https://github.com/nyetwurk) | Make beats `repo_key` variable a unique name less likely to collide | +| [#41](https://github.com/elastic/ansible-beats/pull/41) | [@jmlrt](https://github.com/jmlrt) | Enhance ansible-beats documentation | ## 7.0.0 - 2019/05/09 diff --git a/README.md b/README.md index ffe4893..c3693d6 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.2 +ansible-galaxy install elastic.beats,7.7.0 ``` 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.2 + beats_version: 7.7.0 beat: filebeat beat_conf: filebeat: @@ -54,11 +54,11 @@ The simplest configuration therefore consists of: - /var/log/*.log ``` -The above installs Filebeat 7.6.2 on the hosts 'localhost'. +The above installs Filebeat 7.7.0 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.2](https://github.com/elastic/ansible-beats/blob/master/defaults/main.yml#L4) and [6.8.8](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.7.0](https://github.com/elastic/ansible-beats/blob/master/defaults/main.yml#L4) and [6.8.9](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.2`*): Beats version. +- **beats_version** (*Defaults to `7.7.0`*): 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. - **beats_add_repository** (*Defaults to `{use_repository}`*): Install elastic repo for yum or apt if true. If false, the present repositories will be used. Useful if you already have beats packages in your repo. diff --git a/defaults/main.yml b/defaults/main.yml index 7a97894..def659c 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -1,6 +1,6 @@ --- # defaults file for beats -beats_version: 7.6.2 +beats_version: 7.7.0 oss_version: false version_lock: false use_repository: true diff --git a/helpers/bumper.py b/helpers/bumper.py index 17bc58a..2293025 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.7', - 7: '7.6.1', + 6: '6.8.8', + 7: '7.6.2', } new_versions = { - 6: '6.8.8', - 7: '7.6.2', + 6: '6.8.9', + 7: '7.7.0', } files = [ diff --git a/test/integration/standard-6x.yml b/test/integration/standard-6x.yml index 5db6aa6..62bb357 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.8 + beats_version: 6.8.9 use_repository: "true"