Skip to content

Commit

Permalink
Merge pull request #39 from xneelo/sb_modules_tweak
Browse files Browse the repository at this point in the history
Filebeat module Bugfix
  • Loading branch information
shaunbugler authored Nov 24, 2020
2 parents 0c04759 + 1c9ca99 commit 1a6b7eb
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 5 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
##2020-11-20 - Release 2.0.1
###Summary

Minor tweak to enable/disable module
* Only attempt to enable if it is disabled, only disable if it is enabled

##2020-11-03 - Release 2.0.0
###Summary

Expand Down
2 changes: 2 additions & 0 deletions manifests/config.pp
Original file line number Diff line number Diff line change
Expand Up @@ -76,13 +76,15 @@
exec { "filebeat_${module}_${action}":
command => "filebeat modules ${action} ${module}",
creates => "${modules_conf_dir}/${module}.yml",
onlyif => "[ -e ${modules_conf_dir}/${module}.yml.disabled ]",
require => Package['filebeat'],
notify => Service['filebeat'],
}
} else {
exec { "filebeat_${module}_${action}":
command => "filebeat modules ${action} ${module}",
creates => "${modules_conf_dir}/${module}.yml.disabled",
onlyif => "[ -e ${modules_conf_dir}/${module}.yml ]",
require => Package['filebeat'],
notify => Service['filebeat'],
}
Expand Down
10 changes: 5 additions & 5 deletions metadata.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{
"name": "hetzner-filebeats",
"version": "2.0.0",
"version": "2.0.1",
"author": "Henlu Starke",
"summary": "Simple module to install and configure filebeats for elasticsearch",
"license": "Apache-2.0",
"source": "[email protected]:hetznerZA/hetzner-filebeats.git",
"project_page": "https://github.com/hetznerZA/hetzner-filebeats",
"issues_url": "https://github.com/hetznerZA/hetzner-filebeats/issues",
"source": "[email protected]:xneelo/hetzner-filebeats.git",
"project_page": "https://github.com/xneelo/hetzner-filebeats",
"issues_url": "https://github.com/xneelo/hetzner-filebeats/issues",
"dependencies": [
{
"name": "puppetlabs-stdlib",
Expand All @@ -32,7 +32,7 @@
},
{
"name": "filebeats",
"version_requirement": ">= 5.6.x < 6.3.0"
"version_requirement": ">= 6.3.0 < 8.0.0"
}
],
"pdk-version": "1.10.0",
Expand Down

0 comments on commit 1a6b7eb

Please sign in to comment.