Fix geneva resource optimization (#1447)

* fix geneva bug in resource optimization path

* Add resource optimization for geneva path

* Add resource optimization for geneva path

* Add resource optimization for geneva path

* Add resource optimization for geneva path

* update using right file name

---------

Co-authored-by: Ganga Mahesh Siddem <[email protected]>

Author: wanlonghenry

build/common/installer/scripts/fluent-bit-conf-customizer.rb

@@ -17,12 +17,6 @@
   @using_aad_msi_auth = true
 end
 
-@geneva_logs_integration = false
-if !ENV["GENEVA_LOGS_INTEGRATION"].nil? && !ENV["GENEVA_LOGS_INTEGRATION"].empty? && ENV["GENEVA_LOGS_INTEGRATION"].strip.casecmp("true") == 0
-  @geneva_logs_integration = true
-end
-
-
 @default_service_interval = "15"
 @default_mem_buf_limit = "10"
 @default_high_log_scale_service_interval = "1"
@@ -70,8 +64,8 @@ def substituteStorageTotalLimitSize(new_contents)
 end
 
 def substituteResourceOptimization(resourceOptimizationEnabled, new_contents)
-  #Update the config file only in two conditions: 1. Linux and resource optimization is enabled 2. Windows and using aad msi auth and not using geneva logs integration
-  if (!@isWindows && !resourceOptimizationEnabled.nil? && resourceOptimizationEnabled.to_s.downcase == "true") || (@isWindows && @using_aad_msi_auth && !@geneva_logs_integration)
+  #Update the config file for two scnenarios for non-geneva mode: 1. Linux and resource optimization is enabled 2. Windows and using aad msi auth
+  if (!@isWindows && !resourceOptimizationEnabled.nil? && resourceOptimizationEnabled.to_s.downcase == "true") || (@isWindows && @using_aad_msi_auth)
     puts "config::Starting to substitute the placeholders in fluent-bit.conf file for resource optimization"
     if (@isWindows)
       new_contents = new_contents.gsub("#${ResourceOptimizationPluginFile}", "plugins_file  /etc/fluent-bit/azm-containers-input-plugins.conf")

build/common/installer/scripts/fluent-bit-geneva-conf-customizer.rb

@@ -30,6 +30,16 @@ def is_valid_number?(value)
   return !value.nil? && is_number?(value) && value.to_i > 0
 end
 
+  #Update the config file for geneva mode linux and resource optimization enabled
+def substituteResourceOptimization(resourceOptimizationEnabled, new_contents, isWindows)
+  if !isWindows && !resourceOptimizationEnabled.nil? && resourceOptimizationEnabled.to_s.downcase == "true"
+    puts "config::Starting to substitute the placeholders in fluent-bit-geneva conf file for resource optimization"
+    new_contents = new_contents.gsub("#${ResourceOptimizationPluginFile}", "plugins_file  /etc/opt/microsoft/docker-cimprov/azm-containers-input-plugins.conf")
+    new_contents = new_contents.gsub("#${ResourceOptimizationFBConfigFile}", "@INCLUDE fluent-bit-input.conf")
+  end
+  return new_contents
+end
+
 def substituteFluentBitPlaceHolders(configFilePath)
   begin
     # Replace the fluentbit config file with custom values if present
@@ -46,6 +56,7 @@ def substituteFluentBitPlaceHolders(configFilePath)
     enableFluentBitThreading = ENV["ENABLE_FBIT_THREADING"]
     kubernetesMetadataCollection = ENV["AZMON_KUBERNETES_METADATA_ENABLED"]
     annotationBasedLogFiltering = ENV["AZMON_ANNOTATION_BASED_LOG_FILTERING"]
+    resourceOptimizationEnabled = ENV["AZMON_RESOURCE_OPTIMIZATION_ENABLED"]
 
     serviceInterval = is_valid_number?(interval) ? interval : @default_service_interval
     serviceIntervalSetting = "Flush         " + serviceInterval
@@ -112,6 +123,8 @@ def substituteFluentBitPlaceHolders(configFilePath)
       end
     end
 
+    new_contents = substituteResourceOptimization(resourceOptimizationEnabled, new_contents, @isWindows)
+
     File.open(configFilePath, "w") { |file| file.puts new_contents }
     puts "config::Successfully substituted the placeholders in #{configFileName} file"
   rescue => errorStr

build/linux/installer/conf/fluent-bit-geneva.conf

@@ -12,6 +12,9 @@
     Log_Level     info
     Parsers_File  /etc/opt/microsoft/docker-cimprov/azm-containers-parser.conf
     Log_File      /var/opt/microsoft/docker-cimprov/log/fluent-bit-geneva.log
+    #${ResourceOptimizationPluginFile}
+
+#${ResourceOptimizationFBConfigFile}
 
 #NOTE: Multiline should be the first filter https://docs.fluentbit.io/manual/pipeline/filters/multiline-stacktrace
 #${MultilineEnabled}[FILTER]