Merge pull request #162 from vkhatri/travis-2.4.0

Release v2.4.0

.delivery/project.toml

@@ -0,0 +1 @@
+remote_file = "https://raw.githubusercontent.com/chef-cookbooks/community_cookbook_tools/master/delivery/project.toml"

.rubocop.yml

@@ -1,4 +1,5 @@
 AllCops:
+  # TargetRubyVersion: 2.3
   Exclude:
     - Rakefile
     - Berksfile
@@ -39,3 +40,5 @@ AbcSize:
   Enabled: false
 Style/BlockComments:
   Enabled: false
+ChefModernize/WindowsZipfileUsage:
+  Enabled: false

.travis.yml

@@ -1,14 +1,10 @@
-sudo: required
-dist: trusty
-
 addons:
   apt:
     sources:
-      - chef-stable-trusty
+      - chef-stable-xenial
     packages:
-      - chefdk
+      - chef-workstation
 
-# Don't run bundle install
 install: echo "skip bundle install"
 
 branches:
@@ -20,28 +16,47 @@ services: docker
 
 env:
   matrix:
-    - INSTANCE=chef13-centos6
-    - INSTANCE=chef13-centos7
-    - INSTANCE=chef13-fedora26
-    - INSTANCE=chef13-ubuntu14
-    - INSTANCE=chef13-ubuntu16
-    - INSTANCE=chef13-amazon
-    - INSTANCE=chef13-amazon2
-
-script:
-  - KITCHEN_LOCAL_YAML=.kitchen.dokken.yml /opt/chefdk/embedded/bin/kitchen verify ${INSTANCE}
-  - cat .kitchen/logs/kitchen.log
+    - INSTANCE=current-ver-amazonlinux
+    - INSTANCE=current-ver-amazonlinux-2
+    - INSTANCE=current-ver-debian-9
+    - INSTANCE=current-ver-debian-10
+    - INSTANCE=current-ver-centos-7
+    - INSTANCE=current-ver-centos-8
+    - INSTANCE=current-ver-oraclelinux-7
+    - INSTANCE=current-ver-oraclelinux-8
+    - INSTANCE=current-ver-fedora-latest
+    - INSTANCE=current-ver-ubuntu-1804
+    - INSTANCE=current-ver-ubuntu-2004
+    - INSTANCE=previous-ver-amazonlinux
+    - INSTANCE=previous-ver-amazonlinux-2
+    - INSTANCE=previous-ver-debian-9
+    - INSTANCE=previous-ver-debian-10
+    - INSTANCE=previous-ver-centos-7
+    - INSTANCE=previous-ver-centos-8
+    - INSTANCE=previous-ver-oraclelinux-7
+    - INSTANCE=previous-ver-oraclelinux-8
+    - INSTANCE=previous-ver-fedora-latest
+    - INSTANCE=previous-ver-ubuntu-1804
+    - INSTANCE=previous-ver-ubuntu-2004
 
 before_script:
   - sudo iptables -L DOCKER || ( echo "DOCKER iptables chain missing" ; sudo iptables -N DOCKER )
-  - eval "$(/opt/chefdk/bin/chef shell-init bash)"
-  - /opt/chefdk/embedded/bin/chef --version
-  - /opt/chefdk/embedded/bin/cookstyle --version
-  - /opt/chefdk/embedded/bin/foodcritic --version
+  - eval "$(chef shell-init bash)"
+  - chef --version
 
+script: CHEF_LICENSE=accept KITCHEN_LOCAL_YAML=kitchen.dokken.yml kitchen verify ${INSTANCE}
 
 matrix:
+  allow_failures:
+    - env: INSTANCE=previous-ver-oraclelinux-7
+    - env: INSTANCE=previous-ver-oraclelinux-8
+    - env: INSTANCE=current-ver-oraclelinux-7
+    - env: INSTANCE=current-ver-oraclelinux-8
+    - env: INSTANCE=previous-ver-fedora-latest
+    - env: INSTANCE=current-ver-fedora-latest
   include:
     - script:
-      - /opt/chefdk/bin/chef exec rake
-      env: UNIT_AND_LINT=1
+      - delivery local all
+      env:
+        - UNIT_AND_LINT=1
+        - CHEF_LICENSE=accept

CHANGELOG.md

@@ -1,11 +1,32 @@
 filebeat CHANGELOG
 ==================
 
-2.3.0
+2.4.0
 -----
 
 - Piotr Kantyka - Added property for prefix in prospector yaml filename
 
+- Oskar Bedychaj - Added filebeat_install no resource handle
+
+- Neil Duff-Howie - Fixed runit service when a service name is supplied
+
+- Doug Luxem - Fixes Windows issue where filebeats service is reinstalled on each run
+
+- Chris Minton - Update the config and prospector resources to handle version dependency
+
+- Chris Minton - Update the integration tests for configs
+
+- Chris Minton - Update the README to give the correct configuration for different versions
+
+- Virender Khatri - Updated Kitchen Tests
+
+- Virender Khatri - Update filebeat version to the latest
+
+- Virender Khatri - Fix issue #159 - Filebeat 7.x replaces filebeat.registry_file with filebeat.registry.path
+
+- Virender Khatri - Update dependency cookbook versions
+
+
 2.2.0
 -----
 

README.md

@@ -10,13 +10,13 @@ This is a [Chef] cookbook to manage [Filebeat].
 ## Most Recent Release
 
 ```ruby
-cookbook 'filebeat', '~> 2.2.0'
+cookbook 'filebeat', '~> 2.4.0'
 ```
 
 ## From Git
 
 ```ruby
-cookbook 'filebeat', github: 'vkhatri/chef-filebeat',  tag: 'v2.2.0'
+cookbook 'filebeat', github: 'vkhatri/chef-filebeat',  tag: 'v2.4.0'
 ```
 
 ## Repository
@@ -39,14 +39,12 @@ Also works on Solaris zones given a physical Solaris 11.2 server. For that, use
 
 ## Supported Chef
 
-- Chef 12 (last tested on 12.21.4)
-
-- Chef 13 (last tested on 13.3.42)
+This cookbook is tested against current Chef version. But, the cookbook is known to work with Chef Client version >=12.14.
 
 ## Supported Filebeat
 
-- 5.x
 - 6.x
+- 7.x
 
 ## Cookbook Dependency
 

kitchen.dokken.yml

@@ -0,0 +1,105 @@
+---
+driver:
+  name: dokken
+  privileged: true
+  chef_version: <%= ENV['CHEF_VERSION'] || 'current' %>
+  chef_license: accept-no-persist
+
+transport:
+  name: dokken
+
+provisioner:
+  name: dokken
+  attributes:
+    apt:
+      confd:
+        install_recommends: false
+
+verifier:
+  name: inspec
+
+platforms:
+- name: amazonlinux
+  driver:
+    image: dokken/amazonlinux
+    pid_one_command: /sbin/init
+
+- name: amazonlinux-2
+  driver:
+    image: dokken/amazonlinux-2
+    pid_one_command: /usr/lib/systemd/systemd
+
+- name: debian-9
+  driver:
+    image: dokken/debian-9
+    pid_one_command: /bin/systemd
+    intermediate_instructions:
+      - RUN /usr/bin/apt-get update
+
+- name: debian-10
+  driver:
+    image: dokken/debian-10
+    pid_one_command: /bin/systemd
+    intermediate_instructions:
+      - RUN /usr/bin/apt-get update
+
+- name: centos-7
+  driver:
+    image: dokken/centos-7
+    pid_one_command: /usr/lib/systemd/systemd
+
+- name: centos-8
+  driver:
+    image: dokken/centos-8
+    pid_one_command: /usr/lib/systemd/systemd
+
+- name: oraclelinux-7
+  driver:
+    image: dokken/oraclelinux-7
+    pid_one_command: /usr/lib/systemd/systemd
+
+- name: oraclelinux-8
+  driver:
+    image: dokken/oraclelinux-8
+    pid_one_command: /usr/lib/systemd/systemd
+
+- name: fedora-latest
+  driver:
+    image: dokken/fedora-latest
+    pid_one_command: /usr/lib/systemd/systemd
+
+- name: ubuntu-18.04
+  driver:
+    image: dokken/ubuntu-18.04
+    pid_one_command: /bin/systemd
+    intermediate_instructions:
+      - RUN /usr/bin/apt-get update
+
+- name: ubuntu-20.04
+  driver:
+    image: dokken/ubuntu-20.04
+    pid_one_command: /bin/systemd
+    intermediate_instructions:
+      - RUN /usr/bin/apt-get update
+
+suites:
+  - name: current-ver
+    verifier:
+      inspec_tests:
+        - test/smoke/current-ver
+    run_list:
+      - recipe[filebeat_test::current-ver]
+
+  - name: previous-ver
+    verifier:
+      inspec_tests:
+        - test/smoke/previous-ver
+    run_list:
+      - recipe[filebeat_test::previous-ver]
+
+  - name: runit
+    verifier:
+      inspec_tests:
+        - test/smoke/runit
+    run_list:
+      - recipe[filebeat_test::runit]