deprecate use_journal - add lookup_from_k8s_field - detect input #154
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ewolinetz
reviewed
Sep 26, 2018
| (j_metadata = get_metadata_for_journal_record(record, time, batch_miss_cache)) | ||
| metadata = j_metadata | ||
| end | ||
| if @lookup_from_k8s_field && record.has_key?('kubernetes') && record.has_key?('docker') && |
There was a problem hiding this comment.
this is really messy to look at. can we refactor the key checks into a method?
maybe something where we can pass the map and the key names to check for
There was a problem hiding this comment.
ok - can we do that as a separate PR? This PR is just a cherrypick of 83436cb
Update to kubeclient 4.4.latest - make dependency now on versions between 4 and 5. The new api makes a discovery call to /api/v1 - I had to refactor the tests to take that into consideration. I've tested this with fluentd with ocp 4.2 logging - tests pass. I'm bumping the version to 2.3.0 from 2.2.x due to the big change in the kubeclient version. I also got rid of the dependency on activesupport.
|
closed in favor of 33b403f |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Make the plugin able to detect the source of the metadata,
either from the journal with
CONTAINER_NAMEor from in_tailwith the tag. Add a new source of metadata - if
lookup_from_k8s_field true, then the user may pass inmetadata in the fields
docker.container_id,kubernetes.namespace_name,kubernetes.pod_name,kubernetes.container_name