sync yamls, agent log level to info and remove redundant test http se…

…rver (#1256) * updates * update trivy ignore * update the addon-token-adapter image
microsoft · May 20, 2024 · 5ced912 · 5ced912
1 parent b1ab8ef
commit 5ced912
Show file tree

Hide file tree

Showing 8 changed files with 79 additions and 52 deletions.
diff --git a/build/linux/installer/conf/container.conf b/build/linux/installer/conf/container.conf
@@ -7,7 +7,7 @@
     port 25225
     bind 127.0.0.1
   </source>
-  
+
   # MDM metrics from telegraf
   <source>
     @type tcp
@@ -22,15 +22,15 @@
     @type containerinventory
     tag oneagent.containerInsights.CONTAINER_INVENTORY_BLOB
     run_interval 60
-    @log_level debug
+    @log_level info
   </source>
 
   #cadvisor perf
   <source>
     @type cadvisor_perf
     tag oneagent.containerInsights.LINUX_PERF_BLOB
     run_interval 60
-    @log_level debug
+    @log_level info
   </source>
 
   #custom_metrics_mdm filter plugin
@@ -42,13 +42,13 @@
 
   <filter oms.mdm.container.perf.telegraf**>
    @type telegraf2mdm
-   @log_level debug
+   @log_level info
   </filter>
 
   #containerinventory
   <match **CONTAINER_INVENTORY_BLOB**>
    @type forward
-   @log_level debug
+   @log_level info
    send_timeout 30
    connect_timeout 30
    heartbeat_type none
@@ -66,15 +66,15 @@
     retry_max_times 10
     retry_wait 5s
     retry_max_interval 5m
-    flush_thread_count 5   
+    flush_thread_count 5
    </buffer>
-   keepalive true     
+   keepalive true
   </match>
 
   #cadvisorperf
   <match **LINUX_PERF_BLOB**>
     @type forward
-    @log_level debug
+    @log_level info
     send_timeout 30
     connect_timeout 30
     heartbeat_type none
@@ -92,14 +92,14 @@
      retry_max_times 10
      retry_wait 5s
      retry_max_interval 5m
-     flush_thread_count 5   
+     flush_thread_count 5
     </buffer>
     keepalive true
   </match>
 
   <match mdm.cadvisorperf** oms.mdm.container.perf.telegraf**>
     @type mdm
-    @log_level debug
+    @log_level info
     <buffer>
       @type file
       path /var/opt/microsoft/docker-cimprov/state/out_mdm_cdvisorperf*.buffer
@@ -109,15 +109,15 @@
       retry_max_times 10
       retry_wait 5s
       retry_max_interval 5m
-      flush_thread_count 5   
+      flush_thread_count 5
     </buffer>
     retry_mdm_post_wait_minutes 30
   </match>
 
   #InsightsMetrics
   <match **INSIGHTS_METRICS_BLOB**>
     @type forward
-    @log_level debug
+    @log_level info
     send_timeout 30
     connect_timeout 30
     heartbeat_type none
@@ -135,7 +135,7 @@
      retry_max_times 10
      retry_wait 5s
      retry_max_interval 5m
-     flush_thread_count 5   
+     flush_thread_count 5
     </buffer>
     keepalive true
   </match>
diff --git a/build/linux/installer/conf/kube.conf b/build/linux/installer/conf/kube.conf
@@ -10,7 +10,7 @@
    <match **LINUX_PERF_BLOB**>
     @type forward
     @id out_perf_fwd
-    @log_level debug
+    @log_level info
     send_timeout 30
     connect_timeout 30
     heartbeat_type none
@@ -36,7 +36,7 @@
    <match **INSIGHTS_METRICS_BLOB**>
      @type forward
      @id out_insights_metrics_fwd
-     @log_level debug
+     @log_level info
      send_timeout 30
      connect_timeout 30
      heartbeat_type none
@@ -73,13 +73,13 @@
      @type kube_podinventory
      tag oneagent.containerInsights.KUBE_POD_INVENTORY_BLOB
      run_interval 60
-     @log_level debug
+     @log_level info
     </source>
 
     #kubepodinventory
     <match **KUBE_POD_INVENTORY_BLOB**>
      @type forward
-     @log_level debug
+     @log_level info
      send_timeout 30
      connect_timeout 30
      heartbeat_type none
@@ -105,7 +105,7 @@
     #kubeservices
     <match **KUBE_SERVICES_BLOB**>
      @type forward
-     @log_level debug
+     @log_level info
      send_timeout 30
      connect_timeout 30
      heartbeat_type none
@@ -134,13 +134,13 @@
      @type kube_nodes
      tag oneagent.containerInsights.KUBE_NODE_INVENTORY_BLOB
      run_interval 60
-     @log_level debug
+     @log_level info
     </source>
 
     #containernodeinventory
     <match **CONTAINER_NODE_INVENTORY_BLOB**>
      @type forward
-     @log_level debug
+     @log_level info
      send_timeout 30
      connect_timeout 30
      heartbeat_type none
@@ -171,7 +171,7 @@
     #kubenodeinventory
     <match **KUBE_NODE_INVENTORY_BLOB**>
      @type forward
-     @log_level debug
+     @log_level info
      send_timeout 30
      connect_timeout 30
      heartbeat_type none
@@ -197,7 +197,7 @@
     <match mdm.kubenodeinventory** >
      @type mdm
      @id out_mdm_nodeinventory
-     @log_level debug
+     @log_level info
      <buffer>
       @type file
       path /var/opt/microsoft/docker-cimprov/state/out_mdm_nodeinventory*.buffer
@@ -219,13 +219,13 @@
      @type kube_events
      tag oneagent.containerInsights.KUBE_EVENTS_BLOB
      run_interval 60
-     @log_level debug
+     @log_level info
     </source>
 
     #kubeevents
     <match **KUBE_EVENTS_BLOB**>
      @type forward
-     @log_level debug
+     @log_level info
      send_timeout 30
      connect_timeout 30
      heartbeat_type none
@@ -253,13 +253,13 @@
     <source>
      @type kube_podmdminventory
      run_interval 60
-     @log_level debug
+     @log_level info
     </source>
 
     <match mdm.kubepodinventory**>
      @type mdm
      @id out_mdm_podinventory
-     @log_level debug
+     @log_level info
      <buffer>
       @type file
       path /var/opt/microsoft/docker-cimprov/state/out_mdm_podinventory*.buffer
@@ -282,15 +282,15 @@
      @type kube_perfinventory
      tag oneagent.containerInsights.LINUX_PERF_BLOB
      run_interval 60
-     @log_level debug
+     @log_level info
     </source>
 
     #Kubernetes Persistent Volume inventory
     <source>
      @type kube_pvinventory
      tag oneagent.containerInsights.KUBE_PV_INVENTORY_BLOB
      run_interval 60
-     @log_level debug
+     @log_level info
     </source>
 
     #@include windows_rs_perf.conf
@@ -300,21 +300,21 @@
      @type kubestate_deployments
      tag oneagent.containerInsights.INSIGHTS_METRICS_BLOB
      run_interval 60
-     @log_level debug
+     @log_level info
     </source>
 
     #Kubernetes object state - HPA
     <source>
      @type kubestate_hpa
      tag oneagent.containerInsights.INSIGHTS_METRICS_BLOB
      run_interval 60
-     @log_level debug
+     @log_level info
     </source>
 
     #kubepvinventory
     <match **KUBE_PV_INVENTORY_BLOB**>
      @type forward
-     @log_level debug
+     @log_level info
      send_timeout 30
      connect_timeout 30
      heartbeat_type none
@@ -340,7 +340,7 @@
     <match mdm.cadvisorperf**>
      @type mdm
      @id out_mdm_perf
-     @log_level debug
+     @log_level info
      <buffer>
       @type file
       path /var/opt/microsoft/docker-cimprov/state/out_mdm_cdvisorperf*.buffer

diff --git a/build/linux/installer/conf/windows_rs_containerinventory.conf b/build/linux/installer/conf/windows_rs_containerinventory.conf
@@ -2,7 +2,7 @@
   <match **CONTAINER_INVENTORY_BLOB**>
     @type forward
     @id out_ci_fwd
-    @log_level debug
+    @log_level info
     send_timeout 30
     connect_timeout 30
     heartbeat_type none

diff --git a/build/linux/installer/conf/windows_rs_perf.conf b/build/linux/installer/conf/windows_rs_perf.conf
@@ -3,5 +3,5 @@
     @type win_cadvisor_perf
     tag oneagent.containerInsights.LINUX_PERF_BLOB
     run_interval 60
-    @log_level debug
+    @log_level info
   </source>
diff --git a/build/windows/installer/conf/fluent.conf b/build/windows/installer/conf/fluent.conf
@@ -8,7 +8,7 @@
   @type cadvisor_perf
   tag oms.api.cadvisorperf
   run_interval 60
-  @log_level debug
+  @log_level info
 </source>
 
 #custom_metrics_mdm filter plugin
@@ -21,7 +21,7 @@
 
 <match mdm.cadvisorperf**>
   @type mdm
-  @log_level debug
+  @log_level info
   <buffer>
     @type file
     path /etc/amalogswindows/out_mdm_cdvisorperf.buffer
@@ -31,7 +31,7 @@
     retry_max_times 10
     retry_wait 5s
     retry_max_interval 5m
-    flush_thread_count 5   
+    flush_thread_count 5
   </buffer>
   retry_mdm_post_wait_minutes 30
 </match>
diff --git a/charts/azuremonitor-containers/values.yaml b/charts/azuremonitor-containers/values.yaml
@@ -182,9 +182,12 @@ amalogs:
         cpu: 150m
         memory: 750Mi
     daemonsetwindows:
-      limits:
+      requests:
         cpu: 500m
-        memory: 600Mi
+        memory: 700Mi
+      limits:
+        cpu: 2
+        memory: 2Gi
     deployment:
       requests:
         cpu: 150m