Merge pull request #57 from jmlrt/beat685-742

bump beats to 6.8.5 and 7.4.2

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.4.1
+ansible-galaxy install elastic.beats,7.4.2
 ```
 
 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.4.1
+    beats_version: 7.4.2
     beat: filebeat
     beat_conf:
       inputs:
@@ -53,11 +53,11 @@ The simplest configuration therefore consists of:
             - /var/log/*.log
 ```
 
-The above installs Filebeat 7.4.1 on the hosts 'localhost'.
+The above installs Filebeat 7.4.2 on the hosts 'localhost'.
 
 **Notes**:
 - Beats default version is described in [`beats_version`](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.4.1](defaults/main.yml#L4) and [6.8.4](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.4.2](defaults/main.yml#L4) and [6.8.5](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
@@ -163,7 +163,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.4.1`*): Beats version.
+- **beats_version** (*Defaults to `7.4.2`*): 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.

defaults/main.yml

@@ -1,7 +1,7 @@
 ---
 # defaults file for beats
 
-beats_version: 7.4.1
+beats_version: 7.4.2
 version_lock: false
 use_repository: true
 start_service: true

helpers/bumper.py

@@ -14,13 +14,13 @@
 os.chdir(os.path.join(os.path.dirname(__file__), '..'))
 
 old_versions = {
-    6: '6.8.3',
-    7: '7.4.0',
+    6: '6.8.4',
+    7: '7.4.1',
 }
 
 new_versions = {
-    6: '6.8.4',
-    7: '7.4.1',
+    6: '6.8.5',
+    7: '7.4.2',
 }
 
 files = [

test/integration/standard-6x.yml

@@ -12,5 +12,5 @@
               input_type: log
           registry_file: /var/lib/filebeat/registry
   vars:
-    beats_version: 6.8.4
+    beats_version: 6.8.5
     use_repository: "true"