Skip to content

Commit

Permalink
bump filebeat version to v6.0.1
Browse files Browse the repository at this point in the history
  • Loading branch information
vkhatri committed Dec 12, 2017
1 parent d1aac91 commit 1b29bcf
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 12 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,7 @@ Above configuration will create three different prospector files - `lwrp-prospec

## Core Attributes

* `default['filebeat']['version']` (default: `5.6.4`): filebeat version
* `default['filebeat']['version']` (default: `6.0.1`): filebeat version

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

Expand Down
2 changes: 0 additions & 2 deletions attributes/config.rb
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,6 @@
# default['filebeat']['config']['tags'] = ["service-X", "web-tier"]
# default['filebeat']['config']['fields'] = {'env' => 'test'}
# default['filebeat']['config']['fields_under_root'] = false
# default['filebeat']['config']['queue_size'] = 1000
# default['filebeat']['config']['bulk_queue_size'] = 0
# default['filebeat']['config']['max_procs'] =

# ===== add filebeat prospectors using node attribute example =====
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.6.4'
default['filebeat']['version'] = '6.0.1'
default['filebeat']['release'] = '1'
default['filebeat']['delete_prospectors_dir'] = false
default['filebeat']['purge_prospectors_dir'] = false
Expand Down
16 changes: 8 additions & 8 deletions spec/unit/recipes/default_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
let(:chef_run) do
ChefSpec::SoloRunner.new(platform: 'centos', version: '6.8') do |node|
node.automatic['platform_family'] = 'rhel'
node.override['filebeat']['version'] = '6.0.0-beta1'
node.override['filebeat']['version'] = '6.0.1-beta1'
node.override['filebeat']['purge_prospectors_dir'] = true
end.converge(described_recipe)
end
Expand Down Expand Up @@ -179,12 +179,12 @@

include_examples 'filebeat'

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

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

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

it "has correct default['filebeat']['conf_dir']" do
expect(node['filebeat']['conf_dir']).to eq('C:/opt/filebeat/filebeat-5.6.4-windows-x86_64')
expect(node['filebeat']['conf_dir']).to eq('C:/opt/filebeat/filebeat-6.0.1-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.6.4-windows-x86_64/registry')
expect(node['filebeat']['config']['filebeat.registry_file']).to eq('C:/opt/filebeat/filebeat-6.0.1-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.6.4-windows-x86_64/conf.d')
expect(node['filebeat']['config']['filebeat.config_dir']).to eq('C:/opt/filebeat/filebeat-6.0.1-windows-x86_64/conf.d')
end
end
end

0 comments on commit 1b29bcf

Please sign in to comment.