CHANGELOG.md

@@ -2,7 +2,12 @@ Changelog
 =========
 
 ## Unreleased
-[Full Changelog](https://github.com/pcfens/puppet-filebeat/compare/v3.3.0...HEAD)
+[Full Changelog](https://github.com/pcfens/puppet-filebeat/compare/v3.3.1...HEAD)
+
+## [v3.3.1](https://github.com/pcfens/puppet-filebeat/tree/v3.3.1)
+[Full Changelog](https://github.com/pcfens/puppet-filebeat/compare/v3.3.0...v3.3.1)
+
+- Add a new `manage_apt` flag for disabling the inclusion of puppetlabs/apt [\#185](https://github.com/pcfens/puppet-filebeat/pull/185)
 
 ## [v3.3.0](https://github.com/pcfens/puppet-filebeat/tree/v3.3.0)
 [Full Changelog](https://github.com/pcfens/puppet-filebeat/compare/v3.2.2...v3.3.0)

README.md

@@ -66,7 +66,6 @@ class { 'filebeat':
        'http://anotherserver:9200'
      ],
      'loadbalance' => true,
-     'index'       => 'packetbeat',
      'cas'         => [
         '/etc/pki/root/ca.pem',
      ],
@@ -225,7 +224,8 @@ Installs and configures filebeat.
   prospectors and processors passed as parameters are ignored and everything managed by
   puppet will be removed. (default: present)
 - `manage_repo`: [Boolean] Whether or not the upstream (elastic) repo should be configured or not (default: true)
-- `major_version`: [Enum] The major version of Filebeat to install. Should be either `5` or `6`. The default value is `5`.
+- `major_version`: [Enum] The major version of Filebeat to install. Should be either `'5'` or `'6'`. The default value is `'6'`, except
+   for OpenBSD 6.3 and earlier, which has a default value of `'5'`.
 - `service_ensure`: [String] The ensure parameter on the filebeat service (default: running)
 - `service_enable`: [String] The enable parameter on the filebeat service (default: true)
 - `param repo_priority`: [Integer] Repository priority.  yum and apt supported (default: undef)

manifests/init.pp

@@ -14,6 +14,7 @@
 #
 # @param package_ensure [String] The ensure parameter for the filebeat package (default: present)
 # @param manage_repo [Boolean] Whether or not the upstream (elastic) repo should be configured or not (default: true)
+# @param manage_apt [Boolean] Whether or not the apt class should be explicitly called or not (default: true)
 # @param major_version [Enum] The major version of Filebeat to be installed.
 # @param service_ensure [String] The ensure parameter on the filebeat service (default: running)
 # @param service_enable [String] The enable parameter on the filebeat service (default: true)
@@ -50,6 +51,7 @@
 class filebeat (
   String  $package_ensure                                             = $filebeat::params::package_ensure,
   Boolean $manage_repo                                                = $filebeat::params::manage_repo,
+  Boolean $manage_apt                                                 = $filebeat::params::manage_apt,
   Enum['5','6'] $major_version                                        = $filebeat::params::major_version,
   Variant[Boolean, Enum['stopped', 'running']] $service_ensure        = $filebeat::params::service_ensure,
   Boolean $service_enable                                             = $filebeat::params::service_enable,

manifests/params.pp

@@ -43,11 +43,13 @@
   case $facts['os']['family'] {
     'Archlinux': {
       $manage_repo = false
+      $manage_apt  = false
       $filebeat_path = '/usr/bin/filebeat'
       $major_version = '6'
     }
     'OpenBSD': {
       $manage_repo = false
+      $manage_apt  = false
       $filebeat_path = '/usr/local/bin/filebeat'
       # lint:ignore:only_variable_string
       $major_version = versioncmp('6.3', $::kernelversion) < 0 ? {
@@ -58,6 +60,7 @@
     }
     default: {
       $manage_repo = true
+      $manage_apt  = true
       $filebeat_path = '/usr/share/filebeat/bin/filebeat'
       $major_version = '6'
     }

manifests/repo.pp

@@ -9,7 +9,9 @@
 
   case $::osfamily {
     'Debian': {
-      include ::apt
+      if $::filebeat::manage_apt == true {
+        include ::apt
+      }
 
       Class['apt::update'] -> Package['filebeat']
 

metadata.json

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