[helm]: integration config for scheduler and controller-manager condi…

…tions and containers logs (#5853) (#5883) * fix: integration config for scheduler and controller-manager conditions and containers logs * fix: update rendered examples * fix: add back processors (cherry picked from commit 460f44e) Co-authored-by: Panos Koutsovasilis <panos.koutsovasilis@elastic.co>
elastic · Oct 30, 2024 · 63615c7 · 63615c7
1 parent a3b9f76
commit 63615c7
Show file tree

Hide file tree

Showing 9 changed files with 15 additions and 9 deletions.
diff --git a/deploy/helm/elastic-agent/examples/eck/rendered/manifest.yaml b/deploy/helm/elastic-agent/examples/eck/rendered/manifest.yaml
@@ -424,6 +424,7 @@ stringData:
         streams:
         - data_stream:
             dataset: kubernetes.container_logs
+            type: logs
           id: kubernetes-container-logs-${kubernetes.pod.name}-${kubernetes.container.id}
           parsers:
           - container:

diff --git a/deploy/helm/elastic-agent/examples/kubernetes-default/rendered/manifest.yaml b/deploy/helm/elastic-agent/examples/kubernetes-default/rendered/manifest.yaml
@@ -433,6 +433,7 @@ stringData:
         streams:
         - data_stream:
             dataset: kubernetes.container_logs
+            type: logs
           id: kubernetes-container-logs-${kubernetes.pod.name}-${kubernetes.container.id}
           parsers:
           - container:
@@ -1088,7 +1089,7 @@ spec:
       labels:
         name: agent-pernode-example
       annotations:
-        checksum/config: 1880bff2efcb86e1b6cc442b0804132a46df0bb93ceae4af8cd42b44964e53c6
+        checksum/config: 53aa4ccc3e8557125fecf738e70722e2aaa1199ee79a823f684a9d4a296af7b0
 
     spec:
       dnsPolicy: ClusterFirstWithHostNet

diff --git a/deploy/helm/elastic-agent/examples/kubernetes-hints-autodiscover/rendered/manifest.yaml b/deploy/helm/elastic-agent/examples/kubernetes-hints-autodiscover/rendered/manifest.yaml
@@ -435,6 +435,7 @@ stringData:
         streams:
         - data_stream:
             dataset: kubernetes.container_logs
+            type: logs
           id: kubernetes-container-logs-${kubernetes.pod.name}-${kubernetes.container.id}
           parsers:
           - container:
@@ -1090,7 +1091,7 @@ spec:
       labels:
         name: agent-pernode-example
       annotations:
-        checksum/config: f81171bdf0eed2d3bc8492050be0e6763188e3731e5cfc2b675f6ad8810c6fb7
+        checksum/config: 21fb7e317577410096de8d8e0fb03b32ad2e406b549f75085ae6907d38678e46
 
     spec:
       dnsPolicy: ClusterFirstWithHostNet

diff --git a/deploy/helm/elastic-agent/examples/kubernetes-only-logs/rendered/manifest.yaml b/deploy/helm/elastic-agent/examples/kubernetes-only-logs/rendered/manifest.yaml
@@ -56,6 +56,7 @@ stringData:
         streams:
         - data_stream:
             dataset: kubernetes.container_logs
+            type: logs
           id: kubernetes-container-logs-${kubernetes.pod.name}-${kubernetes.container.id}
           parsers:
           - container:
@@ -226,7 +227,7 @@ spec:
       labels:
         name: agent-pernode-example
       annotations:
-        checksum/config: e4f00459bc975f20e15a69d830b8df6c1998190072d515e0c08cf5b51dd5bbc1
+        checksum/config: 4de2216224a483ae1355aeec668894f764edc48bd3481d8fbc65f67eedc1b336
 
     spec:
       dnsPolicy: ClusterFirstWithHostNet

diff --git a/deploy/helm/elastic-agent/examples/multiple-integrations/rendered/manifest.yaml b/deploy/helm/elastic-agent/examples/multiple-integrations/rendered/manifest.yaml
@@ -461,6 +461,7 @@ stringData:
         streams:
         - data_stream:
             dataset: kubernetes.container_logs
+            type: logs
           id: kubernetes-container-logs-${kubernetes.pod.name}-${kubernetes.container.id}
           parsers:
           - container:
@@ -1116,7 +1117,7 @@ spec:
       labels:
         name: agent-pernode-example
       annotations:
-        checksum/config: f81171bdf0eed2d3bc8492050be0e6763188e3731e5cfc2b675f6ad8810c6fb7
+        checksum/config: 21fb7e317577410096de8d8e0fb03b32ad2e406b549f75085ae6907d38678e46
 
     spec:
       dnsPolicy: ClusterFirstWithHostNet

diff --git a/.../helm/elastic-agent/templates/integrations/_kubernetes/_kubernetes_controller_manager.tpl b/.../helm/elastic-agent/templates/integrations/_kubernetes/_kubernetes_controller_manager.tpl
@@ -37,5 +37,5 @@ hosts:
 period: "10s"
 bearer_token_file: "var/run/secrets/kubernetes.io/serviceaccount/token"
 ssl.verification_mode: "none"
-condition: "${kubernetes.labels.component} == ''kube-controller-manager''"
-{{- end -}}
+condition: "${kubernetes.labels.component} == 'kube-controller-manager'"
+{{- end -}}
diff --git a/deploy/helm/elastic-agent/templates/integrations/_kubernetes/_kubernetes_logs_containers.tpl b/deploy/helm/elastic-agent/templates/integrations/_kubernetes/_kubernetes_logs_containers.tpl
@@ -20,6 +20,7 @@ Config input for container logs
   - id: kubernetes-container-logs-${kubernetes.pod.name}-${kubernetes.container.id}
     data_stream:
       dataset: kubernetes.container_logs
+      type: logs
     paths:
       - '/var/log/containers/*${kubernetes.container.id}.log'
     prospector.scanner.symlinks: {{ dig "vars" "symlinks" true .Values.kubernetes.containers.logs }}

diff --git a/deploy/helm/elastic-agent/templates/integrations/_kubernetes/_kubernetes_scheduler.tpl b/deploy/helm/elastic-agent/templates/integrations/_kubernetes/_kubernetes_scheduler.tpl
@@ -37,5 +37,5 @@ hosts:
 period: "10s"
 bearer_token_file: "/var/run/secrets/kubernetes.io/serviceaccount/token"
 ssl.verification_mode: "none"
-condition: "${kubernetes.labels.component} == ''kube-scheduler''"
-{{- end -}}
+condition: "${kubernetes.labels.component} == 'kube-scheduler'"
+{{- end -}}
diff --git a/deploy/helm/elastic-agent/values.schema.json b/deploy/helm/elastic-agent/values.schema.json
@@ -186,7 +186,7 @@
                                 "additionalParsersConfig": {
                                     "type": "array",
                                     "items": {
-                                        "type": "string"
+                                        "type": "object"
                                     }
                                 }
                             },