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.

Sign up for GitHub

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

[Filebeat] Fix id for config map #37545

Merged
merged 4 commits into from
Jan 8, 2024
Merged

[Filebeat] Fix id for config map #37545

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8bd7c10
Fix config map
constanca-m Jan 4, 2024
c1319a9
Fix config map
constanca-m Jan 4, 2024
904f0f0
Fix config map
constanca-m Jan 4, 2024
8beb014
Remove fingerprint length
constanca-m Jan 5, 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 deploy/kubernetes/filebeat-kubernetes.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ data:
filebeat.yml: |-
filebeat.inputs:
- type: filestream
id: kubernetes-container-logs-${data.kubernetes.pod.name}-${data.kubernetes.container.id}
id: kubernetes-container-logs
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These substitutions should work only in autodiscover, not in regular input configuration, AFAIK.

I see @gsantoro made this change in #37401
How was it tested?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It was not correctly tested in that PR, this is a fix to that

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@constanca-m My point is rather if this was not tested, how can we trust the rest of the changes from that PR? Perhaps we need to ask @gsantoro to re-test those changes.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

hello @rdner , sorry that was my fault. It was an unintended change. I'll do some testing now anyway

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have now tested this. it works as expected with this PR changes. thanks @constanca-m for catching this

paths:
- /var/log/containers/*.log
parsers:
Expand Down
2 changes: 1 addition & 1 deletion deploy/kubernetes/filebeat/filebeat-configmap.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ data:
filebeat.yml: |-
filebeat.inputs:
- type: filestream
id: kubernetes-container-logs-${data.kubernetes.pod.name}-${data.kubernetes.container.id}
id: kubernetes-container-logs
paths:
- /var/log/containers/*.log
parsers:
Expand Down
2 changes: 1 addition & 1 deletion dev-tools/kubernetes/filebeat/manifest.debug.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ data:
filebeat.yml: |-
filebeat.inputs:
- type: filestream
id: kubernetes-container-logs-${data.kubernetes.pod.name}-${data.kubernetes.container.id}
id: kubernetes-container-logs
paths:
- /var/log/containers/*.log
parsers:
Expand Down
2 changes: 1 addition & 1 deletion dev-tools/kubernetes/filebeat/manifest.run.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ data:
filebeat.yml: |-
filebeat.inputs:
- type: filestream
id: kubernetes-container-logs-${data.kubernetes.pod.name}-${data.kubernetes.container.id}
id: kubernetes-container-logs
paths:
- /var/log/containers/*.log
parsers:
Expand Down
Loading