improve custom metrics deprecation logic

build/linux/installer/conf/container-cm.conf

@@ -0,0 +1,141 @@
+ # Fluentd config file for OMS Docker - container components (non kubeAPI)
+
+ # Forward port 25225 for container logs
+ # gangams - not used and get ridoff after confirming safe to remove
+ <source>
+ @type forward
+ port 25225
+ bind 127.0.0.1
+ </source>
+
+ # MDM metrics from telegraf
+ <source>
+ @type tcp
+ tag oms.mdm.container.perf.telegraf.*
+ bind 0.0.0.0
+ port 25228
+ format json
+ </source>
+
+ # Container inventory
+ <source>
+ @type containerinventory
+ tag oneagent.containerInsights.CONTAINER_INVENTORY_BLOB
+ run_interval 60
+ @log_level info
+ </source>
+
+ #cadvisor perf
+ <source>
+ @type cadvisor_perf
+ tag oneagent.containerInsights.LINUX_PERF_BLOB
+ run_interval 60
+ @log_level info
+ </source>
+
+ #custom_metrics_mdm filter plugin
+ <filter mdm.cadvisorperf**>
+ @type cadvisor2mdm
+ metrics_to_collect cpuUsageNanoCores,memoryWorkingSetBytes,memoryRssBytes,pvUsedBytes
+ @log_level info
+ </filter>
+
+ <filter oms.mdm.container.perf.telegraf**>
+ @type telegraf2mdm
+ @log_level info
+ </filter>
+
+ #containerinventory
+ <match **CONTAINER_INVENTORY_BLOB**>
+ @type forward
+ @log_level info
+ 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/containerinventory*.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>
+
+ #cadvisorperf
+ <match **LINUX_PERF_BLOB**>
+ @type forward
+ @log_level info
+ 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/cadvisorperf*.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>
+
+ <match mdm.cadvisorperf** oms.mdm.container.perf.telegraf**>
+ @type mdm
+ @log_level info
+ <buffer>
+ @type file
+ path /var/opt/microsoft/docker-cimprov/state/out_mdm_cdvisorperf*.buffer
+ overflow_action drop_oldest_chunk
+ chunk_limit_size 4m
+ flush_interval 20s
+ retry_max_times 10
+ retry_wait 5s
+ retry_max_interval 5m
+ flush_thread_count 5
+ </buffer>
+ retry_mdm_post_wait_minutes 30
+ </match>
+
+ #InsightsMetrics
+ <match **INSIGHTS_METRICS_BLOB**>
+ @type forward
+ @log_level info
+ 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/insightsmetrics*.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>

build/linux/installer/conf/container.conf

@@ -8,15 +8,6 @@
  bind 127.0.0.1
  </source>
 
- # MDM metrics from telegraf
- <source>
- @type tcp
- tag oms.mdm.container.perf.telegraf.*
- bind 0.0.0.0
- port 25228
- format json
- </source>
-
  # Container inventory
  <source>
  @type containerinventory
@@ -33,18 +24,6 @@
  @log_level info
  </source>
 
- #custom_metrics_mdm filter plugin
- <filter mdm.cadvisorperf**>
- @type cadvisor2mdm
- metrics_to_collect cpuUsageNanoCores,memoryWorkingSetBytes,memoryRssBytes,pvUsedBytes
- @log_level info
- </filter>
-
- <filter oms.mdm.container.perf.telegraf**>
- @type telegraf2mdm
- @log_level info
- </filter>
-
  #containerinventory
  <match **CONTAINER_INVENTORY_BLOB**>
  @type forward
@@ -97,23 +76,6 @@
  keepalive true
  </match>
 
- <match mdm.cadvisorperf** oms.mdm.container.perf.telegraf**>
- @type mdm
- @log_level info
- <buffer>
- @type file
- path /var/opt/microsoft/docker-cimprov/state/out_mdm_cdvisorperf*.buffer
- overflow_action drop_oldest_chunk
- chunk_limit_size 4m
- flush_interval 20s
- retry_max_times 10
- retry_wait 5s
- retry_max_interval 5m
- flush_thread_count 5
- </buffer>
- retry_mdm_post_wait_minutes 30
- </match>
-
  #InsightsMetrics
  <match **INSIGHTS_METRICS_BLOB**>
  @type forward