-
Notifications
You must be signed in to change notification settings - Fork 16.8k
[stable/filebeat] Allow volumes, env vars, and http metrics to be configurable #4372
Conversation
/ok-to-test |
1ca946a
to
3779cf8
Compare
f02e7d8
to
baf81ef
Compare
@sstarcher I've rebased and added some additional functionality - |
stable/filebeat/values.yaml
Outdated
@@ -40,6 +40,23 @@ config: | |||
rotate_every_kb: 10000 | |||
number_of_files: 5 | |||
|
|||
http.enabled: false |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is http.enabled a filebeat configuration? If not I would separate it out into it's own thing. Also the dot in the string may cause issues with people trying to set it on the command line as I believe it will be treated as a map.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Just looked at the docs, I see this is a filebeat configuration. LGTM
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Agreed, having a period in the key makes it a bit tricky to use with --set
and the usage of the key in the template is not the most intuitive. We could try to add a separate, more helm-friendly key value pair that enables the containerPort but I'm not sure how we could conditionally merge a yaml block into the filebeat.yml Secret as its setup now. Any ideas?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I would be fine with keeping it as it is, but I would add a comment around it saying that it can't be set on the command line.
In an effort to standardize things across charts, we tend to go with |
/assign |
9a4ac49
to
97162b4
Compare
@unguiculus done 👍 |
/lgtm |
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: rifelpet, unguiculus The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
…figurable (helm#4372) * [stable/filebeat] Remove trailing whitespace * [stable/filebeat] Add checksum annotations to Daemonset * [stable/filebeat] Add NODE_NAME environment variable * [stable/filebeat] Allow env vars to be configurable * [stable/filebeat] Support exposing http metrics * [stable/filebeat] Support additional volumes * [stable/filebeat] Bump chart version * [stable/filebeat] Add a Chart home to pass linting test
…figurable (helm#4372) * [stable/filebeat] Remove trailing whitespace * [stable/filebeat] Add checksum annotations to Daemonset * [stable/filebeat] Add NODE_NAME environment variable * [stable/filebeat] Allow env vars to be configurable * [stable/filebeat] Support exposing http metrics * [stable/filebeat] Support additional volumes * [stable/filebeat] Bump chart version * [stable/filebeat] Add a Chart home to pass linting test
…figurable (helm#4372) * [stable/filebeat] Remove trailing whitespace * [stable/filebeat] Add checksum annotations to Daemonset * [stable/filebeat] Add NODE_NAME environment variable * [stable/filebeat] Allow env vars to be configurable * [stable/filebeat] Support exposing http metrics * [stable/filebeat] Support additional volumes * [stable/filebeat] Bump chart version * [stable/filebeat] Add a Chart home to pass linting test Signed-off-by: voron <av@arilot.com>
What this PR does / why we need it:
This PR allows additional volumes to be mounted along with additional prospectors configured.
This way we can watch logs from the host's
/var/log
that aren't from container logs themselves.Additional environment variables can be specified as a key-value map in order to support interpolation in the prospector configurations.
Example
values.yaml
for capturing kube-proxy logs on a Kops cluster:I also cleaned up some trailing whitespace and added checksums of the Secret and ConfigMap to the Daemonset annotations so pods will be rolled whenever either the Secret or ConfigMap change.
Which issue this PR fixes: N/A
Special notes for your reviewer:
Default behavior should be unchanged, but pods will be rolled upon upgrading due to the annotation change.