Merge pull request #175 from SumoLogic/prep-1.5.0

Prepare for  1.5.0 release

CHANGELOG.md

@@ -2,13 +2,16 @@
 This project adheres to [Semantic Versioning](http://semver.org/).
 
 This CHANGELOG (now) follows the format listed at [Keep A Changelog](http://keepachangelog.com/)
-
 ## [Unreleased]
+
+## [1.5.0] - 2021-01-06
 ### Added 
 - Added securefiles boolean flag in installer to enable or disable enhanced file security.
 - added fields support to user.properties
 
 ### Changed
+- Deprecated flags disableScript/ActionSource removed.
+- Script / Action Sources are disabled by default.
 - Pass SSM credentials as strings and data bag credentails as symbols
 
 ## [1.4.0] - 2018-06-26

README.md

@@ -201,9 +201,9 @@ for more information about these attributes.
 | `sync_sources` | `String` | Sets the JSON file describing sources to configure on registration, which will be continuously monitored and synchronized with the Collector's configuration | `nil` | `false` | `:install_and_configure`, `:configure` |
 | `ephemeral` | `Boolean` | When `true`, the Collector will be deleted after goes offline for a certain period of time | `false` | `false` | `:install_and_configure`, `:configure` |
 | `clobber` | `Boolean` | When `true`, if there is any existing Collector with the same name, that Collector will be deleted | `false` | `false` | `:install_and_configure`, `:configure` |
-| `disable_script_source` | `Boolean` | If your organization's internal policies restrict the use of scripts, you can disable the creation of script-based Script Sources. When this parameter is passed, this option is removed from the Sumo Logic Web Application, and Script Source cannot be configured | `false` | `false` | `:install_and_configure`, `:configure` |
-| `disable_action_source` | `Boolean` | If your organization's internal policies restrict the use of script actions, you can disable the creation of script-based action sources. When this parameter is passed, action sources will not execute on this collector. | `false` | `false` | `:install_and_configure`, `:configure` |
 | `disable_upgrade` | `Boolean` | If true, the collector rejects upgrade requests from Sumo. | `false` | `false` | `:install_and_configure`, `:configure` |
+| `enable_script_source` | `Boolean` | Script Sources are disabled by default. You can enable them by setting this parameter to true. | `false` | `false` | `:install_and_configure`, `:configure` |
+| `enable_action_source` | `Boolean` | Script Action Sources are disabled by default. You can enable them by setting this parameter to true. | `false` | `false` | `:install_and_configure`, `:configure` |
 | `time_zone` | `String` | The default time zone for sources on this collector | `nil` | `false` | `:install_and_configure`, `:configure` |
 | `target_cpu` | `Integer` | Target to which to limit the CPU usage of this collector | `nil` | `false` | `:install_and_configure`, `:configure` |
 | `wrapper_java_initmemory` | `Integer` | Override the initial Java heap size | `nil` | `false` | `:configure` |

metadata.rb

@@ -8,7 +8,7 @@ source_url 'https://github.com/SumoLogic/sumologic-collector-chef-cookbook' if r
 license 'Apache-2.0'
 description 'Installs/Configures sumologic-collector'
 long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
-version '1.4.0'
+version '1.5.0'
 chef_version '>= 11' if respond_to?(:chef_version)
 
 %w[

resources/default.rb

@@ -35,8 +35,8 @@ attribute :sources, kind_of: String, default: nil
 attribute :sync_sources, kind_of: String, default: nil
 attribute :ephemeral, kind_of: [TrueClass, FalseClass], default: false
 attribute :clobber, kind_of: [TrueClass, FalseClass], default: false
-attribute :disable_script_source, kind_of: [TrueClass, FalseClass], default: false
-attribute :disable_action_source, kind_of: [TrueClass, FalseClass], default: false
+attribute :enable_script_source, kind_of: [TrueClass, FalseClass], default: false
+attribute :enable_action_source, kind_of: [TrueClass, FalseClass], default: false
 attribute :disable_upgrade, kind_of: [TrueClass, FalseClass], default: false
 attribute :time_zone, kind_of: String, default: nil
 attribute :target_cpu, kind_of: Integer, default: nil

templates/default/user.properties.erb

@@ -29,8 +29,8 @@ name=<%= @resource.collector_name %>
 <%= "syncSources=#{@resource.sync_sources}" unless @resource.sync_sources.nil? %>
 <%= "ephemeral=#{@resource.ephemeral}" unless @resource.ephemeral.nil? %>
 <%= "clobber=#{@resource.clobber}" unless @resource.clobber.nil? %>
-<%= "disableScriptSource=#{@resource.disable_script_source}" unless @resource.disable_script_source.nil? %>
-<%= "disableActionSource=#{@resource.disable_action_source}" unless @resource.disable_action_source.nil? %>
+<%= "enableScriptSource=#{@resource.enable_script_source}" unless @resource.disable_script_source.nil? %>
+<%= "enableActionSource=#{@resource.enable_action_source}" unless @resource.disable_action_source.nil? %>
 <%= "disableUpgrade=#{@resource.disable_upgrade}" unless @resource.disable_upgrade.nil? %>
 <%= "timeZone=#{@resource.time_zone}" unless @resource.time_zone.nil? %>
 <%= "targetCPU=#{@resource.target_cpu}" unless @resource.target_cpu.nil? %>