.travis.yml

@@ -9,7 +9,7 @@ rvm:
   - 2.0.0
 env:
   - PUPPET_GEM_VERSION="~> 3.5.1"
-  - PUPPET_GEM_VERSION="~> 3.8.4"
-  - PUPPET_GEM_VERSION="~> 4.3.1"
+  - PUPPET_GEM_VERSION="~> 3.8.6"
+  - PUPPET_GEM_VERSION="~> 4.4.0"
 notifications:
   email: false

CHANGELOG.md

@@ -2,7 +2,17 @@ Changelog
 =========
 
 ## Unreleased
-[Full Changelog](https://github.com/pcfens/puppet-filebeat/compare/v0.5.7...HEAD)
+[Full Changelog](https://github.com/pcfens/puppet-filebeat/compare/v0.5.8...HEAD)
+
+## [v0.5.8](https://github.com/pcfens/puppet-filebeat/tree/v0.5.8)
+[Full Changelog](https://github.com/pcfens/puppet-filebeat/compare/v0.5.7...v0.5.8)
+
+**Fixed Bugs**
+- `doc_type` is now used in the documentation instead of the deprecated `log_type`
+  [\#17](https://github.com/pcfens/puppet-filebeat/pull/17)
+- RedHat based systems should be using the redhat service provider.
+  [\#18](https://github.com/pcfens/puppet-filebeat/pull/18)
+
 
 ## [v0.5.7](https://github.com/pcfens/puppet-filebeat/tree/v0.5.7)
 [Full Changelog](https://github.com/pcfens/puppet-filebeat/compare/v0.5.6...v0.5.7)

README.md

@@ -87,7 +87,7 @@ be defined as a hash added to the class declaration (also used for automatically
 prospectors using hiera), or as their own defined resources.
 
 At a minimum, the `paths` parameter must be set to an array of files or blobs that should
-be shipped. `log_type` is what logstash views as the type parameter if you'd like to
+be shipped. `doc_type` is what logstash views as the type parameter if you'd like to
 apply conditional filters.
 
 ```puppet
@@ -96,7 +96,7 @@ filebeat::prospector { 'syslogs':
     '/var/log/auth.log',
     '/var/log/syslog',
   ],
-  log_type => 'syslog-beat',
+  doc_type => 'syslog-beat',
 }
 ```
 
@@ -195,7 +195,7 @@ to fully understand what these parameters do.
   - `fields`: [Hash] Optional fields to add information to the output (default: {})
   - `fields_under_root`: [Boolean] Should the `fields` parameter fields be stored at the top level of indexed documents.
   - `ignore_older`: [String] Files older than this field will be ignored by filebeat (default: 24h)
-  - `log_type`: [String] (Deprecated - use `doc_type`) The document_type setting (optional - default: log)
+  - `log_type`: [String] \(Deprecated - use `doc_type`\) The document_type setting (optional - default: log)
   - `doc_type`: [String] The event type to used for published lines, used as type field in logstash
     and elasticsearch (optional - default: log)
   - `scan_frequency`: [String] How often should the prospector check for new files (default: 10s)

manifests/init.pp

@@ -36,6 +36,7 @@
   $manage_repo      = $filebeat::params::manage_repo,
   $service_ensure   = $filebeat::params::service_ensure,
   $service_enable   = $filebeat::params::service_enable,
+  $service_provider = $filebeat::params::service_provider,
   $spool_size       = $filebeat::params::spool_size,
   $idle_timeout     = $filebeat::params::idle_timeout,
   $registry_file    = $filebeat::params::registry_file,

manifests/params.pp

@@ -23,13 +23,22 @@
       $tmp_dir         = '/tmp'
       $install_dir     = undef
       $download_url    = undef
+      case $::osfamily {
+        'RedHat': {
+          $service_provider = 'redhat'
+        }
+        default: {
+          $service_provider = undef
+        }
+      }
     }
 
     'Windows' : {
-      $config_dir      = 'C:/Program Files/Filebeat/conf.d'
-      $download_url    = 'https://download.elastic.co/beats/filebeat/filebeat-1.0.1-windows.zip'
-      $install_dir     = 'C:/Program Files'
-      $tmp_dir         = 'C:/Temp'
+      $config_dir       = 'C:/Program Files/Filebeat/conf.d'
+      $download_url     = 'https://download.elastic.co/beats/filebeat/filebeat-1.0.1-windows.zip'
+      $install_dir      = 'C:/Program Files'
+      $tmp_dir          = 'C:/Temp'
+      $service_provider = undef
     }
 
     default : {

manifests/service.pp

@@ -1,6 +1,7 @@
 class filebeat::service {
   service { 'filebeat':
-    ensure => $filebeat::service_ensure,
-    enable => $filebeat::service_enable,
+    ensure   => $filebeat::service_ensure,
+    enable   => $filebeat::service_enable,
+    provider => $filebeat::service_provider,
   }
 }

metadata.json

@@ -1,6 +1,6 @@
 {
   "name": "pcfens-filebeat",
-  "version": "0.5.7",
+  "version": "0.5.8",
   "author": "pcfens",
   "license": "Apache-2.0",
   "summary": "A module to install and manage the filebeat log shipper",

spec/classes/filebeat_spec.rb

@@ -25,6 +25,7 @@
     it { is_expected.to contain_service('filebeat').with(
       :enable => true,
       :ensure => 'running',
+      :provider => nil, # Provider should use the resource default
     )}
     it { is_expected.to contain_apt__source('beats').with(
       :location => 'http://packages.elastic.co/beats/apt',
@@ -48,6 +49,13 @@
       :baseurl => 'https://packages.elastic.co/beats/yum/el/$basearch',
       :gpgkey  => 'http://packages.elastic.co/GPG-KEY-elasticsearch',
     ) }
+
+    it { is_expected.to contain_service('filebeat').with(
+      :enable => true,
+      :ensure => 'running',
+      :provider => 'redhat',
+    )}
+
   end
 
   describe 'on a Windows system' do
@@ -65,6 +73,11 @@
       :path   => 'C:/Program Files/Filebeat/conf.d',
       :recurse => true,
     )}
+    it { is_expected.to contain_service('filebeat').with(
+      :enable => true,
+      :ensure => 'running',
+      :provider => nil, # Provider should use the resource default
+    )}
   end