Skip to content

Commit 460f44e

Browse files
[helm]: integration config for scheduler and controller-manager conditions and containers logs (#5853)
* fix: integration config for scheduler and controller-manager conditions and containers logs * fix: update rendered examples * fix: add back processors
1 parent 053b320 commit 460f44e

File tree

9 files changed

+15
-9
lines changed

9 files changed

+15
-9
lines changed

deploy/helm/elastic-agent/examples/eck/rendered/manifest.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -424,6 +424,7 @@ stringData:
424424
streams:
425425
- data_stream:
426426
dataset: kubernetes.container_logs
427+
type: logs
427428
id: kubernetes-container-logs-${kubernetes.pod.name}-${kubernetes.container.id}
428429
parsers:
429430
- container:

deploy/helm/elastic-agent/examples/kubernetes-default/rendered/manifest.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -433,6 +433,7 @@ stringData:
433433
streams:
434434
- data_stream:
435435
dataset: kubernetes.container_logs
436+
type: logs
436437
id: kubernetes-container-logs-${kubernetes.pod.name}-${kubernetes.container.id}
437438
parsers:
438439
- container:
@@ -1088,7 +1089,7 @@ spec:
10881089
labels:
10891090
name: agent-pernode-example
10901091
annotations:
1091-
checksum/config: 1880bff2efcb86e1b6cc442b0804132a46df0bb93ceae4af8cd42b44964e53c6
1092+
checksum/config: 53aa4ccc3e8557125fecf738e70722e2aaa1199ee79a823f684a9d4a296af7b0
10921093

10931094
spec:
10941095
dnsPolicy: ClusterFirstWithHostNet

deploy/helm/elastic-agent/examples/kubernetes-hints-autodiscover/rendered/manifest.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -435,6 +435,7 @@ stringData:
435435
streams:
436436
- data_stream:
437437
dataset: kubernetes.container_logs
438+
type: logs
438439
id: kubernetes-container-logs-${kubernetes.pod.name}-${kubernetes.container.id}
439440
parsers:
440441
- container:
@@ -1090,7 +1091,7 @@ spec:
10901091
labels:
10911092
name: agent-pernode-example
10921093
annotations:
1093-
checksum/config: f81171bdf0eed2d3bc8492050be0e6763188e3731e5cfc2b675f6ad8810c6fb7
1094+
checksum/config: 21fb7e317577410096de8d8e0fb03b32ad2e406b549f75085ae6907d38678e46
10941095

10951096
spec:
10961097
dnsPolicy: ClusterFirstWithHostNet

deploy/helm/elastic-agent/examples/kubernetes-only-logs/rendered/manifest.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ stringData:
5656
streams:
5757
- data_stream:
5858
dataset: kubernetes.container_logs
59+
type: logs
5960
id: kubernetes-container-logs-${kubernetes.pod.name}-${kubernetes.container.id}
6061
parsers:
6162
- container:
@@ -226,7 +227,7 @@ spec:
226227
labels:
227228
name: agent-pernode-example
228229
annotations:
229-
checksum/config: e4f00459bc975f20e15a69d830b8df6c1998190072d515e0c08cf5b51dd5bbc1
230+
checksum/config: 4de2216224a483ae1355aeec668894f764edc48bd3481d8fbc65f67eedc1b336
230231

231232
spec:
232233
dnsPolicy: ClusterFirstWithHostNet

deploy/helm/elastic-agent/examples/multiple-integrations/rendered/manifest.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -461,6 +461,7 @@ stringData:
461461
streams:
462462
- data_stream:
463463
dataset: kubernetes.container_logs
464+
type: logs
464465
id: kubernetes-container-logs-${kubernetes.pod.name}-${kubernetes.container.id}
465466
parsers:
466467
- container:
@@ -1116,7 +1117,7 @@ spec:
11161117
labels:
11171118
name: agent-pernode-example
11181119
annotations:
1119-
checksum/config: f81171bdf0eed2d3bc8492050be0e6763188e3731e5cfc2b675f6ad8810c6fb7
1120+
checksum/config: 21fb7e317577410096de8d8e0fb03b32ad2e406b549f75085ae6907d38678e46
11201121

11211122
spec:
11221123
dnsPolicy: ClusterFirstWithHostNet

deploy/helm/elastic-agent/templates/integrations/_kubernetes/_kubernetes_controller_manager.tpl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,5 +37,5 @@ hosts:
3737
period: "10s"
3838
bearer_token_file: "var/run/secrets/kubernetes.io/serviceaccount/token"
3939
ssl.verification_mode: "none"
40-
condition: "${kubernetes.labels.component} == ''kube-controller-manager''"
41-
{{- end -}}
40+
condition: "${kubernetes.labels.component} == 'kube-controller-manager'"
41+
{{- end -}}

deploy/helm/elastic-agent/templates/integrations/_kubernetes/_kubernetes_logs_containers.tpl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ Config input for container logs
2020
- id: kubernetes-container-logs-${kubernetes.pod.name}-${kubernetes.container.id}
2121
data_stream:
2222
dataset: kubernetes.container_logs
23+
type: logs
2324
paths:
2425
- '/var/log/containers/*${kubernetes.container.id}.log'
2526
prospector.scanner.symlinks: {{ dig "vars" "symlinks" true .Values.kubernetes.containers.logs }}

deploy/helm/elastic-agent/templates/integrations/_kubernetes/_kubernetes_scheduler.tpl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,5 +37,5 @@ hosts:
3737
period: "10s"
3838
bearer_token_file: "/var/run/secrets/kubernetes.io/serviceaccount/token"
3939
ssl.verification_mode: "none"
40-
condition: "${kubernetes.labels.component} == ''kube-scheduler''"
41-
{{- end -}}
40+
condition: "${kubernetes.labels.component} == 'kube-scheduler'"
41+
{{- end -}}

deploy/helm/elastic-agent/values.schema.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@
186186
"additionalParsersConfig": {
187187
"type": "array",
188188
"items": {
189-
"type": "string"
189+
"type": "object"
190190
}
191191
}
192192
},

0 commit comments

Comments
 (0)