Sarah/health deprecation

build/common/installer/scripts/tomlparser-agent-config.rb

@@ -12,7 +12,6 @@
 
 @configMapMountPath = "/etc/config/settings/agent-settings"
 @configSchemaVersion = ""
-@enable_health_model = false
 
 # 250 Node items (15KB per node) account to approximately 4MB
 @nodesChunkSize = 250
@@ -89,10 +88,6 @@ def parseConfigMap
 def populateSettingValuesFromConfigMap(parsedConfig)
   begin
     if !parsedConfig.nil? && !parsedConfig[:agent_settings].nil?
-      if !parsedConfig[:agent_settings][:health_model].nil? && !parsedConfig[:agent_settings][:health_model][:enabled].nil?
-        @enable_health_model = parsedConfig[:agent_settings][:health_model][:enabled]
-        puts "enable_health_model = #{@enable_health_model}"
-      end
       chunk_config = parsedConfig[:agent_settings][:chunk_config]
       if !chunk_config.nil?
         nodesChunkSize = chunk_config[:NODES_CHUNK_SIZE]
@@ -179,7 +174,6 @@ def populateSettingValuesFromConfigMap(parsedConfig)
     end
   rescue => errorStr
     puts "config::error:Exception while reading config settings for agent configuration setting - #{errorStr}, using defaults"
-    @enable_health_model = false
   end
 end
 
@@ -194,14 +188,12 @@ def populateSettingValuesFromConfigMap(parsedConfig)
   if (File.file?(@configMapMountPath))
     ConfigParseErrorLogger.logError("config::unsupported/missing config schema version - '#{@configSchemaVersion}' , using defaults, please use supported schema version")
   end
-  @enable_health_model = false
 end
 
 # Write the settings to file, so that they can be set as environment variables
 file = File.open("agent_config_env_var", "w")
 
 if !file.nil?
-  file.write("export AZMON_CLUSTER_ENABLE_HEALTH_MODEL=#{@enable_health_model}\n")
   file.write("export NODES_CHUNK_SIZE=#{@nodesChunkSize}\n")
   file.write("export PODS_CHUNK_SIZE=#{@podsChunkSize}\n")
   file.write("export EVENTS_CHUNK_SIZE=#{@eventsChunkSize}\n")

build/common/installer/scripts/tomlparser-prom-agent-config.rb

@@ -84,7 +84,6 @@ def populateSettingValuesFromConfigMap(parsedConfig)
   if (File.file?(@configMapMountPath))
     ConfigParseErrorLogger.logError("config::unsupported/missing config schema version - '#{@configSchemaVersion}' , using defaults, please use supported schema version")
   end
-  @enable_health_model = false
 end
 
 # Write the settings to file, so that they can be set as environment variables

build/linux/installer/conf/container.conf

@@ -33,16 +33,6 @@
     @log_level debug
   </source>
 
-  <filter kubehealth.DaemonSet.Node**>
-   @type cadvisor_health_node
-   @log_level debug
-  </filter>
-
-  <filter kubehealth.DaemonSet.Container**>
-   @type cadvisor_health_container
-   @log_level debug
-  </filter>
-
   #custom_metrics_mdm filter plugin
   <filter mdm.cadvisorperf**>
     @type cadvisor2mdm
@@ -107,34 +97,6 @@
     keepalive true
   </match>
 
-  <match kubehealth.DaemonSet**>
-    @type health_forward
-    send_timeout 60s
-    recover_wait 10s
-    hard_timeout 60s
-    transport tcp
-    ignore_network_errors_at_startup true
-    expire_dns_cache 600s
-    <buffer>
-      @type file
-      overflow_action drop_oldest_chunk
-      path /var/opt/microsoft/docker-cimprov/state/out_health_forward*.buffer
-      chunk_limit_size 3m
-      flush_interval 20s
-      retry_max_times 10   
-      retry_max_interval 5m  
-      retry_wait 5s
-    </buffer>
-    <server>
-      host "#{ENV['HEALTHMODEL_REPLICASET_SERVICE_SERVICE_HOST']}"
-      port "#{ENV['HEALTHMODEL_REPLICASET_SERVICE_SERVICE_PORT']}"
-    </server>
-    <secondary>
-      @type file
-      path /var/opt/microsoft/docker-cimprov/state/fluent_forward_failed.buffer
-    </secondary>
-  </match>
-
   <match mdm.cadvisorperf** oms.mdm.container.perf.telegraf**>
     @type mdm
     @log_level debug

build/linux/installer/conf/kube.conf

@@ -1,11 +1,3 @@
-    #fluent forward plugin
-    <source>
-     @type forward
-     port "#{ENV['HEALTHMODEL_REPLICASET_SERVICE_SERVICE_PORT']}"
-     bind 0.0.0.0
-     chunk_size_limit 4m
-    </source>
-
     #Kubernetes pod inventory
     <source>
      @type kube_podinventory
@@ -38,14 +30,6 @@
      @log_level debug
     </source>
 
-    #Kubernetes health
-    <source>
-     @type kube_health
-     tag kubehealth.ReplicaSet
-     run_interval 60
-     @log_level debug
-    </source>
-
     #cadvisor perf- Windows nodes
     <source>
      @type win_cadvisor_perf
@@ -82,11 +66,6 @@
      @log_level info
     </filter>
 
-    #health model aggregation filter
-    <filter kubehealth**>
-     @type health_model_builder
-    </filter>
-
     #kubepodinventory
     <match **KUBE_POD_INVENTORY_BLOB**>
      @type forward
@@ -357,29 +336,3 @@
      </buffer>
      retry_mdm_post_wait_minutes 30
     </match>
-
-    #kubehealth
-    <match **KUBE_HEALTH_BLOB**>
-     @type forward
-     @log_level debug
-     send_timeout 30
-     connect_timeout 30
-     heartbeat_type none
-     <server>
-       host 0.0.0.0
-       port  "#{ENV['MDSD_FLUENT_SOCKET_PORT']}"
-     </server>
-     <buffer>
-      @type file
-      path /var/opt/microsoft/docker-cimprov/state/kubehealth*.buffer
-      overflow_action drop_oldest_chunk
-      chunk_limit_size 4m
-      queue_limit_length 20
-      flush_interval 20s
-      retry_max_times 10
-      retry_wait 5s
-      retry_max_interval 5m
-      flush_thread_count 5   
-     </buffer>
-     keepalive true     
-    </match>