Skip to content

Commit

Permalink
- Sets the Splunk Enterprise Server and Forwarder upgrade versions to…
Browse files Browse the repository at this point in the history
… 8.0.6 (#182)

- Sets the upgrade attributes to pull v8.0.6 of Splunk Enterprise and Universal Forwarder

Signed-off-by: Dang H. Nguyen <[email protected]>
  • Loading branch information
haidangwa authored Oct 14, 2020
1 parent b50c101 commit 930bd05
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 11 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@

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

## 6.3.11 (2020-10-14)
- Sets the Splunk Enterprise Server and Forwarder upgrade versions to 8.0.6
- Sets the upgrade attributes to pull v8.0.6 of Splunk Enterprise and Universal Forwarder

## 6.3.10 (2020-07-15)
- Fixes Issue [#178](https://github.com/chef-cookbooks/chef-splunk/issues/178)
- `#shcluster_member?` passes `node['ipaddress']` to `#include?`
Expand Down
14 changes: 6 additions & 8 deletions attributes/upgrade.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@
# Cookbook:: chef-splunk
# Attributes:: upgrade
#
# Copyright:: 2014-2019, Chef Software, Inc.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
Expand All @@ -17,15 +15,15 @@
# limitations under the License.

# assumes x86_64 only (is there any reason to test i386 anymore?)
default['splunk']['forwarder']['upgrade']['version'] = '8.0.1'
default['splunk']['server']['upgrade']['version'] = '8.0.1'
default['splunk']['forwarder']['upgrade']['version'] = '8.0.6'
default['splunk']['server']['upgrade']['version'] = '8.0.6'

default['splunk']['server']['upgrade']['url'] = value_for_platform_family(
%w(rhel fedora suse amazon) => 'https://download.splunk.com/products/splunk/releases/8.0.1/linux/splunk-8.0.1-6db836e2fb9e-linux-2.6-x86_64.rpm',
'debian' => 'https://download.splunk.com/products/splunk/releases/8.0.1/linux/splunk-8.0.1-6db836e2fb9e-linux-2.6-amd64.deb'
%w(rhel fedora suse amazon) => 'https://download.splunk.com/products/splunk/releases/8.0.6/linux/splunk-8.0.6-152fb4b2bb96-linux-2.6-x86_64.rpm',
'debian' => 'https://download.splunk.com/products/splunk/releases/8.0.6/linux/splunk-8.0.6-152fb4b2bb96-linux-2.6-amd64.deb'
)

default['splunk']['forwarder']['upgrade']['url'] = value_for_platform_family(
%w(rhel fedora suse amazon) => 'https://download.splunk.com/products/universalforwarder/releases/8.0.1/linux/splunkforwarder-8.0.1-6db836e2fb9e-linux-2.6-x86_64.rpm',
'debian' => 'https://download.splunk.com/products/universalforwarder/releases/8.0.1/linux/splunkforwarder-8.0.1-6db836e2fb9e-linux-2.6-amd64.deb'
%w(rhel fedora suse amazon) => 'https://download.splunk.com/products/universalforwarder/releases/8.0.6/linux/splunkforwarder-8.0.6-152fb4b2bb96-linux-2.6-x86_64.rpm',
'debian' => 'https://download.splunk.com/products/universalforwarder/releases/8.0.6/linux/splunkforwarder-8.0.6-152fb4b2bb96-linux-2.6-amd64.deb'
)
2 changes: 1 addition & 1 deletion metadata.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
maintainer_email '[email protected]'
license 'Apache-2.0'
description 'Manage Splunk Enterprise or Splunk Universal Forwarder'
version '6.2.10'
version '6.2.11'

supports 'debian', '>= 8.9'
supports 'ubuntu', '>= 16.04'
Expand Down
4 changes: 2 additions & 2 deletions spec/recipes/upgrade_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
node.force_default['splunk']['upgrade_enabled'] = true
node.force_default['splunk']['accept_license'] = true
node.force_default['splunk']['server']['upgrade']['url'] = url
node.force_default['splunk']['server']['upgrade']['version'] = '8.0.1'
node.force_default['splunk']['server']['upgrade']['version'] = '8.0.6'
end
end

Expand All @@ -35,7 +35,7 @@
chef_run.node.force_default['splunk']['is_server'] = false
chef_run.node.force_default['splunk']['forwarder']['upgrade']['url'] = ''
chef_run.converge(described_recipe)
expect(chef_run).to upgrade_splunk_installer('splunkforwarder upgrade').with(version: '8.0.1')
expect(chef_run).to upgrade_splunk_installer('splunkforwarder upgrade').with(version: '8.0.6')
end
end
end

0 comments on commit 930bd05

Please sign in to comment.