From 01eb403fe2ac2064d3d774993c2a0484ca0e7879 Mon Sep 17 00:00:00 2001 From: Jeff Cheng <83052155+jeffreyc-splunk@users.noreply.github.com> Date: Tue, 30 Apr 2024 12:26:55 -0400 Subject: [PATCH] chef: fix config file for win installs (#4759) --- deployments/chef/CHANGELOG.md | 4 ++++ deployments/chef/metadata.rb | 2 +- deployments/chef/recipes/default.rb | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/deployments/chef/CHANGELOG.md b/deployments/chef/CHANGELOG.md index a4b04716e7..4883cae69e 100644 --- a/deployments/chef/CHANGELOG.md +++ b/deployments/chef/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +## chef-v0.13.0 + +- Only copy the collector configuration file to `ProgramData` if the source exists. + ## chef-v0.12.0 - `splunk_ballast_size_mib` is deprecated and removed. For Splunk Otel Collector version `0.97.0` or greater, `GOMEMLIMIT` env var is introduced. The default is set to 90% of the `SPLUNK_TOTAL_MEM_MIB`. For more information regarding the usage, please follow the instructions ([here](https://github.com/signalfx/splunk-otel-collector?tab=readme-ov-file#from-0961-to-0970)). diff --git a/deployments/chef/metadata.rb b/deployments/chef/metadata.rb index 256d1b291b..30141d0125 100644 --- a/deployments/chef/metadata.rb +++ b/deployments/chef/metadata.rb @@ -3,7 +3,7 @@ maintainer_email 'signalfx-support@splunk.com' license 'Apache-2.0' description 'Install/Configure the Splunk OpenTelemetry Collector' -version '0.12.0' +version '0.13.0' chef_version '>= 16.0' supports 'amazon' diff --git a/deployments/chef/recipes/default.rb b/deployments/chef/recipes/default.rb index 35d880136d..c48c878887 100644 --- a/deployments/chef/recipes/default.rb +++ b/deployments/chef/recipes/default.rb @@ -24,7 +24,7 @@ remote_file node['splunk_otel_collector']['collector_config_dest'] do source "#{node['splunk_otel_collector']['collector_config_source']}" - only_if { node['splunk_otel_collector']['collector_config'] == {} } + only_if { ::File.exist?(node['splunk_otel_collector']['collector_config_source']) && node['splunk_otel_collector']['collector_config'] == {} } notifies :restart, 'windows_service[splunk-otel-collector]', :delayed end