From dbd436cedf4f57cb854f9f039af81a3b24d23f06 Mon Sep 17 00:00:00 2001 From: Samiur Arif Date: Tue, 9 Apr 2024 09:57:28 -0700 Subject: [PATCH] bumping up version (#4642) --- deployments/chef/CHANGELOG.md | 4 ++++ deployments/chef/README.md | 6 +----- deployments/chef/attributes/default.rb | 2 +- deployments/chef/metadata.rb | 2 +- deployments/chef/recipes/collector_win_registry.rb | 4 ++-- deployments/chef/templates/splunk-otel-collector.conf.erb | 5 +++-- 6 files changed, 12 insertions(+), 11 deletions(-) diff --git a/deployments/chef/CHANGELOG.md b/deployments/chef/CHANGELOG.md index 602885d8e0..a4b04716e7 100644 --- a/deployments/chef/CHANGELOG.md +++ b/deployments/chef/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +## 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)). + ## chef-v0.11.0 - On Windows the `SPLUNK_*` environment variables were moved from the machine scope to the collector service scope. diff --git a/deployments/chef/README.md b/deployments/chef/README.md index 1be5e7cedf..daafacf8a9 100644 --- a/deployments/chef/README.md +++ b/deployments/chef/README.md @@ -102,11 +102,7 @@ required `splunk_access_token` attribute and some optional attributes: Collector. The `SPLUNK_MEMORY_TOTAL_MIB` environment variable will be set with this value for the Collector service. (**default:** `512`) -- `splunk_ballast_size_mib`: Explicitly set the ballast size for the Collector - instead of the value calculated from the `splunk_memory_total_mib` attribute. - This should be set to 1/3 to 1/2 of configured memory. The - `SPLUNK_BALLAST_SIZE_MIB` environment variable will be set with this value - for the Collector service. (**default:** `''`) +- `gomemlimit`: The `GOMEMLIMIT` environment variable is introduced for the Splunk Otel Collector version >=0.97.0, allowing the limitation of memory usage in the GO runtime. This feature can help enhance GC (Garbage Collection) related performance and prevent GC related Out of Memory (OOM) situations. - `splunk_listen_interface`: The network interface the collector receivers will listen on (**default** `0.0.0.0`). diff --git a/deployments/chef/attributes/default.rb b/deployments/chef/attributes/default.rb index 6330a2b61a..7f50c8953a 100644 --- a/deployments/chef/attributes/default.rb +++ b/deployments/chef/attributes/default.rb @@ -20,7 +20,7 @@ default['splunk_otel_collector']['splunk_hec_url'] = "#{node['splunk_otel_collector']['splunk_ingest_url']}/v1/log" default['splunk_otel_collector']['splunk_hec_token'] = "#{node['splunk_otel_collector']['splunk_access_token']}" default['splunk_otel_collector']['splunk_memory_total_mib'] = '512' -default['splunk_otel_collector']['splunk_ballast_size_mib'] = '' +default['splunk_otel_collector']['gomemlimit'] = '' default['splunk_otel_collector']['splunk_listen_interface'] = '' default['splunk_otel_collector']['collector_config'] = {} diff --git a/deployments/chef/metadata.rb b/deployments/chef/metadata.rb index b008d0b9b0..256d1b291b 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.11.0' +version '0.12.0' chef_version '>= 16.0' supports 'amazon' diff --git a/deployments/chef/recipes/collector_win_registry.rb b/deployments/chef/recipes/collector_win_registry.rb index b8c1d49695..a2e9a0a03d 100644 --- a/deployments/chef/recipes/collector_win_registry.rb +++ b/deployments/chef/recipes/collector_win_registry.rb @@ -15,8 +15,8 @@ { name: 'SPLUNK_TRACE_URL', type: :string, data: node['splunk_otel_collector']['splunk_trace_url'].to_s }, ] -unless node['splunk_otel_collector']['splunk_ballast_size_mib'].to_s.strip.empty? - collector_env_vars.push({ name: 'SPLUNK_BALLAST_SIZE_MIB', type: :string, data: node['splunk_otel_collector']['splunk_ballast_size_mib'].to_s }) +unless node['splunk_otel_collector']['gomemlimit'].to_s.strip.empty? + collector_env_vars.push({ name: 'GOMEMLIMIT', type: :string, data: node['splunk_otel_collector']['gomemlimit'].to_s }) end unless node['splunk_otel_collector']['splunk_listen_interface'].to_s.strip.empty? collector_env_vars.push({ name: 'SPLUNK_LISTEN_INTERFACE', type: :string, data: node['splunk_otel_collector']['splunk_listen_interface'].to_s }) diff --git a/deployments/chef/templates/splunk-otel-collector.conf.erb b/deployments/chef/templates/splunk-otel-collector.conf.erb index c000839b02..58a237ad0c 100644 --- a/deployments/chef/templates/splunk-otel-collector.conf.erb +++ b/deployments/chef/templates/splunk-otel-collector.conf.erb @@ -33,8 +33,9 @@ SPLUNK_MEMORY_TOTAL_MIB=<%= node['splunk_otel_collector']['splunk_memory_total_m SPLUNK_LISTEN_INTERFACE=<%= node['splunk_otel_collector']['splunk_listen_interface'] %> <% end -%> -# How much memory to allocate to the ballast. This should be set to 1/3 to 1/2 of configured memory. -SPLUNK_BALLAST_SIZE_MIB=<%= node['splunk_otel_collector']['splunk_ballast_size_mib'] %> +<% unless node['splunk_otel_collector']['gomemlimit'].to_s.strip.empty? -%> +GOMEMLIMIT=<%= node['splunk_otel_collector']['gomemlimit'] %> +<% end -%> # The path to the Smart Agent bundle. SPLUNK_BUNDLE_DIR=<%= node['splunk_otel_collector']['splunk_bundle_dir'] %>