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

Added Replace_Dots option to fluent-bit Elasticsearch output defaulti… #491

Merged
merged 2 commits into from
Apr 21, 2021
Merged

Added Replace_Dots option to fluent-bit Elasticsearch output defaulti… #491

merged 2 commits into from
Apr 21, 2021

Conversation

jasonumiker
Copy link
Contributor

There is an existing approved pull request that you are having trouble merging because another PR got in and took the Helm chart version number - #362

I just recreated that incrementing the version number again - so this one should be mergable...

@jaypipes
Copy link
Contributor

@jasonumiker I squash-merged #353 this morning. Apologies for the delay and thank you for your patience. This PR can now be closed.

@jaypipes jaypipes closed this Apr 21, 2021
@jaypipes jaypipes reopened this Apr 21, 2021
@jaypipes
Copy link
Contributor

@jasonumiker Apologies again! I did not realize until just now that #353 only referred to the kinesis config section and not the Elasticsearch section, which you PR and #362 refer to. Reopening this. Le sigh, sorry about this...

@jaypipes jaypipes merged commit 481ff2f into aws:master Apr 21, 2021
@jaypipes
Copy link
Contributor

@jasonumiker @dpujadas OK, this is now merged (with chart version 0.1.11. I manually resolved the conflicts in this PR that resulted in me merging #353. Apologies for all the confusion and annoyances to you both!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants