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.

Sign up for GitHub

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

Cherry-pick #23628 to 7.x: [Elastic Log Driver] Change hosts config flag #23968

Merged
merged 1 commit into from
Feb 10, 2021
Merged

Cherry-pick #23628 to 7.x: [Elastic Log Driver] Change hosts config flag #23968

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions CHANGELOG.next.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -316,6 +316,9 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d

*Functionbeat*

*Elastic Logging Plugin*
- Fix out of date CLI flags on docs. {pull}23628[23628]


==== Added

Expand Down
2 changes: 1 addition & 1 deletion x-pack/dockerlogbeat/docs/configuration.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ The local log also supports the `max-file`, `max-size` and `compress` options th
["source","sh",subs="attributes"]
----
docker run --log-driver=elastic/{log-driver-alias}:{version} \
--log-opt endpoint="myhost:9200" \
--log-opt hosts="myhost:9200" \
--log-opt user="myusername" \
--log-opt password="mypassword" \
--log-opt max-file=10 \
Expand Down
4 changes: 2 additions & 2 deletions x-pack/dockerlogbeat/docs/install.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ example:
["source","sh",subs="attributes"]
----
docker run --log-driver=elastic/{log-driver-alias}:{version} \
--log-opt endpoint="https://myhost:9200" \
--log-opt hosts="https://myhost:9200" \
--log-opt user="myusername" \
--log-opt password="mypassword" \
-it debian:jessie /bin/bash
Expand All @@ -98,7 +98,7 @@ example:
{
"log-driver" : "elastic/{log-driver-alias}:{version}",
"log-opts" : {
"endpoint" : "https://myhost:9200",
"hosts" : "https://myhost:9200",
"user" : "myusername",
"password" : "mypassword"
}
Expand Down
8 changes: 4 additions & 4 deletions x-pack/dockerlogbeat/docs/usage.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ The following examples show common configurations for the {log-driver}.
["source","sh",subs="attributes"]
----
docker run --log-driver=elastic/{log-driver-alias}:{version} \
--log-opt endpoint="myhost:9200" \
--log-opt hosts="myhost:9200" \
--log-opt user="myusername" \
--log-opt password="mypassword" \
-it debian:jessie /bin/bash
Expand All @@ -29,7 +29,7 @@ docker run --log-driver=elastic/{log-driver-alias}:{version} \
{
"log-driver" : "elastic/{log-driver-alias}:{version}",
"log-opts" : {
"endpoint" : "myhost:9200",
"hosts" : "myhost:9200",
"user" : "myusername",
"password" : "mypassword",
}
Expand Down Expand Up @@ -71,7 +71,7 @@ docker run --log-driver=elastic/{log-driver-alias}:{version} \
["source","sh",subs="attributes"]
----
docker run --log-driver=elastic/{log-driver-alias}:{version} \
--log-opt endpoint="myhost:9200" \
--log-opt hosts="myhost:9200" \
--log-opt user="myusername" \
--log-opt password="mypassword" \
--log-opt index="eld-%{[agent.version]}-%{+yyyy.MM.dd}" \
Expand All @@ -85,7 +85,7 @@ docker run --log-driver=elastic/{log-driver-alias}:{version} \
{
"log-driver" : "elastic/{log-driver-alias}:{version}",
"log-opts" : {
"endpoint" : "myhost:9200",
"hosts" : "myhost:9200",
"user" : "myusername",
"index" : "eld-%{[agent.version]}-%{+yyyy.MM.dd}",
"password" : "mypassword",
Expand Down