Merge from ci_feature to ci_feature_prod

installer/conf/kube.conf

@@ -47,12 +47,44 @@
   log_level debug
 </source>
 
+#cadvisor perf- Windows nodes
+<source>
+	type wincadvisorperf
+	tag oms.api.wincadvisorperf
+	run_interval 60s
+  log_level debug
+</source>
+
 <filter mdm.kubepodinventory** mdm.kubenodeinventory**>
   type filter_inventory2mdm
   custom_metrics_azure_regions eastus,southcentralus,westcentralus,westus2,southeastasia,northeurope,westEurope
   log_level info
 </filter>
 
+#custom_metrics_mdm filter plugin for perf data from windows nodes
+<filter mdm.cadvisorperf**>
+  type filter_cadvisor2mdm
+  custom_metrics_azure_regions eastus,southcentralus,westcentralus,westus2,southeastasia,northeurope,westEurope
+  metrics_to_collect cpuUsageNanoCores,memoryWorkingSetBytes
+  log_level info
+</filter>
+
+<match mdm.cadvisorperf**>
+  type out_mdm
+  log_level debug
+  num_threads 5
+  buffer_chunk_limit 20m
+  buffer_type file
+  buffer_path %STATE_DIR_WS%/out_mdm_cdvisorperf*.buffer
+  buffer_queue_limit 20
+  buffer_queue_full_action drop_oldest_chunk
+  flush_interval 20s
+  retry_limit 10
+  retry_wait 30s
+  max_retry_wait 9m
+  retry_mdm_post_wait_minutes 60
+</match>
+
 <match oms.containerinsights.KubePodInventory**>
   type out_oms
   log_level debug
@@ -168,3 +200,18 @@
   max_retry_wait 9m
   retry_mdm_post_wait_minutes 60
 </match>
+
+<match oms.api.wincadvisorperf**>
+  type out_oms
+  log_level debug
+  num_threads 5
+  buffer_chunk_limit 20m
+  buffer_type file
+  buffer_path %STATE_DIR_WS%/out_oms_api_wincadvisorperf*.buffer
+  buffer_queue_limit 20
+  buffer_queue_full_action drop_oldest_chunk
+  flush_interval 20s
+  retry_limit 10
+  retry_wait 30s
+  max_retry_wait 9m
+</match>

installer/conf/td-agent-bit.conf

@@ -23,10 +23,33 @@
     Mem_Buf_Limit 2m
     Path_Key filepath
     Skip_Long_Lines On
+    Ignore_Older 5m
+
+[INPUT]
+    Name tail
+    Tag oms.container.log.telegraf.err.*
+    Path /var/opt/microsoft/docker-cimprov/log/telegraf.log
+    DB /var/opt/microsoft/docker-cimprov/state/telegraf-log-state.db
+    Mem_Buf_Limit 2m
+    Path_Key filepath
+    Skip_Long_Lines On
+    Ignore_Older 5m
+
+[INPUT]
+    Name        tcp
+    Tag oms.container.perf.telegraf.*
+    Listen      0.0.0.0
+    Port        25226
+    Chunk_Size  32
+    Buffer_Size 64
+
+[FILTER]
+    Name grep
+    Match oms.container.log.telegraf.err.*
+    #Regex log /^(?:(?!\[azure_monitor\]: failed to write batch: \[403\] 403 Forbidden).)*$/
 
 [OUTPUT]
     Name                            oms
     EnableTelemetry                 true
     TelemetryPushIntervalSeconds    300
-    Match                           oms.container.log.*
-    AgentVersion                    ciprod03122019
+    Match                           oms.container.*