-
Notifications
You must be signed in to change notification settings - Fork 533
es_out: support Upstream Servers with configuration overriding #1143
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
base: master
Are you sure you want to change the base?
es_out: support Upstream Servers with configuration overriding #1143
Conversation
cb36f75
to
7611f0e
Compare
This PR is stale because it has been open 45 days with no activity. Remove stale label or comment or this will be closed in 10 days. |
This pull request is waiting for review of fluent/fluent-bit#7608 |
This PR is stale because it has been open 45 days with no activity. Remove stale label or comment or this will be closed in 10 days. |
7611f0e
to
25c7642
Compare
25c7642
to
7138a28
Compare
7138a28
to
c1092dc
Compare
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 left suggestions, but I've added my technical writing-based approval based on that to keep this moving.
Primarily, I was looking to help the table be more consistent and readable, while implementing some style-based suggestions for consistency.
a78ebf2
to
c620db5
Compare
Hi @cnorris-cs, I applied some (!) parts of your suggestions as well as introduced additional changes for consistency with your suggestions. Please take a look at this pull request one more time when you have time. Some of the changes are implemented in dedicated commits (for ease of revert in case of concerns) - please let me know if I need to squash all commits into a single one. Thank you for your review. |
c620db5
to
23f04ef
Compare
23f04ef
to
d8bad1b
Compare
d8bad1b
to
d465436
Compare
@fluent/fluent-bit-maintainers -- this PR needs a technical review. |
d465436
to
6546d15
Compare
6546d15
to
2d9ae77
Compare
2d9ae77
to
8448868
Compare
d318151
to
4b84694
Compare
4b84694
to
469c0ea
Compare
2dd2d3b
to
feefc9f
Compare
feefc9f
to
6051778
Compare
6051778
to
148fce1
Compare
fac2cc7
to
8ed632e
Compare
This still looks ok to me from a writing perspective. |
8ed632e
to
af68253
Compare
c02d041
to
312b9a1
Compare
312b9a1
to
02dbd5d
Compare
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.
Couple of minor stylistic suggestions for consistency, but these docs changes look good to me otherwise.
pipeline/outputs/elasticsearch.md
Outdated
| `Host` | IP address or hostname of the target Elasticsearch instance. | `127.0.0.1` | Yes. Default value isn't applicable for NODE section of Upstream configuration, which **requires** Host to be specified. | | ||
| `Port` | TCP port of the target Elasticsearch instance. | `9200` | Yes. Default value isn't applicable for NODE section of Upstream configuration, which **requires** Port to be specified. | |
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.
| `Host` | IP address or hostname of the target Elasticsearch instance. | `127.0.0.1` | Yes. Default value isn't applicable for NODE section of Upstream configuration, which **requires** Host to be specified. | | |
| `Port` | TCP port of the target Elasticsearch instance. | `9200` | Yes. Default value isn't applicable for NODE section of Upstream configuration, which **requires** Port to be specified. | | |
| `Host` | IP address or hostname of the target Elasticsearch instance. | `127.0.0.1` | Yes. Default value isn't applicable for NODE section of Upstream configuration, which requires `Host` to be specified. | | |
| `Port` | TCP port of the target Elasticsearch instance. | `9200` | Yes. Default value isn't applicable for NODE section of Upstream configuration, which requires `Port` to be specified. | |
We don't use bold for emphasis, per our style guide. Also ensuring keys are code fenced.
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.
Applied suggested changes. Thank you.
pipeline/outputs/elasticsearch.md
Outdated
The `http_proxy`, `no_proxy`, and `TLS` parameters used for AWS Sigv4 Authentication | ||
(for connection of plugin to AWS to generate authentication signature) are never | ||
picked from the `NODE` section of the | ||
[Upstream](../../administration/configuring-fluent-bit/classic-mode/upstream-servers.md) | ||
configuration. However, `TLS` parameters for connection of the plugin to | ||
Elasticsearch **can** be overridden in the `NODE` section of Upstream, even if AWS | ||
authentication is used. |
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.
The `http_proxy`, `no_proxy`, and `TLS` parameters used for AWS Sigv4 Authentication | |
(for connection of plugin to AWS to generate authentication signature) are never | |
picked from the `NODE` section of the | |
[Upstream](../../administration/configuring-fluent-bit/classic-mode/upstream-servers.md) | |
configuration. However, `TLS` parameters for connection of the plugin to | |
Elasticsearch **can** be overridden in the `NODE` section of Upstream, even if AWS | |
authentication is used. | |
The `http_proxy`, `no_proxy`, and `TLS` parameters used for AWS Sigv4 Authentication (for connection of plugin to AWS to generate authentication signature) are never picked from the `NODE` section of the [Upstream](../../administration/configuring-fluent-bit/classic-mode/upstream-servers.md) configuration. However, `TLS` parameters for connection of the plugin to Elasticsearch can be overridden in the `NODE` section of Upstream, even if AWS authentication is used. |
Unfortunately, GitBook messes up the rendering of properly linewrapped text :(
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.
Applied suggested changes. Thank you.
Signed-off-by: Marat Abrarov <[email protected]>
Signed-off-by: Marat Abrarov <[email protected]>
…d on review comments. Signed-off-by: Marat Abrarov <[email protected]>
Signed-off-by: Marat Abrarov <[email protected]>
02dbd5d
to
da614db
Compare
Implementation of Upstream feature for the Elasticsearch output plugin.
Refer to fluent/fluent-bit#7608 for the changes in Fluent Bit code.