From 1b29bcfac697b10caef205b9033f204ae9004702 Mon Sep 17 00:00:00 2001 From: Virender Khatri Date: Tue, 12 Dec 2017 12:38:12 +0530 Subject: [PATCH] bump filebeat version to v6.0.1 --- README.md | 2 +- attributes/config.rb | 2 -- attributes/default.rb | 2 +- spec/unit/recipes/default_spec.rb | 16 ++++++++-------- 4 files changed, 10 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index 7a8dafd..80e2351 100644 --- a/README.md +++ b/README.md @@ -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 diff --git a/attributes/config.rb b/attributes/config.rb index f1d156c..dfff291 100755 --- a/attributes/config.rb +++ b/attributes/config.rb @@ -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 ===== diff --git a/attributes/default.rb b/attributes/default.rb index 24550cd..7edb461 100755 --- a/attributes/default.rb +++ b/attributes/default.rb @@ -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 diff --git a/spec/unit/recipes/default_spec.rb b/spec/unit/recipes/default_spec.rb index 0dbd6e6..b58b860 100644 --- a/spec/unit/recipes/default_spec.rb +++ b/spec/unit/recipes/default_spec.rb @@ -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 @@ -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 @@ -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