Showing with 38 additions and 9 deletions.

+0 −1 .gitignore

+7 −0 .rubocop.yml

+6 −0 .vscode/extensions.json

+8 −1 CHANGELOG.md

+11 −2 Rakefile

+1 −1 manifests/repo.pp

+4 −4 metadata.json

+1 −0 spec/default_facts.yml
diff --git a/.gitignore b/.gitignore
@@ -25,4 +25,3 @@
 .project
 .envrc
 /inventory.yaml
-.vscode/
diff --git a/.rubocop.yml b/.rubocop.yml
@@ -27,6 +27,7 @@ GetText/DecorateString:
   Description: We don't want to decorate test output.
   Exclude:
   - spec/**/*
+  Enabled: false
 RSpec/BeforeAfterAll:
   Description: Beware of using after(:all) as it may cause state to leak between tests.
     A necessary evil in acceptance testing.
@@ -88,6 +89,12 @@ Style/MethodCalledOnDoEndBlock:
   Enabled: true
 Style/StringMethods:
   Enabled: true
+GetText/DecorateFunctionMessage:
+  Enabled: false
+GetText/DecorateStringFormattingUsingInterpolation:
+  Enabled: false
+GetText/DecorateStringFormattingUsingPercent:
+  Enabled: false
 Layout/EndOfLine:
   Enabled: false
 Layout/IndentHeredoc:

diff --git a/.vscode/extensions.json b/.vscode/extensions.json
@@ -0,0 +1,6 @@
+{
+  "recommendations": [
+    "jpogran.puppet-vscode",
+    "rebornix.Ruby"
+  ]
+}
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,9 +2,16 @@ Changelog
 =========
 
 ## Unreleased
-[Full Changelog](https://github.com/pcfens/puppet-filebeat/compare/v4.1.1...HEAD)
+[Full Changelog](https://github.com/pcfens/puppet-filebeat/compare/v4.1.2...HEAD)
+
+## [v4.1.2](https://github.com/pcfens/puppet-filebeat/tree/v4.1.2)
+[Full Changelog](https://github.com/pcfens/puppet-filebeat/compare/v4.1.1...v4.1.2)
+
+- Fix hardocded path to ym [#\229](https://github.com/pcfens/puppet-filebeat/pull/229)
 
 ## [v4.1.1](https://github.com/pcfens/puppet-filebeat/tree/v4.1.1)
+[Full Changelog](https://github.com/pcfens/puppet-filebeat/compare/v4.1.0...v4.1.1)
+
 - Support old versions of filebeat for a version fact only [#\227](https://github.com/pcfens/puppet-filebeat/pull/227)
 - Fix the processor input data type [#\228](https://github.com/pcfens/puppet-filebeat/issues/228)
 

diff --git a/Rakefile b/Rakefile
@@ -15,8 +15,17 @@ end
 
 def changelog_project
   return unless Rake.application.top_level_tasks.include? "changelog"
-  returnVal = nil || JSON.load(File.read('metadata.json'))['source'].match(%r{.*/([^/]*)})[1]
-  raise "unable to find the changelog_project in .sync.yml or the name in metadata.json" if returnVal.nil?
+
+  returnVal = nil
+  returnVal ||= begin
+    metadata_source = JSON.load(File.read('metadata.json'))['source']
+    metadata_source_match = metadata_source && metadata_source.match(%r{.*\/([^\/]*?)(?:\.git)?\Z})
+
+    metadata_source_match && metadata_source_match[1]
+  end
+
+  raise "unable to find the changelog_project in .sync.yml or calculate it from the source in metadata.json" if returnVal.nil?
+
   puts "GitHubChangelogGenerator project:#{returnVal}"
   returnVal
 end

diff --git a/manifests/repo.pp b/manifests/repo.pp
@@ -44,7 +44,7 @@
       }
 
       exec { 'flush-yum-cache':
-        command     => '/bin/yum clean all',
+        command     => 'yum clean all',
         refreshonly => true,
         path        => ['/bin', '/usr/bin', '/sbin', '/usr/sbin'],
       }

diff --git a/metadata.json b/metadata.json
@@ -1,6 +1,6 @@
 {
   "name": "pcfens-filebeat",
-  "version": "4.1.1",
+  "version": "4.1.2",
   "author": "pcfens",
   "summary": "A module to install and manage the filebeat log shipper",
   "license": "Apache-2.0",
@@ -106,7 +106,7 @@
     "elasticsearch",
     "elastic"
   ],
-  "pdk-version": "1.12.0",
-  "template-url": "pdk-default#1.12.0",
-  "template-ref": "1.12.0-0-g55d9ae2"
+  "pdk-version": "1.14.1",
+  "template-url": "pdk-default#1.14.1",
+  "template-ref": "1.14.1-0-g0b5b39b"
 }
diff --git a/spec/default_facts.yml b/spec/default_facts.yml
@@ -3,5 +3,6 @@
 # Facts specified here will override the values provided by rspec-puppet-facts.
 ---
 ipaddress: "172.16.254.254"
+ipaddress6: "FE80:0000:0000:0000:AAAA:AAAA:AAAA"
 is_pe: false
 macaddress: "AA:AA:AA:AA:AA:AA"