Skip to content

Commit

Permalink
[helm]: integration config for scheduler and controller-manager condi…
Browse files Browse the repository at this point in the history
…tions and containers logs (#5853)

* fix: integration config for scheduler and controller-manager conditions and containers logs

* fix: update rendered examples

* fix: add back processors
  • Loading branch information
pkoutsovasilis authored Oct 30, 2024
1 parent 053b320 commit 460f44e
Show file tree
Hide file tree
Showing 9 changed files with 15 additions and 9 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -1088,7 +1089,7 @@ spec:
labels:
name: agent-pernode-example
annotations:
checksum/config: 1880bff2efcb86e1b6cc442b0804132a46df0bb93ceae4af8cd42b44964e53c6
checksum/config: 53aa4ccc3e8557125fecf738e70722e2aaa1199ee79a823f684a9d4a296af7b0

spec:
dnsPolicy: ClusterFirstWithHostNet
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -1090,7 +1091,7 @@ spec:
labels:
name: agent-pernode-example
annotations:
checksum/config: f81171bdf0eed2d3bc8492050be0e6763188e3731e5cfc2b675f6ad8810c6fb7
checksum/config: 21fb7e317577410096de8d8e0fb03b32ad2e406b549f75085ae6907d38678e46

spec:
dnsPolicy: ClusterFirstWithHostNet
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -226,7 +227,7 @@ spec:
labels:
name: agent-pernode-example
annotations:
checksum/config: e4f00459bc975f20e15a69d830b8df6c1998190072d515e0c08cf5b51dd5bbc1
checksum/config: 4de2216224a483ae1355aeec668894f764edc48bd3481d8fbc65f67eedc1b336

spec:
dnsPolicy: ClusterFirstWithHostNet
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -1116,7 +1117,7 @@ spec:
labels:
name: agent-pernode-example
annotations:
checksum/config: f81171bdf0eed2d3bc8492050be0e6763188e3731e5cfc2b675f6ad8810c6fb7
checksum/config: 21fb7e317577410096de8d8e0fb03b32ad2e406b549f75085ae6907d38678e46

spec:
dnsPolicy: ClusterFirstWithHostNet
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 -}}
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 -}}
2 changes: 1 addition & 1 deletion deploy/helm/elastic-agent/values.schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@
"additionalParsersConfig": {
"type": "array",
"items": {
"type": "string"
"type": "object"
}
}
},
Expand Down

0 comments on commit 460f44e

Please sign in to comment.