Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[promtail] allow to inject templates #3248

Merged
merged 22 commits into from
Sep 17, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
196607a
feat(promtail): allow to inject templates
Wielewout Jul 26, 2024
e6c14a7
docs(promtail): generate docs
Wielewout Jul 30, 2024
7e6064d
Merge branch 'main' into promtail-tpl-extraVolumes
zanhsieh Aug 8, 2024
63740bf
Merge branch 'main' into promtail-tpl-extraVolumes
Wielewout Aug 8, 2024
07f4c1d
Merge branch 'main' into promtail-tpl-extraVolumes
Wielewout Aug 9, 2024
c9ea6ca
Merge branch 'main' into promtail-tpl-extraVolumes
Wielewout Aug 9, 2024
570a7d8
Merge branch 'main' into promtail-tpl-extraVolumes
Wielewout Aug 12, 2024
8863b0d
Merge branch 'main' into promtail-tpl-extraVolumes
Wielewout Aug 12, 2024
473fef6
Merge branch 'main' into promtail-tpl-extraVolumes
zanhsieh Aug 12, 2024
1308152
Merge branch 'main' into promtail-tpl-extraVolumes
Wielewout Aug 19, 2024
141a200
Merge branch 'main' into promtail-tpl-extraVolumes
zanhsieh Aug 19, 2024
ca5bd1a
Merge branch 'main' into promtail-tpl-extraVolumes
Wielewout Aug 19, 2024
59150d6
Merge branch 'main' into promtail-tpl-extraVolumes
Sheikh-Abubaker Aug 22, 2024
4e20c0c
Merge branch 'main' into promtail-tpl-extraVolumes
Wielewout Aug 26, 2024
7d6c10c
Merge branch 'main' into promtail-tpl-extraVolumes
Sheikh-Abubaker Aug 26, 2024
9414ccd
Merge branch 'main' into promtail-tpl-extraVolumes
zanhsieh Aug 27, 2024
0c9ccc6
Merge branch 'main' into promtail-tpl-extraVolumes
Wielewout Aug 29, 2024
303e56f
Merge branch 'main' into promtail-tpl-extraVolumes
Wielewout Sep 2, 2024
949b379
Merge branch 'main' into promtail-tpl-extraVolumes
Wielewout Sep 4, 2024
d5f1b67
Merge branch 'main' into promtail-tpl-extraVolumes
Wielewout Sep 6, 2024
1bf6731
Merge branch 'main' into promtail-tpl-extraVolumes
Wielewout Sep 16, 2024
9483576
Bump patch version
Wielewout Sep 17, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion charts/promtail/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: promtail
description: Promtail is an agent which ships the contents of local logs to a Loki instance
type: application
appVersion: 3.0.0
version: 6.16.5
version: 6.16.6
home: https://grafana.com/loki
sources:
- https://github.com/grafana/loki
Expand Down
2 changes: 1 addition & 1 deletion charts/promtail/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# promtail

![Version: 6.16.5](https://img.shields.io/badge/Version-6.16.5-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 3.0.0](https://img.shields.io/badge/AppVersion-3.0.0-informational?style=flat-square)
![Version: 6.16.6](https://img.shields.io/badge/Version-6.16.6-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 3.0.0](https://img.shields.io/badge/AppVersion-3.0.0-informational?style=flat-square)

Promtail is an agent which ships the contents of local logs to a Loki instance

Expand Down
4 changes: 2 additions & 2 deletions charts/promtail/templates/_pod.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ spec:
{{- end }}
{{- with .Values.initContainer }}
initContainers:
{{- toYaml . | nindent 4 }}
{{- tpl (toYaml .) $ | nindent 4 }}
{{- end }}
{{- with .Values.global.imagePullSecrets | default .Values.imagePullSecrets }}
imagePullSecrets:
Expand Down Expand Up @@ -167,6 +167,6 @@ spec:
{{- toYaml . | nindent 4 }}
{{- end }}
{{- with .Values.extraVolumes }}
{{- toYaml . | nindent 4 }}
{{- tpl (toYaml .) $ | nindent 4 }}
{{- end }}
{{- end }}
Loading