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

[DOC] precedence between environment variables and yml in docker #12198

Merged
merged 2 commits into from Mar 29, 2022

Conversation

jsvd
Copy link
Member

@jsvd jsvd commented Aug 21, 2020

No description provided.

Copy link
Contributor

@karenzone karenzone left a comment

Choose a reason for hiding this comment

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

Looks like there's an extra word. Otherwise, LGTM

Comment on lines 142 to 143
for variables that can be mapped to Logstash settings. Settings that are found
in the environment are merged into `logstash.yml` as the container starts up.
in the environment are override those in the `logstash.yml` as the container starts up.
Copy link
Contributor

Choose a reason for hiding this comment

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

Nice change. Looks like one more word needs to be deleted:

in the environment are override those in the logstash.yml as the container starts up.

Copy link
Contributor

Choose a reason for hiding this comment

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

@andsel Ha! Looks like we were reviewing the same time. :-)

Copy link
Contributor

@andsel andsel left a comment

Choose a reason for hiding this comment

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

Just one nitpick, fixed that, LGTM

docs/static/docker.asciidoc Outdated Show resolved Hide resolved
Copy link
Contributor

@andsel andsel left a comment

Choose a reason for hiding this comment

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

There is an are that doesn't fit as per comment https://github.com/elastic/logstash/pull/12198/files#r474645544

Co-authored-by: Andrea Selva <selva.andre@gmail.com>
@jsvd jsvd requested a review from andsel March 29, 2022 15:55
@github-actions
Copy link
Contributor

📃 DOCS PREVIEWhttps://logstash_12198.docs-preview.app.elstc.co/diff
Note: if you get a "404!" please wait until the elasticsearch ci job finishes.

Copy link
Contributor

@andsel andsel left a comment

Choose a reason for hiding this comment

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

LGTM

@jsvd jsvd merged commit 682f07b into main Mar 29, 2022
@jsvd jsvd deleted the jsvd-patch-2 branch March 29, 2022 16:19
@jsvd
Copy link
Member Author

jsvd commented Mar 29, 2022

@logstashmachine backport 8.1

@jsvd
Copy link
Member Author

jsvd commented Mar 29, 2022

@logstashmachine backport 7.17

github-actions bot pushed a commit that referenced this pull request Mar 29, 2022
)

* [DOC] precedence between environment variables and yml in docker

Co-authored-by: Andrea Selva <selva.andre@gmail.com>
(cherry picked from commit 682f07b)
github-actions bot pushed a commit that referenced this pull request Mar 29, 2022
)

* [DOC] precedence between environment variables and yml in docker

Co-authored-by: Andrea Selva <selva.andre@gmail.com>
(cherry picked from commit 682f07b)
jsvd added a commit that referenced this pull request Mar 29, 2022
) (#13948)

Backport PR #12198 to 8.1 branch

Co-authored-by: Andrea Selva <selva.andre@gmail.com>
(cherry picked from commit 682f07b)

Co-authored-by: João Duarte <jsvd@users.noreply.github.com>
jsvd added a commit that referenced this pull request Mar 29, 2022
) (#13949)

Backport PR #12198 to 7.17 branch

Co-authored-by: Andrea Selva <selva.andre@gmail.com>
(cherry picked from commit 682f07b)

Co-authored-by: João Duarte <jsvd@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants