Merge pull request #139 from vkhatri/travis-lwrp

added lwrp resources

.kitchen.dokken.yml

@@ -15,43 +15,6 @@ provisioner:
     apt:
       confd:
         install_recommends: false
-    filebeat:
-      config:
-        logging.level: info
-        logging.to_files: true
-        logging.files:
-          name: filebeat
-        output.elasticsearch:
-          hosts: ["127.0.0.1:9200"]
-      prospectors:
-        secure_logs:
-          paths:
-            - /var/log/secure
-          type: log
-          fields:
-            type: secure_logs
-        syslog_logs:
-          paths:
-            - /var/log/syslog
-          type: log
-          fields:
-            type: syslog_logs
-        messages_log:
-          paths:
-            - /var/log/messages
-          type: log
-          fields:
-            type: messages_log
-        extra_log:
-          paths:
-            - /var/log/*.log
-          type: log
-          fields:
-            type: extra_log
-          exclude_files:
-            - /var/log/messages
-            - /var/log/syslog
-            - /var/log/secure
 
 platforms:
   - name: ubuntu14
@@ -129,40 +92,42 @@ platforms:
 suites:
   - name: chef12
     driver:
-      chef_version: 12.21.4
+      chef_version: 12.22.5
     verifier:
       inspec_tests:
         - test/smoke/v6
     run_list:
-      - recipe[filebeat::default]
       - recipe[filebeat_test::defaultv6]
 
   - name: chef13
     driver:
-      chef_version: 13.3.42
+      chef_version: 13.9.4
     verifier:
       inspec_tests:
         - test/smoke/v6
     run_list:
-      - recipe[filebeat::default]
       - recipe[filebeat_test::defaultv6]
 
   - name: chef14
     driver:
-      chef_version: 14.0.202
+      chef_version: 14.2.0
     verifier:
       inspec_tests:
         - test/smoke/v6
     run_list:
-      - recipe[filebeat::default]
       - recipe[filebeat_test::defaultv6]
 
+  - name: chef13runit
+    driver:
+      chef_version: 13.9.4
+    verifier:
+      inspec_tests:
+        - test/smoke/v6runit
+    run_list:
+      - recipe[filebeat_test::defaultv6runit]
+
   - name: chef13-preview
     driver:
       chef_version: 13.3.42
     run_list:
-      - recipe[filebeat::default]
-      - recipe[filebeat_test::defaultv6]
-    attributes:
-      filebeat:
-        version: 6.0.0-rc2
+      - recipe[filebeat_test::defaultv6preview]

.kitchen.yml

@@ -2,53 +2,20 @@
 driver:
   name: vagrant
 
+verifier:
+  name: inspec
+
 provisioner:
   # client_rb:
     # treat_deprecation_warnings_as_errors: true
     # resource_cloning: false
   name: chef_zero
-  # log_file: "/tmp/kitchen/chef-client.log"
+  log_file: "/kitchen-chef-client.log"
+  # log_level: debug
   attributes:
     apt:
       confd:
         install_recommends: false
-    filebeat:
-      config:
-        logging.level: info
-        logging.to_files: true
-        logging.files:
-          name: filebeat
-        output.elasticsearch:
-          hosts: ["127.0.0.1:9200"]
-      prospectors:
-        secure_logs:
-          paths:
-            - /var/log/secure
-          type: log
-          fields:
-            type: secure_logs
-        syslog_logs:
-          paths:
-            - /var/log/syslog
-          type: log
-          fields:
-            type: syslog_logs
-        messages_log:
-          paths:
-            - /var/log/messages
-          type: log
-          fields:
-            type: messages_log
-        extra_log:
-          paths:
-            - /var/log/*.log
-          type: log
-          fields:
-            type: extra_log
-          exclude_files:
-            - /var/log/messages
-            - /var/log/syslog
-            - /var/log/secure
 
 platforms:
   - name: ubuntu-14.04
@@ -66,41 +33,71 @@ platforms:
       guest: windows
       communicator: winrm
       gui: false
+      platform: windows
 
 suites:
   - name: chef12
     driver:
-      require_chef_omnibus: 12.21.4
+      require_chef_omnibus: 12.22.5
+    verifier:
+      inspec_tests:
+        - test/smoke/v6
+    excludes:
+      - windows-2012R2
     run_list:
-      - recipe[filebeat::default]
       - recipe[filebeat_test::defaultv6]
 
   - name: chef13
     driver:
-      require_chef_omnibus: 13.3.42
+      require_chef_omnibus: 13.9.4
+    verifier:
+      inspec_tests:
+        - test/smoke/v6
+    excludes:
+      - windows-2012R2
     run_list:
-      - recipe[filebeat::default]
       - recipe[filebeat_test::defaultv6]
 
   - name: chef14
     driver:
-      require_chef_omnibus: 14.0.202
+      require_chef_omnibus: 14.2.0
+    verifier:
+      inspec_tests:
+        - test/smoke/v6
+    excludes:
+      - windows-2012R2
     run_list:
-      - recipe[filebeat::default]
       - recipe[filebeat_test::defaultv6]
 
-  - name: runit
+  - name: chef13win
+    driver:
+      require_chef_omnibus: 13.9.4
+    verifier:
+      inspec_tests:
+        - test/smoke/v6windows
+    run_list:
+      - recipe[filebeat_test::defaultv6]
+    includes:
+      - windows-2012R2
+
+  - name: chef13runit
+    driver:
+      require_chef_omnibus: 13.9.4
     excludes:
       - windows-2012R2
     run_list:
       - recipe[filebeat::default]
 
-  - name: chef13-preview
+  - name: chef13preview
     driver:
-      chef_version: 13.3.42
+      chef_version: 13.9.4
+    verifier:
+      inspec_tests:
+        - test/smoke/v6
+    excludes:
+      - windows-2012R2
     run_list:
-      - recipe[filebeat::default]
-      - recipe[filebeat_test::defaultv6]
+      - recipe[filebeat_test::defaultv6preview]
     attributes:
       filebeat:
         version: 6.0.0-beta2

.rubocop.yml

@@ -32,7 +32,7 @@ ClassLength:
 Metrics/MethodLength:
   Enabled: false
 Metrics/BlockLength:
-  Max: 50
+  Max: 125
   Exclude:
     - "**/*_spec.rb"
 AbcSize:

.travis.yml

@@ -20,15 +20,6 @@ services: docker
 
 env:
   matrix:
-    - INSTANCE=chef12-centos6
-    - INSTANCE=chef12-centos7
-    - INSTANCE=chef12-fedora26
-    - INSTANCE=chef12-ubuntu14
-    - INSTANCE=chef12-ubuntu16
-    - INSTANCE=chef12-debian8
-    - INSTANCE=chef12-debian9
-    - INSTANCE=chef12-amazon
-    - INSTANCE=chef12-amazon2
     - INSTANCE=chef13-centos6
     - INSTANCE=chef13-centos7
     - INSTANCE=chef13-fedora26

CHANGELOG.md

@@ -1,6 +1,20 @@
 filebeat CHANGELOG
 ==================
 
+1.5.0
+-----
+- Virender Khatri - Updated filebeat version to v6.2.4
+
+- Jean Rouge - Making it possible to pass additional command line arguments to the filebeat service
+
+- Virender Khatri - Updated tests and clean up
+
+- Michael Burns - Updated default_spec.rb
+
+- Michael Burns - Use unzip_windows_zipfile for unit test
+
+- Oleksiy Kovyrin - Enable sensitive flag for filebeat file resource
+
 1.4.0
 -----