Skip to content

Commit

Permalink
Merge pull request #96 from vkhatri/beats-5.2.2
Browse files Browse the repository at this point in the history
Beats 5.2.2
  • Loading branch information
vkhatri authored Mar 4, 2017
2 parents abe2e3d + 9369af9 commit 99281b2
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 12 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,11 @@ filebeat CHANGELOG

This file is used to list changes made in each version of the filebeat cookbook.

0.4.9
-----

- Virender Khatri - Updated Beats Version to v5.2.2

0.4.8
-----

Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@ This is a [Chef] cookbook to manage [Filebeat].
## Most Recent Release

```ruby
cookbook 'filebeat', '~> 0.4.8'
cookbook 'filebeat', '~> 0.4.9'
```

## From Git

```ruby
cookbook 'filebeat', github: 'vkhatri/chef-filebeat', tag: 'v0.4.8'
cookbook 'filebeat', github: 'vkhatri/chef-filebeat', tag: 'v0.4.9'
```

## Repository
Expand Down Expand Up @@ -294,7 +294,7 @@ Above configuration will create three different prospector files - `prospector-s
## Core Attributes


* `default['filebeat']['version']` (default: `5.2.0`): filebeat version
* `default['filebeat']['version']` (default: `5.2.2`): filebeat version

* `default['filebeat']['ignore_version']` (default: `false`): ignore filebeat version for `package` install

Expand Down
2 changes: 1 addition & 1 deletion attributes/default.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
default['filebeat']['version'] = '5.2.0'
default['filebeat']['version'] = '5.2.2'
default['filebeat']['release'] = '1'
default['filebeat']['disable_service'] = false
default['filebeat']['package_url'] = 'auto'
Expand Down
2 changes: 1 addition & 1 deletion metadata.rb
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
license 'Apache 2.0'
description 'Installs/Configures Elastic Filebeat'
long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
version '0.4.8'
version '0.4.9'
source_url 'https://github.com/vkhatri/chef-filebeat' if respond_to?(:source_url)
issues_url 'https://github.com/vkhatri/chef-filebeat/issues' if respond_to?(:issues_url)

Expand Down
14 changes: 7 additions & 7 deletions spec/unit/recipes/default_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -143,12 +143,12 @@

include_examples 'filebeat'

it 'create prospector directory C:/opt/filebeat/filebeat-5.2.0-windows-x86_64/conf.d' do
expect(chef_run).to create_directory('C:/opt/filebeat/filebeat-5.2.0-windows-x86_64/conf.d')
it 'create prospector directory C:/opt/filebeat/filebeat-5.2.2-windows-x86_64/conf.d' do
expect(chef_run).to create_directory('C:/opt/filebeat/filebeat-5.2.2-windows-x86_64/conf.d')
end

it 'configure C:/opt/filebeat/filebeat-5.2.0-windows/filebeat.yml' do
expect(chef_run).to create_file('C:/opt/filebeat/filebeat-5.2.0-windows-x86_64/filebeat.yml')
it 'configure C:/opt/filebeat/filebeat-5.2.2-windows/filebeat.yml' do
expect(chef_run).to create_file('C:/opt/filebeat/filebeat-5.2.2-windows-x86_64/filebeat.yml')
end

it 'include recipe filebeat::install_windows' do
Expand All @@ -172,15 +172,15 @@
end

it "has correct default['filebeat']['conf_dir']" do
expect(node['filebeat']['conf_dir']).to eq('C:/opt/filebeat/filebeat-5.2.0-windows-x86_64')
expect(node['filebeat']['conf_dir']).to eq('C:/opt/filebeat/filebeat-5.2.2-windows-x86_64')
end

it "has correct default['filebeat']['config']['filebeat']['registry_file']" do
expect(node['filebeat']['config']['filebeat']['registry_file']).to eq('C:/opt/filebeat/filebeat-5.2.0-windows-x86_64/registry')
expect(node['filebeat']['config']['filebeat']['registry_file']).to eq('C:/opt/filebeat/filebeat-5.2.2-windows-x86_64/registry')
end

it "has correct default['filebeat']['config']['filebeat']['config_dir']" do
expect(node['filebeat']['config']['filebeat']['config_dir']).to eq('C:/opt/filebeat/filebeat-5.2.0-windows-x86_64/conf.d')
expect(node['filebeat']['config']['filebeat']['config_dir']).to eq('C:/opt/filebeat/filebeat-5.2.2-windows-x86_64/conf.d')
end
end
end

0 comments on commit 99281b2

Please sign in to comment.